From b0279f6f6c3336cd3fefe155d6c6318d62657169 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:13:27 -0500 Subject: [PATCH 1/4] Emergency toolbox fill rework (#29202) * emergency toolbox fill rework * Fuck --- .../Catalog/Fills/Items/toolboxes.yml | 28 +++++++-------- .../Objects/Misc/fire_extinguisher.yml | 33 ++++++++++++++++++ .../fire_extinguisher_closed.png | Bin 0 -> 559 bytes .../fire_extinguisher_open.png | Bin 0 -> 590 bytes .../inhand-left.png | Bin 0 -> 320 bytes .../inhand-right.png | Bin 0 -> 313 bytes .../Misc/fire_extinguisher_mini.rsi/meta.json | 25 +++++++++++++ 7 files changed, 71 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_closed.png create mode 100644 Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_open.png create mode 100644 Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 87921a71d4f..1091207bba4 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -7,24 +7,22 @@ - type: StorageFill contents: - id: CrowbarRed - - id: ClothingMaskBreath - - id: ClothingMaskBreath - prob: 0.5 - - id: EmergencyOxygenTankFilled - - id: EmergencyOxygenTankFilled - prob: 0.5 - - id: FoodTinMRE - - id: FoodTinMRE - prob: 0.5 - - id: DrinkWaterBottleFull - - id: DrinkWaterBottleFull - prob: 0.5 + - id: RadioHandheld + - id: WelderMini + - id: FireExtinguisherMini + # Random lighting item orGroup - id: FlashlightLantern - - id: FlashlightLantern - prob: 0.5 + orGroup: LightingItem + - id: Flare + orGroup: LightingItem + - id: GlowstickBase + orGroup: LightingItem + # Low-chance items + - id: FoodSnackChocolate + prob: 0.15 - id: HarmonicaInstrument prob: 0.15 - + - type: entity id: ToolboxElectricalFilled name: electrical toolbox diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index f1802e426fb..8ee730cc944 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -79,3 +79,36 @@ - type: VaporVisuals animationTime: 0.8 animationState: extinguish + +- type: entity + name: pocket fire extinguisher + parent: FireExtinguisher + id: FireExtinguisherMini + description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother. + components: + - type: Sprite + sprite: Objects/Misc/fire_extinguisher_mini.rsi + layers: + - state: fire_extinguisher_closed + map: [ "enabled" ] + - type: Item + sprite: Objects/Misc/fire_extinguisher_mini.rsi + size: Small + - type: SolutionContainerManager + solutions: + spray: + maxVol: 30 + reagents: + - ReagentId: Water + Quantity: 30 + - type: MeleeWeapon + wideAnimationRotation: 180 + damage: + types: + Blunt: 3 #completely ineffective; your fists are better + soundHit: + path: /Audio/Effects/weak_hit1.ogg + - type: PhysicalComposition + materialComposition: + Steel: 50 + Glass: 40 \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_closed.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/fire_extinguisher_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..3ae6804597bebd167d30421596e213ca5a9bf26a GIT binary patch literal 559 zcmV+~0?_@5P)#g4ix*KrG1QZyR^X*a3<0q8?75Ps7C_v8SY^$_68*Y6xYaES8Cikg=WK++tx&6UeN9Ph>84N=1uI$v1CE`nAhNYjLuzIPoY!C(@-cW9UVrhD$?eDB9O_q+>Tb=B1tOPC~` znV3+m_8%`SX!EoaMk5im`1TEje3o1xPo+}f?70i{?d%00{^F$;)5t*L^(#K6KH<1t z)7hmf*VsEetW}9^x&{C|&qD~olV{HX80Zi2Be%-@+$;|sJ^~%I3p52b!H@5N%``eao2eHLzQ1Aw1BJqjS~x+1ie>&VnHkWPOAz;#^|;P+XL zvw?89u@1YgC=3m8|G;6jx}(1%Q>z8Zckjh$B+_yM0)aqd9k(nsmdOan{FA9wfx3hc zNZCGhtXBK)OK4<3N=d-)Yuc;UswOD2DUecP+cs6F#*N!I6~Ncbca9u9M0$Byk7Z)O z7ub$%2N~QICYvh~vV$BycGLuAcn73~lyLggIHA5?HawSLFi1AvdE{Ejs0HdroKUFLi*)ugw>heYQ&)nI30{|aZRv3&<8s!=p za2y9`z0!!S`550EhtJWg+AO0>xR_k}8+3Qh1Z8F*SI9TT_2=0{Mp^A1B!FZhVdkW( cuC_|Q0LkpD(fKtcBme*a07*qoM6N<$f>m4%00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..570b1dbcc44a8746b2cedc1c172de13fa37dd8c8 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xPMbDm$Bu0;Up_arv@o@{K6UCuZgKIg+t-e(sR5PjR=Xqtq_|3g z{DS|(0K=v;I_H6+oCO|{#S9F5he4R}c>anMpx{(b7srqY_qW#!g$^t5xCC-?3%{#> z*pn0EvZhd?YsroKGX&2ZRt*wYb~pe;zr!7V8A`|=+?df->{(SD{<}_P*IK62^&hei zm_$a$MP9P7I=tp<`@t6+%)){S4kiRYmDi|l8mY! wJ|B23sFAGjrfGAzexot>?dH?_x*gW$AE@pvYBhZSALu{^Pgg&ebxsLQ0Lu@4?f?J) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3a62d5a9f921670025feb2dbd6dcb9b8b992e0d9 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xPMbF6<;&+gc5E}Xv@o@{K6UCuZgKIg+t-e(sR5N-o%oy=NO6?} z`33)n0ftRybj|}sISV`@iy0XB4ude`@%$AjK*2sw7srqY_qW%)`5F{>TrW1cru>&S z^9}eJnJw|+!QD>ZHSBFcvv`2I85mx=Gwfa1^)y-O`CF#Sa@iW2>5&P)*yc08v3dT{ z^4q%@JJoIV@w&I)*9tQ*2!T-$`ySETe;u;t?F!?n)LPBBXu+KWOf4%I3l&Tbm~p$v qc2sJu`X2e;TVii0-xgMdrLqTEdyC7jHfsZ2#^CAd=d#Wzp$Py9+jH{( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json new file mode 100644 index 00000000000..db1885634a5 --- /dev/null +++ b/Resources/Textures/Objects/Misc/fire_extinguisher_mini.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation13 at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. Edited by Flareguy for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fire_extinguisher_open" + }, + { + "name": "fire_extinguisher_closed" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} From b42525c3fea7cc2a51047c310a132bb27226d0e6 Mon Sep 17 00:00:00 2001 From: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:41:50 -0400 Subject: [PATCH 2/4] re-adds emergency oxygen to toolboxes --- Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 1091207bba4..5f0604ee0d6 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -17,11 +17,16 @@ orGroup: LightingItem - id: GlowstickBase orGroup: LightingItem + # Grimbly - Oxygen + - id: ClothingMaskBreath + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: EmergencyOxygenTankFilled # Low-chance items - id: FoodSnackChocolate prob: 0.15 - id: HarmonicaInstrument - prob: 0.15 + prob: 0.10 - type: entity id: ToolboxElectricalFilled From d10e88f1d142db9f6a36854d5e52393d4a32a94e Mon Sep 17 00:00:00 2001 From: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:45:03 -0400 Subject: [PATCH 3/4] adds mini-fire extinguishers to atmos --- Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index e4d995e52ee..83e66927716 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -85,6 +85,7 @@ - id: ClothingOuterSuitAtmosFire - id: ClothingHeadHelmetAtmosFire - id: GasAnalyzer + - id: FireExtinguisherMini - id: MedkitOxygenFilled - id: HolofanProjector - id: DoorRemoteFirefight @@ -104,6 +105,7 @@ - id: ClothingOuterSuitAtmosFire - id: ClothingHeadHelmetAtmosFire - id: GasAnalyzer + - id: FireExtinguisherMini - id: MedkitOxygenFilled - id: HolofanProjector - id: DoorRemoteFirefight From 7b6810c363d53abb1080db81ec3ee68f7d1e6ff3 Mon Sep 17 00:00:00 2001 From: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com> Date: Wed, 18 Sep 2024 15:47:33 -0400 Subject: [PATCH 4/4] MRE real --- Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 5f0604ee0d6..9e99750bff3 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -27,6 +27,8 @@ prob: 0.15 - id: HarmonicaInstrument prob: 0.10 + - id: FoodTinMRE + prob: 0.20 - type: entity id: ToolboxElectricalFilled