diff --git a/code/game/objects/closets/malfunction.dm b/code/game/objects/closets/malfunction.dm index cb85b49a68b..a21311fdfea 100644 --- a/code/game/objects/closets/malfunction.dm +++ b/code/game/objects/closets/malfunction.dm @@ -1,7 +1,7 @@ /obj/structure/closet/malf/suits/New() ..() sleep(2) - new /obj/item/weapon/tank/jetpack/void_jetpack(src) + new /obj/item/weapon/tank/jetpack/void(src) new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/head/helmet/space/nasavoid(src) new /obj/item/clothing/suit/space/nasavoid(src) diff --git a/code/game/objects/tanks/jetpack.dm b/code/game/objects/tanks/jetpack.dm index 29470531879..6e4c0c2fac7 100644 --- a/code/game/objects/tanks/jetpack.dm +++ b/code/game/objects/tanks/jetpack.dm @@ -65,14 +65,14 @@ return -/obj/item/weapon/tank/jetpack/void_jetpack +/obj/item/weapon/tank/jetpack/void name = "Void Jetpack (Oxygen)" desc = "It works well in a void." icon_state = "voidjetpack" item_state = "jetpack-void" -/obj/item/weapon/tank/jetpack/blue_jetpack +/obj/item/weapon/tank/jetpack/oxygen name = "Jetpack (Oxygen)" desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" @@ -83,7 +83,7 @@ src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return -/obj/item/weapon/tank/jetpack/black_jetpack +/obj/item/weapon/tank/jetpack/carbondioxide 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." icon_state = "black_jetpack" diff --git a/maps/oldstation.dmm b/maps/oldstation.dmm index a98b14e73dc..7d2588823ac 100644 --- a/maps/oldstation.dmm +++ b/maps/oldstation.dmm @@ -167,7 +167,7 @@ "dk" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,/turf/simulated/floor/plating,/area/engine/engineering) "dl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/engine/engineering) "dm" = (/obj/machinery/dispenser{pltanks = 0},/turf/simulated/floor,/area/derelict/bridge) -"dn" = (/obj/structure/rack,/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/mask/gas,/obj/item/clothing/gloves/black,/obj/item/clothing/under/color/black,/obj/item/clothing/shoes/black,/obj/item/weapon/tank/jetpack,/turf/simulated/floor,/area/derelict/bridge) +"dn" = (/obj/structure/rack,/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/obj/item/clothing/mask/gas,/obj/item/clothing/gloves/black,/obj/item/clothing/under/color/black,/obj/item/clothing/shoes/black,/obj/item/weapon/tank/jetpack/oxygen,/turf/simulated/floor,/area/derelict/bridge) "do" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/hallway/primary/central) "dp" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor/plating/airless,/area/assembly/chargebay) "dq" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/turf/simulated/wall/r_wall,/area/assembly/chargebay) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 963582832f4..f3c74cf6225 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -1089,8 +1089,8 @@ "auW" = (/obj/machinery/power/apc{dir = 4; name = "Tech. Storage APC"; pixel_x = 24; pixel_y = 0},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/storage/tech) "auX" = (/turf/simulated/wall/r_wall,/area/maintenance/fpmaint) "auY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint) -"auZ" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/ai_monitored/storage/eva) -"ava" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/ai_monitored/storage/eva) +"auZ" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/item/weapon/tank/jetpack/carbondioxide,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/ai_monitored/storage/eva) +"ava" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/tank/jetpack/carbondioxide,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/ai_monitored/storage/eva) "avb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/ai_monitored/storage/eva) "avc" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/ai_monitored/storage/eva) "avd" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/ai_monitored/storage/eva) diff --git a/maps/uterus.dmm b/maps/uterus.dmm index b3906319945..b240a1be9e2 100644 --- a/maps/uterus.dmm +++ b/maps/uterus.dmm @@ -859,7 +859,7 @@ "aqA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/hallway/primary/fore) "aqB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "red"; dir = 1},/area/hallway/primary/fore) "aqC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "red"; dir = 5},/area/hallway/primary/fore) -"aqD" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack,/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/ai_monitored/storage/eva) +"aqD" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/jetpack/oxygen,/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/ai_monitored/storage/eva) "aqE" = (/obj/machinery/dispenser{pltanks = 0},/turf/simulated/floor,/area/ai_monitored/storage/eva) "aqF" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/device/multitool,/obj/machinery/camera/motion,/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/ai_monitored/storage/eva) "aqG" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/ai_monitored/storage/eva) @@ -2885,7 +2885,7 @@ "bdy" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/grille,/turf/simulated/floor/plating,/area/toxins/mixing) "bdz" = (/obj/machinery/embedded_controller/radio/airlock_controller{airpump_tag = "tox_airlock_pump"; exterior_door_tag = "tox_airlock_exterior"; id_tag = "tox_airlock_control"; interior_door_tag = "tox_airlock_interior"; pixel_x = 0; pixel_y = -22; sanitize_external = 1; sensor_tag = "tox_airlock_sensor"},/turf/simulated/floor,/area/toxins/mixing) "bdA" = (/obj/structure/closet/extinguisher{pixel_x = 0; pixel_y = -27},/turf/simulated/floor,/area/toxins/mixing) -"bdB" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/mixing) +"bdB" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/toxins/mixing) "bdC" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/mixing) "bdD" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/mixing) "bdE" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/toxins/mixing) @@ -3189,7 +3189,7 @@ "bjq" = (/obj/machinery/atmospherics/binary/pump,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/toxins/xenobiology) "bjr" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{tag = "icon-warnwhite (SOUTHWEST)"; icon_state = "warnwhite"; dir = 10},/area/toxins/xenobiology) "bjs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/xenobiology) -"bjt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) +"bjt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{tag = "icon-warnwhitecorner (NORTH)"; icon_state = "warnwhitecorner"; dir = 1},/area/toxins/xenobiology) "bju" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; icon_state = "manifold-r-f"; dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "bjv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "bjw" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology)