diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index fa3e0e63169..8e0f55640ee 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -70,7 +70,6 @@ "ak" = ( /obj/structure/dresser, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -26 }, /turf/open/floor/plasteel/vault, @@ -298,7 +297,6 @@ "aP" = ( /obj/structure/dresser, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 26 }, /turf/open/floor/plasteel/vault{ @@ -312,9 +310,7 @@ }, /area/ruin/powered/syndicate_lava_base) "aR" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/item/weapon/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, @@ -372,7 +368,6 @@ /area/ruin/powered/syndicate_lava_base) "aX" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 28 }, /obj/structure/sink{ @@ -394,9 +389,7 @@ }, /area/ruin/powered/syndicate_lava_base) "ba" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/item/weapon/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, @@ -555,8 +548,7 @@ /obj/structure/table/reinforced, /obj/item/device/healthanalyzer, /obj/item/stack/sheet/mineral/plasma{ - amount = 5; - layer = 3.1 + amount = 5 }, /turf/open/floor/plasteel/podhatch, /area/ruin/powered/syndicate_lava_base) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 52b8dcab891..5eaffe84a28 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -1509,8 +1509,7 @@ /area/derelict/singularity_engine) "en" = ( /obj/machinery/power/emitter{ - dir = 1; - icon_state = "emitter" + dir = 1 }, /turf/open/floor/plating/airless, /area/derelict/singularity_engine) diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index faeb6ff7249..2998fbcbc05 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -160,17 +160,8 @@ /turf/open/floor/plasteel/airless, /area/awaymission/challenge/main) "aI" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 2; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 2 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -200,17 +191,8 @@ /area/awaymission/challenge/main) "aO" = ( /obj/structure/window/reinforced, -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 2; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 2 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -228,17 +210,8 @@ /turf/open/floor/plasteel, /area/awaymission/challenge/main) "aS" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 4; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 4 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -261,17 +234,8 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "aW" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 8; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 8 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -341,17 +305,8 @@ /turf/open/floor/plating, /area/awaymission/challenge/main) "bf" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/structure/window/reinforced{ dir = 1 @@ -377,17 +332,8 @@ /turf/open/floor/plasteel, /area/awaymission/challenge/main) "bi" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 @@ -402,17 +348,8 @@ /turf/open/floor/plating, /area/awaymission/challenge/main) "bk" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/machinery/light, /turf/open/floor/plating, @@ -421,17 +358,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -446,17 +374,8 @@ /turf/closed/wall/mineral/plastitanium, /area/awaymission/challenge/main) "bo" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 2; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 2 }, /obj/structure/window/reinforced{ dir = 8 @@ -528,17 +447,8 @@ /turf/open/floor/plating, /area/awaymission/challenge/main) "bx" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 8; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 8 }, /obj/structure/window/reinforced{ dir = 8 @@ -578,17 +488,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 8; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 8 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -596,17 +497,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 4; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 4 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -654,17 +546,8 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bL" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/structure/window/reinforced{ dir = 1 @@ -672,32 +555,14 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bM" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bN" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -705,17 +570,8 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bO" = ( -/obj/machinery/power/emitter{ - active = 1; - active_power_usage = 0; - anchored = 1; - dir = 1; - idle_power_usage = 0; - locked = 1; - name = "Energy Cannon"; - req_access_txt = "100"; - state = 2; - use_power = 0 +/obj/machinery/power/emitter/ctf{ + dir = 1 }, /obj/structure/window/reinforced{ dir = 8 diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index c6805c74e02..329b7ec95c1 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -3813,9 +3813,7 @@ }) "fg" = ( /obj/structure/table, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, /obj/machinery/light/small{ active_power_usage = 0; dir = 1; diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 93082303df4..dc36614ac4c 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -2406,11 +2406,7 @@ }, /area/awaymission/snowdin/post) "gA" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "3" - }, +/obj/structure/closet/secure_closet/contraband/armory, /obj/item/weapon/gun/ballistic/automatic/speargun, /obj/item/weapon/twohanded/spear, /obj/item/weapon/twohanded/spear, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 096a83e5bfe..e36ddc39052 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -920,11 +920,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acv" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "3" - }, +/obj/structure/closet/secure_closet/contraband/armory, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory) "acw" = ( @@ -2587,9 +2583,7 @@ /turf/open/floor/plasteel/red/side, /area/security/prison) "afH" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /turf/open/floor/plasteel/red/side, /area/security/prison) "afI" = ( @@ -8732,8 +8726,7 @@ amount = 5 }, /obj/item/stack/sheet/mineral/plasma{ - amount = 10; - layer = 2.9 + amount = 10 }, /turf/open/floor/plasteel/floorgrime, /area/maintenance/department/electrical) @@ -25661,12 +25654,8 @@ "bio" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /obj/machinery/requests_console{ department = "Chemistry"; departmentType = 2; @@ -28254,11 +28243,7 @@ /area/crew_quarters/heads/hop) "bnQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "Ian's bed! Looks comfy."; - name = "Ian's bed" - }, +/obj/structure/bed/dogbed/ian, /mob/living/simple_animal/pet/dog/corgi/Ian{ dir = 8 }, @@ -30031,9 +30016,7 @@ }, /area/science/explab) "brD" = ( -/obj/structure/closet/emcloset{ - pixel_x = -2 - }, +/obj/structure/closet/emcloset, /turf/open/floor/plasteel/white/corner{ dir = 8 }, @@ -39322,9 +39305,7 @@ network = list("Toxins"); use_power = 0 }, -/obj/item/target/alien{ - anchored = 1 - }, +/obj/item/target/alien/anchored, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -40157,9 +40138,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -41168,15 +41147,9 @@ /area/science/misc_lab) "bPG" = ( /obj/structure/table, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /obj/machinery/light, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; @@ -41535,12 +41508,8 @@ /obj/machinery/newscaster{ pixel_x = -30 }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /turf/open/floor/plasteel/white, /area/medical/virology) "bQF" = ( @@ -48451,8 +48420,7 @@ /area/engine/atmos) "cfS" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4; - + dir = 4 }, /turf/open/floor/plasteel, /area/engine/atmos) @@ -53677,9 +53645,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cqW" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/item/weapon/tank/internals/plasma, /obj/structure/cable/yellow, /obj/effect/turf_decal/stripes/line{ @@ -54147,8 +54113,7 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "csf" = ( -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 8; state = 2 }, @@ -55170,8 +55135,7 @@ }, /obj/item/clothing/head/welding, /obj/item/stack/sheet/mineral/plasma{ - amount = 35; - layer = 3.1 + amount = 35 }, /obj/machinery/firealarm{ dir = 4; @@ -57682,8 +57646,7 @@ /obj/structure/cable/yellow{ d1 = 2; d2 = 4; - icon_state = "2-4"; - + icon_state = "2-4" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -57712,8 +57675,7 @@ /obj/structure/cable/yellow{ d1 = 2; d2 = 8; - icon_state = "2-8"; - + icon_state = "2-8" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -57790,12 +57752,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 4; - icon_state = "emitter"; - state = 2; - + state = 2 }, /turf/open/floor/plating, /area/engine/engineering) @@ -57803,8 +57762,7 @@ /obj/structure/cable/yellow{ d1 = 1; d2 = 4; - icon_state = "1-4"; - + icon_state = "1-4" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -57817,8 +57775,7 @@ /obj/structure/cable/yellow{ d1 = 1; d2 = 8; - icon_state = "1-8"; - + icon_state = "1-8" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -57826,8 +57783,7 @@ /obj/structure/cable/yellow{ d1 = 1; d2 = 8; - icon_state = "1-8"; - + icon_state = "1-8" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -59498,9 +59454,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "cEu" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -59542,9 +59496,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "cEz" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -59689,9 +59641,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "cEN" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -59727,9 +59677,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cES" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -59829,9 +59777,7 @@ /turf/open/floor/engine, /area/engine/engineering) "cFd" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -59867,9 +59813,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "cFi" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -60495,14 +60439,11 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "cGU" = ( -/obj/structure/reflector/double{ - anchored = 1 - }, +/obj/structure/reflector/double/anchored, /turf/open/floor/plasteel/black, /area/engine/engineering) "cGV" = ( -/obj/structure/reflector/box{ - anchored = 1; +/obj/structure/reflector/box/anchored{ dir = 1 }, /turf/open/floor/plasteel/black, @@ -60606,17 +60547,14 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 4; - icon_state = "emitter"; state = 2 }, /turf/open/floor/plating, /area/engine/engineering) "cHi" = ( -/obj/structure/reflector/box{ - anchored = 1; +/obj/structure/reflector/box/anchored{ dir = 1 }, /turf/open/floor/plasteel/black, @@ -60626,10 +60564,8 @@ icon_state = "0-4"; d2 = 4 }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 8; - icon_state = "emitter"; state = 2 }, /turf/open/floor/plating, @@ -60664,18 +60600,14 @@ /turf/open/floor/plating, /area/engine/engineering) "cHo" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 1; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 1 }, /turf/open/floor/plating, /area/engine/engineering) "cHp" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 4; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 4 }, /turf/open/floor/plating, /area/engine/engineering) @@ -62574,9 +62506,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "cMI" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -62584,9 +62514,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "cMJ" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index c65f91b376e..fee9ef07120 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -32943,8 +32943,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ state = 2 }, /turf/open/floor/plating{ @@ -32971,8 +32970,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ state = 2 }, /turf/open/floor/plating{ @@ -32984,8 +32982,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ state = 2 }, /turf/open/floor/plating{ @@ -34154,28 +34151,22 @@ }, /area/engine/engineering) "bmB" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 4; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 4 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/engine/engineering) "bmC" = ( -/obj/structure/reflector/box{ - anchored = 1 - }, +/obj/structure/reflector/box/anchored, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/engine/engineering) "bmD" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 1; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 1 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -38211,9 +38202,7 @@ }, /area/engine/supermatter) "btu" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -38270,9 +38259,7 @@ }, /area/engine/supermatter) "btA" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ icon_state = "0-4"; d2 = 4 @@ -39151,9 +39138,7 @@ }, /area/engine/supermatter) "buZ" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ icon_state = "0-4"; d2 = 4 @@ -39885,9 +39870,7 @@ }, /area/engine/engineering) "bwo" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -41616,7 +41599,6 @@ "bzz" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 4 }, /turf/open/floor/plasteel/black{ @@ -46802,12 +46784,8 @@ "bIO" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /obj/machinery/camera{ c_tag = "Chemistry"; dir = 10; @@ -51591,7 +51569,6 @@ /area/engine/atmos) "bRz" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 1 }, /turf/open/floor/plasteel{ @@ -51605,7 +51582,6 @@ name = "Waste Loop" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 4 }, /turf/open/floor/plasteel{ @@ -88758,8 +88734,7 @@ /area/security/processing) "dnR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4; - + dir = 4 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 778567610ed..c656675c3f0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -430,9 +430,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/structure/sign/vacuum{ pixel_x = -32 }, @@ -4401,9 +4399,7 @@ /turf/open/space, /area/solar/port/fore) "ajK" = ( -/obj/structure/reflector/single{ - anchored = 1 - }, +/obj/structure/reflector/single/anchored, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4414,8 +4410,7 @@ }, /area/engine/atmospherics_engine) "ajM" = ( -/obj/structure/reflector/box{ - anchored = 1; +/obj/structure/reflector/box/anchored{ dir = 4; icon_state = "reflector_box" }, @@ -4442,10 +4437,8 @@ }, /area/engine/atmospherics_engine) "ajP" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 8; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 8 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4808,18 +4801,14 @@ }, /area/engine/atmospherics_engine) "akQ" = ( -/obj/structure/reflector/double{ - anchored = 1 - }, +/obj/structure/reflector/double/anchored, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/engine/atmospherics_engine) "akR" = ( -/obj/structure/reflector/double{ - anchored = 1; - dir = 1; - icon_state = "reflector_double" +/obj/structure/reflector/double/anchored{ + dir = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -5260,10 +5249,8 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solar/port/fore) "alP" = ( -/obj/structure/reflector/double{ - anchored = 1; - dir = 4; - icon_state = "reflector_double" +/obj/structure/reflector/double/anchored{ + dir = 4 }, /turf/open/floor/plasteel/vault{ dir = 5 @@ -5824,9 +5811,7 @@ }, /area/engine/atmospherics_engine) "anb" = ( -/obj/structure/reflector/box{ - anchored = 1 - }, +/obj/structure/reflector/box/anchored, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -6001,11 +5986,7 @@ /turf/open/floor/wood, /area/security/vacantoffice) "anx" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "19" - }, +/obj/structure/closet/secure_closet/contraband/heads, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -6317,10 +6298,8 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solar/port/fore) "aoa" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 1; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 1 }, /turf/open/floor/plasteel/vault{ dir = 8 @@ -6622,8 +6601,7 @@ pixel_y = 1; d2 = 2 }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 1; state = 2 }, @@ -9202,7 +9180,6 @@ /area/maintenance/port/fore) "atw" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /obj/structure/table/wood, @@ -9295,7 +9272,6 @@ /area/maintenance/port/fore) "atH" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /obj/structure/table/reinforced, @@ -9376,7 +9352,6 @@ "atO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -26 }, /obj/structure/sink{ @@ -9706,9 +9681,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "auC" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -9744,9 +9717,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "auH" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -12392,7 +12363,6 @@ /area/engine/atmospherics_engine) "aAc" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 4 }, /obj/effect/turf_decal/bot, @@ -16501,9 +16471,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) @@ -18759,7 +18727,6 @@ /area/maintenance/port/fore) "aMv" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /turf/open/floor/plasteel/redblue, @@ -20654,7 +20621,6 @@ /area/crew_quarters/theatre) "aPL" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -25752,8 +25718,7 @@ /area/engine/atmos) "aZp" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4; - + dir = 4 }, /turf/open/floor/plasteel/neutral, /area/engine/atmos) @@ -29503,11 +29468,7 @@ }, /area/security/main) "bgJ" = ( -/obj/structure/bed/dogbed{ - desc = "Seems kind of... fishy."; - name = "Cayenne's bed"; - pixel_y = 5 - }, +/obj/structure/bed/dogbed/cayenne, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, @@ -29651,7 +29612,6 @@ /area/engine/atmos) "bha" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 1 }, /obj/effect/turf_decal/stripes/line, @@ -30603,7 +30563,6 @@ "bjc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 1 }, /turf/open/floor/plasteel/caution{ @@ -30612,7 +30571,6 @@ /area/engine/atmos) "bjd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 1 }, /turf/open/floor/plasteel/caution{ @@ -30625,7 +30583,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 1 }, /turf/open/floor/plasteel, @@ -33345,7 +33302,6 @@ /area/engine/atmos) "bod" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 4 }, /obj/effect/turf_decal/stripes/line{ @@ -35027,7 +34983,6 @@ "brg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 4 }, /turf/open/floor/plasteel/caution{ @@ -35708,7 +35663,6 @@ pixel_x = 26 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 4 }, /obj/machinery/meter{ @@ -37176,9 +37130,7 @@ "bvd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/gravity_generator) @@ -41315,12 +41267,7 @@ }, /area/security/warden) "bBI" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Secure Evidence Closet"; - req_access_txt = "0"; - req_one_access_txt = "3,4" - }, +/obj/structure/closet/secure_closet/evidence, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -43330,12 +43277,7 @@ }, /area/security/warden) "bFr" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Secure Evidence Closet"; - req_access_txt = "0"; - req_one_access_txt = "3,4" - }, +/obj/structure/closet/secure_closet/evidence, /obj/machinery/camera{ c_tag = "Security - Evidence Storage"; dir = 1; @@ -44420,9 +44362,7 @@ /turf/closed/wall/r_wall, /area/engine/transit_tube) "bHw" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -46426,11 +46366,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "bLn" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "3" - }, +/obj/structure/closet/secure_closet/contraband/armory, /obj/machinery/light{ dir = 4 }, @@ -46992,12 +46928,7 @@ }, /area/tcommsat/computer) "bMC" = ( -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "Renault's bed! Looks comfy. A foxy person needs a foxy pet."; - name = "Renault's bed"; - pixel_y = 2 - }, +/obj/structure/bed/dogbed/renault, /mob/living/simple_animal/pet/fox/Renault, /turf/open/floor/plasteel/vault{ dir = 8 @@ -52302,8 +52233,7 @@ amount = 50 }, /obj/item/stack/sheet/mineral/plasma{ - amount = 20; - layer = 3.1 + amount = 20 }, /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -53232,9 +53162,7 @@ /turf/open/floor/plating/airless, /area/engine/engineering) "bXv" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -57198,9 +57126,7 @@ /turf/open/floor/plating, /area/engine/engineering) "ceD" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -58051,12 +57977,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cgv" = ( -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "Ian's bed! Looks comfy."; - name = "Ian's bed"; - pixel_y = 2 - }, +/obj/structure/bed/dogbed/ian, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -64354,12 +64275,8 @@ }, /area/crew_quarters/fitness/recreation) "csV" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -65942,9 +65859,7 @@ /turf/open/space, /area/space) "cwc" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ icon_state = "0-4"; @@ -68306,7 +68221,6 @@ /area/crew_quarters/toilet/restrooms) "cAu" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -26 }, /obj/structure/sink{ @@ -69070,7 +68984,6 @@ "cBS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -26 }, /obj/structure/sink{ @@ -69304,9 +69217,7 @@ /turf/open/floor/plating/airless, /area/engine/engineering) "cCs" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/machinery/light/small, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -69871,9 +69782,7 @@ /turf/closed/wall, /area/crew_quarters/fitness/recreation) "cDx" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -76361,7 +76270,6 @@ /area/maintenance/department/electrical) "cQf" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - name = "scrubbers pipe"; dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -83014,7 +82922,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /obj/structure/cable/white{ @@ -85628,8 +85535,7 @@ icon_state = "1-8" }, /obj/item/stack/sheet/mineral/plasma{ - amount = 5; - layer = 3.1 + amount = 5 }, /obj/item/device/taperecorder, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -91403,10 +91309,7 @@ /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "dut" = ( -/obj/structure/bed/dogbed{ - desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."; - name = "Runtime's bed" - }, +/obj/structure/bed/dogbed/runtime, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -95874,7 +95777,6 @@ pixel_y = -32 }, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 28 }, /obj/effect/turf_decal/bot, @@ -96144,7 +96046,6 @@ /area/crew_quarters/theatre/abandoned) "dDA" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 28 }, /obj/effect/decal/cleanable/dirt, @@ -98594,7 +98495,6 @@ pixel_x = -12 }, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 28 }, /obj/effect/decal/cleanable/dirt, @@ -99814,7 +99714,6 @@ pixel_x = -12 }, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /obj/machinery/shower{ @@ -100403,11 +100302,7 @@ /turf/open/floor/plasteel/blue/side, /area/security/checkpoint/customs) "dLS" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "19" - }, +/obj/structure/closet/secure_closet/contraband/heads, /obj/item/weapon/storage/secure/briefcase, /turf/open/floor/plasteel/blue/side{ dir = 6 @@ -110186,9 +110081,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "ehF" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -110196,9 +110089,7 @@ /turf/open/floor/circuit/green, /area/engine/supermatter) "ehG" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 57d2018b0f8..c474b447939 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3531,15 +3531,11 @@ /turf/open/floor/plasteel/vault, /area/security/prison) "agH" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /turf/open/floor/plasteel/vault, /area/security/prison) "agI" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -4476,12 +4472,7 @@ }, /area/security/warden) "aiz" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Secure Evidence Closet"; - req_access_txt = "0"; - req_one_access_txt = "3,4" - }, +/obj/structure/closet/secure_closet/evidence, /obj/item/weapon/storage/secure/briefcase{ name = "Secure Evidence Briefcase"; pixel_x = 3; @@ -20095,8 +20086,7 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "aMo" = ( -/obj/structure/reflector/box{ - anchored = 1; +/obj/structure/reflector/box/anchored{ dir = 8 }, /turf/open/floor/plasteel/black, @@ -37596,12 +37586,7 @@ layer = 4; pixel_y = 32 }, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "Ian's bed! Looks comfy."; - name = "Ian's bed"; - pixel_y = 2 - }, +/obj/structure/bed/dogbed/ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bsQ" = ( @@ -40667,8 +40652,7 @@ }, /obj/structure/cable/yellow, /obj/item/stack/sheet/mineral/plasma{ - amount = 35; - layer = 3.1 + amount = 35 }, /turf/open/floor/plasteel/black, /area/ai_monitored/storage/satellite) @@ -57650,8 +57634,7 @@ /area/maintenance/disposal/incinerator) "cfs" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4; - + dir = 4 }, /obj/machinery/meter, /turf/open/floor/plasteel/floorgrime, @@ -58256,11 +58239,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "cgG" = ( -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -59897,12 +59876,8 @@ }, /area/medical/medbay/central) "cjS" = ( -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, /obj/item/weapon/reagent_containers/glass/bottle/charcoal{ @@ -62107,7 +62082,6 @@ dir = 8 }, /obj/item/stack/sheet/mineral/plasma{ - layer = 2.9; pixel_y = 4 }, /turf/open/floor/plasteel/white, @@ -70297,9 +70271,7 @@ network = list("Toxins"); use_power = 0 }, -/obj/item/target/alien{ - anchored = 1 - }, +/obj/item/target/alien/anchored, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -71049,15 +71021,9 @@ pixel_x = 29; receive_ore_updates = 1 }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /obj/structure/table/glass, /turf/open/floor/plasteel/whitegreen/side{ dir = 4 @@ -82454,9 +82420,7 @@ }, /area/maintenance/port/fore) "daY" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable, /turf/open/floor/engine, /area/engine/supermatter) @@ -82961,19 +82925,15 @@ "dcc" = ( /obj/structure/table/glass, /obj/item/stack/sheet/mineral/plasma{ - layer = 2.9; pixel_y = 4 }, /obj/item/stack/sheet/mineral/plasma{ - layer = 2.9; pixel_y = 4 }, /obj/item/stack/sheet/mineral/plasma{ - layer = 2.9; pixel_y = 4 }, /obj/item/stack/sheet/mineral/plasma{ - layer = 2.9; pixel_y = 4 }, /obj/item/weapon/reagent_containers/glass/beaker{ @@ -83882,8 +83842,7 @@ /area/science/xenobiology) "ddD" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8; - + dir = 8 }, /obj/machinery/deepfryer, /turf/open/floor/plasteel/cafeteria{ @@ -84335,8 +84294,7 @@ /area/engine/engineering) "deK" = ( /obj/structure/cable/white, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 2; state = 2 }, @@ -84419,10 +84377,8 @@ /turf/open/floor/engine, /area/engine/engineering) "deY" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 1; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 1 }, /turf/open/floor/plating, /area/engine/engineering) @@ -84462,18 +84418,14 @@ /turf/open/floor/engine, /area/engine/engineering) "dff" = ( -/obj/structure/reflector/double{ - anchored = 1; - dir = 1; - icon_state = "reflector_double" +/obj/structure/reflector/double/anchored{ + dir = 1 }, /turf/open/floor/plasteel/black, /area/engine/engineering) "dfg" = ( -/obj/structure/reflector/single{ - anchored = 1; - dir = 8; - icon_state = "reflector" +/obj/structure/reflector/single/anchored{ + dir = 8 }, /turf/open/floor/plating, /area/engine/engineering) @@ -84522,9 +84474,7 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "dfq" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 @@ -84574,8 +84524,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 1; state = 2 }, @@ -84586,8 +84535,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 1; state = 2 }, @@ -86988,9 +86936,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "dlS" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 @@ -86998,9 +86944,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "dlT" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-2"; d2 = 2 diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index a14cc8ac17d..6d5ada79b17 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1036,9 +1036,7 @@ name = "Primary Hallway" }) "abO" = ( -/obj/structure/closet/emcloset{ - anchored = 1 - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -1563,7 +1561,6 @@ }) "acO" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -26 }, /obj/structure/sink{ @@ -1899,7 +1896,6 @@ /area/crew_quarters/heads/hop) "adl" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 26 }, /obj/structure/sink{ @@ -2036,7 +2032,6 @@ /area/security/detectives_office) "adE" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 26 }, /obj/structure/sink{ @@ -2756,12 +2751,7 @@ /area/crew_quarters/heads/hop) "aeJ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "Ian's bed! Looks comfy."; - name = "Ian's bed"; - pixel_y = 2 - }, +/obj/structure/bed/dogbed/ian, /mob/living/simple_animal/pet/dog/corgi/Ian, /turf/open/floor/plasteel/vault{ dir = 5 @@ -7963,7 +7953,6 @@ /area/security/brig) "amO" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -26 }, /obj/structure/sink{ @@ -17936,7 +17925,6 @@ }, /obj/item/weapon/lipstick/random, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /turf/open/floor/plasteel/vault{ @@ -23364,9 +23352,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "aMR" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -23411,9 +23397,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "aMX" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -26886,10 +26870,8 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aSV" = ( -/obj/machinery/power/emitter{ - icon_state = "emitter"; +/obj/machinery/power/emitter/anchored{ dir = 1; - anchored = 1; state = 2 }, /obj/structure/cable/white, @@ -32076,7 +32058,6 @@ }, /obj/structure/table/reinforced, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = -28 }, /turf/open/floor/plasteel/vault{ @@ -32885,7 +32866,6 @@ pixel_y = -32 }, /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 28 }, /obj/effect/turf_decal/bot, @@ -34249,7 +34229,6 @@ /area/maintenance/starboard) "bgB" = ( /obj/structure/mirror{ - desc = "Mirror mirror on the wall, who is the most robust of them all?"; pixel_x = 26 }, /obj/structure/sink{ @@ -39787,9 +39766,7 @@ /turf/closed/wall/r_wall, /area/engine/supermatter) "buZ" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -39797,9 +39774,7 @@ /turf/open/floor/circuit/green, /area/engine/supermatter) "bva" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable{ d2 = 8; icon_state = "0-8" diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 63475a027b6..4d027893039 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2749,11 +2749,7 @@ /turf/open/floor/plasteel/black, /area/security/armory) "agm" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "3" - }, +/obj/structure/closet/secure_closet/contraband/armory, /obj/item/weapon/book/codex_gigas, /obj/item/weapon/poster/random_contraband, /obj/item/weapon/grenade/smokebomb, @@ -3074,9 +3070,7 @@ /turf/open/floor/plasteel/black, /area/security/transfer) "ahc" = ( -/obj/structure/closet/secure_closet/brig{ - anchored = 1 - }, +/obj/structure/closet/secure_closet/brig, /turf/open/floor/plasteel/black, /area/security/prison) "ahd" = ( @@ -7369,11 +7363,7 @@ name = "EXTERNAL AIRLOCK"; pixel_x = 32 }, -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/crew_quarters/dorms) "aqc" = ( @@ -7967,11 +7957,7 @@ /turf/open/floor/plasteel/darkyellow, /area/bridge) "arv" = ( -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/bridge) "arw" = ( @@ -10909,12 +10895,7 @@ layer = 4; pixel_y = 32 }, -/obj/structure/bed/dogbed{ - anchored = 1; - desc = "Ian's bed! Looks comfy."; - name = "Ian's bed"; - pixel_y = 2 - }, +/obj/structure/bed/dogbed/ian, /mob/living/simple_animal/pet/dog/corgi/Ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -13609,8 +13590,7 @@ /area/hallway/primary/central) "aDM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -24836,8 +24816,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -27155,15 +27134,9 @@ /area/science/xenobiology) "bhs" = ( /obj/structure/table, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, -/obj/item/stack/sheet/mineral/plasma{ - layer = 2.9 - }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -37785,11 +37758,7 @@ /turf/open/floor/plating, /area/science/mineral_storeroom) "bCY" = ( -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -41809,8 +41778,7 @@ /area/space) "bLO" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4; - + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -43860,11 +43828,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/engine/engineering) "bQp" = ( @@ -43884,9 +43848,7 @@ /turf/open/floor/plating, /area/engine/engineering) "bQq" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/item/weapon/tank/internals/plasma, /obj/structure/cable/yellow, /obj/effect/turf_decal/stripes/line{ @@ -43895,9 +43857,7 @@ /turf/open/floor/plating, /area/engine/engineering) "bQr" = ( -/obj/machinery/power/rad_collector{ - anchored = 1 - }, +/obj/machinery/power/rad_collector/anchored, /obj/structure/cable/yellow, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43951,11 +43911,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/engine/engineering) "bQz" = ( @@ -44280,8 +44236,7 @@ /turf/open/floor/plating/airless, /area/engine/engineering) "bRj" = ( -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 4; state = 2 }, @@ -44319,8 +44274,7 @@ /turf/open/floor/plating/airless, /area/engine/engineering) "bRo" = ( -/obj/machinery/power/emitter{ - anchored = 1; +/obj/machinery/power/emitter/anchored{ dir = 8; state = 2 }, @@ -44731,11 +44685,7 @@ /turf/open/floor/plating, /area/tcommsat/computer) "bSo" = ( -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/tcommsat/computer) "bSp" = ( @@ -48142,8 +48092,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4; - + dir = 4 }, /turf/open/floor/plating, /area/engine/atmos) @@ -48204,11 +48153,7 @@ /turf/open/space, /area/space/nearstation) "cbc" = ( -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/department/engine) "cbd" = ( @@ -49048,11 +48993,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/closet/emcloset{ - anchored = 1; - desc = "It's a storage unit for emergency breath masks and O2 tanks, and is securely bolted in place."; - name = "anchored emergency closet" - }, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/chapel/main/monastery) "cdf" = ( @@ -49878,8 +49819,7 @@ /area/chapel/main/monastery) "cfi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1; - + dir = 1 }, /turf/open/floor/plasteel/vault{ dir = 5 diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index 660ee9a6e4a..8860fe2ec42 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -2462,7 +2462,6 @@ /area/ctf) "hf" = ( /obj/machinery/power/emitter/energycannon{ - icon_state = "emitter"; dir = 1 }, /turf/open/floor/plating, @@ -3521,11 +3520,7 @@ }, /area/centcom/supply) "jZ" = ( -/obj/structure/closet/secure_closet{ - anchored = 1; - name = "Contraband Locker"; - req_access_txt = "19" - }, +/obj/structure/closet/secure_closet/contraband/heads, /turf/open/floor/plasteel/vault{ dir = 8 }, diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index e0dad50c6c2..2075969a4c2 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -56,18 +56,14 @@ /turf/open/floor/noslip, /area/shuttle/escape) "am" = ( -/obj/structure/reflector/single{ - anchored = 1 - }, +/obj/structure/reflector/single/anchored, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plating, /area/shuttle/escape) "an" = ( -/obj/structure/reflector/box{ - anchored = 1 - }, +/obj/structure/reflector/box/anchored, /turf/open/floor/plating, /area/shuttle/escape) "ao" = ( @@ -221,15 +217,11 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "aN" = ( -/obj/structure/reflector/single{ - anchored = 1 - }, +/obj/structure/reflector/single/anchored, /turf/open/floor/plating/airless, /area/shuttle/escape) "aO" = ( -/obj/structure/reflector/double{ - anchored = 1 - }, +/obj/structure/reflector/double/anchored, /turf/open/floor/plating/airless, /area/shuttle/escape) "aP" = ( diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index d86ea633384..e30b9bb2cd6 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -49,6 +49,9 @@ desc = "A shooting target that looks like a xenomorphic alien." hp = 2350 +/obj/item/target/alien/anchored + anchored = TRUE + /obj/item/target/clown icon_state = "target_c" desc = "A shooting target that looks like a useless clown." diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 19a44397207..2624113dbf1 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -162,6 +162,26 @@ buildstackamount = 10 var/mob/living/owner = null +/obj/structure/bed/dogbed/ian + desc = "Ian's bed! Looks comfy." + name = "Ian's bed" + anchored = TRUE + +/obj/structure/bed/dogbed/cayenne + desc = "Seems kind of... fishy." + name = "Cayenne's bed" + anchored = TRUE + +/obj/structure/bed/dogbed/renault + desc = "Renault's bed! Looks comfy. A foxy person needs a foxy pet." + name = "Renault's bed" + anchored = TRUE + +/obj/structure/bed/dogbed/runtime + desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off." + name = "Runtime's bed" + anchored = TRUE + /obj/structure/bed/dogbed/proc/update_owner(mob/living/M) owner = M name = "[M]'s bed" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index d1643cfb02c..f8d60424571 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -199,6 +199,12 @@ anchored = TRUE var/id = null +/obj/structure/closet/secure_closet/evidence + anchored = TRUE + name = "Secure Evidence Closet" + req_access_txt = "0" + req_one_access_txt = list(GLOB.access_armory, GLOB.access_forensics_lockers) + /obj/structure/closet/secure_closet/brig/PopulateContents() ..() new /obj/item/clothing/under/rank/prisoner( src ) @@ -218,6 +224,16 @@ new /obj/item/clothing/head/powdered_wig (src) new /obj/item/weapon/storage/briefcase(src) +/obj/structure/closet/secure_closet/contraband/armory + anchored = TRUE + name = "Contraband Locker" + req_access = list(GLOB.access_armory) + +/obj/structure/closet/secure_closet/contraband/heads + anchored = TRUE + name = "Contraband Locker" + req_access = list(GLOB.access_heads) + /obj/structure/closet/secure_closet/armory1 name = "armory armor locker" req_access = list(GLOB.access_armory) diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 3936b2770d9..f93ed0eb77c 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -148,6 +148,9 @@ buildstacktype = /obj/item/stack/sheet/glass buildstackamount = 5 +/obj/structure/reflector/single/anchored + anchored = TRUE + /obj/structure/reflector/single/get_reflection(srcdir,pdir) var/new_dir = rotations["[srcdir]"]["[pdir]"] return new_dir @@ -171,6 +174,9 @@ buildstacktype = /obj/item/stack/sheet/rglass buildstackamount = 10 +/obj/structure/reflector/double/anchored + anchored = TRUE + /obj/structure/reflector/double/get_reflection(srcdir,pdir) var/new_dir = double_rotations["[srcdir]"]["[pdir]"] return new_dir @@ -194,6 +200,9 @@ buildstacktype = /obj/item/stack/sheet/mineral/diamond buildstackamount = 1 +/obj/structure/reflector/box/anchored + anchored = TRUE + /obj/structure/reflector/box/get_reflection(srcdir,pdir) var/new_dir = box_rotations["[srcdir]"]["[pdir]"] return new_dir diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index aca8be54c9a..f74ec9de9b7 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -18,6 +18,9 @@ GLOBAL_LIST_EMPTY(rad_collectors) var/locked = FALSE var/drainratio = 1 +/obj/machinery/power/rad_collector/anchored + anchored = TRUE + /obj/machinery/power/rad_collector/New() ..() GLOB.rad_collectors += src diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 152989dc155..464f4da5be2 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -33,6 +33,19 @@ var/datum/effect_system/spark_spread/sparks +/obj/machinery/power/emitter/anchored + anchored = TRUE + +/obj/machinery/power/emitter/ctf + name = "Energy Cannon" + active = TRUE + active_power_usage = FALSE + idle_power_usage = FALSE + locked = TRUE + req_access_txt = "100" + state = 2 + use_power = FALSE + /obj/machinery/power/emitter/New() ..() var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/emitter(null)