diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 74893a0466a..f0648fbd6ca 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -424,9 +424,7 @@ /turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "bO" = ( -/obj/structure/closet/secure_closet/bar{ - req_access = list(25) - }, +/obj/structure/closet/secure_closet/bar, /turf/simulated/floor/plasteel/freezer, /area/ninja/holding) "bP" = ( @@ -824,6 +822,16 @@ /obj/machinery/economy/vending/boozeomat, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) +"dm" = ( +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "do" = ( /obj/structure/table/abductor, /obj/item/surgicaldrill/alien, @@ -2341,6 +2349,16 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"im" = ( +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/item/stack/sheet/plasmarglass/fifty, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "in" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "sit_tele"; @@ -4742,9 +4760,6 @@ /obj/effect/landmark/spawner/tdome1, /turf/simulated/floor/plasteel, /area/tdome/arena) -"pX" = ( -/turf/simulated/floor/plasteel/dark/nitrogen, -/area/centcom/specops) "pY" = ( /obj/machinery/door/airlock/centcom{ name = "Team Storage" @@ -5133,19 +5148,13 @@ /turf/simulated/floor/plasteel/freezer, /area/admin) "rp" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/rglass/fifty, +/obj/item/stack/sheet/rglass/fifty, +/obj/item/stack/sheet/rglass/fifty, +/obj/item/stack/sheet/rglass/fifty, +/obj/item/stack/sheet/rglass/fifty, +/obj/item/stack/sheet/rglass/fifty, +/obj/structure/shelf/engineering, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "rq" = ( @@ -7702,10 +7711,7 @@ }, /area/centcom/suppy) "Bm" = ( -/obj/machinery/door/poddoor/multi_tile/impassable/three_tile_hor{ - id_tag = "SpecopsEngineering"; - name = "Special Operations Engineering Storage" - }, +/obj/machinery/economy/vending/tool/free, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Bo" = ( @@ -7794,6 +7800,13 @@ /obj/structure/chair/sofa, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/escape) +"BC" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/grass, +/area/centcom/suppy) "BD" = ( /obj/structure/chair/sofa, /obj/machinery/light/spot{ @@ -8078,28 +8091,6 @@ icon_state = "bar" }, /area/tdome/tdomeobserve) -"CH" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/plasteel{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 50 - }, -/turf/simulated/floor/plasteel/dark, -/area/centcom/specops) "CI" = ( /obj/structure/urinal{ pixel_y = 28 @@ -8446,9 +8437,14 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/gamma/space) "DZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "vault" - }, +/obj/item/stock_parts/cell/bluespace, +/obj/item/stock_parts/cell/bluespace, +/obj/item/stock_parts/cell/bluespace, +/obj/item/stock_parts/cell/bluespace, +/obj/item/stock_parts/cell/bluespace, +/obj/item/stock_parts/cell/bluespace, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Ea" = ( /obj/effect/mapping_helpers/airlock/access/all/centcomm/specops, @@ -9255,13 +9251,13 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) "GV" = ( -/obj/structure/table/reinforced, -/obj/item/stock_parts/cell/bluespace, -/obj/item/stock_parts/cell/bluespace, -/obj/item/stock_parts/cell/bluespace, -/obj/item/stock_parts/cell/bluespace, -/obj/item/stock_parts/cell/bluespace, -/obj/item/stock_parts/cell/bluespace, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/item/rcl/pre_loaded, +/obj/structure/shelf/engineering, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "GW" = ( @@ -9881,16 +9877,6 @@ }, /turf/simulated/floor/plating, /area/centcom/specops) -"Jg" = ( -/obj/structure/table/reinforced, -/obj/item/storage/belt/utility/chief/full, -/obj/item/storage/belt/utility/chief/full, -/obj/item/storage/belt/utility/chief/full, -/obj/item/storage/belt/utility/chief/full, -/obj/item/storage/belt/utility/chief/full, -/obj/item/storage/belt/utility/chief/full, -/turf/simulated/floor/plasteel/dark, -/area/centcom/specops) "Jh" = ( /turf/simulated/wall/indestructible/riveted, /area/tdome/tdomeadmin) @@ -9950,10 +9936,8 @@ }, /area/tdome/tdomeobserve) "Jr" = ( -/obj/structure/railing, -/obj/structure/flora/ausbushes/genericbush, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/portable/pump/bluespace, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Js" = ( /obj/structure/table/wood/fancy/purple, @@ -9967,6 +9951,16 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/grass, /area/centcom/specops) +"Ju" = ( +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/stack/sheet/plasteel/fifty, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "Jv" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -10047,10 +10041,14 @@ }, /area/centcom/gamma) "JE" = ( -/obj/structure/railing, -/obj/structure/flora/ausbushes/pointybush, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/item/stack/sheet/plasmaglass/fifty, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "JG" = ( /obj/structure/railing, @@ -10889,43 +10887,13 @@ /turf/simulated/floor/wood, /area/ghost_bar) "My" = ( -/obj/structure/table/reinforced, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, -/obj/item/rcd_ammo/large, /obj/item/rcd/combat, /obj/item/rcd/combat, /obj/item/rcd/combat, /obj/item/rcd/combat, /obj/item/rcd/combat, /obj/item/rcd/combat, +/obj/structure/shelf/engineering, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Mz" = ( @@ -11134,19 +11102,13 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/ghost_bar) "Nb" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/structure/shelf/engineering, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Nc" = ( @@ -11388,6 +11350,16 @@ "NX" = ( /turf/simulated/floor/plating/asteroid/ancient, /area/ghost_bar) +"NY" = ( +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/item/storage/belt/utility/chief/full, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "NZ" = ( /obj/machinery/computer/security/telescreen/entertainment, /turf/simulated/wall/indestructible/riveted, @@ -11549,19 +11521,13 @@ /turf/simulated/floor/wood, /area/centcom/evac) "OA" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, -/obj/item/grenade/chem_grenade/metalfoam, +/obj/structure/closet/crate/engineering, +/obj/item/stack/sheet/mineral/uranium{ + amount = 50 + }, +/obj/item/stack/sheet/mineral/uranium{ + amount = 10 + }, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "OB" = ( @@ -11934,13 +11900,13 @@ /turf/simulated/floor/plating/airless, /area/centcom/control) "PM" = ( -/obj/structure/closet/crate/engineering, -/obj/item/stack/sheet/mineral/uranium{ - amount = 10 - }, -/obj/item/stack/sheet/mineral/uranium{ - amount = 50 - }, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/metal/fifty, +/obj/structure/shelf/engineering, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "PO" = ( @@ -12059,6 +12025,13 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/administration) +"Qh" = ( +/obj/machinery/door/poddoor/multi_tile/impassable/four_tile_hor{ + name = "Special Operations Engineering Storage"; + id_tag = "SpecopsEngineering" + }, +/turf/simulated/floor/plasteel/dark, +/area/centcom/specops) "Qj" = ( /obj/structure/chair/sofa{ color = "#63009c" @@ -12088,10 +12061,14 @@ /turf/simulated/floor/wood, /area/wizard_station) "Qr" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "vault" - }, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/structure/shelf/engineering, +/turf/simulated/floor/plasteel/dark, /area/centcom/specops) "Qs" = ( /obj/effect/turf_decal/delivery, @@ -13380,13 +13357,13 @@ }, /area/tdome/tdomeobserve) "VC" = ( -/obj/structure/table/reinforced, /obj/item/rpd/bluespace, /obj/item/rpd/bluespace, /obj/item/rpd/bluespace, /obj/item/rpd/bluespace, /obj/item/rpd/bluespace, /obj/item/rpd/bluespace, +/obj/structure/shelf/engineering, /turf/simulated/floor/plasteel/dark, /area/centcom/specops) "VD" = ( @@ -14263,6 +14240,12 @@ }, /turf/simulated/floor/wood, /area/centcom/control) +"Yr" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/genericbush, +/turf/simulated/floor/grass, +/area/centcom/suppy) "Ys" = ( /obj/machinery/door/window{ name = "Equipment Room"; @@ -33410,10 +33393,10 @@ aN aN aN aN -aN -Db -aN -aN +Zr +Zr +Zr +Zr Zr Zr Zr @@ -33667,16 +33650,16 @@ aN aN aN aN -aN -aN -aN -aN Zr -NU -NU -NU +JE +JE +JE +Qr +Qr +Qr +PM +PM PM -tq Zr Ji Ra @@ -33924,16 +33907,16 @@ aN aN aN aN -aN -aN -aN -aN Zr -aH Ra Ra Ra -tq +Ra +Ra +Ra +Ra +Ra +Ra Zr Ji Ra @@ -34181,18 +34164,18 @@ aN aN aN aN -aN -aN -aN -aN -Zr +VI +im +im +im rp +rp +rp +aH Ra -Ra -Ra -Ra -Bm -Ji +GO +Zr +hm Ra Xz Yj @@ -34438,17 +34421,17 @@ aN aN aN aN -aN -aN -aN -aN -VI +Zr +Ju +Ju +Ju Nb +Nb +Nb +aH Ra Ra -Ra -Ra -pX +Qh Ji Ra Xz @@ -34681,10 +34664,6 @@ oc oc oc oc -aN -aN -aN -aN Db aN aN @@ -34700,7 +34679,11 @@ aN aN Db Zr -CH +Ra +Ra +Ra +Ra +Ra Ra Ra Ra @@ -34939,10 +34922,6 @@ oc oc oc aN -aN -aN -aN -aN wK wK wK @@ -34957,13 +34936,17 @@ wK aN aN Zr -Vo Ra Ra Ra -GO -Zr -hm +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ji Ra Xz RD @@ -35196,10 +35179,6 @@ oc oc oc aN -aN -aN -aN -aN wK oV BL @@ -35214,12 +35193,16 @@ lq GX aN Zr +dm +dm +dm +NY VC My -Jg -OA -GV -Zr +tq +Ra +Ra +Ra Ji Ra Xz @@ -35453,10 +35436,6 @@ oc oc oc aN -aN -aN -aN -aN wK Fc Fc @@ -35470,14 +35449,18 @@ Fc Gf GY aN +VI +Jr +Jr +Jr +Jr +Jr +Jr +tq +Ra +GO Zr -Zr -Zr -Zr -Zr -Zr -Zr -Ji +hm Ra Xz Zr @@ -35710,10 +35693,6 @@ oc oc oc aN -aN -aN -aN -Db wK Bd Fc @@ -35728,12 +35707,16 @@ Gf GY Db Zr -oN -oN -oN -MN +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra Zr -Jr Ji Ra Xz @@ -35967,10 +35950,6 @@ oc oc oc aN -aN -aN -aN -aN wK Fc Fc @@ -35985,12 +35964,16 @@ Gf GY aN Zr -JW -Ra -Ra +Vo +Bm +GV +OA +NU +NU +NU +DZ DZ Zr -Jt Ji Ra Xz @@ -36224,10 +36207,6 @@ oc oc oc aN -aN -aN -aN -aN wK SS nE @@ -36242,12 +36221,16 @@ lq Ha aN Zr -Hv -Hv -Ra -DZ -pY -Ji +Zr +Zr +Zr +Zr +Zr +Zr +Zr +Zr +Zr +Zr Ra Ra Xz @@ -36481,10 +36464,6 @@ oc oc oc aN -aN -aN -aN -aN wK wK wK @@ -36499,13 +36478,17 @@ wK aN aN Zr +JW oN oN -Ra -DZ -pY -Qr -Ra +oN +oN +oN +oN +MN +Zr +Jt +Ji Ra Xz Zr @@ -36737,10 +36720,6 @@ oc oc oc oc -aN -aN -aN -aN Db aN aN @@ -36755,14 +36734,18 @@ aN aN aN Db -zN -Ra -Ra -Ra -DZ Zr -Jx -Ji +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +pY +Ra +Ra Ra Xz Zr @@ -36997,10 +36980,6 @@ oc aN aN aN -aN -aN -aN -aN Jn Fw CO @@ -37012,13 +36991,17 @@ aN aN aN aN -Zr +zN +Ra +Hv +Hv +Hv Hv Hv Hv MN Zr -JE +Jx Ji AV Xo @@ -37254,10 +37237,6 @@ oc aN aN aN -aN -aN -aN -aN Jn Ci CM @@ -37276,6 +37255,10 @@ Zr Zr Zr Zr +Zr +Zr +Zr +Zr Ud WQ Ud @@ -37511,10 +37494,6 @@ oc aN aN aN -aN -aN -aN -aN xI oD MX @@ -37526,9 +37505,13 @@ aN aN aN aN +Jn +Jn +Jn Ex Jn Jn +Jn Ok Sk YA @@ -37768,10 +37751,6 @@ oc aN aN aN -aN -aN -aN -aN xI Bl CQ @@ -37785,6 +37764,10 @@ xI wo Jn Wa +BC +Yr +BC +Wa Jn Rg Rg @@ -38025,10 +38008,6 @@ aN aN aN aN -aN -aN -aN -aN xI KM Es @@ -38042,6 +38021,10 @@ xZ Bu Jn JY +JY +JY +JY +JY Jn qS ZC @@ -38282,10 +38265,6 @@ aN aN aN aN -aN -aN -aN -aN xI Fg sk @@ -38299,6 +38278,10 @@ sk DF Be sk +sk +sk +sk +sk Mz ZC ZC @@ -38539,10 +38522,6 @@ aN aN aN aN -aN -aN -aN -aN Jn Jn Jn @@ -38555,6 +38534,10 @@ Jn Jn Jn Jn +Jn +Jn +Jn +JY JY Jn ZC diff --git a/code/modules/atmospherics/machinery/portable/portable_pump.dm b/code/modules/atmospherics/machinery/portable/portable_pump.dm index 5474bdf2bfa..8821a933103 100644 --- a/code/modules/atmospherics/machinery/portable/portable_pump.dm +++ b/code/modules/atmospherics/machinery/portable/portable_pump.dm @@ -1,6 +1,6 @@ -/// The maximum `target_pressure` you can set on the pump. Equates to about 1013.25 kPa. -#define MAX_TARGET_PRESSURE 10 * ONE_ATMOSPHERE +/// The maximum `target_pressure` you can set on the pump. +#define MAX_TARGET_PRESSURE 45 * ONE_ATMOSPHERE /// The pump will be siphoning gas. #define DIRECTION_IN 0 /// The pump will be pumping gas out. @@ -9,7 +9,9 @@ /obj/machinery/atmospherics/portable/pump name = "portable air pump" icon = 'icons/obj/atmos.dmi' - icon_state = "psiphon:0" + icon_state = "ppump:0" + base_icon_state = "ppump" + var/base_attachment_icon_state = "ppump" density = TRUE volume = 1000 /// The direction the pump is operating in. This should be either `DIRECTION_IN` or `DIRECTION_OUT`. @@ -18,6 +20,12 @@ target_pressure = 101.325 resistance_flags = NONE +/obj/machinery/atmospherics/portable/pump/Initialize(mapload) + . = ..() + // Fill with normal air. + air_contents.set_oxygen(MAX_TARGET_PRESSURE * O2STANDARD * volume / (T20C * R_IDEAL_GAS_EQUATION)) + air_contents.set_nitrogen(MAX_TARGET_PRESSURE * N2STANDARD * volume / (T20C * R_IDEAL_GAS_EQUATION)) + /obj/machinery/atmospherics/portable/pump/examine(mob/user) . = ..() . += "Invaluable for filling air in a room rapidly after a breach repair. The internal gas container can be filled by \ @@ -26,14 +34,14 @@ A tank of gas can also be attached to the air pump, allowing you to fill or empty the tank, via the internal one." /obj/machinery/atmospherics/portable/pump/update_icon_state() - icon_state = "psiphon:[on]" + icon_state = "[base_icon_state]:[on]" /obj/machinery/atmospherics/portable/pump/update_overlays() . = ..() if(holding_tank) - . += "siphon-open" + . += "[base_attachment_icon_state]-open" if(connected_port) - . += "siphon-connector" + . += "[base_attachment_icon_state]-connector" /obj/machinery/atmospherics/portable/pump/emp_act(severity) if(stat & (BROKEN|NOPOWER)) @@ -166,6 +174,7 @@ direction = DIRECTION_OUT if(on && holding_tank) investigate_log("[key_name(usr)] started a transfer into [holding_tank].
", "atmos") + update_icon() return TRUE if("remove_tank") @@ -179,6 +188,34 @@ add_fingerprint(usr) +/obj/machinery/atmospherics/portable/pump/big + name = "large portable air pump" + icon_state = "ppump_big:0" + base_icon_state = "ppump_big" + base_attachment_icon_state = "ppump_big" + volume = 5000 + +/obj/machinery/atmospherics/portable/pump/big/examine(mob/user) + . = ..() + . += "
This one is quite large, enabling it to hold more air." + +/obj/machinery/atmospherics/portable/pump/bluespace + name = "bluespace portable air pump" + icon_state = "ppump_bs:0" + base_icon_state = "ppump_bs" + base_attachment_icon_state = "ppump_big" + volume = 25000 + +/obj/machinery/atmospherics/portable/pump/bluespace/examine(mob/user) + . = ..() + . += "
This one is not only large, but made of exotic materials, and uses bluespace technology to hold even more air." + +/obj/machinery/atmospherics/portable/pump/bluespace/update_icon_state() + if(on && direction == DIRECTION_IN) + icon_state = "[base_icon_state]:[on]-r" + else + icon_state = "[base_icon_state]:[on]" + #undef MAX_TARGET_PRESSURE #undef DIRECTION_IN #undef DIRECTION_OUT diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index f2526a70dbc..df888f2dcce 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -40,9 +40,9 @@ /obj/machinery/atmospherics/portable/scrubber/update_overlays() . = ..() if(holding_tank) - . += "scrubber-open" + . += "pscrubber-open" if(connected_port) - . += "scrubber-connector" + . += "pscrubber-connector" /obj/machinery/atmospherics/portable/scrubber/process_atmos() ..() diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index 3482d2a3ef4..74769e2dae3 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ