From 0ac084a28b3a71c3ce5b5730a9da2db2260fefd2 Mon Sep 17 00:00:00 2001 From: esainane Date: Sun, 21 Nov 2021 05:14:12 +1300 Subject: [PATCH] [MDB IGNORE] Repath wall reagent dispensers (#62593) * Repath wall reagent dispensers This changes /obj/structure/reagent_dispensers/{virusfood,peppertank} to be subpaths of /obj/structure/reagent_dispensers/wall. The WALLITEMS test now checks for all wall mounted reagent dispensers, instead of just peppertank specifically. > git ls-files '*.dmm' | xargs -d\\n sed -i 's@/obj/structure/reagent_dispensers/peppertank@/obj/structure/reagent_dispensers/wall/peppertank@g' > git ls-files '*.dmm' | xargs -d\\n sed -i 's@/obj/structure/reagent_dispensers/virusfood@/obj/structure/reagent_dispensers/wall/virusfood@g' --- .../lavaland_surface_syndicate_base1.dmm | 2 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 2 +- .../SpaceRuins/turretedoutpost.dmm | 2 +- _maps/RandomZLevels/SnowCabin.dmm | 4 +-- _maps/RandomZLevels/moonoutpost19.dmm | 2 +- _maps/RandomZLevels/research.dmm | 4 +-- _maps/RandomZLevels/undergroundoutpost45.dmm | 6 ++-- .../map_files/Deltastation/DeltaStation2.dmm | 32 +++++++++---------- .../map_files/IceBoxStation/IceBoxStation.dmm | 18 +++++------ _maps/map_files/KiloStation/KiloStation.dmm | 24 +++++++------- _maps/map_files/MetaStation/MetaStation.dmm | 20 ++++++------ _maps/map_files/generic/CentCom.dmm | 16 +++++----- _maps/map_files/tramstation/tramstation.dmm | 22 ++++++------- _maps/shuttles/emergency_casino.dmm | 2 +- _maps/shuttles/emergency_cere.dmm | 2 +- _maps/shuttles/emergency_donut.dmm | 2 +- _maps/shuttles/emergency_medisim.dmm | 2 +- _maps/shuttles/emergency_meta.dmm | 2 +- _maps/shuttles/emergency_nature.dmm | 2 +- _maps/shuttles/emergency_omega.dmm | 2 +- _maps/shuttles/emergency_raven.dmm | 2 +- _maps/shuttles/emergency_tram.dmm | 2 +- _maps/shuttles/labour_box.dmm | 2 +- _maps/shuttles/labour_delta.dmm | 2 +- _maps/shuttles/labour_kilo.dmm | 2 +- code/__HELPERS/global_lists.dm | 2 +- code/modules/reagents/reagent_dispenser.dm | 21 ++++++------ 27 files changed, 101 insertions(+), 100 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index a19d1eeb599..965c7942f7d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1258,7 +1258,7 @@ /area/ruin/syndicate_lava_base/virology) "fj" = ( /obj/structure/table/glass, -/obj/structure/reagent_dispensers/virusfood/directional/north, +/obj/structure/reagent_dispensers/wall/virusfood/directional/north, /obj/item/clothing/gloves/color/latex, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 981b5b6aae1..7ac7f31f0a6 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -1663,7 +1663,7 @@ /area/ruin/space/has_grav/deepstorage/armory) "ex" = ( /obj/structure/table, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/effect/spawner/random/exotic/tool, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/deepstorage/armory) diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index 621c86ff351..24d77736f82 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -159,7 +159,7 @@ /area/ruin/space/has_grav/turretedoutpost) "aC" = ( /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/item/gps/spaceruin, /turf/open/floor/iron, /area/ruin/space/has_grav/turretedoutpost) diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index 9b7725bd208..808572ddc5f 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -1515,7 +1515,7 @@ /turf/open/floor/plating/asteroid/snow, /area/awaymission/cabin/snowforest) "eP" = ( -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -1717,7 +1717,7 @@ /turf/open/floor/iron/dark, /area/awaymission/cabin/caves/mountain) "fm" = ( -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/blue{ dir = 4 }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index d1e40b70a47..1a91229ed63 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -2706,7 +2706,7 @@ }, /area/awaymission/moonoutpost19/research) "gi" = ( -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 94262d5a72a..64f54fe8898 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -942,7 +942,7 @@ /turf/open/floor/iron/dark, /area/awaymission/research/interior/gateway) "cG" = ( -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/purple{ dir = 1 }, @@ -3884,7 +3884,7 @@ /turf/open/floor/iron/dark, /area/awaymission/research/interior/genetics) "iI" = ( -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/effect/turf_decal/tile/purple{ dir = 1 }, diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index a035e60a547..857048e2a0e 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -1732,7 +1732,7 @@ dir = 8 }, /obj/structure/chair, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -7385,7 +7385,7 @@ }, /area/awaymission/undergroundoutpost45/research) "oC" = ( -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -8785,7 +8785,7 @@ /obj/structure/table, /obj/item/storage/box, /obj/item/storage/box, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 60b0645652b..cb99587ad69 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2021,7 +2021,7 @@ /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/radio, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -4397,7 +4397,7 @@ /area/engineering/gravity_generator) "aGu" = ( /obj/machinery/status_display/evac/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/radio, @@ -6128,7 +6128,7 @@ /area/security/prison/safe) "aUD" = ( /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/item/electropack, /obj/item/assembly/signaler, /obj/machinery/light/directional/west, @@ -6811,7 +6811,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -10419,7 +10419,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron/dark, /area/security/detectives_office) "bJn" = ( @@ -13461,7 +13461,7 @@ /area/security/checkpoint/engineering) "bYH" = ( /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/machinery/status_display/evac/directional/east, /obj/machinery/recharger, /obj/effect/turf_decal/tile/red, @@ -14095,7 +14095,7 @@ /turf/open/floor/iron, /area/ai_monitored/security/armory) "cbL" = ( -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/structure/table/reinforced, /obj/item/clothing/mask/gas/sechailer{ pixel_x = -3; @@ -14325,7 +14325,7 @@ /area/security/courtroom) "cdd" = ( /obj/machinery/light/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -17335,7 +17335,7 @@ /turf/open/floor/iron, /area/maintenance/starboard) "cuK" = ( -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/structure/rack, /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/flashes, @@ -19541,7 +19541,7 @@ /obj/item/book/manual/wiki/security_space_law, /obj/item/radio, /obj/machinery/status_display/ai/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -20011,7 +20011,7 @@ /area/maintenance/starboard/fore) "cSM" = ( /obj/machinery/status_display/evac/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, /obj/item/radio, @@ -31539,7 +31539,7 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "dWm" = ( -/obj/structure/reagent_dispensers/virusfood/directional/west, +/obj/structure/reagent_dispensers/wall/virusfood/directional/west, /obj/structure/table/glass, /obj/machinery/reagentgrinder{ desc = "Used to grind things up into raw materials and liquids."; @@ -57735,7 +57735,7 @@ /area/medical/surgery/room_b) "lom" = ( /obj/item/kirbyplants/random, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 @@ -58181,7 +58181,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/iron/dark, /area/command/heads_quarters/hos) "lvc" = ( @@ -59208,7 +59208,7 @@ "lJt" = ( /obj/machinery/recharger, /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -71284,7 +71284,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron, /area/security/brig) "pfC" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c6c33a2753b..f019bc1e216 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -6236,7 +6236,7 @@ /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/spray/cleaner, -/obj/structure/reagent_dispensers/virusfood/directional/south, +/obj/structure/reagent_dispensers/wall/virusfood/directional/south, /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/white, /area/medical/virology) @@ -11459,7 +11459,7 @@ /area/hallway/primary/central) "cpJ" = ( /obj/machinery/computer/security, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -20102,7 +20102,7 @@ /area/maintenance/aft) "grr" = ( /obj/machinery/airalarm/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, @@ -21341,7 +21341,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "gYL" = ( -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/machinery/airalarm/directional/north, /obj/structure/closet/secure_closet/security/science, /obj/effect/turf_decal/tile/red{ @@ -33732,7 +33732,7 @@ /obj/structure/table, /obj/machinery/recharger, /obj/machinery/airalarm/directional/east, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron/showroomfloor, /area/security/warden) "nsE" = ( @@ -34193,7 +34193,7 @@ /turf/open/floor/iron, /area/command/heads_quarters/hop) "nFX" = ( -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/structure/table, /obj/machinery/recharger{ pixel_y = 4 @@ -40653,7 +40653,7 @@ /area/service/chapel) "rcF" = ( /obj/machinery/light/directional/east, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/security/office) @@ -52869,7 +52869,7 @@ /obj/structure/table, /obj/item/storage/toolbox/emergency, /obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "xkb" = ( @@ -52964,7 +52964,7 @@ /turf/open/floor/iron, /area/security/prison) "xlX" = ( -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/newscaster/directional/south, /obj/machinery/camera/directional/south{ c_tag = "Security Post - Cargo" diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index bf0121e91eb..8c2890118d4 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -31815,7 +31815,7 @@ /obj/machinery/camera/directional/west{ c_tag = "Warden's Office" }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -33487,7 +33487,7 @@ dir = 4 }, /obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/item/crowbar, /obj/item/book/manual/wiki/security_space_law, /obj/structure/cable, @@ -38395,7 +38395,7 @@ /area/maintenance/starboard/aft) "hJF" = ( /obj/structure/closet/secure_closet/detective, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/structure/cable, /obj/item/book/manual/wiki/detective, /obj/machinery/power/apc/auto_name/directional/west, @@ -38697,7 +38697,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -42318,7 +42318,7 @@ pixel_x = 6 }, /obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, @@ -44008,7 +44008,7 @@ dir = 4 }, /obj/machinery/airalarm/directional/east, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/machinery/camera/directional/east{ c_tag = "Science Security Post"; name = "science camera"; @@ -46351,7 +46351,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/reagent_dispensers/virusfood/directional/south, +/obj/structure/reagent_dispensers/wall/virusfood/directional/south, /turf/open/floor/iron/dark, /area/medical/virology) "kwT" = ( @@ -53754,7 +53754,7 @@ /obj/machinery/light_switch/directional/south{ pixel_x = 10 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/item/screwdriver, /obj/machinery/firealarm/directional/south{ pixel_x = -3 @@ -55315,7 +55315,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/iron/dark, /area/security/brig) "nLl" = ( @@ -69752,7 +69752,7 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron/dark, /area/command/heads_quarters/hos) "sSm" = ( @@ -73221,7 +73221,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "uiI" = ( @@ -75148,7 +75148,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/item/storage/box/firingpins, /obj/item/storage/box/firingpins, /obj/item/storage/lockbox/loyalty, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a84de43ef46..1a46d9b431b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -17199,7 +17199,7 @@ /obj/machinery/computer/secure_data{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron/dark, /area/security/checkpoint/science) "ecG" = ( @@ -32186,7 +32186,7 @@ /area/engineering/main) "jzk" = ( /obj/structure/table/glass, -/obj/structure/reagent_dispensers/virusfood/directional/west, +/obj/structure/reagent_dispensers/wall/virusfood/directional/west, /obj/machinery/requests_console/directional/south{ department = "Virology"; name = "Virology Requests Console"; @@ -39490,7 +39490,7 @@ "mhk" = ( /obj/structure/table, /obj/item/flashlight/lamp, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/security/execution/education) @@ -40473,7 +40473,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "mCd" = ( -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/structure/closet/secure_closet/security, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/red{ @@ -44054,7 +44054,7 @@ }, /area/medical/treatment_center) "nKE" = ( -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/depsec/supply, @@ -45746,7 +45746,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ooM" = ( -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Security - Gear Room" }, @@ -48404,7 +48404,7 @@ "por" = ( /obj/item/pen, /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/item/folder/red, /obj/item/book/manual/wiki/security_space_law{ pixel_x = 3; @@ -58382,7 +58382,7 @@ /turf/open/floor/iron/dark, /area/commons/locker) "sSO" = ( -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -64844,7 +64844,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/item/radio/intercom/directional/north{ pixel_x = 32 }, @@ -71058,7 +71058,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "xsa" = ( -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/recharger{ pixel_y = 4 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 1cb76f6268f..7cf3dc9ff3d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -585,7 +585,7 @@ /obj/item/grenade/c4/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -1995,7 +1995,7 @@ /obj/item/grenade/c4/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/control) @@ -2257,7 +2257,7 @@ /turf/open/floor/iron, /area/centcom/supply) "jg" = ( -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3999,7 +3999,7 @@ /turf/open/floor/iron/dark, /area/centcom/control) "mW" = ( -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -5862,7 +5862,7 @@ /obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, /obj/machinery/newscaster/security_unit/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9485,7 +9485,7 @@ /obj/structure/table/wood, /obj/item/storage/photo_album, /obj/item/camera, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -9828,7 +9828,7 @@ }, /obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -10684,7 +10684,7 @@ /obj/structure/table/reinforced, /obj/item/storage/box/syringes, /obj/item/gun/syringe/rapidsyringe, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 }, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index f06deefabaa..d5c929e7797 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -12516,7 +12516,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) "cSD" = ( @@ -12587,7 +12587,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/iron, /area/security/checkpoint/supply) "cTH" = ( @@ -19831,7 +19831,7 @@ /area/maintenance/central) "fAM" = ( /obj/structure/table/wood, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/recharger{ pixel_y = 4 }, @@ -22590,7 +22590,7 @@ /area/hallway/primary/central) "gCm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron/showroomfloor, /area/security/office) "gCn" = ( @@ -26159,7 +26159,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron, /area/security/checkpoint/medical) @@ -33083,7 +33083,7 @@ dir = 1 }, /obj/machinery/computer/prisoner/management, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/security/checkpoint/escape) "krk" = ( @@ -33374,7 +33374,7 @@ /obj/machinery/computer/secure_data{ dir = 1 }, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/security/checkpoint/engineering) @@ -41566,7 +41566,7 @@ network = list("ss13","rd","Security") }, /obj/effect/landmark/start/depsec/science, -/obj/structure/reagent_dispensers/peppertank/directional/south, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /turf/open/floor/iron, /area/security/checkpoint/science) "nMD" = ( @@ -48605,7 +48605,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 3 }, -/obj/structure/reagent_dispensers/virusfood/directional/east, +/obj/structure/reagent_dispensers/wall/virusfood/directional/east, /turf/open/floor/iron/white, /area/medical/virology) "qpj" = ( @@ -62549,7 +62549,7 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/iron, @@ -65038,7 +65038,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 }, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/structure/rack, /obj/item/restraints/handcuffs, /turf/open/floor/iron, diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index f6350229296..e1e5acf552d 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -1393,7 +1393,7 @@ /turf/open/floor/carpet/green, /area/shuttle/escape) "PW" = ( -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "Qk" = ( diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 47bab746e09..d6b52b2868f 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -483,7 +483,7 @@ "aU" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "aV" = ( diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index c0de4e4cf21..f1c341e1292 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -195,7 +195,7 @@ "aK" = ( /obj/structure/table, /obj/machinery/recharger, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "aL" = ( diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index bec555b485a..444b22a9827 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -1182,7 +1182,7 @@ /turf/template_noop, /area/shuttle/escape) "Vn" = ( -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/machinery/light/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 28fa9541c22..20d670a4302 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -763,7 +763,7 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/structure/reagent_dispensers/peppertank/directional/east, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "qi" = ( diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm index 41273703f1b..e1a62ac9d8a 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -234,7 +234,7 @@ }, /obj/structure/chair/comfy/shuttle, /obj/machinery/light/directional/west, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron/dark, /area/shuttle/escape/brig) "hC" = ( diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index 485830862fc..e1282288008 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -16,7 +16,7 @@ dir = 4 }, /obj/machinery/newscaster/security_unit/directional/north, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "ae" = ( diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 9b8cf8f2166..8697e35b9ef 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -371,7 +371,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/structure/table/reinforced, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm index 036dcec49cf..cc853ef6bad 100644 --- a/_maps/shuttles/emergency_tram.dmm +++ b/_maps/shuttles/emergency_tram.dmm @@ -137,7 +137,7 @@ /area/shuttle/escape) "aB" = ( /obj/structure/chair/comfy/shuttle, -/obj/structure/reagent_dispensers/peppertank/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/mineral/plastitanium/red/brig, /area/shuttle/escape/brig) "aC" = ( diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm index d6405a9ce6e..177f6ece28b 100644 --- a/_maps/shuttles/labour_box.dmm +++ b/_maps/shuttles/labour_box.dmm @@ -10,7 +10,7 @@ /obj/machinery/computer/shuttle/labor{ dir = 4 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) "d" = ( diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm index 87622fe64da..171cec10a1f 100644 --- a/_maps/shuttles/labour_delta.dmm +++ b/_maps/shuttles/labour_delta.dmm @@ -10,7 +10,7 @@ /obj/machinery/computer/shuttle/labor{ dir = 4 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/labor) "d" = ( diff --git a/_maps/shuttles/labour_kilo.dmm b/_maps/shuttles/labour_kilo.dmm index 89a416ad070..5210fe36760 100644 --- a/_maps/shuttles/labour_kilo.dmm +++ b/_maps/shuttles/labour_kilo.dmm @@ -10,7 +10,7 @@ /obj/machinery/computer/shuttle/labor{ dir = 4 }, -/obj/structure/reagent_dispensers/peppertank/directional/west, +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/bot, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 27ce94a5725..93ada58c40a 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list( /obj/structure/fireaxecabinet, /obj/structure/mirror, /obj/structure/noticeboard, - /obj/structure/reagent_dispensers/peppertank, + /obj/structure/reagent_dispensers/wall, /obj/structure/sign, /obj/structure/sign/picture_frame ))) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 3835c6f725f..e2258c81867 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -142,17 +142,21 @@ explosion(src, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 7, flame_range = 12) qdel(src) -/obj/structure/reagent_dispensers/peppertank +/// Wall mounted dispeners, like pepper spray or virus food. Not a normal tank, and shouldn't be able to be turned into a plumbed stationary one. +/obj/structure/reagent_dispensers/wall + anchored = TRUE + density = FALSE + can_be_tanked = FALSE + +/obj/structure/reagent_dispensers/wall/peppertank name = "pepper spray refiller" desc = "Contains condensed capsaicin for use in law \"enforcement.\"" icon_state = "pepper" - anchored = TRUE - density = FALSE reagent_id = /datum/reagent/consumable/condensedcapsaicin -MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/peppertank, 30) +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/peppertank, 30) -/obj/structure/reagent_dispensers/peppertank/Initialize(mapload) +/obj/structure/reagent_dispensers/wall/peppertank/Initialize(mapload) . = ..() if(prob(1)) desc = "IT'S PEPPER TIME, BITCH!" @@ -198,16 +202,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/peppertank, 30) if(!QDELETED(src)) qdel(src) - -/obj/structure/reagent_dispensers/virusfood +/obj/structure/reagent_dispensers/wall/virusfood name = "virus food dispenser" desc = "A dispenser of low-potency virus mutagenic." icon_state = "virus_food" - anchored = TRUE - density = FALSE reagent_id = /datum/reagent/consumable/virus_food -MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/virusfood, 30) +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/virusfood, 30) /obj/structure/reagent_dispensers/cooking_oil name = "vat of cooking oil"