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 cf0847d4d67..4e71e59c8fb 100644 Binary files a/modular_skyrat/master_files/icons/obj/tank.dmi and b/modular_skyrat/master_files/icons/obj/tank.dmi differ 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