diff --git a/Resources/Changelog/Offbrand.yml b/Resources/Changelog/Offbrand.yml index f51a59e33c..2db4516c94 100644 --- a/Resources/Changelog/Offbrand.yml +++ b/Resources/Changelog/Offbrand.yml @@ -95,4 +95,14 @@ Entries: type: Add id: 6 time: '2025-10-03T22:00:00.0000000+00:00' +- author: sowelipililimute + changes: + - message: The simulation of the cardiovascular system has been overhauled! The new system is more granular and based on a more physiologically accurate model than before. + type: Tweak + - message: Tourniquets now consistently use the new behaviour of being persistent effects. + type: Fix + - message: Tourniquets now bruise the target slightly more. + type: Tweak + id: 7 + time: '2025-10-08T22:00:00.0000000+00:00' Order: 2 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 95cd04bb9b..c3eb185892 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -317,7 +317,7 @@ - id: DefibrillatorSyndicate - id: MedkitCombatFilled amount: 4 - - id: Tourniquet + - id: TourniquetOffbrand # Offbrand amount: 4 - id: CombatMedipen amount: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml index 304d2850ef..60856202aa 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -12,7 +12,7 @@ contrabandInventory: ClothingNeckStethoscope: 2 Saw: 2 - Tourniquet: 3 + TourniquetOffbrand: 3 # Offbrand DrinkChangelingStingCan: 2 emaggedInventory: DrinkNukieCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index c3a7f40539..5b5483f4de 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -40,7 +40,7 @@ ChemistryBottleInaprovaline: 3 # Offbrand ChemistryBottleDylovene: 3 # Offbrand ChemistryBottleDexalin: 3 # Offbrand - Tourniquet: 2 + TourniquetOffbrand: 2 # Offbrand Splints: 2 # Offbrand ChemistryBottleEpinephrine: 3 ChemistryBottleBicaridine: 1 @@ -67,7 +67,7 @@ Brutepack: 5 Ointment: 4 Bloodpack: 5 - Tourniquet: 1 + TourniquetOffbrand: 1 # Offbrand ChemistryBottleEpinephrine: 3 Syringe: 5 BoxBottle: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index f612f65eca..a5f737e7c7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -8,7 +8,7 @@ ClusterBangFull: 2 GrenadeStinger: 4 Flash: 5 - Tourniquet: 5 + TourniquetOffbrand: 5 # Offbrand FlashlightSeclite: 5 ClothingEyesGlassesSunglasses: 2 ClothingEyesHudSecurity: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml index f5585a5e32..66dfe48b03 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/security.yml @@ -20,7 +20,7 @@ - Handcuffs - Zipties - FlashlightSeclite - - Tourniquet + - TourniquetOffbrand # Offbrand chance: 0.85 - type: entity @@ -50,7 +50,7 @@ - FlashlightSeclite - GrenadeFlashBang - SecurityWhistle - - Tourniquet + - TourniquetOffbrand # Offbrand chance: 0.85 # Armory loot spawner diff --git a/Resources/Prototypes/_Offbrand/status_effects.yml b/Resources/Prototypes/_Offbrand/status_effects.yml index 3f03c0462c..ff833d842b 100644 --- a/Resources/Prototypes/_Offbrand/status_effects.yml +++ b/Resources/Prototypes/_Offbrand/status_effects.yml @@ -437,7 +437,7 @@ - type: DamageOverTimeStatusEffect damages: types: - Blunt: 0.15 + Blunt: 0.30 - type: BleedMultiplierStatusEffect multiplier: 0.25 diff --git a/Resources/migration.yml b/Resources/migration.yml index d05795def4..4c9ac6d0ae 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -728,3 +728,6 @@ BibleSatanic: null # 2025-10-8 ClothingBeltAssault: ClothingBeltMilitaryWebbing + +# Offbrand +Tourniquet: TourniquetOffbrand