From 99dcbd474366156faa2a07cb76af7bef3a4c6935 Mon Sep 17 00:00:00 2001 From: Robwo <31576505+R0bro@users.noreply.github.com> Date: Tue, 14 Jul 2026 14:34:07 -0400 Subject: [PATCH] Adds Emergency Vox Nitrogen Tanks to Oxygen Closets (#5911) ## About The Pull Request #Nitrogen4Vox I know we have low amount of vox players but this feels like a no-brainer change. Also this updates the emergency nitrogen tank sprite to be consistent with tg's. image ## Changelog :cl: Robwo add: Added emergency n2 tanks to oxygen closets for vox. /:cl: --- .../crates_lockers/closets/utility_closets.dm | 5 +++++ modular_skyrat/master_files/icons/obj/tank.dmi | Bin 573 -> 911 bytes .../game/objects/items/tanks/n2_tanks.dm | 11 +++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 2aa03b89440..222b4e753aa 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -43,20 +43,25 @@ if ("small") new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/tank/internals/nitrogen/belt/emergency(src) //BUBBER ADDITION - nitrogen 4 vox <3 + new /obj/item/tank/internals/nitrogen/belt/emergency(src) //BUBBER ADDITION - nitrogen 4 vox <3 new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/mask/breath(src) if ("aid") new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/tank/internals/nitrogen/belt/emergency(src) //BUBBER ADDITION - nitrogen 4 vox <3 new /obj/item/storage/medkit/emergency(src) new /obj/item/clothing/mask/breath(src) if ("tank") new /obj/item/tank/internals/oxygen(src) + new /obj/item/tank/internals/nitrogen(src) //BUBBER ADDITION - nitrogen 4 vox <3 new /obj/item/clothing/mask/breath(src) if ("both") new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/tank/internals/nitrogen/belt/emergency(src) //BUBBER ADDITION - nitrogen 4 vox <3 new /obj/item/clothing/mask/breath(src) // SKYRAT EDIT REMOVAL START diff --git a/modular_skyrat/master_files/icons/obj/tank.dmi b/modular_skyrat/master_files/icons/obj/tank.dmi index cf0847d4d67e2205f1131e3e59efe5abbb87657a..4e71e59c8fb7b6ec501307f6fad9ac503a57a089 100644 GIT binary patch delta 846 zcmV-U1F`(Q1dj)QiBL{Q4GJ0x0000DNk~Le0001B0000$2m=5B0MhD$JOBUyQBX`& zMZmzo5)v0UIYkHv3teJw92_LDAye5}K``c-UkN(@%er!Lit_gN>FMdYzsE#9R6jva zD=au%TwFdqMT?7zs;a8Q#Kbc*Gl+i&RgrlX$rs};PZ@v zZZI_OqVJS5==Dv50gWkIXZf^NebZpu1AmIqd*hj`Ry`W5AHR3RAG6q>Q|keu;|m$Y z-?XK+ln8~OuA@cfN>GC)3m z{=rZFi2Q2(VL-GJK2ZOPKaKi>KyGgsVSO}zqF!%?w@A3u|1^%|uSD?R7yF;yrmXoN zr%_Ef&Zqbvr)kJCf6@~SYODMy{Gbnb7R#|cHGve8%>SXUx2Gjg zQkMB!`Yi)K6S{t@ffq!hfh(@K;)-v7ix9%O0(PFy)vy*M=JO;%SQgY+PEr8=V2?OY z0B#>sLY>qHJMkouFZX33gGp z5N_zIKxtS|>~e=CECOl@3ZO;sCyTGtAzC2dhrr6$Z)JT5tnk3$z<(zTM0`enfxy+9 z^0U-P??5>hc;Ijpz#WkBo&*Aeo4S^Lm;i=5{9b-l4u>I=fQI8g0uIN7ZQsXn8uoqT z2>|awK*R4~0gq!s-5>?vt?~p<;h6AVAqC+2&J#R^V*;#cg@85X35tn`;M1&JWxzj zMZmzoJvKBhCL?EKVwRDPO-f3Cd3ZiOMTtU1%u-1(=9ytYI`VO0_E1D!P)F_X&*|yu zudlC^l$5~0z(h($0d!JMQvg8b*k%9#0DpQ^Sad{@luLgvJ}EO@iHkEOv#1y- zY{#lU zHVp6o+5+Y;2a8t+`!f<#vUyjr??XH^G<2u`|AS-pziZ(1zbmKz{SDat@AG#5yVCx% z`u`1Htp5Ifp8NP`|99|S|G&3|F5d0`p|92-H8l;3BX6(#00000NkvXXu0mjfx8>xP diff --git a/modular_skyrat/modules/customization/game/objects/items/tanks/n2_tanks.dm b/modular_skyrat/modules/customization/game/objects/items/tanks/n2_tanks.dm index e8c39ac3356..f1b0e569e4a 100644 --- a/modular_skyrat/modules/customization/game/objects/items/tanks/n2_tanks.dm +++ b/modular_skyrat/modules/customization/game/objects/items/tanks/n2_tanks.dm @@ -5,7 +5,9 @@ /obj/item/tank/internals/nitrogen name = "nitrogen tank" desc = "A small tank of nitrogen, for crew who don't breathe the standard air mix." - icon_state = "oxygen_fr" + icon = 'modular_skyrat/master_files/icons/obj/tank.dmi' + icon_state = "nitrogen" + tank_holder_icon_state = "holder_nitrogen" force = 10 distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE distribute_pressure = 4 // see vox.dm for their intake values balance changes @@ -19,12 +21,12 @@ air_contents.gases[/datum/gas/nitrogen][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) /obj/item/tank/internals/nitrogen/belt - icon = 'modular_skyrat/master_files/icons/obj/tank.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/belt.dmi' lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/equipment/tanks_lefthand.dmi' righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/equipment/tanks_righthand.dmi' - icon_state = "nitrogen_extended" + icon_state = "nitrogen_emergency_ext" inhand_icon_state = "nitrogen" + tank_holder_icon_state = "holder_nitrogen_emergency_ext" slot_flags = ITEM_SLOT_BELT force = 5 volume = 12 @@ -37,7 +39,8 @@ /obj/item/tank/internals/nitrogen/belt/emergency name = "emergency nitrogen tank" desc = "Used for emergencies. Contains very little nitrogen, so try to conserve it until you actually need it." - icon_state = "nitrogen" + icon_state = "nitrogen_emergency" + tank_holder_icon_state = "holder_nitrogen_emergency" worn_icon_state = "nitrogen_extended" volume = 3