mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
-CO2 Jetpacks now spawn with distribute_pressure 0
-Tanks in your suit storage, belt, and pockets take priority over tanks on your back when using the internals button on the HUD -Added an extra set of vents and scrubbers to the prison wing git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3841 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -93,6 +93,7 @@
|
|||||||
/obj/item/weapon/tank/jetpack/carbondioxide
|
/obj/item/weapon/tank/jetpack/carbondioxide
|
||||||
name = "Jetpack (Carbon Dioxide)"
|
name = "Jetpack (Carbon Dioxide)"
|
||||||
desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals."
|
desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals."
|
||||||
|
distribute_pressure = 0
|
||||||
icon_state = "jetpack-black"
|
icon_state = "jetpack-black"
|
||||||
item_state = "jetpack-black"
|
item_state = "jetpack-black"
|
||||||
|
|
||||||
|
|||||||
@@ -361,10 +361,7 @@
|
|||||||
usr << "\red You are not wearing a mask"
|
usr << "\red You are not wearing a mask"
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
if (istype(usr.back, /obj/item/weapon/tank))
|
if (ishuman(usr) && istype(usr:s_store, /obj/item/weapon/tank))
|
||||||
usr << "\blue You are now running on internals from the [usr.back] on your back."
|
|
||||||
usr.internal = usr.back
|
|
||||||
else if (ishuman(usr) && istype(usr:s_store, /obj/item/weapon/tank))
|
|
||||||
usr << "\blue You are now running on internals from the [usr:s_store] on your [usr:wear_suit]."
|
usr << "\blue You are now running on internals from the [usr:s_store] on your [usr:wear_suit]."
|
||||||
usr.internal = usr:s_store
|
usr.internal = usr:s_store
|
||||||
else if (ishuman(usr) && istype(usr:belt, /obj/item/weapon/tank))
|
else if (ishuman(usr) && istype(usr:belt, /obj/item/weapon/tank))
|
||||||
@@ -376,6 +373,9 @@
|
|||||||
else if (istype(usr:r_store, /obj/item/weapon/tank))
|
else if (istype(usr:r_store, /obj/item/weapon/tank))
|
||||||
usr << "\blue You are now running on internals from the [usr:r_store] in your right pocket."
|
usr << "\blue You are now running on internals from the [usr:r_store] in your right pocket."
|
||||||
usr.internal = usr:r_store
|
usr.internal = usr:r_store
|
||||||
|
else if (istype(usr.back, /obj/item/weapon/tank))
|
||||||
|
usr << "\blue You are now running on internals from the [usr.back] on your back."
|
||||||
|
usr.internal = usr.back
|
||||||
else if (istype(usr.l_hand, /obj/item/weapon/tank))
|
else if (istype(usr.l_hand, /obj/item/weapon/tank))
|
||||||
usr << "\blue You are now running on internals from the [usr.l_hand] on your left hand."
|
usr << "\blue You are now running on internals from the [usr.l_hand] on your left hand."
|
||||||
usr.internal = usr.l_hand
|
usr.internal = usr.l_hand
|
||||||
|
|||||||
19263
maps/tgstation.2.0.9.dmm
19263
maps/tgstation.2.0.9.dmm
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user