diff --git a/README.md b/README.md
index b286239314..aaf2ad2a27 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ hassle if you want to make any changes at all, so it's not recommended.)
## INSTALLATION
First-time installation should be fairly straightforward. First, you'll need
-BYOND installed. You can get it from http://www.byond.com/. Once you've done
+BYOND installed. You can get it from https://www.byond.com/download. Once you've done
that, extract the game files to wherever you want to keep them. This is a
sourcecode-only release, so the next step is to compile the server files.
Open tgstation.dme by double-clicking it, open the Build menu, and click
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
index 3a89d344a8..8a34879707 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -10,14 +10,11 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- },
+/turf/closed/wall,
/area/ruin/unpowered)
"e" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -25,7 +22,6 @@
/obj/structure/table/wood,
/obj/item/storage/box/cups,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -36,14 +32,12 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"h" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -51,7 +45,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -59,7 +52,6 @@
/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -72,7 +64,6 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -89,7 +80,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -97,7 +87,6 @@
/obj/item/chair/wood/wings,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -105,7 +94,6 @@
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -113,7 +101,6 @@
/obj/item/trash/plate,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -121,7 +108,6 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -129,7 +115,6 @@
/obj/item/chair/wood/wings,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -141,13 +126,11 @@
name = "party hat"
},
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"s" = (
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -155,14 +138,12 @@
/obj/structure/chair/wood/wings,
/obj/effect/decal/remains/human,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"u" = (
/obj/structure/glowshroom/single,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -175,7 +156,6 @@
/obj/item/kitchen/fork,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -187,7 +167,6 @@
name = "pizza spawner"
},
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -195,7 +174,6 @@
/obj/structure/table/wood,
/obj/item/trash/plate,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -204,7 +182,6 @@
/obj/structure/glowshroom/single,
/obj/item/a_gift,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -213,7 +190,6 @@
/obj/item/trash/plate,
/obj/item/kitchen/fork,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -224,7 +200,6 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -233,7 +208,6 @@
/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,
/obj/item/trash/plate,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -241,7 +215,6 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/pizzaslice/meat,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -249,21 +222,18 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/store/cake/birthday,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"G" = (
/obj/structure/table/wood,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"H" = (
/obj/item/chair/wood/wings,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -271,7 +241,6 @@
/obj/item/kitchen/fork,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -279,7 +248,6 @@
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -291,7 +259,6 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -299,7 +266,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -307,7 +273,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/a_gift,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -320,7 +285,6 @@
/obj/item/kitchen/knife,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -330,13 +294,11 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"Q" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
@@ -344,7 +306,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/baseturf_helper/lava_land/surface,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 9ff1aad4c6..cceb58a95d 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -19,43 +19,31 @@
name = "Asteroid - Space"
})
"af" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ag" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/crusher)
"ah" = (
/obj/structure/kitchenspike,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ai" = (
/obj/structure/closet/secure_closet/freezer/meat,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aj" = (
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"ak" = (
/obj/machinery/conveyor{
dir = 4;
id = "bunkerrecycle"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"al" = (
/obj/machinery/conveyor{
@@ -65,9 +53,7 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"am" = (
/obj/machinery/recycler/deathtrap,
@@ -75,9 +61,7 @@
dir = 4;
id = "bunkerrecycle"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"an" = (
/obj/machinery/conveyor{
@@ -85,9 +69,7 @@
id = "bunkerrecycle";
movedir = 2
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"ao" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -96,46 +78,34 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ap" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 10
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ar" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"as" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"at" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"au" = (
/obj/machinery/conveyor_switch{
@@ -144,9 +114,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"av" = (
/obj/structure/window/plasma/reinforced{
@@ -157,62 +125,45 @@
id = "bunkerrecycle";
movedir = 2
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"aw" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/storage)
"ax" = (
/obj/machinery/processor{
name = "processor"
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ay" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"az" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aA" = (
/obj/machinery/gibber,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aB" = (
/obj/structure/table,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"aC" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"aD" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"aE" = (
/obj/structure/cable/yellow{
@@ -223,9 +174,7 @@
name = "Recycling APC";
pixel_y = -24
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"aF" = (
/obj/machinery/conveyor{
@@ -236,9 +185,7 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"aG" = (
/obj/structure/closet/cardboard,
@@ -345,18 +292,14 @@
/area/ruin/space/has_grav/deepstorage/storage)
"aM" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/airlock{
name = "Freezer"
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aO" = (
/obj/machinery/door/airlock/highsecurity{
@@ -366,23 +309,17 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/crusher)
"aP" = (
/obj/machinery/door/airlock/highsecurity{
name = "Recycling Room";
req_access_txt = "200"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/crusher)
"aQ" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"aR" = (
/obj/structure/closet/cardboard,
@@ -466,9 +403,7 @@
},
/obj/item/storage/box/cups,
/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aY" = (
/obj/structure/table,
@@ -482,9 +417,7 @@
/obj/machinery/firealarm{
pixel_y = 24
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"aZ" = (
/obj/structure/table,
@@ -497,9 +430,7 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ba" = (
/obj/structure/table,
@@ -512,30 +443,22 @@
dir = 9
},
/obj/item/kitchen/knife,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bc" = (
/obj/structure/sink/kitchen{
pixel_y = 24
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bd" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"be" = (
/obj/structure/cable/yellow{
@@ -544,17 +467,13 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"bf" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"bg" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -562,9 +481,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bh" = (
/obj/structure/table,
@@ -573,9 +490,7 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bi" = (
/obj/machinery/vending/hydronutrients,
@@ -585,9 +500,7 @@
/obj/machinery/firealarm{
pixel_y = 24
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bj" = (
/obj/machinery/vending/hydroseeds{
@@ -596,18 +509,14 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bk" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/light{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/light,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bl" = (
/obj/machinery/hydroponics/constructable,
@@ -617,57 +526,43 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/light{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/light,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bm" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bp" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 6
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bq" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"br" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bs" = (
/obj/structure/closet/secure_closet/freezer/kitchen{
@@ -677,38 +572,28 @@
dir = 4
},
/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bt" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bu" = (
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bv" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bw" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bx" = (
/obj/structure/table,
@@ -717,9 +602,7 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"by" = (
/obj/structure/cable/yellow{
@@ -728,35 +611,25 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"bz" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"bA" = (
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bB" = (
/obj/structure/table,
/obj/item/cultivator,
/obj/item/hatchet,
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bC" = (
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -766,52 +639,38 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bF" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bG" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bH" = (
/obj/structure/reagent_dispensers/watertank/high,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bI" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/storage/box/ingredients/wildcard,
/obj/item/storage/box/ingredients/wildcard,
/obj/item/storage/box/ingredients/wildcard,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bJ" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -820,9 +679,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -831,9 +688,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -842,9 +697,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bN" = (
/obj/structure/cable/yellow{
@@ -855,16 +708,12 @@
name = "Kitchen APC";
pixel_y = -24
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bO" = (
/obj/machinery/light,
/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bP" = (
/obj/structure/cable/yellow{
@@ -874,32 +723,24 @@
dir = 8;
pixel_x = -24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"bQ" = (
/obj/machinery/door/airlock/public/glass{
name = "Hydroponics"
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bR" = (
/obj/structure/sink{
dir = 4;
pixel_x = 11
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bS" = (
/obj/machinery/hydroponics/constructable,
-/turf/open/floor/light{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/light,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"bT" = (
/obj/effect/turf_decal/delivery,
@@ -915,9 +756,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bU" = (
/obj/effect/turf_decal/delivery,
@@ -930,21 +769,15 @@
/obj/item/reagent_containers/food/snacks/beans,
/obj/item/reagent_containers/food/snacks/beans,
/obj/item/reagent_containers/food/snacks/beans,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/storage)
"bX" = (
/obj/machinery/door/airlock/highsecurity{
@@ -952,9 +785,7 @@
req_access_txt = "200"
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"bY" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -965,16 +796,12 @@
/obj/machinery/door/airlock/public/glass{
name = "Kitchen"
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/cafeteria,
/area/ruin/space/has_grav/deepstorage/kitchen)
"bZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/smartfridge,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/kitchen)
"ca" = (
/obj/structure/cable/yellow{
@@ -984,18 +811,14 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cb" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cc" = (
/obj/structure/cable/yellow{
@@ -1003,35 +826,27 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cd" = (
/obj/structure/table,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"ce" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cf" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cg" = (
/obj/structure/cable/yellow{
@@ -1042,9 +857,7 @@
name = "Hydroponics APC";
pixel_x = 24
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"ch" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -1052,15 +865,11 @@
dir = 8;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"ci" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cj" = (
/obj/structure/noticeboard{
@@ -1069,9 +878,7 @@
/obj/item/paper/fluff/ruins/deepstorage/water_concern,
/obj/item/paper/fluff/ruins/deepstorage/hydro_notice,
/obj/item/paper/fluff/ruins/deepstorage/recycling_notice,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ck" = (
/obj/structure/chair{
@@ -1083,9 +890,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cl" = (
/obj/structure/table,
@@ -1096,9 +901,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cm" = (
/obj/structure/table,
@@ -1110,9 +913,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1122,40 +923,30 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"co" = (
/obj/structure/closet/crate/bin,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cp" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage)
"cq" = (
/obj/machinery/shower{
dir = 4
},
/obj/item/soap,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cr" = (
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cs" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -1164,9 +955,7 @@
locked = 0;
pixel_y = 23
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"ct" = (
/obj/structure/cable/yellow{
@@ -1175,18 +964,14 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cu" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1194,9 +979,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cw" = (
/obj/structure/table,
@@ -1209,18 +992,14 @@
pixel_y = 4
},
/obj/item/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cx" = (
/obj/machinery/seed_extractor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cy" = (
/obj/machinery/biogenerator,
@@ -1228,27 +1007,21 @@
dir = 4
},
/obj/item/reagent_containers/glass/beaker/large,
-/turf/open/floor/plasteel/hydrofloor{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/hydrofloor,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cz" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/light{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/light,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cA" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/turf/open/floor/light{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/light,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"cB" = (
/obj/effect/turf_decal/delivery,
@@ -1261,9 +1034,7 @@
/obj/item/reagent_containers/glass/beaker/waterbottle/large,
/obj/item/reagent_containers/glass/beaker/waterbottle/large,
/obj/item/reagent_containers/glass/beaker/waterbottle/large,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"cC" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -1272,9 +1043,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"cD" = (
/obj/machinery/door/airlock/highsecurity{
@@ -1287,9 +1056,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"cE" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -1299,74 +1066,54 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cF" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cG" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 10
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cH" = (
/obj/structure/chair{
dir = 4
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cI" = (
/obj/structure/table,
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cJ" = (
/obj/structure/table,
/obj/item/kitchen/fork,
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cK" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/vending/coffee,
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cM" = (
/obj/machinery/shower{
dir = 4
},
/obj/structure/window/plasma/reinforced,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cN" = (
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cO" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -1377,18 +1124,14 @@
/obj/structure/mirror{
pixel_x = 24
},
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cQ" = (
/obj/structure/cable/yellow,
@@ -1397,9 +1140,7 @@
name = "Storage APC";
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"cR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -1407,20 +1148,14 @@
icon_state = "1-2"
},
/obj/machinery/computer/arcade,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cS" = (
/obj/structure/chair/stool,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"cT" = (
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cU" = (
/obj/structure/chair{
@@ -1429,9 +1164,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cV" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
@@ -1440,9 +1173,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -1451,30 +1182,22 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/bar{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/bar,
/area/ruin/space/has_grav/deepstorage)
"cX" = (
/obj/structure/toilet{
dir = 4
},
/obj/structure/curtain,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cY" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"cZ" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"da" = (
/obj/structure/cable/yellow{
@@ -1482,9 +1205,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/armory)
"db" = (
/obj/structure/table,
@@ -1492,9 +1213,7 @@
/obj/item/device/healthanalyzer,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/gauze,
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dc" = (
/obj/structure/table,
@@ -1503,9 +1222,7 @@
pixel_y = 4
},
/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dd" = (
/obj/structure/table,
@@ -1517,30 +1234,22 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"de" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/armory)
"df" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"dg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/storage)
"dh" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
@@ -1548,9 +1257,7 @@
icon_state = "1-4"
},
/obj/machinery/computer/arcade,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"di" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1560,9 +1267,7 @@
icon_state = "4-8"
},
/obj/structure/chair/stool,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dj" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -1575,9 +1280,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1586,9 +1289,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dl" = (
/obj/structure/cable/yellow{
@@ -1597,17 +1298,13 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dm" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dn" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -1617,9 +1314,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"do" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -1627,24 +1322,18 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage)
"dq" = (
/obj/machinery/door/airlock{
name = "Showers"
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/freezer{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/freezer,
/area/ruin/space/has_grav/deepstorage)
"dr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -1654,9 +1343,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ds" = (
/obj/structure/cable/yellow{
@@ -1667,20 +1354,14 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/armory)
"dt" = (
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"du" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dv" = (
/obj/structure/table,
@@ -1695,9 +1376,7 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dw" = (
/obj/effect/turf_decal/delivery,
@@ -1716,9 +1395,7 @@
/obj/item/vending_refill/coffee,
/obj/item/vending_refill/cigarette,
/obj/item/vending_refill/cigarette,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"dx" = (
/obj/effect/turf_decal/delivery,
@@ -1734,38 +1411,28 @@
/obj/item/vending_refill/coffee,
/obj/item/vending_refill/cigarette,
/obj/item/vending_refill/cigarette,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"dy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/storage)
"dz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/storage)
"dA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/dorm)
"dB" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/dorm)
"dC" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -1775,17 +1442,13 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1794,17 +1457,13 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1814,15 +1473,11 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dH" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1831,33 +1486,25 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dJ" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dL" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dM" = (
/obj/machinery/door/airlock/highsecurity{
@@ -1867,25 +1514,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dP" = (
/obj/structure/table,
@@ -1900,15 +1541,11 @@
dir = 8;
pixel_x = 24
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"dQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/dorm)
"dR" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -1917,9 +1554,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"dS" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -1932,26 +1567,20 @@
/obj/machinery/door/airlock/public/glass{
name = "Dorms"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"dT" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dU" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dV" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -1964,9 +1593,7 @@
pixel_y = -24
},
/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dW" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
@@ -1974,9 +1601,7 @@
icon_state = "1-4"
},
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dX" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -1985,9 +1610,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dY" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
@@ -1999,9 +1622,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"dZ" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -2011,18 +1632,14 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ea" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"eb" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -2032,9 +1649,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ec" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -2050,18 +1665,14 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ed" = (
/obj/machinery/atmospherics/pipe/manifold4w/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ee" = (
/obj/machinery/door/airlock/highsecurity{
@@ -2074,9 +1685,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"ef" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -2085,17 +1694,13 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"eg" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"eh" = (
/obj/structure/table,
@@ -2110,15 +1715,11 @@
name = "Armory APC";
pixel_x = 24
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"ei" = (
/obj/structure/dresser,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"ej" = (
/obj/structure/table/wood,
@@ -2126,9 +1727,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"ek" = (
/obj/structure/bed,
@@ -2136,35 +1735,27 @@
dir = 4
},
/obj/item/bedsheet,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"el" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/dorm)
"em" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"en" = (
/obj/machinery/door/airlock/highsecurity{
name = "Canister Storage";
req_access_txt = "200"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"eo" = (
/obj/machinery/door/poddoor{
@@ -2172,23 +1763,17 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ep" = (
/obj/machinery/door/poddoor{
id = "bunkerinterior"
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"eq" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
"er" = (
/obj/machinery/door/airlock/highsecurity{
@@ -2199,15 +1784,11 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"es" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
"et" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -2220,9 +1801,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"eu" = (
/obj/structure/cable/yellow{
@@ -2233,25 +1812,19 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/armory)
"ev" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 5
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"ew" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"ex" = (
/obj/structure/table,
@@ -2265,9 +1838,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"ey" = (
/obj/structure/closet/cabinet,
@@ -2276,9 +1847,7 @@
icon_state = "centcom";
name = "bunker access ID"
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"ez" = (
/obj/structure/chair/stool,
@@ -2286,17 +1855,13 @@
dir = 4
},
/obj/machinery/light/small,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"eA" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"eB" = (
/obj/machinery/door/airlock{
@@ -2306,9 +1871,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"eC" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
@@ -2317,14 +1880,10 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"eD" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"eE" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -2332,9 +1891,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"eF" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -2344,9 +1901,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"eG" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -2355,17 +1910,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"eH" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
"eI" = (
/obj/structure/table,
@@ -2398,9 +1949,7 @@
network = list("Bunker1");
pixel_y = 2
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eJ" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -2413,9 +1962,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eK" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -2428,9 +1975,7 @@
/obj/machinery/firealarm{
pixel_y = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eL" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -2444,17 +1989,13 @@
name = "Airlock Control APC";
pixel_y = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eM" = (
/obj/structure/cable/yellow,
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/armory)
"eN" = (
/obj/structure/table,
@@ -2465,9 +2006,7 @@
/obj/item/storage/firstaid/toxin,
/obj/item/storage/pill_bottle/charcoal,
/obj/machinery/light,
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"eO" = (
/obj/structure/table,
@@ -2482,9 +2021,7 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"eP" = (
/obj/structure/table,
@@ -2503,9 +2040,7 @@
/obj/item/device/flashlight/flare{
pixel_y = 6
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/deepstorage/armory)
"eQ" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -2515,24 +2050,18 @@
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"eR" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"eS" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"eT" = (
/obj/machinery/door/poddoor/shutters/preopen{
@@ -2546,9 +2075,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/airlock)
"eU" = (
/obj/structure/chair{
@@ -2557,9 +2084,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eV" = (
/obj/structure/cable/yellow{
@@ -2568,15 +2093,11 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eX" = (
/obj/machinery/atmospherics/components/binary/valve{
@@ -2586,9 +2107,7 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"eY" = (
/obj/machinery/door/airlock/highsecurity{
@@ -2599,9 +2118,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"eZ" = (
/obj/machinery/door/airlock/highsecurity{
@@ -2609,41 +2126,31 @@
req_access_txt = "200"
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fa" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 6
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/armory)
"fb" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/armory)
"fc" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
"fd" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 8
},
-/turf/open/floor/plating/airless/astplate{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless/astplate,
/area/ruin/space/has_grav/deepstorage/power)
"fe" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -2654,22 +2161,16 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"ff" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"fg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fh" = (
/obj/machinery/door/poddoor/shutters/preopen{
@@ -2678,47 +2179,35 @@
/obj/structure/cable/yellow,
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/airlock)
"fi" = (
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fj" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fk" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fm" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fn" = (
/obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -2730,20 +2219,14 @@
locked = 0;
pixel_y = 23
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fo" = (
/obj/machinery/suit_storage_unit/syndicate,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fp" = (
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
"fq" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
@@ -2751,9 +2234,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"fr" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
@@ -2763,17 +2244,13 @@
dir = 4
},
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fs" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/airlock)
"ft" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
@@ -2783,27 +2260,21 @@
dir = 4;
pixel_x = -24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fu" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
},
/obj/machinery/light,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fv" = (
/obj/machinery/atmospherics/components/binary/valve{
dir = 4;
name = "Port To Hall"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fw" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
@@ -2811,9 +2282,7 @@
dir = 8
},
/obj/item/wrench,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/airlock)
"fx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -2829,9 +2298,7 @@
pixel_x = -25;
pixel_y = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fy" = (
/obj/machinery/atmospherics/components/trinary/mixer{
@@ -2841,26 +2308,20 @@
node2_concentration = 0.8;
on = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fz" = (
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fA" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fB" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
@@ -2868,9 +2329,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"fC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
@@ -2879,14 +2338,10 @@
id_tag = "o2_out_bunker";
name = "oxygen out"
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"fD" = (
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"fE" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -2896,9 +2351,7 @@
name = "Dormory APC";
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"fF" = (
/obj/machinery/door/poddoor{
@@ -2906,30 +2359,22 @@
},
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fG" = (
/obj/machinery/door/poddoor{
id = "bunkerexterior"
},
/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fH" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fI" = (
/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fJ" = (
/obj/machinery/computer/atmos_control/tank{
@@ -2940,66 +2385,50 @@
output_tag = "o2_out_bunker";
sensors = list("o2_sensor_bunker" = "Tank")
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"fK" = (
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"fL" = (
/obj/machinery/air_sensor{
frequency = 1441;
id_tag = "o2_sensor_bunker"
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"fM" = (
/obj/machinery/atmospherics/miner/oxygen,
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"fN" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/dorm)
"fO" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"fP" = (
/obj/structure/closet/wardrobe/pjs,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"fQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fR" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -3014,9 +2443,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fS" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -3025,14 +2452,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fT" = (
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fU" = (
/obj/machinery/camera{
@@ -3044,15 +2467,11 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fV" = (
/obj/structure/closet/emcloset,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"fW" = (
/obj/structure/cable/yellow{
@@ -3061,9 +2480,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"fX" = (
/obj/structure/cable/yellow{
@@ -3075,9 +2492,7 @@
/obj/structure/sign/electricshock{
pixel_y = 32
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"fY" = (
/obj/effect/turf_decal/stripes/line{
@@ -3089,9 +2504,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"fZ" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
@@ -3100,9 +2513,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"ga" = (
/obj/machinery/atmospherics/components/trinary/filter{
@@ -3110,17 +2521,13 @@
filter_type = "o2";
on = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gb" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gc" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -3128,9 +2535,7 @@
},
/obj/machinery/door/firedoor,
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gd" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
@@ -3138,9 +2543,7 @@
frequency = 1441;
id = "n2_in_bunker"
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"ge" = (
/obj/machinery/door/airlock{
@@ -3149,17 +2552,13 @@
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"gf" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"gg" = (
/obj/machinery/washing_machine,
@@ -3170,9 +2569,7 @@
dir = 8;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"gh" = (
/obj/structure/cable/yellow{
@@ -3184,9 +2581,7 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gi" = (
/obj/machinery/power/terminal{
@@ -3198,18 +2593,14 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
icon_state = "2-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gk" = (
/obj/machinery/light{
@@ -3219,57 +2610,43 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gl" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"gm" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/closet/crate/bin{
name = "laundry bin"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"gn" = (
/obj/machinery/light/small,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"go" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"gp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
"gq" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gr" = (
/obj/machinery/power/smes/engineering,
@@ -3279,9 +2656,7 @@
/obj/structure/sign/electricshock{
pixel_y = -32
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3290,9 +2665,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -3302,17 +2675,13 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gu" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
dir = 5
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
@@ -3321,22 +2690,16 @@
id_tag = "n2_out_bunker";
name = "nitrogen out"
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"gw" = (
/obj/machinery/sleeper{
dir = 4
},
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/deepstorage/dorm)
"gx" = (
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/deepstorage/dorm)
"gy" = (
/obj/structure/closet/crate/freezer,
@@ -3351,9 +2714,7 @@
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/random,
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/deepstorage/dorm)
"gz" = (
/obj/machinery/door/airlock/highsecurity{
@@ -3361,9 +2722,7 @@
name = "Inconspicuous Airlock";
req_access_txt = "200"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"gA" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
@@ -3372,17 +2731,13 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gB" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gC" = (
/obj/machinery/computer/atmos_control/tank{
@@ -3393,55 +2748,41 @@
output_tag = "n2_out_bunker";
sensors = list("n2_sensor_bunker" = "Tank")
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gD" = (
/obj/machinery/air_sensor{
frequency = 1441;
id_tag = "n2_sensor_bunker"
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"gE" = (
/obj/machinery/atmospherics/miner/nitrogen,
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"gF" = (
/obj/machinery/light/small,
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/deepstorage/dorm)
"gG" = (
/obj/machinery/iv_drip,
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/deepstorage/dorm)
"gH" = (
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"gI" = (
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"gJ" = (
/obj/machinery/light/small{
@@ -3450,9 +2791,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gK" = (
/obj/structure/cable/yellow{
@@ -3461,9 +2800,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gL" = (
/obj/machinery/door/airlock/highsecurity{
@@ -3473,23 +2810,17 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gN" = (
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gO" = (
/obj/machinery/atmospherics/components/trinary/filter{
@@ -3497,9 +2828,7 @@
filter_type = "n2o";
on = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gP" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
@@ -3507,9 +2836,7 @@
frequency = 1441;
id = "o2_in_bunker"
},
-/turf/open/floor/plating/airless{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/deepstorage/power)
"gQ" = (
/obj/machinery/door/airlock/highsecurity{
@@ -3518,18 +2845,14 @@
req_access_txt = "200"
},
/obj/structure/fans/tiny,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"gR" = (
/obj/structure/grille,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gS" = (
/obj/structure/grille,
@@ -3540,9 +2863,7 @@
icon_state = "1-8"
},
/obj/machinery/door/firedoor,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3552,17 +2873,13 @@
/obj/structure/sign/radiation{
pixel_x = -32
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3574,9 +2891,7 @@
pixel_y = 4
},
/obj/item/storage/toolbox/electrical,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gW" = (
/obj/structure/table,
@@ -3585,9 +2900,7 @@
pixel_y = 4
},
/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gX" = (
/obj/machinery/power/rtg/advanced,
@@ -3595,51 +2908,37 @@
icon_state = "1-2"
},
/obj/structure/cable/yellow,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gY" = (
/obj/machinery/door/airlock/highsecurity{
name = "Telecomms";
req_access_txt = "200"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gZ" = (
/obj/machinery/power/rtg/advanced,
/obj/structure/cable/yellow,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"ha" = (
/obj/machinery/power/rtg/advanced,
/obj/machinery/light/small,
/obj/structure/cable/yellow,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"hb" = (
/obj/machinery/blackbox_recorder,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"hc" = (
/obj/machinery/light/small,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"hd" = (
/obj/machinery/telecomms/relay/preset/telecomms,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"he" = (
/obj/structure/window/reinforced{
@@ -3648,9 +2947,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/crusher)
"hf" = (
/obj/machinery/hydroponics/constructable,
@@ -3662,9 +2959,7 @@
locked = 0;
pixel_y = 23
},
-/turf/open/floor/light{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/light,
/area/ruin/space/has_grav/deepstorage/hydroponics)
"hg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -3673,18 +2968,14 @@
/obj/machinery/firealarm{
pixel_y = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"hh" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"hi" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -3696,9 +2987,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"hj" = (
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
@@ -3711,16 +3000,12 @@
dir = 4;
pixel_x = 24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/dorm)
"hk" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"hl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -3731,43 +3016,33 @@
dir = 8;
pixel_x = -24
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"hm" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"hn" = (
/obj/structure/closet/emcloset,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/plasteel/floorgrime{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage)
"ho" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/turf/closed/wall/mineral/iron{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
"hp" = (
/obj/machinery/power/smes/engineering,
/obj/structure/cable/yellow{
icon_state = "0-8"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"hq" = (
/obj/machinery/door/firedoor,
@@ -3775,9 +3050,117 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/airless
- },
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/deepstorage/power)
+"hr" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/mineral/random/low_chance,
+/area/ruin/unpowered/no_grav)
+"hs" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"ht" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hu" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hv" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hw" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hx" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hy" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hz" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hA" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/kitchen)
+"hB" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/hydroponics)
+"hC" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hD" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hE" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hF" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hG" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hH" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hI" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hJ" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hK" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hL" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hM" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hN" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hO" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hP" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hQ" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hR" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hS" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hT" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage)
+"hU" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
+"hV" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/dorm)
+"hW" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/armory)
+"hX" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav/deepstorage/airlock)
+"hY" = (
+/obj/effect/baseturf_helper/asteroid/airless,
+/turf/closed/wall/mineral/iron,
/area/ruin/space/has_grav/deepstorage/power)
(1,1,1) = {"
@@ -4259,7 +3642,7 @@ ab
ab
ab
ab
-ab
+hr
ab
ab
ab
@@ -4318,14 +3701,14 @@ ab
ab
ab
ab
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-dB
+hE
+hJ
+hN
+hP
+hQ
+hS
+hU
+hV
dB
dB
dB
@@ -4370,7 +3753,7 @@ ab
ab
ab
ab
-aw
+hF
bT
bU
cB
@@ -4419,10 +3802,10 @@ ab
ab
ab
aw
-aw
-aw
-aw
-aw
+hz
+hC
+hD
+hG
bU
bU
cB
@@ -4470,11 +3853,11 @@ ab
ab
ab
ab
-aw
+hs
aG
aR
bm
-aw
+hH
bV
ch
cC
@@ -4522,15 +3905,15 @@ ab
ab
ab
ab
-aw
+ht
aH
aS
bn
-aw
-aw
-aw
+hI
+hK
+hO
cD
-aw
+hR
dg
dz
dQ
@@ -4574,7 +3957,7 @@ ab
ab
ab
ab
-aw
+hu
aI
aT
bo
@@ -4626,7 +4009,7 @@ ab
ab
ab
ab
-aw
+hv
aJ
aU
bp
@@ -4678,12 +4061,12 @@ ab
ab
ab
ab
-aw
+hw
aK
aV
bq
bG
-aw
+hL
cj
cG
bz
@@ -4730,12 +4113,12 @@ ab
ab
ab
ab
-aw
+hx
aL
aW
br
bH
-aw
+hM
ck
cH
cT
@@ -4782,8 +4165,8 @@ ab
ab
ab
ab
-aw
-af
+hy
+hA
af
af
af
@@ -4999,7 +4382,7 @@ af
cp
cp
cp
-cp
+hT
dI
dX
eq
@@ -5059,7 +4442,7 @@ eJ
eV
fi
fu
-eq
+hX
ho
fp
fp
@@ -5575,7 +4958,7 @@ de
de
de
de
-de
+hW
fb
fp
fD
@@ -5585,7 +4968,7 @@ fp
fD
gE
fD
-fp
+hY
ab
ab
ab
@@ -5719,7 +5102,7 @@ ab
ab
ab
ab
-aQ
+hB
aQ
aQ
aQ
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index 2eab719806..42b04d5c30 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -4059,14 +4059,10 @@
/area/ruin/space/has_grav/hotel/pool)
"li" = (
/obj/effect/light_emitter,
-/turf/open/floor/plating/beach/water{
- baseturf = /turf/open/space
- },
+/turf/open/floor/plating/beach/water,
/area/ruin/space/has_grav/hotel/pool)
"lj" = (
-/turf/open/floor/plating/beach/water{
- baseturf = /turf/open/space
- },
+/turf/open/floor/plating/beach/water,
/area/ruin/space/has_grav/hotel/pool)
"lk" = (
/obj/structure/chair{
@@ -4274,9 +4270,7 @@
/area/ruin/space/has_grav/hotel/security)
"lP" = (
/obj/item/bikehorn/rubberducky,
-/turf/open/floor/plating/beach/water{
- baseturf = /turf/open/space
- },
+/turf/open/floor/plating/beach/water,
/area/ruin/space/has_grav/hotel/pool)
"lQ" = (
/obj/structure/table,
@@ -4655,6 +4649,10 @@
},
/turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel)
+"mW" = (
+/obj/effect/baseturf_helper/space,
+/turf/closed/wall,
+/area/ruin/space/has_grav/hotel/pool)
(1,1,1) = {"
aa
@@ -7090,7 +7088,7 @@ ih
fi
cJ
jt
-jQ
+mW
jQ
jQ
jQ
diff --git a/_maps/RandomZLevels/beach2.dmm b/_maps/RandomZLevels/beach2.dmm
index 7f48402838..81bb0144d9 100644
--- a/_maps/RandomZLevels/beach2.dmm
+++ b/_maps/RandomZLevels/beach2.dmm
@@ -91,22 +91,16 @@
density = 0;
pixel_y = 18
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"at" = (
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"au" = (
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"av" = (
/obj/structure/toilet{
@@ -117,9 +111,7 @@
/area/awaymission/beach)
"aw" = (
/obj/structure/closet/secure_closet/personal/cabinet,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"ax" = (
/obj/item/bedsheet/rainbow,
@@ -131,9 +123,7 @@
pixel_x = 24;
specialfunctions = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"ay" = (
/obj/effect/overlay/palmtree_r,
@@ -151,9 +141,7 @@
/obj/item/reagent_containers/food/drinks/bottle/wine,
/obj/item/reagent_containers/food/drinks/bottle/rum,
/obj/structure/table/wood,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aB" = (
/obj/effect/overlay/coconut,
@@ -174,9 +162,7 @@
/obj/structure/mirror{
pixel_y = 28
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aF" = (
/obj/machinery/button/door{
@@ -186,9 +172,7 @@
pixel_x = 24;
specialfunctions = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aG" = (
/obj/machinery/button/door{
@@ -198,9 +182,7 @@
pixel_x = 24;
specialfunctions = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aH" = (
/obj/machinery/door/airlock/sandstone{
@@ -238,74 +220,52 @@
/area/awaymission/beach)
"aM" = (
/obj/structure/closet/gmcloset,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aN" = (
/obj/structure/closet/secure_closet/bar,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aO" = (
/obj/structure/table/wood,
/obj/item/book/manual/barman_recipes,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aP" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aQ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aR" = (
/obj/structure/table/wood,
/obj/item/clothing/glasses/sunglasses,
/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aS" = (
/obj/effect/mob_spawn/human/bartender/alive,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aT" = (
/obj/machinery/vending/boozeomat,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aU" = (
/obj/machinery/vending/cigarette,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aV" = (
/obj/machinery/vending/cola,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aW" = (
/obj/machinery/vending/snack,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aX" = (
/obj/structure/mineral_door/wood{
@@ -316,29 +276,21 @@
"aY" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/ale,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"aZ" = (
/obj/structure/table/wood,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"ba" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"bb" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/beach/sand
- },
+/turf/open/floor/wood,
/area/awaymission/beach)
"bc" = (
/obj/item/toy/beach_ball,
@@ -431,6 +383,10 @@
"bt" = (
/turf/open/floor/plating/beach/water,
/area/awaymission/beach)
+"bu" = (
+/obj/effect/baseturf_helper/beach/sand,
+/turf/open/floor/plating/beach/sand,
+/area/awaymission/beach)
(1,1,1) = {"
aa
@@ -43447,7 +43403,7 @@ ab
ab
ab
ab
-ac
+bu
ac
ac
ac
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index cfbd187283..06ef5c5c79 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -10,7 +10,6 @@
/area/awaymission/caves/BMP_asteroid/level_three)
"ad" = (
/turf/open/lava/smooth{
- baseturf = /turf/open/lava/smooth;
desc = "Looks hot.";
luminosity = 5;
name = "lava";
@@ -36,7 +35,6 @@
/area/awaymission/caves/BMP_asteroid/level_three)
"ah" = (
/turf/open/lava/smooth{
- baseturf = /turf/open/lava/smooth;
desc = "Looks hot.";
luminosity = 5;
name = "lava";
@@ -77,14 +75,12 @@
/area/awaymission/caves/BMP_asteroid/level_four)
"ao" = (
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"ap" = (
/obj/structure/destructible/cult/pylon,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -97,14 +93,12 @@
"ar" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"as" = (
/obj/effect/decal/cleanable/blood/gibs/old,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -124,7 +118,6 @@
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/organ/heart/demon,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -134,25 +127,20 @@
name = "shock rune"
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aw" = (
/obj/effect/decal/remains/human,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"ax" = (
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
-/turf/closed/wall/mineral/cult{
- baseturf = /turf/open/lava/smooth
- },
+/turf/closed/wall/mineral/cult,
/area/awaymission/caves/BMP_asteroid/level_four)
"ay" = (
/obj/structure/destructible/cult/tome,
@@ -162,14 +150,12 @@
},
/obj/item/coin/antagtoken,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"az" = (
/obj/structure/constructshell,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -177,14 +163,12 @@
/obj/structure/girder/cult,
/obj/item/stack/sheet/runed_metal,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aB" = (
/mob/living/simple_animal/hostile/spawner/skeleton,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -192,14 +176,12 @@
/obj/structure/bed,
/obj/item/bedsheet/cult,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aD" = (
/obj/item/stack/sheet/runed_metal,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -213,7 +195,6 @@
name = "an extremely flamboyant book"
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -225,37 +206,29 @@
name = "weak forcefield"
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aG" = (
/obj/item/ectoplasm,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aH" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/BMP_asteroid/level_three)
"aI" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
"aJ" = (
-/turf/closed/wall/rust{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall/rust,
/area/awaymission/caves/BMP_asteroid/level_three)
"aK" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -264,7 +237,6 @@
dir = 4
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -275,7 +247,6 @@
id = "minedeep"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -293,7 +264,6 @@
dir = 8
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -305,7 +275,6 @@
name = "rusty ladder"
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -318,14 +287,12 @@
"aR" = (
/obj/effect/forcefield/cult,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aS" = (
/obj/structure/girder/cult,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -351,7 +318,6 @@
"aV" = (
/obj/effect/forcefield/cult,
/turf/open/lava/smooth{
- baseturf = /turf/open/lava/smooth;
desc = "Looks hot.";
luminosity = 5;
name = "lava";
@@ -361,7 +327,6 @@
"aW" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -371,7 +336,6 @@
id_target = "minedeepup"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -390,7 +354,6 @@
name = "flame rune"
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -398,7 +361,6 @@
/obj/structure/destructible/cult/talisman,
/obj/item/plasma_fist_scroll,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -418,9 +380,7 @@
/turf/open/floor/plating/asteroid/basalt/lava{
initial_gas_mix = "n2=23;o2=14"
},
-/turf/closed/wall/mineral/cult{
- baseturf = /turf/open/lava/smooth
- },
+/turf/closed/wall/mineral/cult,
/area/awaymission/caves/BMP_asteroid/level_four)
"be" = (
/mob/living/simple_animal/hostile/spawner/mining/goliath,
@@ -431,7 +391,6 @@
"bf" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -452,7 +411,6 @@
dir = 9
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -461,7 +419,6 @@
dir = 1
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -470,7 +427,6 @@
dir = 5
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -479,7 +435,6 @@
dir = 8
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -488,7 +443,6 @@
calibrated = 0
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -497,7 +451,6 @@
dir = 4
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -513,14 +466,12 @@
dir = 10
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
"bq" = (
/obj/machinery/gateway,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -529,7 +480,6 @@
dir = 6
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -565,7 +515,6 @@
/obj/effect/decal/cleanable/blood,
/mob/living/simple_animal/hostile/spawner/skeleton,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -586,7 +535,6 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -595,7 +543,6 @@
/obj/item/device/necromantic_stone,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -607,14 +554,12 @@
/area/awaymission/caves/BMP_asteroid/level_three)
"bC" = (
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
"bD" = (
/mob/living/simple_animal/hostile/skeleton,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -622,7 +567,6 @@
/obj/structure/destructible/cult/pylon,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_four)
@@ -634,7 +578,6 @@
name = "rusty ladder"
},
/turf/open/floor/engine/cult{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_three)
@@ -670,7 +613,6 @@
/area/awaymission/caves/BMP_asteroid)
"bM" = (
/turf/open/lava/smooth{
- baseturf = /turf/open/lava/smooth;
desc = "Looks hot.";
luminosity = 5;
name = "lava";
@@ -682,7 +624,6 @@
/area/awaymission/caves/BMP_asteroid/level_two)
"bO" = (
/turf/open/lava/smooth{
- baseturf = /turf/open/lava/smooth;
desc = "Looks hot.";
luminosity = 5;
name = "lava";
@@ -703,25 +644,19 @@
},
/area/awaymission/caves/BMP_asteroid/level_two)
"bQ" = (
-/turf/closed/wall/rust{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall/rust,
/area/awaymission/caves/BMP_asteroid/level_two)
"bR" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/BMP_asteroid/level_two)
"bS" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
"bT" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
@@ -731,7 +666,6 @@
id_target = "minedeepup"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
@@ -758,7 +692,6 @@
"bY" = (
/mob/living/simple_animal/hostile/skeleton,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
@@ -774,7 +707,6 @@
"ca" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -816,25 +748,19 @@
id = "mineintro"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
"cf" = (
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
"cg" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/research)
"ch" = (
-/turf/closed/wall/rust{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall/rust,
/area/awaymission/caves/research)
"ci" = (
/obj/item/shard,
@@ -859,7 +785,6 @@
"cl" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
@@ -868,7 +793,6 @@
/area/awaymission/caves/BMP_asteroid/level_two)
"cn" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -879,14 +803,12 @@
/obj/structure/filingcabinet,
/obj/item/paper/fluff/awaymissions/caves/omega,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cp" = (
/obj/structure/table,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -898,14 +820,12 @@
/area/awaymission/caves/BMP_asteroid/level_two)
"cr" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cs" = (
/obj/item/shard,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -914,34 +834,29 @@
/obj/item/stack/rods,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cu" = (
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cv" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cw" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cx" = (
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -960,7 +875,6 @@
"cA" = (
/obj/effect/decal/remains/xeno,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -970,7 +884,6 @@
},
/obj/effect/decal/cleanable/xenoblood,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -979,14 +892,12 @@
/obj/item/restraints/handcuffs/cable,
/obj/item/restraints/handcuffs/cable,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cD" = (
/obj/effect/decal/remains/human,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -997,14 +908,12 @@
},
/obj/item/stack/rods,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1019,13 +928,11 @@
"cH" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
"cI" = (
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
@@ -1039,9 +946,7 @@
desc = "A warning sign which reads 'HOLY SHIT NIGGA WHAT ARE YOU DOING'.";
name = "\improper HOLY SHIT NIGGA WHAT ARE YOU DOING"
},
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/BMP_asteroid/level_two)
"cL" = (
/mob/living/simple_animal/hostile/spawner/mining/basilisk,
@@ -1054,7 +959,6 @@
dir = 8
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1062,7 +966,6 @@
/obj/machinery/door/window/eastleft,
/obj/effect/decal/cleanable/xenoblood/xgibs,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1072,14 +975,12 @@
},
/obj/machinery/door/window/eastleft,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cP" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1099,7 +1000,6 @@
"cR" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1110,7 +1010,6 @@
icon_state = "right"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1122,7 +1021,6 @@
icon_state = "right"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1138,7 +1036,6 @@
"cV" = (
/obj/effect/decal/cleanable/xenoblood/xgibs,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1147,7 +1044,6 @@
dir = 4
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1155,14 +1051,12 @@
/obj/structure/table,
/obj/item/melee/baton,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"cY" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1172,7 +1066,6 @@
pixel_x = 32
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1187,7 +1080,6 @@
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/crap,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1207,14 +1099,12 @@
"dd" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
"de" = (
/obj/machinery/light,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1226,7 +1116,6 @@
/obj/item/grenade/syndieminibomb/concussion,
/obj/item/grenade/syndieminibomb/concussion,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/research)
@@ -1236,24 +1125,19 @@
id_target = "mineintroup"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid/level_two)
"dh" = (
/obj/machinery/door/airlock/external,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
"di" = (
/obj/structure/table,
/obj/item/paper/fluff/awaymissions/caves/magma,
/obj/item/pen,
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dj" = (
/obj/structure/ladder/unbreakable{
@@ -1261,64 +1145,46 @@
height = 2;
id = "minedeep"
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dk" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dl" = (
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
"dm" = (
/obj/structure/spider/stickyweb,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid/level_two)
"dn" = (
/obj/structure/chair{
dir = 1
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"do" = (
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dp" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
/obj/item/clothing/glasses/meson,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dq" = (
/obj/machinery/light/small/built{
dir = 4
},
/obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dr" = (
/obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"ds" = (
/obj/structure/closet/secure_closet/personal,
@@ -1330,193 +1196,137 @@
pixel_x = 5;
throwforce = 1
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dt" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/northblock)
"du" = (
-/turf/closed/wall/rust{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall/rust,
/area/awaymission/caves/northblock)
"dv" = (
/obj/machinery/suit_storage_unit/mining{
desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
name = "rusted suit storage unit"
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dw" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid/level_two)
"dx" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/cobweb,
/obj/item/sord,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dy" = (
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dz" = (
/obj/structure/table/wood,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dA" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/gun/energy/kinetic_accelerator,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dB" = (
/obj/structure/dresser,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dC" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dD" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dE" = (
/obj/machinery/light/small/built{
dir = 8
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dF" = (
/obj/structure/bed,
/obj/item/bedsheet,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dG" = (
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dH" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/landmark/awaystart,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dI" = (
/obj/machinery/door/airlock{
name = "Dorm"
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dJ" = (
/obj/item/stack/rods,
/obj/structure/spider/stickyweb,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/northblock)
"dK" = (
/obj/structure/girder,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/northblock)
"dL" = (
/obj/item/stack/sheet/metal,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/northblock)
"dM" = (
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/northblock)
"dN" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/northblock)
"dO" = (
/mob/living/simple_animal/hostile/retaliate/bat{
desc = "A rare breed of bat which roosts deep in caves.";
name = "Cave Bat"
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/northblock)
"dP" = (
/obj/item/stack/rods,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/northblock)
"dQ" = (
/obj/machinery/door/airlock/mining{
name = "Dorm Access"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/northblock)
"dR" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/northblock)
"dS" = (
/obj/machinery/light/small,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/northblock)
"dT" = (
/obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/northblock)
"dU" = (
/obj/structure/closet/crate/miningcar{
@@ -1533,51 +1343,39 @@
/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dW" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/BMP_asteroid)
"dX" = (
-/turf/closed/wall/rust{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall/rust,
/area/awaymission/caves/BMP_asteroid)
"dY" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/landmark/awaystart,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"dZ" = (
/obj/machinery/light/small{
dir = 8
},
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"ea" = (
/obj/item/stack/sheet/metal,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"eb" = (
/obj/machinery/light/small/built{
dir = 8
},
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
"ec" = (
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
@@ -1585,14 +1383,12 @@
/obj/structure/bed,
/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
"ee" = (
/obj/structure/girder,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
@@ -1604,30 +1400,22 @@
/area/awaymission/caves/BMP_asteroid)
"eg" = (
/obj/effect/decal/cleanable/robot_debris/old,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eh" = (
/obj/structure/table,
/obj/item/device/radio,
/obj/item/device/radio,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ei" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"ej" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"ek" = (
/obj/structure/window{
@@ -1635,41 +1423,33 @@
dir = 8
},
/mob/living/simple_animal/hostile/mining_drone,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"el" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/gun/energy/laser/captain/scattershot,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"em" = (
/obj/structure/closet/secure_closet/personal,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
"en" = (
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
"eo" = (
/obj/item/stack/rods,
/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
"ep" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
@@ -1677,15 +1457,11 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"er" = (
/obj/structure/chair/stool,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"es" = (
/obj/structure/window{
@@ -1694,14 +1470,11 @@
},
/obj/structure/window,
/mob/living/simple_animal/hostile/mining_drone,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"et" = (
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/northblock)
@@ -1712,32 +1485,24 @@
},
/area/awaymission/caves/BMP_asteroid)
"ev" = (
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ew" = (
/obj/structure/table,
/obj/item/device/mining_scanner,
/obj/item/device/mining_scanner,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ex" = (
/obj/structure/closet/secure_closet/miner,
/obj/effect/decal/cleanable/cobweb,
/obj/item/survivalcapsule,
/obj/item/extinguisher/mini,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ey" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ez" = (
/obj/machinery/light/small/built{
@@ -1747,22 +1512,16 @@
desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
name = "rusted suit storage unit"
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eA" = (
/obj/structure/table,
/obj/item/paper/fluff/awaymissions/caves/work_notice,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eB" = (
/obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eC" = (
/obj/structure/table,
@@ -1771,67 +1530,47 @@
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
/obj/item/clothing/glasses/meson,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eD" = (
/obj/structure/closet/secure_closet/miner,
/obj/item/survivalcapsule,
/obj/item/extinguisher/mini,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eE" = (
/obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eF" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall,
/area/awaymission/caves/listeningpost)
"eG" = (
-/turf/closed/wall/rust{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/closed/wall/rust,
/area/awaymission/caves/listeningpost)
"eH" = (
/obj/machinery/vending/sustenance,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eI" = (
/obj/structure/closet/crate/trashcart,
/obj/item/switchblade,
/obj/item/switchblade,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eJ" = (
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eK" = (
/obj/structure/table,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/gun/energy/kinetic_accelerator,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eL" = (
/obj/machinery/vending/sovietsoda,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eM" = (
/obj/machinery/light/small{
@@ -1840,21 +1579,15 @@
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
/obj/item/device/multitool,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eN" = (
/obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eO" = (
/obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eP" = (
/obj/structure/table,
@@ -1874,9 +1607,7 @@
pixel_x = 5;
throwforce = 1
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eQ" = (
/obj/machinery/mineral/mint,
@@ -1886,9 +1617,7 @@
/area/awaymission/caves/BMP_asteroid)
"eR" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eS" = (
/obj/machinery/light/small/built,
@@ -1896,29 +1625,21 @@
desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
name = "rusted suit storage unit"
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eT" = (
/obj/structure/closet/emcloset,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"eU" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eV" = (
/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eW" = (
/obj/structure/barricade/wooden,
@@ -1927,23 +1648,17 @@
"eX" = (
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eY" = (
/obj/structure/table,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"eZ" = (
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"fa" = (
/obj/structure/noticeboard{
@@ -1951,9 +1666,7 @@
},
/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
/obj/item/paper/fluff/awaymissions/caves/saftey_notice,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"fb" = (
/mob/living/simple_animal/hostile/spawner/mining/hivelord,
@@ -2005,15 +1718,11 @@
/area/awaymission/caves/BMP_asteroid)
"fh" = (
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/listeningpost)
"fi" = (
/obj/machinery/door/airlock/external,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/listeningpost)
"fj" = (
/obj/effect/mob_spawn/human/skeleton/alive{
@@ -2036,9 +1745,7 @@
},
/area/awaymission/caves/BMP_asteroid/level_two)
"fm" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/listeningpost)
"fn" = (
/obj/structure/closet/crate{
@@ -2075,9 +1782,7 @@
"fq" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fr" = (
/obj/machinery/light/small/built{
@@ -2085,33 +1790,25 @@
},
/obj/structure/spider/stickyweb,
/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fs" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"ft" = (
/obj/structure/table,
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/fire,
/obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fu" = (
/obj/structure/table,
/obj/item/storage/firstaid/brute,
/obj/item/reagent_containers/blood/OPlus,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fv" = (
/obj/structure/glowshroom/single,
@@ -2131,40 +1828,31 @@
id_target = "mineintrodown"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"fy" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"fz" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"fA" = (
/obj/structure/bed,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fB" = (
/obj/structure/spider/stickyweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fC" = (
/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fD" = (
/obj/structure/spider/stickyweb,
@@ -2172,9 +1860,7 @@
dir = 8
},
/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fE" = (
/obj/machinery/light/small,
@@ -2197,9 +1883,7 @@
/area/awaymission/caves/BMP_asteroid)
"fH" = (
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"fI" = (
/obj/structure/sign/bluecross{
@@ -2211,44 +1895,33 @@
/area/awaymission/caves/BMP_asteroid)
"fJ" = (
/obj/structure/grille,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"fK" = (
/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fL" = (
/obj/structure/sign/examroom{
pixel_y = 32
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fM" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fN" = (
/obj/machinery/door/airlock/external,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"fO" = (
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2276,15 +1949,11 @@
/obj/item/storage/firstaid/toxin,
/obj/item/storage/firstaid/toxin,
/obj/item/reagent_containers/blood/OPlus,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fT" = (
/obj/machinery/iv_drip,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fU" = (
/obj/effect/landmark/awaystart,
@@ -2295,7 +1964,6 @@
/area/awaymission/caves/BMP_asteroid)
"fV" = (
/turf/open/floor/plasteel/elevatorshaft{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
},
@@ -2303,7 +1971,6 @@
"fW" = (
/obj/structure/girder,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2329,13 +1996,10 @@
"fY" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"fZ" = (
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2346,20 +2010,16 @@
id = "mineintro"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gb" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gc" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2383,22 +2043,18 @@
"gf" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gg" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/donkpockets,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gh" = (
/obj/structure/table/reinforced,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2406,7 +2062,6 @@
/obj/structure/table/reinforced,
/obj/item/stack/rods,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2414,9 +2069,7 @@
/obj/machinery/door/airlock/mining{
name = "Kitchen"
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gk" = (
/obj/effect/landmark/awaystart,
@@ -2426,15 +2079,11 @@
/area/awaymission/caves/BMP_asteroid/level_two)
"gl" = (
/obj/item/trash/plate,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gm" = (
/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gn" = (
/obj/item/grown/log,
@@ -2445,29 +2094,23 @@
"go" = (
/obj/structure/chair/stool,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gp" = (
/obj/structure/table_frame,
/turf/open/floor/plating{
- baseturf = /turf/open/lava/smooth;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gq" = (
/obj/structure/chair/stool,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gr" = (
/obj/structure/table,
/obj/item/kitchen/fork,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gs" = (
/obj/item/device/assembly/igniter,
@@ -2478,63 +2121,47 @@
"gt" = (
/obj/structure/table_frame,
/obj/item/stack/sheet/metal,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gu" = (
/obj/item/stack/rods,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gv" = (
/obj/structure/table_frame,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gw" = (
/obj/structure/reagent_dispensers/beerkeg,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gx" = (
/obj/structure/table,
/obj/item/kitchen/fork,
/obj/item/trash/plate,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gy" = (
/obj/item/reagent_containers/food/drinks/drinkingglass,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plasteel,
/area/awaymission/caves/BMP_asteroid)
"gz" = (
/obj/machinery/door/airlock/external{
name = "Mess Hall"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"gA" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gB" = (
/obj/machinery/mech_bay_recharge_port,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2553,7 +2180,6 @@
dir = 4
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2562,7 +2188,6 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/glasses/material,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2574,34 +2199,26 @@
/obj/structure/table,
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
/obj/item/paper/fluff/awaymissions/caves/mech_notice,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"gI" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gJ" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gK" = (
/obj/structure/girder,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"gL" = (
/obj/item/stack/rods,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"gM" = (
/obj/structure/mecha_wreckage/ripley,
@@ -2610,21 +2227,18 @@
"gN" = (
/obj/structure/holohoop,
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gO" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gP" = (
/obj/item/toy/beach_ball/holoball,
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2655,16 +2269,13 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/basalt
- },
+/turf/open/floor/plating,
/area/awaymission/caves/BMP_asteroid)
"gU" = (
/obj/structure/holohoop{
dir = 1
},
/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
@@ -2681,6 +2292,31 @@
/obj/effect/mapping_helpers/planet_z,
/turf/closed/indestructible/rock,
/area/space/nearstation)
+"gX" = (
+/obj/effect/baseturf_helper/lava,
+/turf/closed/mineral/volcanic,
+/area/awaymission/caves/BMP_asteroid/level_three)
+"gY" = (
+/obj/effect/baseturf_helper/lava,
+/turf/open/lava/smooth{
+ desc = "Looks hot.";
+ luminosity = 5;
+ name = "lava";
+ initial_gas_mix = "n2=23;o2=14"
+ },
+/area/awaymission/caves/BMP_asteroid/level_four)
+"gZ" = (
+/obj/effect/baseturf_helper/lava,
+/turf/closed/mineral/volcanic,
+/area/awaymission/caves/BMP_asteroid/level_two)
+"ha" = (
+/obj/effect/baseturf_helper/lava,
+/turf/closed/mineral/volcanic,
+/area/awaymission/caves/BMP_asteroid)
+"hb" = (
+/obj/effect/baseturf_helper/asteroid/basalt,
+/turf/closed/wall,
+/area/awaymission/caves/northblock)
(1,1,1) = {"
aa
@@ -4489,7 +4125,7 @@ aa
aa
aa
aa
-ac
+gX
ac
ac
ac
@@ -4647,7 +4283,7 @@ aa
aa
aa
aa
-bL
+ha
bL
bL
bL
@@ -5693,7 +5329,7 @@ bL
bL
bL
bL
-dt
+hb
dt
dt
du
@@ -47151,7 +46787,7 @@ aa
aa
aa
aa
-ad
+gY
ad
ad
ad
@@ -52448,7 +52084,7 @@ aa
aa
aa
aa
-bK
+gZ
bK
bK
bK
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 7fb4fa76f1..31a6232330 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -9,16 +9,12 @@
/turf/open/floor/plating/asteroid/snow,
/area/awaymission/snowdin)
"ad" = (
-/turf/closed/wall/ice{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall/ice,
/area/awaymission/snowdin/post)
"ae" = (
/obj/effect/decal/cleanable/oil,
/obj/vehicle/ridden/atv,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"af" = (
/turf/open/floor/plating/ice,
@@ -30,45 +26,32 @@
desc = "An emptied plasma tank, the oil on the nozzle seems to implied it was used for more than plasma storage.";
name = "dusty plasma tank"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"ah" = (
/obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"ai" = (
/obj/vehicle/ridden/atv,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"aj" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"ak" = (
/obj/structure/door_assembly/door_assembly_centcom,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"al" = (
-/turf/closed/wall/ice{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall/ice,
/area/awaymission/snowdin/base)
"am" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"an" = (
/obj/structure/table,
@@ -76,19 +59,14 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"ao" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"ap" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -97,7 +75,6 @@
/obj/machinery/door/window/westright,
/obj/item/paper/crumpled/ruins/snowdin/keys,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -109,7 +86,6 @@
status = 2
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -117,16 +93,12 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"at" = (
/obj/structure/filingcabinet,
/obj/item/paper/fluff/awaymissions/snowdin/secnotice,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"au" = (
/obj/item/gun/ballistic/shotgun/boltaction,
@@ -141,9 +113,7 @@
/obj/item/restraints/handcuffs,
/obj/item/device/assembly/flash,
/obj/item/storage/box/lethalshot,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"av" = (
/obj/effect/decal/cleanable/oil,
@@ -156,51 +126,37 @@
name = "garage door button";
pixel_x = 32
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"aw" = (
/obj/structure/chair/office/dark,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"ax" = (
/obj/item/ammo_casing/a762,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"ay" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
/obj/item/key,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"az" = (
/obj/machinery/door/poddoor/shutters{
id = "garagesnow"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"aA" = (
/obj/machinery/door/airlock/external,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"aB" = (
/obj/structure/table/reinforced,
/obj/structure/barricade/wooden,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"aC" = (
/obj/structure/barricade/wooden,
@@ -208,30 +164,22 @@
name = "Security Office";
req_access_txt = "63"
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/base)
"aD" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall,
/area/awaymission/snowdin/base)
"aE" = (
/obj/structure/cable{
icon_state = "0-2"
},
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"aF" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"aG" = (
/obj/machinery/light/small{
@@ -242,13 +190,11 @@
"aH" = (
/obj/item/ammo_casing/a762,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"aI" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -257,7 +203,6 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -266,7 +211,6 @@
dir = 1
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -276,15 +220,12 @@
/area/awaymission/snowdin)
"aM" = (
/obj/machinery/recharge_station,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"aN" = (
/obj/item/trash/sosjerky,
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -293,27 +234,21 @@
dir = 9
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"aP" = (
/obj/machinery/gateway{
dir = 5
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"aQ" = (
/obj/machinery/gateway{
dir = 1
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"aR" = (
/obj/structure/closet/crate,
@@ -325,9 +260,7 @@
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/shoes/winterboots,
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"aS" = (
/obj/structure/closet/crate,
@@ -335,9 +268,7 @@
/obj/item/storage/firstaid/fire,
/obj/item/storage/pill_bottle/stimulant,
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"aT" = (
/obj/machinery/light/small{
@@ -365,53 +296,39 @@
/obj/item/gun/ballistic/shotgun/automatic,
/obj/item/gun/ballistic/shotgun/automatic,
/obj/item/gun/ballistic/shotgun/automatic,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"aZ" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"ba" = (
/obj/machinery/door/airlock/maintenance_hatch,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bb" = (
/obj/machinery/gateway{
dir = 8
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bc" = (
/obj/machinery/gateway{
dir = 4
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bd" = (
/obj/machinery/gateway/centeraway{
calibrated = 0
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"be" = (
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bf" = (
/obj/structure/closet/crate{
@@ -421,54 +338,40 @@
/obj/item/reagent_containers/spray/cleaner,
/obj/item/soap/nanotrasen,
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bg" = (
/obj/machinery/iv_drip,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"bh" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bi" = (
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bj" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bk" = (
/obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bl" = (
/obj/structure/table,
/obj/item/shovel,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bm" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -477,18 +380,14 @@
dir = 10
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bo" = (
/obj/machinery/gateway{
dir = 6
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bp" = (
/obj/machinery/gateway,
@@ -496,9 +395,7 @@
icon_state = "0-2"
},
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"bq" = (
/obj/structure/closet/crate,
@@ -515,9 +412,7 @@
/obj/item/reagent_containers/food/snacks/grown/cocoapod,
/obj/item/reagent_containers/food/snacks/grown/cocoapod,
/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/base)
"br" = (
/obj/machinery/light{
@@ -525,7 +420,6 @@
},
/obj/machinery/iv_drip,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -533,17 +427,13 @@
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bt" = (
/obj/structure/table,
/obj/item/shovel,
/obj/item/paper/crumpled/ruins/snowdin/shovel,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bu" = (
/obj/machinery/power/terminal{
@@ -553,7 +443,6 @@
icon_state = "0-2"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -563,14 +452,12 @@
name = "power storage unit"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"bw" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -580,7 +467,6 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -590,14 +476,12 @@
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"bz" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -608,7 +492,6 @@
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/random,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -616,22 +499,16 @@
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bC" = (
/obj/structure/showcase/machinery/signal_decrypter,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bD" = (
/obj/machinery/space_heater,
/obj/machinery/light/small,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bE" = (
/obj/structure/closet/crate/trashcart,
@@ -643,21 +520,15 @@
},
/obj/item/storage/box/rubbershot,
/obj/item/key,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bF" = (
/obj/machinery/power/port_gen/pacman,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bG" = (
/obj/machinery/space_heater,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"bH" = (
/obj/machinery/power/terminal{
@@ -670,7 +541,6 @@
icon_state = "1-4"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -680,7 +550,6 @@
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -693,7 +562,6 @@
icon_state = "1-8"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -701,7 +569,6 @@
/obj/item/trash/pistachios,
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -711,7 +578,6 @@
},
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
@@ -721,317 +587,227 @@
/area/awaymission/snowdin)
"bN" = (
/obj/machinery/door/airlock/public/glass,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"bO" = (
/obj/structure/dresser,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"bP" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/landmark/awaystart,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"bQ" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"bR" = (
/obj/structure/bookcase/random/fiction,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"bS" = (
/obj/structure/fireaxecabinet{
pixel_y = 32
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"bT" = (
/obj/structure/bookcase/random/nonfiction,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"bU" = (
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"bV" = (
/obj/structure/table/wood,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"bW" = (
/obj/machinery/light{
dir = 8
},
/obj/structure/filingcabinet,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"bX" = (
/obj/structure/table,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"bY" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"bZ" = (
/obj/structure/table,
/obj/item/device/flashlight/lamp,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"ca" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/vending/coffee,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cb" = (
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cc" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cd" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/gloves/color/black,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"ce" = (
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cf" = (
/obj/machinery/door/airlock{
name = "Dorm Room"
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cg" = (
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"ch" = (
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"ci" = (
/obj/structure/chair{
dir = 1
},
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"cj" = (
/obj/structure/chair/comfy/beige,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"ck" = (
/obj/item/cigbutt,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cl" = (
/obj/structure/chair/stool,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cm" = (
/obj/machinery/hydroponics/constructable,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cn" = (
/obj/structure/table/wood,
/obj/item/trash/cheesie,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"co" = (
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cp" = (
/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cq" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cr" = (
/obj/structure/table/wood,
/obj/item/trash/candle,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cs" = (
/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"ct" = (
/obj/structure/table/wood,
/obj/item/pizzabox/mushroom,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cu" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cv" = (
/obj/structure/table/wood,
/obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cw" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/decal/cleanable/blood/gibs,
/obj/effect/gibspawner/human,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cx" = (
/obj/structure/table/wood,
/obj/item/key,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cy" = (
/obj/structure/table/wood,
/obj/item/trash/can,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cz" = (
/obj/machinery/door/airlock{
name = "Dorm Room"
},
/obj/structure/barricade/wooden,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cA" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cB" = (
/obj/machinery/light/small{
dir = 4
},
/mob/living/simple_animal/hostile/bear/snow,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cC" = (
/obj/effect/decal/cleanable/blood/gibs,
/obj/effect/decal/remains/human,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/base)
"cD" = (
/obj/structure/chair,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"cE" = (
/obj/structure/chair/comfy/beige{
dir = 1;
icon_state = "comfychair"
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cF" = (
/obj/machinery/light,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cG" = (
/obj/machinery/light{
@@ -1039,43 +815,32 @@
},
/obj/structure/filingcabinet,
/obj/item/paper/fluff/awaymissions/snowdin/log,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/base)
"cH" = (
/obj/machinery/light,
/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cI" = (
/obj/structure/table,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/base)
"cJ" = (
/obj/machinery/door/airlock{
name = "Dorms"
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/base)
"cK" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"cL" = (
/obj/machinery/door/airlock/external,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/base)
"cM" = (
/obj/structure/statue/snow/snowman,
@@ -1142,9 +907,7 @@
/turf/closed/indestructible/rock/snow/ice,
/area/awaymission/snowdin/post)
"cZ" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall,
/area/awaymission/snowdin/post)
"da" = (
/obj/effect/decal/remains/human,
@@ -1172,13 +935,11 @@
/area/awaymission/snowdin/post)
"de" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
"df" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1192,7 +953,6 @@
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1215,7 +975,6 @@
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1235,7 +994,6 @@
dir = 4
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1248,7 +1006,6 @@
/area/awaymission/snowdin/dungeon1)
"dp" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1264,7 +1021,6 @@
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1276,7 +1032,6 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
/obj/effect/spawner/lootdrop/snowdin/dungeonmisc,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1284,7 +1039,6 @@
"dt" = (
/obj/item/paper/crumpled/ruins/snowdin/lootstructures,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1324,7 +1078,6 @@
"dA" = (
/obj/item/clothing/shoes/winterboots,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1332,7 +1085,6 @@
"dB" = (
/obj/item/clothing/shoes/winterboots,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1340,7 +1092,6 @@
/obj/structure/table,
/obj/item/clothing/suit/hooded/wintercoat,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1353,7 +1104,6 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmisc,
/obj/effect/spawner/lootdrop/snowdin/dungeonmisc,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1368,7 +1118,6 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmisc,
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1380,7 +1129,6 @@
status = 2
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1390,14 +1138,11 @@
dir = 8
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
"dJ" = (
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"dK" = (
/obj/structure/closet/cabinet,
@@ -1406,9 +1151,7 @@
/obj/item/clothing/gloves/color/black,
/obj/item/shovel,
/obj/item/switchblade,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"dL" = (
/obj/structure/closet/crate,
@@ -1416,7 +1159,6 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmid,
/obj/effect/spawner/lootdrop/snowdin/dungeonmid,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140;
wet = 0
},
@@ -1426,7 +1168,6 @@
dir = 1
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140;
wet = 0
},
@@ -1435,9 +1176,7 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"dO" = (
/obj/machinery/door/airlock{
@@ -1445,9 +1184,7 @@
name = "Dorm Room";
req_access_txt = "150"
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"dP" = (
/turf/open/floor/plating/asteroid/basalt{
@@ -1456,7 +1193,6 @@
/area/awaymission/snowdin/post)
"dQ" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140;
wet = 0
},
@@ -1469,7 +1205,6 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmisc,
/obj/effect/spawner/lootdrop/snowdin/dungeonmisc,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1477,9 +1212,7 @@
/obj/structure/bed,
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"dT" = (
/turf/open/lava{
@@ -1488,16 +1221,13 @@
/area/awaymission/snowdin/post)
"dU" = (
/mob/living/simple_animal/hostile/skeleton/eskimo,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"dV" = (
/obj/machinery/door/airlock/public/glass{
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -1508,7 +1238,6 @@
"dX" = (
/obj/structure/table,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -1520,7 +1249,6 @@
status = 2
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1534,7 +1262,6 @@
status = 2
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -1544,7 +1271,6 @@
id_target = "up"
},
/turf/open/floor/plasteel/stairs/right{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1554,27 +1280,23 @@
id_target = "up"
},
/turf/open/floor/plasteel/stairs/left{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
"ec" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin/post)
"ed" = (
/turf/open/floor/plasteel/stairs/right{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
"ee" = (
/turf/open/floor/plasteel/stairs/left{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -1582,7 +1304,6 @@
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1590,7 +1311,6 @@
"eg" = (
/obj/machinery/light/small,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -1713,9 +1433,7 @@
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/post)
"eD" = (
-/turf/closed/wall/ice{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall/ice,
/area/awaymission/snowdin/dungeon1)
"eE" = (
/obj/structure/table/wood,
@@ -1761,7 +1479,6 @@
"eM" = (
/mob/living/simple_animal/hostile/skeleton/eskimo,
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -1797,9 +1514,7 @@
/obj/item/cautery{
pixel_x = 4
},
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"eR" = (
/turf/closed/indestructible/rock/snow,
@@ -1867,36 +1582,26 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"fe" = (
/obj/machinery/door/airlock{
name = "Dorm Room"
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"ff" = (
/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"fg" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/post)
"fh" = (
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/post)
"fi" = (
/obj/machinery/light/small{
@@ -1906,24 +1611,18 @@
/obj/item/implanter/storage,
/obj/item/clothing/shoes/jackboots,
/obj/item/switchblade,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fj" = (
/obj/machinery/recharge_station,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fk" = (
/turf/open/floor/plating/ice,
/area/awaymission/snowdin/post)
"fl" = (
/obj/machinery/power/port_gen/pacman,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fm" = (
/turf/open/floor/plating/ice/colder,
@@ -1947,39 +1646,27 @@
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/gloves/color/black,
/obj/item/shovel,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"fq" = (
/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/post)
"fr" = (
/obj/machinery/door/airlock/maintenance_hatch,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fs" = (
/obj/item/cigbutt/cigarbutt,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/post)
"ft" = (
/obj/effect/landmark/awaystart,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fu" = (
/obj/machinery/space_heater,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fv" = (
/turf/open/floor/plating/snowed/colder,
@@ -1998,33 +1685,25 @@
/area/awaymission/snowdin/dungeon1)
"fy" = (
/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/post)
"fz" = (
/obj/machinery/power/terminal{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fA" = (
/obj/structure/table,
/obj/item/key,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fB" = (
/obj/machinery/power/smes/magical{
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
name = "power storage unit"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"fC" = (
/obj/item/stack/sheet/metal,
@@ -2036,7 +1715,6 @@
"fE" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2055,14 +1733,12 @@
/obj/item/paper_bin,
/obj/item/pen,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"fI" = (
/obj/structure/door_assembly/door_assembly_centcom,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140;
wet = 0
},
@@ -2080,14 +1756,12 @@
dir = 4
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"fM" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -2098,7 +1772,6 @@
dir = 4
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2115,7 +1788,6 @@
"fQ" = (
/obj/structure/grille,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -2123,14 +1795,12 @@
"fR" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"fS" = (
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140;
wet = 0
},
@@ -2138,13 +1808,11 @@
"fT" = (
/mob/living/simple_animal/hostile/bear/snow,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"fU" = (
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -2153,14 +1821,12 @@
/obj/item/reagent_containers/food/drinks/drinkingglass,
/obj/item/key,
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
"fW" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -2177,7 +1843,6 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmid,
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140;
wet = 0
},
@@ -2192,7 +1857,6 @@
/obj/structure/table,
/obj/item/storage/box/donkpockets,
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/post)
@@ -2206,9 +1870,7 @@
/obj/machinery/door/poddoor/shutters{
id = "garagesnow2"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gd" = (
/obj/structure/ladder/unbreakable{
@@ -2226,9 +1888,7 @@
name = "shutter control";
pixel_x = 32
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"gf" = (
/mob/living/simple_animal/hostile/skeleton/ice,
@@ -2284,7 +1944,6 @@
id_target = "down"
},
/turf/open/floor/plasteel/stairs/left{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/cave)
@@ -2294,19 +1953,16 @@
id_target = "down"
},
/turf/open/floor/plasteel/stairs/right{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/cave)
"gp" = (
/turf/open/floor/plasteel/stairs/left{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/cave)
"gq" = (
/turf/open/floor/plasteel/stairs/right{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 140
},
/area/awaymission/snowdin/cave)
@@ -2316,7 +1972,6 @@
"gs" = (
/obj/structure/girder,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -2329,48 +1984,36 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gu" = (
/obj/item/stock_parts/cell/high/empty,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gv" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gw" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gx" = (
/obj/machinery/telecomms/allinone{
intercept = 1
},
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"gy" = (
/obj/structure/table,
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"gz" = (
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2380,9 +2023,7 @@
/obj/item/twohanded/spear,
/obj/item/twohanded/spear,
/obj/item/twohanded/spear,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gB" = (
/obj/structure/table,
@@ -2390,7 +2031,6 @@
dir = 4
},
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2399,21 +2039,17 @@
dir = 4
},
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"gD" = (
/obj/structure/table,
/obj/item/shovel,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gE" = (
/obj/item/pen,
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2421,7 +2057,6 @@
/obj/structure/table,
/obj/item/paper_bin,
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2432,14 +2067,11 @@
},
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
/obj/effect/spawner/lootdrop/snowdin/dungeonmid,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gH" = (
/obj/structure/filingcabinet,
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2448,7 +2080,6 @@
dir = 8
},
/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2456,28 +2087,21 @@
/obj/machinery/door/airlock/public/glass,
/obj/structure/barricade/wooden,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"gK" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gL" = (
/obj/machinery/light/small,
/obj/structure/showcase/machinery/signal_decrypter,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gM" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"gN" = (
/turf/open/floor/plating,
@@ -2492,14 +2116,12 @@
"gP" = (
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"gQ" = (
/obj/machinery/vending/coffee,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2508,34 +2130,26 @@
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/gloves/color/black,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"gS" = (
/obj/structure/bed,
/obj/item/bedsheet,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"gT" = (
/obj/structure/closet/cabinet,
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"gU" = (
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"gV" = (
/obj/structure/table,
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
@@ -2544,14 +2158,12 @@
dir = 8
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
"gX" = (
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2565,9 +2177,7 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"ha" = (
/obj/structure/barricade/wooden,
@@ -2575,29 +2185,22 @@
name = "Security Office";
req_access_txt = "63"
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"hb" = (
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"hc" = (
/obj/structure/table/reinforced,
/obj/structure/barricade/wooden,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"hd" = (
/obj/machinery/light/built{
dir = 8
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2605,7 +2208,6 @@
/obj/machinery/door/airlock/external,
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -2623,44 +2225,33 @@
status = 2
},
/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"hh" = (
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"hi" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"hj" = (
/obj/structure/chair/office/dark{
dir = 1
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"hk" = (
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/post)
"hl" = (
/obj/machinery/door/airlock{
name = "Dorms"
},
/obj/structure/barricade/wooden,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/post)
"hm" = (
/obj/item/gun/ballistic/shotgun/boltaction,
@@ -2674,51 +2265,40 @@
},
/obj/item/restraints/handcuffs,
/obj/item/device/assembly/flash,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"hn" = (
/obj/structure/filingcabinet,
/obj/item/paper/fluff/awaymissions/snowdin/secnotice,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"ho" = (
/obj/machinery/door/airlock{
name = "Dorm Room"
},
/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"hp" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall,
/area/awaymission/snowdin)
"hq" = (
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"hr" = (
/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow;
temperature = 180
},
/area/awaymission/snowdin/post)
"hs" = (
/obj/structure/closet/cabinet,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/post)
"ht" = (
/mob/living/simple_animal/hostile/skeleton/eskimo,
@@ -2801,7 +2381,6 @@
/obj/structure/window/reinforced/fulltile/ice,
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -2810,17 +2389,13 @@
/obj/structure/table,
/obj/item/shovel,
/obj/item/key,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"hL" = (
/obj/structure/table,
/obj/item/shovel,
/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"hM" = (
/obj/machinery/space_heater,
@@ -2830,9 +2405,7 @@
icon_state = "bulb-broken";
status = 2
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"hN" = (
/obj/effect/decal/cleanable/blood/old,
@@ -2841,7 +2414,6 @@
"hO" = (
/obj/machinery/door/airlock/glass_large,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2853,7 +2425,6 @@
dir = 1
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/post)
@@ -2873,56 +2444,41 @@
/turf/open/floor/plating/snowed/colder,
/area/awaymission/snowdin/dungeon1)
"hV" = (
-/turf/closed/wall/r_wall{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall/r_wall,
/area/awaymission/snowdin/sekret)
"hW" = (
/obj/structure/closet/emcloset,
/obj/item/tank/internals/emergency_oxygen/engi,
/obj/item/clothing/mask/breath,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"hX" = (
/obj/machinery/space_heater,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"hY" = (
/obj/machinery/power/port_gen/pacman,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"hZ" = (
/obj/machinery/light,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin/post)
"ia" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"ib" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"ic" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"id" = (
/mob/living/simple_animal/hostile/skeleton/templar,
@@ -2936,42 +2492,31 @@
dir = 8
},
/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"if" = (
/obj/structure/table,
/obj/item/shovel,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"ig" = (
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/post)
"ih" = (
/obj/machinery/door/poddoor/shutters{
id = "sekret"
},
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/post)
"ii" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/post)
"ij" = (
/obj/machinery/porta_turret/syndicate,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -2982,44 +2527,32 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"il" = (
/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"im" = (
/obj/machinery/power/terminal{
dir = 4
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"in" = (
/obj/machinery/power/smes/magical{
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
name = "power storage unit"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"ip" = (
/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"iq" = (
/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"ir" = (
/obj/item/gun/ballistic/shotgun/boltaction,
@@ -3034,33 +2567,25 @@
/obj/item/restraints/handcuffs,
/obj/item/device/assembly/flash,
/obj/item/storage/box/lethalshot,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"is" = (
/obj/machinery/door/airlock/glass_security{
name = "Security Office";
req_access_txt = "63"
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/post)
"it" = (
/obj/machinery/light/small,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin/post)
"iu" = (
/obj/machinery/door/airlock/highsecurity{
name = "Maint";
req_access_txt = "150"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/sekret)
"iv" = (
/obj/item/device/multitool,
@@ -3068,14 +2593,12 @@
/area/awaymission/snowdin)
"iw" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"ix" = (
/obj/machinery/vending/snack,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3083,54 +2606,41 @@
/obj/structure/table,
/obj/item/storage/firstaid/toxin,
/obj/item/storage/firstaid/toxin,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iz" = (
/obj/machinery/iv_drip,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iA" = (
/obj/structure/table,
/obj/item/storage/firstaid/o2,
/obj/item/storage/firstaid/o2,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iB" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/regular,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iC" = (
/obj/structure/table,
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/fire,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iD" = (
/obj/structure/table,
/obj/item/storage/firstaid/brute,
/obj/item/storage/firstaid/brute,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iE" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3140,7 +2650,6 @@
dir = 1
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3157,14 +2666,11 @@
},
/area/awaymission/snowdin/dungeon1)
"iI" = (
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iJ" = (
/obj/structure/table/reinforced,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3172,7 +2678,6 @@
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3180,7 +2685,6 @@
"iL" = (
/obj/structure/grille,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3190,9 +2694,7 @@
/turf/open/floor/plating,
/area/awaymission/snowdin)
"iN" = (
-/turf/closed/wall/mineral/plastitanium{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall/mineral/plastitanium,
/area/awaymission/snowdin)
"iO" = (
/obj/effect/spawner/lootdrop/snowdin/dungeonheavy,
@@ -3210,7 +2712,6 @@
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile/ice,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3220,7 +2721,6 @@
dir = 8
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3228,9 +2728,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"iU" = (
/obj/structure/window/reinforced{
@@ -3239,9 +2737,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"iV" = (
/obj/structure/window/reinforced{
@@ -3250,24 +2746,19 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"iW" = (
/obj/structure/sign/bluecross{
pixel_x = -32
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"iX" = (
/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"iY" = (
/obj/machinery/light/small,
@@ -3280,38 +2771,31 @@
"ja" = (
/obj/item/shard,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin)
"jb" = (
/obj/structure/frame/computer,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jc" = (
/obj/machinery/door/poddoor/shutters{
id = "garagesnow3"
},
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"jd" = (
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin/sekret)
"je" = (
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3322,20 +2806,15 @@
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"jg" = (
/obj/structure/table/optable,
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"jh" = (
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"ji" = (
/obj/machinery/door/airlock/highsecurity{
@@ -3343,33 +2822,25 @@
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"jj" = (
-/turf/closed/wall/ice{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall/ice,
/area/awaymission/snowdin)
"jk" = (
/obj/machinery/door/airlock/external,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin)
"jl" = (
/obj/structure/table,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin)
"jm" = (
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jo" = (
/obj/machinery/porta_turret/syndicate,
@@ -3380,7 +2851,6 @@
dir = 4
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3388,33 +2858,25 @@
/obj/machinery/sleeper{
dir = 4
},
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"jr" = (
/obj/structure/window/reinforced,
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"js" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"jt" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
-/turf/open/floor/plasteel/whiteblue{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/whiteblue,
/area/awaymission/snowdin/sekret)
"ju" = (
/obj/machinery/sleeper{
@@ -3423,43 +2885,32 @@
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"jv" = (
/obj/machinery/light,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"jw" = (
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin)
"jx" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/human,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jy" = (
/obj/item/storage/box/donkpockets{
pixel_x = 3;
pixel_y = 3
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jz" = (
/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jA" = (
/obj/item/device/radio/intercom{
@@ -3471,15 +2922,11 @@
subspace_transmission = 1;
syndie = 1
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jB" = (
/obj/effect/gibspawner/human,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jC" = (
/obj/item/tank/internals/plasma{
@@ -3489,40 +2936,30 @@
/turf/open/floor/plating/asteroid/snow,
/area/awaymission/snowdin)
"jD" = (
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"jE" = (
/obj/machinery/vending/coffee,
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"jF" = (
/obj/structure/table/wood,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"jG" = (
/obj/structure/chair/comfy/beige{
dir = 8
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"jH" = (
/obj/machinery/sleeper{
dir = 8
},
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"jI" = (
/obj/machinery/door/airlock/glass_large{
@@ -3533,17 +2970,13 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"jJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"jK" = (
/obj/effect/decal/cleanable/blood,
@@ -3559,9 +2992,7 @@
name = "Cockpit";
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jN" = (
/turf/closed/wall/mineral/plastitanium{
@@ -3582,15 +3013,11 @@
/area/awaymission/snowdin/sekret)
"jP" = (
/obj/machinery/vending/cigarette,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"jQ" = (
/obj/structure/table,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"jR" = (
/obj/structure/closet/crate/freezer,
@@ -3600,22 +3027,17 @@
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/random,
/obj/item/reagent_containers/blood/random,
-/turf/open/floor/plasteel/cmo{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cmo,
/area/awaymission/snowdin/sekret)
"jS" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"jT" = (
/obj/structure/girder,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3628,23 +3050,18 @@
"jV" = (
/obj/structure/table,
/obj/item/paper/crumpled/ruins/snowdin/misc1,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jW" = (
/obj/structure/table,
/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"jX" = (
/obj/machinery/door/airlock/glass_large{
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -3654,14 +3071,11 @@
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"jZ" = (
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"ka" = (
/obj/structure/closet/syndicate,
@@ -3680,22 +3094,17 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kb" = (
/obj/machinery/porta_turret/syndicate,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kc" = (
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin)
@@ -3705,7 +3114,6 @@
},
/obj/structure/window/reinforced/fulltile/ice,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3717,83 +3125,60 @@
"kf" = (
/obj/item/stack/cable_coil,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin)
"kg" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"kh" = (
/obj/structure/chair{
dir = 4
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"ki" = (
/obj/structure/chair{
dir = 8
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"kj" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"kk" = (
/obj/structure/mirror/magic/lesser{
desc = "A collab of the Wizard Federation and the Syndicate, a specialized mirror to help our operatives personalize themselves while stuck in this icy hell-hole.";
pixel_x = -32
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"kl" = (
-/turf/closed/wall{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/closed/wall,
/area/awaymission/snowdin/sekret)
"km" = (
/obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"kn" = (
/obj/structure/bookcase/random/reference,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"ko" = (
/obj/structure/bookcase/random/adult,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"kp" = (
/obj/structure/bookcase/random/religion,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"kq" = (
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/sekret)
"kr" = (
/obj/structure/table/reinforced,
@@ -3802,23 +3187,17 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/sekret)
"ks" = (
/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/sekret)
"kt" = (
/obj/structure/chair/office/dark{
dir = 4
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/sekret)
"ku" = (
/obj/structure/rack,
@@ -3831,17 +3210,13 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kv" = (
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"kw" = (
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"kx" = (
/obj/structure/rack,
@@ -3851,30 +3226,24 @@
},
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka,
/obj/item/paper/fluff/awaymissions/snowdin/saw_usage,
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"ky" = (
/obj/machinery/door/window/brigdoor/westleft{
name = "SAW Security Door";
req_access_txt = "150"
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kz" = (
/obj/item/shard,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin)
"kA" = (
/obj/structure/grille/broken,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -3889,35 +3258,25 @@
"kC" = (
/obj/item/crowbar/red,
/obj/effect/decal/cleanable/vomit,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"kD" = (
/obj/structure/dresser,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"kE" = (
/obj/structure/table/wood,
/obj/item/paper/fluff/awaymissions/snowdin/syndienotice,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"kF" = (
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"kG" = (
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"kH" = (
/obj/item/gun/ballistic/shotgun/boltaction,
@@ -3932,9 +3291,7 @@
/obj/item/restraints/handcuffs,
/obj/item/device/assembly/flash,
/obj/item/storage/box/lethalshot,
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/sekret)
"kI" = (
/obj/structure/rack,
@@ -3953,15 +3310,11 @@
name = "Security Office";
req_access_txt = "63"
},
-/turf/open/floor/plasteel/darkred{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkred,
/area/awaymission/snowdin/sekret)
"kK" = (
/obj/structure/chair/stool,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"kL" = (
/obj/structure/rack,
@@ -3969,14 +3322,11 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kM" = (
/obj/machinery/light/built,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin)
@@ -3988,9 +3338,7 @@
/obj/machinery/door/airlock{
name = "Dorm Room"
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"kP" = (
/obj/machinery/door/airlock/glass_large{
@@ -3998,7 +3346,6 @@
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4008,9 +3355,7 @@
/area/awaymission/snowdin/sekret)
"kR" = (
/obj/structure/table,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"kS" = (
/obj/structure/rack,
@@ -4019,9 +3364,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kT" = (
/obj/structure/rack,
@@ -4030,9 +3373,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/turf/open/floor/plasteel/dark{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/sekret)
"kU" = (
/obj/structure/girder,
@@ -4040,112 +3381,83 @@
/area/awaymission/snowdin)
"kV" = (
/obj/structure/table,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"kW" = (
/obj/item/storage/box/zipties{
pixel_x = 1;
pixel_y = 2
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"kX" = (
/obj/structure/chair{
dir = 8
},
/obj/item/reagent_containers/food/drinks/ale,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"kY" = (
/obj/structure/bookcase/random/fiction,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"kZ" = (
/obj/machinery/space_heater,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"la" = (
/obj/structure/bed/dogbed,
/mob/living/simple_animal/pet/dog/corgi/puppy{
name = "Mr.Kempsy"
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lb" = (
/obj/structure/bookcase/random/nonfiction,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lc" = (
/obj/structure/chair/stool,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"ld" = (
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"le" = (
/obj/structure/table,
/obj/item/pizzabox/mushroom,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"lf" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/effect/landmark/awaystart,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"lg" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/clothing/gloves/color/black,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"lh" = (
/obj/structure/table/wood,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"li" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin)
"lj" = (
/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lk" = (
/obj/item/clothing/head/helmet/space/syndicate/black/red,
@@ -4153,42 +3465,30 @@
/area/awaymission/snowdin)
"ll" = (
/obj/machinery/light,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lm" = (
/obj/structure/table/wood,
/obj/item/trash/candle,
/obj/item/paper_bin,
/obj/item/pen/fourcolor,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"ln" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lo" = (
/obj/structure/table,
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"lp" = (
/obj/structure/filingcabinet,
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/white,
/area/awaymission/snowdin/sekret)
"lq" = (
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"lr" = (
/obj/structure/table,
@@ -4199,29 +3499,21 @@
listening = 1;
name = "Pirate Radio Listening Channel"
},
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"ls" = (
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"lt" = (
/obj/structure/bed,
/obj/item/bedsheet,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"lu" = (
/obj/item/shard{
icon_state = "medium"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lv" = (
/obj/machinery/door/window{
@@ -4229,38 +3521,28 @@
name = "EVA Storage";
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lw" = (
/obj/machinery/door/airlock/external{
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lx" = (
/obj/structure/table/wood,
/obj/item/book/manual/nuclear,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"ly" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lz" = (
/obj/structure/table,
/obj/machinery/microwave,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"lA" = (
/obj/machinery/door/airlock/highsecurity{
@@ -4268,7 +3550,6 @@
req_access_txt = "150"
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4281,41 +3562,29 @@
listening = 0;
name = "Pirate Radio Broadcast Channel"
},
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"lC" = (
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/white,
/area/awaymission/snowdin/sekret)
"lD" = (
/obj/structure/chair/office/light{
dir = 8
},
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"lE" = (
/obj/machinery/door/airlock/public/glass,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin)
"lF" = (
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin)
"lG" = (
/obj/machinery/door/airlock{
name = "Dorm Room"
},
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"lH" = (
/obj/structure/bed,
@@ -4324,16 +3593,13 @@
dir = 4
},
/obj/effect/landmark/awaystart,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin)
"lI" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4345,15 +3611,11 @@
storage_type = null;
suit_type = null
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lK" = (
/obj/effect/decal/cleanable/vomit,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lL" = (
/obj/machinery/door/window{
@@ -4363,42 +3625,31 @@
name = "EVA Storage";
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lM" = (
/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lN" = (
/obj/item/gun/ballistic/automatic/pistol,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lO" = (
/obj/structure/table,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"lP" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen/fourcolor,
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"lQ" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4420,107 +3671,77 @@
syndie = 1
},
/obj/item/reagent_containers/food/drinks/ale,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lT" = (
/obj/effect/mob_spawn/human/syndicatesoldier,
/obj/effect/decal/cleanable/vomit,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"lU" = (
/obj/machinery/light/small,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"lV" = (
/obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive/female,
-/turf/open/floor/carpet{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/carpet,
/area/awaymission/snowdin/sekret)
"lW" = (
/obj/structure/table/wood,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lX" = (
/obj/structure/chair/comfy/beige{
dir = 4
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lY" = (
/obj/structure/table/wood,
/obj/machinery/light,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"lZ" = (
/obj/structure/chair/comfy/beige{
dir = 8
},
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"ma" = (
/obj/structure/table/wood,
/obj/item/gun/ballistic/automatic/c20r/toy,
-/turf/open/floor/wood{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/wood,
/area/awaymission/snowdin/sekret)
"mb" = (
/obj/machinery/light,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"mc" = (
/obj/machinery/light,
/obj/structure/table,
/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/plasteel/cafeteria{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/cafeteria,
/area/awaymission/snowdin/sekret)
"md" = (
/obj/machinery/light{
dir = 8
},
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/white,
/area/awaymission/snowdin/sekret)
"me" = (
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/plasteel/white{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/white,
/area/awaymission/snowdin/sekret)
"mf" = (
/obj/machinery/recharge_station,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mg" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mh" = (
/obj/item/device/assembly/voice{
@@ -4538,15 +3759,11 @@
/obj/item/reagent_containers/syringe/charcoal{
pixel_y = 4
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mk" = (
/obj/structure/chair/stool,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"ml" = (
/obj/machinery/door/window{
@@ -4557,36 +3774,28 @@
/obj/item/reagent_containers/syringe/charcoal{
pixel_y = 4
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mm" = (
/obj/machinery/door/window/westright{
name = "Tool Storage";
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mn" = (
/obj/item/stock_parts/cell/high,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mo" = (
/obj/item/target/alien,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"mp" = (
/obj/item/target/clown,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4598,9 +3807,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"mr" = (
/obj/structure/table/reinforced,
@@ -4608,7 +3815,6 @@
dir = 1
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4619,7 +3825,6 @@
pixel_y = 32
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4627,7 +3832,6 @@
/obj/item/ammo_casing/c10mm,
/obj/item/ammo_casing/c10mm,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4637,7 +3841,6 @@
faction = list("syndicate")
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4648,7 +3851,6 @@
},
/obj/item/storage/firstaid/tactical,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4656,7 +3858,6 @@
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/tactical,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4664,7 +3865,6 @@
/obj/structure/table/reinforced,
/obj/item/storage/backpack/duffelbag/syndie/ammo/smg,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4673,7 +3873,6 @@
dir = 1
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4683,16 +3882,13 @@
dir = 1
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin)
"mA" = (
/obj/item/stack/medical/bruise_pack,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mB" = (
/obj/machinery/door/window{
@@ -4703,9 +3899,7 @@
req_access_txt = "150"
},
/obj/item/stack/medical/ointment,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mC" = (
/obj/machinery/door/window{
@@ -4713,22 +3907,17 @@
name = "Tool Storage";
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mD" = (
/obj/item/storage/toolbox/syndicate,
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mE" = (
/obj/item/screwdriver{
pixel_y = 9
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4742,7 +3931,6 @@
"mG" = (
/obj/item/target,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4752,14 +3940,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"mI" = (
/obj/item/ammo_casing/c10mm,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4767,14 +3952,11 @@
/obj/machinery/telecomms/relay/preset/ruskie{
use_power = 0
},
-/turf/open/floor/plasteel/purple{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/purple,
/area/awaymission/snowdin/sekret)
"mK" = (
/obj/machinery/light/built,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4782,7 +3964,6 @@
"mL" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin)
@@ -4791,7 +3972,6 @@
icon_state = "medium"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4802,9 +3982,7 @@
name = "Secure Storage";
req_access_txt = "150"
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mO" = (
/obj/structure/window/reinforced{
@@ -4813,14 +3991,11 @@
/obj/structure/window/reinforced{
dir = 1
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mP" = (
/obj/item/stock_parts/cell/high,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4836,15 +4011,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"mS" = (
/obj/structure/table/reinforced,
/obj/item/ammo_box/a357,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4854,7 +4026,6 @@
pixel_y = 2
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4867,9 +4038,7 @@
/obj/structure/mirror{
pixel_x = 30
},
-/turf/open/floor/mineral/plastitanium/brig{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/mineral/plastitanium/brig,
/area/awaymission/snowdin)
"mW" = (
/obj/structure/flora/grass/green,
@@ -4881,7 +4050,6 @@
dir = 8
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -4892,57 +4060,43 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"mZ" = (
/obj/structure/table/reinforced,
/obj/item/ammo_box/c10mm,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
"na" = (
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nb" = (
/mob/living/simple_animal/bot/cleanbot{
name = "\improper Cleanksy"
},
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nc" = (
/obj/structure/table,
/obj/item/paper/crumpled/ruins/snowdin/shovel,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nd" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"ne" = (
/obj/structure/table,
/obj/item/device/flashlight/lamp,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nf" = (
/obj/machinery/space_heater,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4952,7 +4106,6 @@
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -4977,9 +4130,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"nk" = (
/mob/living/simple_animal/hostile/syndicate{
@@ -4988,28 +4139,21 @@
name = "Weakened Syndicate Operative";
speed = 2
},
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nl" = (
/obj/structure/filingcabinet,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nm" = (
/obj/structure/chair{
dir = 1
},
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nn" = (
/obj/item/shovel,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5019,7 +4163,6 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5042,15 +4185,12 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/sekret)
"nt" = (
/obj/structure/table/reinforced,
/obj/machinery/light,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5061,7 +4201,6 @@
pixel_y = -32
},
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5069,7 +4208,6 @@
/obj/item/ammo_casing/a357,
/obj/item/ammo_casing/a357,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5083,7 +4221,6 @@
/obj/item/target/clown,
/obj/machinery/light,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5091,7 +4228,6 @@
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/pistol,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5101,7 +4237,6 @@
/obj/item/storage/box/lethalshot,
/obj/item/storage/box/lethalshot,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5109,7 +4244,6 @@
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/shotgun/automatic/combat,
/turf/open/floor/plasteel{
- baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/sekret)
@@ -5125,27 +4259,19 @@
},
/obj/structure/filingcabinet,
/obj/item/paper/fluff/awaymissions/snowdin/log2,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nC" = (
/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nD" = (
/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nE" = (
/obj/machinery/door/airlock/maintenance_hatch,
-/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plating,
/area/awaymission/snowdin)
"nF" = (
/obj/machinery/power/smes/magical{
@@ -5153,7 +4279,6 @@
name = "power storage unit"
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5163,27 +4288,21 @@
dir = 4
},
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
/area/awaymission/snowdin)
"nH" = (
/obj/effect/decal/cleanable/vomit,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nI" = (
/obj/structure/chair,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nJ" = (
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5196,20 +4315,15 @@
/area/awaymission/snowdin)
"nL" = (
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nM" = (
/obj/structure/table,
-/turf/open/floor/plasteel/darkbrown{
- baseturf = /turf/open/floor/plating/asteroid/snow
- },
+/turf/open/floor/plasteel/darkbrown,
/area/awaymission/snowdin)
"nN" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5218,7 +4332,6 @@
/obj/structure/closet/crate,
/obj/item/survivalcapsule,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5226,7 +4339,6 @@
"nP" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating{
- baseturf = /turf/open/floor/plating/asteroid/snow;
icon = 'icons/turf/snow.dmi';
temperature = 140
},
@@ -5241,9 +4353,33 @@
/obj/effect/mapping_helpers/planet_z,
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin)
+"nS" = (
+/obj/effect/baseturf_helper/asteroid/snow,
+/turf/closed/indestructible/rock/snow,
+/area/awaymission/snowdin)
+"nT" = (
+/obj/effect/baseturf_helper/asteroid/snow,
+/turf/closed/wall/ice,
+/area/awaymission/snowdin/post)
+"nU" = (
+/obj/effect/baseturf_helper/asteroid/snow,
+/turf/closed/wall/ice,
+/area/awaymission/snowdin/base)
+"nV" = (
+/obj/effect/baseturf_helper/asteroid/snow,
+/turf/closed/indestructible/rock/snow/ice,
+/area/awaymission/snowdin/dungeon1)
+"nW" = (
+/obj/effect/baseturf_helper/asteroid/snow,
+/turf/closed/wall/mineral/snow,
+/area/awaymission/snowdin/igloo)
+"nX" = (
+/obj/effect/baseturf_helper/asteroid/snow,
+/turf/open/floor/plating/asteroid/snow,
+/area/awaymission/snowdin/cave)
(1,1,1) = {"
-aa
+nS
aa
aa
aa
@@ -15536,7 +14672,7 @@ aa
aa
ac
ac
-al
+nU
al
al
al
@@ -20160,7 +19296,7 @@ aa
aa
aa
ac
-ad
+nT
ad
am
ad
@@ -23126,8 +22262,8 @@ ad
hl
ad
ad
-gr
-gr
+ez
+ez
eS
eR
eR
@@ -23370,21 +22506,21 @@ eR
eR
eR
ez
-eC
-eC
-eC
+ez
+ez
+ez
ez
gI
gz
gs
gU
gU
-gr
+ez
gU
gU
df
-gr
-gr
+ez
+ez
eS
eS
eS
@@ -23626,10 +22762,10 @@ eR
eR
eT
eT
-eC
-eC
-eC
-eC
+ez
+ez
+ez
+ez
gz
gz
gz
@@ -23638,9 +22774,9 @@ gU
gU
gU
df
-gr
-gr
-gr
+ez
+ez
+ez
fk
eT
eS
@@ -23883,8 +23019,8 @@ eS
eR
eS
eS
-eC
-eC
+ez
+ez
ez
gz
ez
@@ -23896,7 +23032,7 @@ gU
hg
gU
df
-gr
+ez
fk
fk
eT
@@ -24140,9 +23276,9 @@ eS
eS
eS
eS
-eC
+ez
fk
-eC
+ez
eM
gz
ad
@@ -24398,7 +23534,7 @@ eT
eS
eR
eK
-eC
+ez
ez
gz
gz
@@ -24655,7 +23791,7 @@ eR
eR
eR
ad
-eC
+ez
gz
gz
gz
@@ -32781,7 +31917,7 @@ ac
ac
ac
ac
-cP
+nW
cW
cP
ac
@@ -34887,7 +34023,7 @@ ac
ac
ac
ac
-eS
+nX
eS
eS
eS
@@ -42028,7 +41164,7 @@ ab
ab
ab
ab
-cN
+nV
cN
cN
cN
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 335393adac..2f9716406c 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -22174,7 +22174,8 @@
req_access_txt = "20"
},
/obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/corp,
+/obj/effect/spawner/lootdrop/aimodule_harmless,
+/obj/effect/spawner/lootdrop/aimodule_neutral,
/obj/structure/window/reinforced{
dir = 1
},
@@ -22235,7 +22236,7 @@
},
/obj/item/aiModule/reset/purge,
/obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/antimov,
+/obj/effect/spawner/lootdrop/aimodule_harmful,
/obj/structure/window/reinforced{
dir = 1
},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 2852c76257..fe77452705 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -54219,14 +54219,10 @@
name = "Core Modules";
req_access_txt = "20"
},
-/obj/item/aiModule/core/full/paladin{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/aiModule/core/full/asimov,
-/obj/item/aiModule/core/full/corp{
- pixel_x = -3;
- pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_harmless{
+ fan_out_items = 1;
+ lootdoubles = 0;
+ lootcount = 3
},
/obj/structure/sign/nanotrasen{
pixel_x = -32
@@ -54279,12 +54275,12 @@
name = "Core Modules";
req_access_txt = "20"
},
-/obj/item/aiModule/core/full/antimov{
- pixel_x = 3;
- pixel_y = 3
+/obj/effect/spawner/lootdrop/aimodule_harmful{
+ fan_out_items = 1;
+ lootdoubles = 0;
+ lootcount = 2
},
-/obj/item/aiModule/supplied/oxygen,
-/obj/item/aiModule/supplied/protectStation{
+/obj/item/aiModule/supplied/oxygen{
pixel_x = -3;
pixel_y = -3
},
@@ -55144,6 +55140,10 @@
pixel_y = 3
},
/obj/item/aiModule/core/full/custom,
+/obj/item/aiModule/core/full/asimov{
+ pixel_x = -3;
+ pixel_y = -3
+ },
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -55226,7 +55226,7 @@
req_access_txt = "20"
},
/obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/tyrant{
+/obj/item/aiModule/supplied/protectStation{
pixel_x = 3;
pixel_y = 3
},
@@ -57252,14 +57252,10 @@
/area/ai_monitored/turret_protected/ai_upload)
"clQ" = (
/obj/structure/table/reinforced,
-/obj/item/aiModule/core/full/drone{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/aiModule/core/full/reporter,
-/obj/item/aiModule/core/full/liveandletlive{
- pixel_x = -3;
- pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_neutral{
+ fan_out_items = 1;
+ lootdoubles = 0;
+ lootcount = 3
},
/turf/open/floor/plasteel/vault{
dir = 8
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 8ed9acf09f..3480f9d6c4 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -18443,6 +18443,7 @@
"aMG" = (
/obj/structure/table,
/obj/item/aiModule/core/full/asimov,
+/obj/effect/spawner/lootdrop/aimodule_harmless,
/obj/item/aiModule/core/freeformcore,
/obj/machinery/door/window{
base_state = "right";
@@ -18452,7 +18453,7 @@
req_access_txt = "20"
},
/obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/corp,
+/obj/effect/spawner/lootdrop/aimodule_neutral,
/obj/item/aiModule/core/full/custom,
/obj/machinery/flasher{
pixel_y = 24;
@@ -18477,7 +18478,7 @@
pixel_y = 24;
id = "AI"
},
-/obj/item/aiModule/core/full/antimov,
+/obj/effect/spawner/lootdrop/aimodule_harmful,
/obj/item/aiModule/supplied/oxygen,
/obj/item/aiModule/supplied/protectStation,
/obj/item/aiModule/zeroth/oneHuman,
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index ffda1f471d..787c2a72e2 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -2376,14 +2376,10 @@
name = "Core Modules";
req_access_txt = "20"
},
-/obj/item/aiModule/core/full/paladin{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/aiModule/core/full/asimov,
-/obj/item/aiModule/core/full/corp{
- pixel_x = -3;
- pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_harmless{
+ fan_out_items = 1;
+ lootdoubles = 0;
+ lootcount = 3
},
/obj/structure/sign/nanotrasen{
pixel_x = -32
@@ -2499,12 +2495,12 @@
name = "Core Modules";
req_access_txt = "20"
},
-/obj/item/aiModule/core/full/antimov{
- pixel_x = 3;
- pixel_y = 3
+/obj/effect/spawner/lootdrop/aimodule_harmful{
+ fan_out_items = 1;
+ lootdoubles = 0;
+ lootcount = 2
},
-/obj/item/aiModule/supplied/oxygen,
-/obj/item/aiModule/supplied/protectStation{
+/obj/item/aiModule/supplied/oxygen{
pixel_x = -3;
pixel_y = -3
},
@@ -2875,6 +2871,10 @@
pixel_y = 3
},
/obj/item/aiModule/core/full/custom,
+/obj/item/aiModule/core/full/asimov{
+ pixel_x = -3;
+ pixel_y = -3
+ },
/obj/machinery/camera{
c_tag = "AI Core - Port";
dir = 4;
@@ -2900,7 +2900,7 @@
req_access_txt = "20"
},
/obj/structure/window/reinforced,
-/obj/item/aiModule/core/full/tyrant{
+/obj/item/aiModule/supplied/protectStation{
pixel_x = 3;
pixel_y = 3
},
@@ -4361,14 +4361,10 @@
/area/ai_monitored/turret_protected/ai)
"ahV" = (
/obj/structure/table/reinforced,
-/obj/item/aiModule/core/full/drone{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/aiModule/core/full/reporter,
-/obj/item/aiModule/core/full/liveandletlive{
- pixel_x = -3;
- pixel_y = -3
+/obj/effect/spawner/lootdrop/aimodule_neutral{
+ fan_out_items = 1;
+ lootdoubles = 0;
+ lootcount = 3
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -23737,7 +23733,6 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start/chemist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/medical/chemistry)
@@ -24229,7 +24224,6 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start/chemist,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -74189,7 +74183,7 @@ aRf
aSk
aTr
aUt
-aVk
+aVl
aWg
aRf
aXr
diff --git a/_maps/map_files/OmegaStation/job_changes.dm b/_maps/map_files/OmegaStation/job_changes.dm
index 7f6c24fe26..bef766da7b 100644
--- a/_maps/map_files/OmegaStation/job_changes.dm
+++ b/_maps/map_files/OmegaStation/job_changes.dm
@@ -164,4 +164,5 @@ MAP_REMOVE_JOB(geneticist)
MAP_REMOVE_JOB(virologist)
MAP_REMOVE_JOB(rd)
MAP_REMOVE_JOB(warden)
-MAP_REMOVE_JOB(lawyer)
\ No newline at end of file
+MAP_REMOVE_JOB(lawyer)
+MAP_REMOVE_JOB(chemist)
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 7eb9a7ac7a..a504dc4a0b 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -12140,6 +12140,7 @@
"aED" = (
/obj/structure/table,
/obj/item/aiModule/core/full/asimov,
+/obj/effect/spawner/lootdrop/aimodule_harmless,
/obj/item/aiModule/core/freeformcore,
/obj/machinery/door/window{
base_state = "right";
@@ -12148,7 +12149,7 @@
name = "Core Modules";
req_access_txt = "20"
},
-/obj/item/aiModule/core/full/corp,
+/obj/effect/spawner/lootdrop/aimodule_neutral,
/obj/item/aiModule/core/full/custom,
/obj/structure/window/reinforced{
dir = 1;
@@ -12197,7 +12198,7 @@
req_access_txt = "20"
},
/obj/item/aiModule/reset/purge,
-/obj/item/aiModule/core/full/antimov,
+/obj/effect/spawner/lootdrop/aimodule_harmful,
/obj/item/aiModule/supplied/protectStation,
/obj/structure/window/reinforced{
dir = 1;
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index e383e33e0b..caa457f43a 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -353,7 +353,6 @@
name = "emergency shower"
},
/turf/open/floor/plasteel/whiteblue/side{
- baseturf = /turf/open/lava/smooth/lava_land_surface;
dir = 4
},
/area/shuttle/escape)
diff --git a/code/__DEFINES/cleaning.dm b/code/__DEFINES/cleaning.dm
index 9f32992eb0..eed0ee5f54 100644
--- a/code/__DEFINES/cleaning.dm
+++ b/code/__DEFINES/cleaning.dm
@@ -4,4 +4,9 @@
#define CLEAN_MEDIUM 3 // Acceptable tools
#define CLEAN_STRONG 4 // Industrial strength
#define CLEAN_IMPRESSIVE 5 // Cleaning strong enough your granny would be proud
-#define CLEAN_GOD 6 // Cleans things spotless down to the atomic structure
\ No newline at end of file
+#define CLEAN_GOD 6 // Cleans things spotless down to the atomic structure
+
+//How strong things have to be to wipe forensic evidence...
+#define CLEAN_STRENGTH_FINGERPRINTS CLEAN_IMPRESSIVE
+#define CLEAN_STRENGTH_BLOOD CLEAN_WEAK
+#define CLEAN_STRENGTH_FIBERS CLEAN_IMPRESSIVE
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 78ade5c650..7eebdff142 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -27,6 +27,13 @@
#define COMPONENT_NO_AFTERATTACK 1 //Return this in response if you don't want afterattack to be called
#define COMSIG_ATOM_HULK_ATTACK "hulk_attack" //from base of atom/attack_hulk(): (/mob/living/carbon/human)
#define COMSIG_PARENT_EXAMINE "atom_examine" //from base of atom/examine(): (/mob)
+#define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name" //from base of atom/get_examine_name(): (/mob, list/overrides)
+ //Positions for overrides list
+ #define EXAMINE_POSITION_ARTICLE 1
+ #define EXAMINE_POSITION_BEFORE 2
+ #define EXAMINE_POSITION_NAME 3
+ //End positions
+ #define COMPONENT_EXNAME_CHANGED 1
#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (/atom/movable, /atom)
#define COMSIG_ATOM_EX_ACT "atom_ex_act" //from base of atom/ex_act(): (severity, target)
#define COMSIG_ATOM_EMP_ACT "atom_emp_act" //from base of atom/emp_act(): (severity)
diff --git a/code/__DEFINES/forensics.dm b/code/__DEFINES/forensics.dm
new file mode 100644
index 0000000000..bb512edcde
--- /dev/null
+++ b/code/__DEFINES/forensics.dm
@@ -0,0 +1,2 @@
+#define IF_HAS_BLOOD_DNA(__thing) GET_COMPONENT_FROM(__FR##__thing, /datum/component/forensics, __thing); if(__FR##__thing && length(__FR##__thing.blood_DNA))
+#define IF_HAS_BLOOD_DNA_AND(__thing, __conditions...) GET_COMPONENT_FROM(__FR##__thing, /datum/component/forensics, __thing); if(__FR##__thing && length(__FR##__thing.blood_DNA) && (##__conditions))
diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index 942a82e73f..ecb3fcc611 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -32,6 +32,7 @@
#define STASIS_MUTE "stasis"
#define GENETICS_SPELL "genetics_spell"
#define TRAUMA_DISABILITY "trauma"
+#define CHEMICAL_DISABILITY "chemical"
// bitflags for machine stat variable
#define BROKEN 1
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
index 4f36ddbb1e..2e1524ebac 100644
--- a/code/__DEFINES/status_effects.dm
+++ b/code/__DEFINES/status_effects.dm
@@ -64,6 +64,8 @@
#define STATUS_EFFECT_KINDLE /datum/status_effect/kindle //A knockdown reduced by 1 second for every 3 points of damage the target takes.
+#define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute.
+
/////////////
// NEUTRAL //
/////////////
diff --git a/code/__DEFINES/turf_flags.dm b/code/__DEFINES/turf_flags.dm
new file mode 100644
index 0000000000..fd89041207
--- /dev/null
+++ b/code/__DEFINES/turf_flags.dm
@@ -0,0 +1,3 @@
+#define CHANGETURF_DEFER_CHANGE 1
+#define CHANGETURF_IGNORE_AIR 2
+#define CHANGETURF_FORCEOP 4
\ No newline at end of file
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 91d104c43b..8ca98ebf37 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -18,6 +18,9 @@
//Antag information
gather_antag_data()
+ //Nuke disk
+ record_nuke_disk_location()
+
/datum/controller/subsystem/ticker/proc/gather_antag_data()
var/team_gid = 1
var/list/team_ids = list()
@@ -46,11 +49,57 @@
antag_info["objectives"] += list(list("objective_type"=O.type,"text"=O.explanation_text,"result"=result))
SSblackbox.record_feedback("associative", "antagonists", 1, antag_info)
+/datum/controller/subsystem/ticker/proc/record_nuke_disk_location()
+ var/obj/item/disk/nuclear/N = locate() in GLOB.poi_list
+ if(N)
+ var/list/data = list()
+ var/turf/T = get_turf(N)
+ if(T)
+ data["x"] = T.x
+ data["y"] = T.y
+ data["z"] = T.z
+ var/atom/outer = get_atom_on_turf(N,/mob/living)
+ if(outer != N)
+ if(isliving(outer))
+ var/mob/living/L = outer
+ data["holder"] = L.real_name
+ else
+ data["holder"] = outer.name
+
+ SSblackbox.record_feedback("associative", "roundend_nukedisk", 1 , data)
+
+/datum/controller/subsystem/ticker/proc/gather_newscaster()
+ var/json_file = file("[GLOB.log_directory]/newscaster.json")
+ var/list/file_data = list()
+ var/pos = 1
+ for(var/V in GLOB.news_network.network_channels)
+ var/datum/newscaster/feed_channel/channel = V
+ if(!istype(channel))
+ stack_trace("Non-channel in newscaster channel list")
+ continue
+ file_data["[pos]"] = list("channel name" = "[channel.channel_name]", "author" = "[channel.author]", "censored" = channel.censored ? 1 : 0, "author censored" = channel.authorCensor ? 1 : 0, "messages" = list())
+ for(var/M in channel.messages)
+ var/datum/newscaster/feed_message/message = M
+ if(!istype(message))
+ stack_trace("Non-message in newscaster channel messages list")
+ continue
+ var/list/comment_data = list()
+ for(var/C in message.comments)
+ var/datum/newscaster/feed_comment/comment = C
+ if(!istype(comment))
+ stack_trace("Non-message in newscaster message comments list")
+ continue
+ comment_data += list(list("author" = "[comment.author]", "time stamp" = "[comment.time_stamp]", "body" = "[comment.body]"))
+ file_data["[pos]"]["messages"] += list(list("author" = "[message.author]", "time stamp" = "[message.time_stamp]", "censored" = message.bodyCensor ? 1 : 0, "author censored" = message.authorCensor ? 1 : 0, "photo file" = "[message.photo_file]", "photo caption" = "[message.caption]", "body" = "[message.body]", "comments" = comment_data))
+ pos++
+ if(GLOB.news_network.wanted_issue.active)
+ file_data["wanted"] = list("author" = "[GLOB.news_network.wanted_issue.scannedUser]", "criminal" = "[GLOB.news_network.wanted_issue.criminal]", "description" = "[GLOB.news_network.wanted_issue.body]", "photo file" = "[GLOB.news_network.wanted_issue.photo_file]")
+ WRITE_FILE(json_file, json_encode(file_data))
/datum/controller/subsystem/ticker/proc/declare_completion()
set waitfor = FALSE
- to_chat(world, "
The round has ended.")
+ to_chat(world, "
The round has ended.")
if(LAZYLEN(GLOB.round_end_notifiees))
send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.")
@@ -78,7 +127,7 @@
send2irc("Server", "Round just ended.")
- if(CONFIG_GET(string/cross_server_address))
+ if(length(CONFIG_GET(keyed_string_list/cross_server)))
send_news_report()
CHECK_TICK
@@ -346,7 +395,7 @@
currrent_category = A.roundend_category
previous_category = A
result += A.roundend_report()
- result += "
"
+ result += "
"
if(all_antagonists.len)
var/datum/antagonist/last = all_antagonists[all_antagonists.len]
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index ddfbec5935..68428cae90 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -58,9 +58,11 @@
SendSignal(COMSIG_ITEM_ATTACK, M, user)
if(flags_1 & NOBLUDGEON_1)
return
-
- if(user.has_disability(DISABILITY_PACIFISM))
+
+ if(force && user.has_disability(DISABILITY_PACIFISM))
+ to_chat(user, "You don't want to harm other living beings!")
return
+
if(!force)
playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
else if(hitsound)
diff --git a/code/citadel/cit_reagents.dm b/code/citadel/cit_reagents.dm
index 12604f26f5..79ccfea936 100644
--- a/code/citadel/cit_reagents.dm
+++ b/code/citadel/cit_reagents.dm
@@ -21,7 +21,7 @@
S = new(T)
S.reagents.add_reagent("semen", reac_volume)
if(data["blood_DNA"])
- S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
+ S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
/obj/effect/decal/cleanable/semen
name = "semen"
@@ -62,17 +62,16 @@
icon = 'code/citadel/icons/effects.dmi'
icon_state = "fem1"
random_icon_states = list("fem1", "fem2", "fem3", "fem4")
- blood_DNA = list()
blood_state = null
bloodiness = null
/obj/effect/decal/cleanable/femcum/New()
..()
dir = pick(1,2,4,8)
+ add_blood_DNA(list("Non-human DNA" = "A+"))
/obj/effect/decal/cleanable/femcum/replace_decal(obj/effect/decal/cleanable/femcum/F)
- if (F.blood_DNA)
- blood_DNA |= F.blood_DNA.Copy()
+ F.add_blood_DNA(return_blood_DNA())
..()
/datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)
@@ -86,7 +85,7 @@
S = new(T)
S.reagents.add_reagent("femcum", reac_volume)
if(data["blood_DNA"])
- S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
+ S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
//aphrodisiac & anaphrodisiac
diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm
index 7cda1d9e5a..4e8e3b5e49 100644
--- a/code/citadel/custom_loadout/custom_items.dm
+++ b/code/citadel/custom_loadout/custom_items.dm
@@ -10,6 +10,14 @@
w_class = WEIGHT_CLASS_TINY
flags_1 = NOBLUDGEON_1
+/obj/item/soap/cebu //real versions, for admin shenanigans. Adminspawn only
+ desc = "A bright blue bar of soap that smells of wolves"
+ icon = 'icons/obj/custom.dmi'
+ icon_state = "cebu"
+
+/obj/item/soap/cebu/fast //speedyquick cleaning version. Still not as fast as Syndiesoap. Adminspawn only.
+ cleanspeed = 15
+
/*Inferno707*/
diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm
index 9a6a6581c9..2713b19976 100644
--- a/code/citadel/dogborgstuff.dm
+++ b/code/citadel/dogborgstuff.dm
@@ -259,7 +259,7 @@
to_chat(user,"You clean \the [target.name].")
var/obj/effect/decal/cleanable/C = locate() in target
qdel(C)
- target.clean_blood()
+ SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
else if(ishuman(target))
if(src.emagged)
var/mob/living/silicon/robot.R = user
@@ -292,7 +292,7 @@
to_chat(user, "You clean \the [target.name].")
var/obj/effect/decal/cleanable/C = locate() in target
qdel(C)
- target.clean_blood()
+ SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
return
diff --git a/code/datums/antagonists/monkey.dm b/code/datums/antagonists/monkey.dm
index b1c5642a39..518161b51b 100644
--- a/code/datums/antagonists/monkey.dm
+++ b/code/datums/antagonists/monkey.dm
@@ -16,8 +16,7 @@
var/datum/disease/D = new /datum/disease/transformation/jungle_fever/monkeymode
if(!owner.current.HasDisease(D))
- D.affected_mob = owner
- owner.current.viruses += D
+ owner.current.AddDisease(D)
else
QDEL_NULL(D)
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index fcd4651459..46ffc25643 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -205,13 +205,13 @@
new_comp = new nt(arglist(args))
if(!QDELETED(new_comp))
old_comp.InheritComponent(new_comp, TRUE)
- qdel(new_comp)
+ QDEL_NULL(new_comp)
if(COMPONENT_DUPE_HIGHLANDER)
if(!new_comp)
new_comp = new nt(arglist(args))
if(!QDELETED(new_comp))
new_comp.InheritComponent(old_comp, FALSE)
- qdel(old_comp)
+ QDEL_NULL(old_comp)
if(COMPONENT_DUPE_UNIQUE_PASSARGS)
if(!new_comp)
var/list/arguments = args.Copy(2)
diff --git a/code/datums/components/cleaning.dm b/code/datums/components/cleaning.dm
index 5d9d5992e2..cb91d3c513 100644
--- a/code/datums/components/cleaning.dm
+++ b/code/datums/components/cleaning.dm
@@ -13,28 +13,28 @@
if(!isturf(tile))
return
- tile.clean_blood()
+ tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
for(var/A in tile)
if(is_cleanable(A))
qdel(A)
else if(istype(A, /obj/item))
- var/obj/item/cleaned_item = A
- cleaned_item.clean_blood()
+ var/obj/item/I = A
+ I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
else if(ishuman(A))
var/mob/living/carbon/human/cleaned_human = A
if(cleaned_human.lying)
if(cleaned_human.head)
- cleaned_human.head.clean_blood()
+ cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_head()
if(cleaned_human.wear_suit)
- cleaned_human.wear_suit.clean_blood()
+ cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_wear_suit()
else if(cleaned_human.w_uniform)
- cleaned_human.w_uniform.clean_blood()
+ cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_w_uniform()
if(cleaned_human.shoes)
- cleaned_human.shoes.clean_blood()
+ cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_shoes()
- cleaned_human.clean_blood()
+ cleaned_human.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.wash_cream()
to_chat(cleaned_human, "[AM] cleans your face!")
diff --git a/code/datums/components/decal.dm b/code/datums/components/decal.dm
index a79de32898..53faa27f39 100644
--- a/code/datums/components/decal.dm
+++ b/code/datums/components/decal.dm
@@ -6,19 +6,11 @@
var/mutable_appearance/pic
/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description)
- if(!isatom(parent) || !_icon || !_icon_state)
+ if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color))
. = COMPONENT_INCOMPATIBLE
CRASH("A turf decal was applied incorrectly to [parent.type]: icon:[_icon ? _icon : "none"] icon_state:[_icon_state ? _icon_state : "none"]")
-
- // It has to be made from an image or dir breaks because of a byond bug
- var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
- pic = new(temp_image)
- pic.color = _color
-
- cleanable = _cleanable
description = _description
-
- apply()
+ cleanable = _cleanable
if(_dir) // If no dir is assigned at start then it follows the atom's dir
RegisterSignal(COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
@@ -26,6 +18,7 @@
RegisterSignal(COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
if(_description)
RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
+ apply()
/datum/component/decal/Destroy()
remove()
@@ -36,6 +29,15 @@
remove(thing)
apply(thing)
+/datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
+ if(!_icon || !_icon_state)
+ return FALSE
+ // It has to be made from an image or dir breaks because of a byond bug
+ var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
+ pic = new(temp_image)
+ pic.color = _color
+ return TRUE
+
/datum/component/decal/proc/apply(atom/thing)
var/atom/master = thing || parent
master.add_overlay(pic, TRUE)
diff --git a/code/datums/components/decals/blood.dm b/code/datums/components/decals/blood.dm
new file mode 100644
index 0000000000..f2dc9a48d0
--- /dev/null
+++ b/code/datums/components/decals/blood.dm
@@ -0,0 +1,35 @@
+/datum/component/decal/blood
+ dupe_mode = COMPONENT_DUPE_UNIQUE
+
+/datum/component/decal/blood/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_STRENGTH_BLOOD, _color, _layer=ABOVE_OBJ_LAYER)
+ if(!isitem(parent))
+ . = COMPONENT_INCOMPATIBLE
+ CRASH("Warning: Blood decal attempted to be added to non-item of type [parent.type]")
+ . = ..()
+ RegisterSignal(COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name)
+
+/datum/component/decal/blood/generate_appearance(_icon, _icon_state, _dir, _layer, _color)
+ var/obj/item/I = parent
+ if(!_icon)
+ _icon = 'icons/effects/blood.dmi'
+ if(!_icon_state)
+ _icon_state = "itemblood"
+ if(!initial(I.icon) || !initial(I.icon_state))
+ return FALSE
+ var/static/list/blood_splatter_appearances = list()
+ //try to find a pre-processed blood-splatter. otherwise, make a new one
+ var/index = "[REF(initial(I.icon))]-[initial(I.icon_state)]"
+ pic = blood_splatter_appearances[index]
+ if(!pic)
+ var/icon/blood_splatter_icon = icon(initial(I.icon), initial(I.icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object
+ blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
+ blood_splatter_icon.Blend(icon(_icon, _icon_state), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
+ pic = mutable_appearance(blood_splatter_icon, initial(I.icon_state), I.layer)
+ blood_splatter_appearances[index] = pic
+ return TRUE
+
+/datum/component/decal/blood/proc/get_examine_name(mob/user, list/override)
+ var/atom/A = parent
+ override[EXAMINE_POSITION_ARTICLE] = A.gender == PLURAL? "some" : "a"
+ override[EXAMINE_POSITION_BEFORE] = " blood-stained "
+ return COMPONENT_EXNAME_CHANGED
diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm
index 1950b8b664..55633a2087 100644
--- a/code/datums/components/forensics.dm
+++ b/code/datums/components/forensics.dm
@@ -138,7 +138,7 @@
if(laststamppos)
LAZYSET(hiddenprints, M.key, copytext(hiddenprints[M.key], 1, laststamppos))
hiddenprints[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]" //made sure to be existing by if(!LAZYACCESS);else
- parent.fingerprintslast = M.ckey
+ fingerprintslast = M.ckey
return TRUE
/datum/component/forensics/proc/add_blood_DNA(list/dna) //list(dna_enzymes = type)
diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm
index 11611cadfb..13ec5ed8f9 100644
--- a/code/datums/components/thermite.dm
+++ b/code/datums/components/thermite.dm
@@ -63,7 +63,7 @@
if(amount >= 50)
var/burning_time = max(100, 100-amount)
- master = master.ChangeTurf(master.baseturf)
+ master = master.ScrapeAway()
master.burn_tile()
if(user)
master.add_hiddenprint(user)
diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm
index 73b76a9155..85a8e40863 100644
--- a/code/datums/explosion.dm
+++ b/code/datums/explosion.dm
@@ -55,6 +55,8 @@ GLOBAL_LIST_EMPTY(explosions)
var/orig_heavy_range = heavy_impact_range
var/orig_light_range = light_impact_range
+ var/orig_max_distance = max(devastation_range, heavy_impact_range, light_impact_range, flash_range, flame_range)
+
//Zlevel specific bomb cap multiplier
var/cap_multiplier = 1
switch(epicenter.z)
@@ -119,11 +121,13 @@ GLOBAL_LIST_EMPTY(explosions)
// If inside the blast radius + world.view - 2
if(dist <= round(max_range + world.view - 2, 1))
M.playsound_local(epicenter, null, 100, 1, frequency, falloff = 5, S = explosion_sound)
+ shake_camera(M, 25, min(orig_max_distance - dist, 100))
// You hear a far explosion if you're outside the blast radius. Small bombs shouldn't be heard all over the station.
else if(dist <= far_dist)
var/far_volume = CLAMP(far_dist, 30, 50) // Volume is based on explosion size and dist
far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion
M.playsound_local(epicenter, null, far_volume, 1, frequency, falloff = 5, S = far_explosion_sound)
+ shake_camera(M, 10, min(orig_max_distance - dist, 50))
EX_PREPROCESS_CHECK_TICK
//postpone processing for a bit
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index cc64cc2eb8..22868f855f 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -479,3 +479,27 @@
desc = "Blinding light dances in your vision, stunning and silencing you. Any damage taken will shorten the light's effects!"
icon_state = "kindle"
alerttooltipstyle = "clockcult"
+
+
+//Ichorial Stain: Applied to servants revived by a vitality matrix. Prevents them from being revived by one again until the effect fades.
+/datum/status_effect/ichorial_stain
+ id = "ichorial_stain"
+ status_type = STATUS_EFFECT_UNIQUE
+ duration = 600
+ examine_text = "SUBJECTPRONOUN is drenched in thick, blue ichor!"
+ alert_type = /obj/screen/alert/status_effect/ichorial_stain
+
+/datum/status_effect/ichorial_stain/on_apply()
+ owner.visible_message("[owner] gets back up, [owner.p_their()] body dripping blue ichor!", \
+ "Thick blue ichor covers your body; you can't be revived like this again until it dries!")
+ return TRUE
+
+/datum/status_effect/ichorial_stain/on_remove()
+ owner.visible_message("The blue ichor on [owner]'s body dries out!", \
+ "The ichor on your body is dry - you can now be revived by vitality matrices again!")
+
+/obj/screen/alert/status_effect/ichorial_stain
+ name = "Ichorial Stain"
+ desc = "Your body is covered in blue ichor! You can't be revived by vitality matrices."
+ icon_state = "ichorial_stain"
+ alerttooltipstyle = "clockcult"
diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm
index 19bd880a77..e24359d18c 100644
--- a/code/datums/status_effects/status_effect.dm
+++ b/code/datums/status_effects/status_effect.dm
@@ -9,6 +9,7 @@
var/mob/living/owner //The mob affected by the status effect.
var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
+ var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7743d804cd..eb63ca147f 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -5,10 +5,6 @@
var/flags_1 = 0
var/flags_2 = 0
-
- var/list/fingerprints
- var/list/fingerprintshidden
- var/list/blood_DNA
var/container_type = NONE
var/admin_spawned = 0 //was this spawned by an admin? used for stat tracking stuff.
var/datum/reagents/reagents = null
@@ -232,21 +228,22 @@
/atom/proc/in_contents_of(container)//can take class or object instance as argument
if(ispath(container))
if(istype(src.loc, container))
- return 1
+ return TRUE
else if(src in container)
- return 1
+ return TRUE
+ return FALSE
+
+/atom/proc/get_examine_name(mob/user)
+ . = "\a [src]"
+ var/list/override = list(gender == PLURAL? "some" : "a" , " ", "[name]")
+ if(SendSignal(COMSIG_ATOM_GET_EXAMINE_NAME, user, override) & COMPONENT_EXNAME_CHANGED)
+ . = override.Join("")
+
+/atom/proc/get_examine_string(mob/user, thats = FALSE)
+ . = "[icon2html(src, user)] [thats? "That's ":""][get_examine_name(user)]"
/atom/proc/examine(mob/user)
- //This reformat names to get a/an properly working on item descriptions when they are bloody
- var/f_name = "\a [src]."
- if(src.blood_DNA && !istype(src, /obj/effect/decal))
- if(gender == PLURAL)
- f_name = "some "
- else
- f_name = "a "
- f_name += "blood-stained [name]!"
-
- to_chat(user, "[icon2html(src, user)] That's [f_name]")
+ to_chat(user, get_examine_string(user, TRUE))
if(desc)
to_chat(user, desc)
@@ -303,11 +300,6 @@
if(AM && isturf(AM.loc))
step(AM, turn(AM.dir, 180))
-GLOBAL_LIST_EMPTY(blood_splatter_icons)
-
-/atom/proc/blood_splatter_index()
- return "[REF(initial(icon))]-[initial(icon_state)]"
-
//returns the mob's dna info as a list, to be inserted in an object's blood_DNA list
/mob/living/proc/get_blood_dna_list()
if(get_blood_id() != "blood")
@@ -332,100 +324,28 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
// Returns 0 if we have that blood already
var/new_blood_dna = L.get_blood_dna_list()
if(!new_blood_dna)
- return 0
- if(!blood_DNA) //if our list of DNA doesn't exist yet, initialise it.
- blood_DNA = list()
- var/old_length = blood_DNA.len
- blood_DNA |= new_blood_dna
- if(blood_DNA.len == old_length)
- return 0
- return 1
-
-//to add blood dna info to the object's blood_DNA list
-/atom/proc/transfer_blood_dna(list/blood_dna)
- if(!blood_DNA)
- blood_DNA = list()
- var/old_length = blood_DNA.len
- blood_DNA |= blood_dna
- if(blood_DNA.len > old_length)
- return 1//some new blood DNA was added
-
+ return FALSE
+ var/old_length = blood_DNA_length()
+ add_blood_DNA(new_blood_dna)
+ if(blood_DNA_length() == old_length)
+ return FALSE
+ return TRUE
//to add blood from a mob onto something, and transfer their dna info
/atom/proc/add_mob_blood(mob/living/M)
var/list/blood_dna = M.get_blood_dna_list()
if(!blood_dna)
- return 0
- return add_blood(blood_dna)
-
-//to add blood onto something, with blood dna info to include.
-/atom/proc/add_blood(list/blood_dna)
- return 0
-
-/obj/add_blood(list/blood_dna)
- return transfer_blood_dna(blood_dna)
-
-/obj/item/add_blood(list/blood_dna)
- var/blood_count = !blood_DNA ? 0 : blood_DNA.len
- if(!..())
- return 0
- if(!blood_count)//apply the blood-splatter overlay if it isn't already in there
- add_blood_overlay()
- return 1 //we applied blood to the item
-
-/obj/item/proc/add_blood_overlay()
- if(initial(icon) && initial(icon_state))
- //try to find a pre-processed blood-splatter. otherwise, make a new one
- var/index = blood_splatter_index()
- var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
- if(!blood_splatter_icon)
- blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object
- blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
- blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
- blood_splatter_icon = fcopy_rsc(blood_splatter_icon)
- GLOB.blood_splatter_icons[index] = blood_splatter_icon
- add_overlay(blood_splatter_icon)
-
-/obj/item/clothing/gloves/add_blood(list/blood_dna)
- . = ..()
- transfer_blood = rand(2, 4)
-
-/turf/add_blood(list/blood_dna, list/datum/disease/diseases)
- var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
- if(!B)
- B = new /obj/effect/decal/cleanable/blood/splatter(src, diseases)
- B.transfer_blood_dna(blood_dna) //give blood info to the blood decal.
- return 1 //we bloodied the floor
-
-/mob/living/carbon/human/add_blood(list/blood_dna)
- if(wear_suit)
- wear_suit.add_blood(blood_dna)
- update_inv_wear_suit()
- else if(w_uniform)
- w_uniform.add_blood(blood_dna)
- update_inv_w_uniform()
- if(gloves)
- var/obj/item/clothing/gloves/G = gloves
- G.add_blood(blood_dna)
- else
- transfer_blood_dna(blood_dna)
- bloody_hands = rand(2, 4)
- update_inv_gloves() //handles bloody hands overlays and updating
- return 1
-
-/atom/proc/clean_blood()
- if(islist(blood_DNA))
- blood_DNA = null
- return 1
+ return FALSE
+ return add_blood_DNA(blood_dna)
/atom/proc/wash_cream()
- return 1
+ return TRUE
/atom/proc/isinspace()
if(isspaceturf(get_turf(src)))
- return 1
+ return TRUE
else
- return 0
+ return FALSE
/atom/proc/handle_fall()
return
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 62efa887ea..c606cb1d3b 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -144,27 +144,27 @@
/atom/movable/proc/clean_on_move()
var/turf/tile = loc
if(isturf(tile))
- tile.clean_blood()
+ tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
for(var/A in tile)
if(is_cleanable(A))
qdel(A)
else if(istype(A, /obj/item))
var/obj/item/cleaned_item = A
- cleaned_item.clean_blood()
+ cleaned_item.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
else if(ishuman(A))
var/mob/living/carbon/human/cleaned_human = A
if(cleaned_human.lying)
if(cleaned_human.head)
- cleaned_human.head.clean_blood()
+ cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_head()
if(cleaned_human.wear_suit)
- cleaned_human.wear_suit.clean_blood()
+ cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_wear_suit()
else if(cleaned_human.w_uniform)
- cleaned_human.w_uniform.clean_blood()
+ cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_w_uniform()
if(cleaned_human.shoes)
- cleaned_human.shoes.clean_blood()
+ cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
cleaned_human.update_inv_shoes()
cleaned_human.clean_blood()
cleaned_human.wash_cream()
diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm
index e7f23bc07b..7a219407a4 100644
--- a/code/game/gamemodes/changeling/powers/headcrab.dm
+++ b/code/game/gamemodes/changeling/powers/headcrab.dm
@@ -8,6 +8,8 @@
/obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user)
set waitfor = FALSE
+ if(alert("Are we sure we wish to kill ourself and create a headslug?",,"Yes", "No") == "No")
+ return
var/datum/mind/M = user.mind
var/list/organs = user.getorganszone("head", 1)
@@ -35,4 +37,4 @@
if(crab.origin)
crab.origin.active = 1
crab.origin.transfer_to(crab)
- to_chat(crab, "You burst out of the remains of your former body in a shower of gore!")
\ No newline at end of file
+ to_chat(crab, "You burst out of the remains of your former body in a shower of gore!")
diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
index 29655a0ac9..3237cf5d35 100644
--- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
+++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
@@ -278,7 +278,7 @@
animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
sleep(10)
//as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
- while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src))
+ while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src) && !L.buckled)
sigil_active = TRUE
if(animation_number >= 4)
new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
@@ -313,21 +313,28 @@
revival_cost = 0
var/mob/dead/observer/ghost = L.get_ghost(TRUE)
if(GLOB.clockwork_vitality >= revival_cost && (ghost || (L.mind && L.mind.active)))
- if(ghost)
- ghost.reenter_corpse()
- L.revive(1, 1)
- var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
- animate(V, alpha = 0, transform = matrix()*2, time = 8)
- playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
- L.visible_message("[L] suddenly gets back up, [L.p_their()] body dripping blue ichor!", "\"[text2ratvar("You will be okay, child.")]\"")
- GLOB.clockwork_vitality -= revival_cost
+ if(L.has_status_effect(STATUS_EFFECT_ICHORIAL_STAIN))
+ visible_message("[src] strains, but nothing happens...")
+ if(L.pulledby)
+ to_chat(L.pulledby, "[L] was already revived recently by a vitality matrix! Wait a bit longer!")
+ break
+ else
+ if(ghost)
+ ghost.reenter_corpse()
+ L.revive(1, 1)
+ var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
+ animate(V, alpha = 0, transform = matrix()*2, time = 8)
+ playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
+ to_chat(L, "\"[text2ratvar("You will be okay, child.")]\"")
+ L.apply_status_effect(STATUS_EFFECT_ICHORIAL_STAIN)
+ GLOB.clockwork_vitality -= revival_cost
break
if(!L.client || L.client.is_afk())
set waitfor = FALSE
var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [L.name], an inactive clock cultist?", "[name]", null, "Clock Cultist", 50, L)
var/mob/dead/observer/theghost = null
if(candidates.len)
- to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!")
+ to_chat(L, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form!")
message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(L)]) to replace an inactive clock cultist.")
L.ghostize(0)
L.key = theghost.key
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
index 09cfeb99d3..c4774fe0ad 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
@@ -70,6 +70,12 @@
quickbind = TRUE
quickbind_desc = "Creates a Vitality Matrix, which drains non-Servants on it to heal Servants that cross it."
+/datum/clockwork_scripture/create_object/vitality_matrix/check_special_requirements()
+ if(locate(object_path) in range(1, invoker))
+ to_chat(invoker, "Vitality matrices placed next to each other could interfere and cause a feedback loop! Move away from the other ones!")
+ return FALSE
+ return ..()
+
//Judicial Visor: Creates a judicial visor, which can smite an area.
/datum/clockwork_scripture/create_object/judicial_visor
diff --git a/code/game/gamemodes/clock_cult/clock_structures/trap_triggers/pressure_sensor.dm b/code/game/gamemodes/clock_cult/clock_structures/trap_triggers/pressure_sensor.dm
index f6a7b8e347..fffabe8f5c 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/trap_triggers/pressure_sensor.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/trap_triggers/pressure_sensor.dm
@@ -3,7 +3,7 @@
name = "pressure sensor"
desc = "A thin plate of brass, barely visible but clearly distinct."
clockwork_desc = "A trigger that will activate when a non-servant runs across it."
- max_integrity = 25
+ max_integrity = 5
icon_state = "pressure_sensor"
alpha = 80
layer = LOW_ITEM_LAYER
diff --git a/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm b/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm
index d79ca88ecb..c91cf594e8 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm
@@ -21,9 +21,10 @@
STOP_PROCESSING(SSfastprocess, src)
if(buckled_mobs && buckled_mobs.len)
var/mob/living/L = buckled_mobs[1]
- L.Knockdown(100)
- L.visible_message("[L] is maimed as the skewer shatters while still in their body!")
- L.adjustBruteLoss(15)
+ if(iscarbon(L))
+ L.Knockdown(100)
+ L.visible_message("[L] is maimed as the skewer shatters while still in their body!")
+ L.adjustBruteLoss(15)
unbuckle_mob(L)
return ..()
@@ -48,14 +49,22 @@
/obj/structure/destructible/clockwork/trap/brass_skewer/activate()
if(density)
return
- var/mob/living/carbon/squirrel = locate() in get_turf(src)
+ var/mob/living/squirrel = locate() in get_turf(src)
if(squirrel)
- squirrel.visible_message("A massive brass spike erupts from the ground, impaling [squirrel]!", \
- "A massive brass spike rams through your chest, hoisting you into the air!")
- squirrel.emote("scream")
- playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE)
- playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE)
- squirrel.apply_damage(20, BRUTE, "chest")
+ if(iscyborg(squirrel))
+ if(!squirrel.stat)
+ squirrel.visible_message("A massive brass spike erupts from the ground, rending [squirrel]'s chassis but shattering into pieces!", \
+ "A massive brass spike rips through your chassis and bursts into shrapnel in your casing!")
+ squirrel.adjustBruteLoss(50)
+ squirrel.Stun(20)
+ addtimer(CALLBACK(src, .proc/take_damage, max_integrity), 1)
+ else
+ squirrel.visible_message("A massive brass spike erupts from the ground, impaling [squirrel]!", \
+ "A massive brass spike rams through your chest, hoisting you into the air!")
+ squirrel.emote("scream")
+ playsound(squirrel, 'sound/effects/splat.ogg', 50, TRUE)
+ playsound(squirrel, 'sound/misc/desceration-03.ogg', 50, TRUE)
+ squirrel.apply_damage(20, BRUTE, "chest")
mouse_opacity = MOUSE_OPACITY_OPAQUE //So players can interact with the tile it's on to pull them off
buckle_mob(squirrel, TRUE)
else
diff --git a/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm b/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm
index 1463ca6ac0..b1734b3aef 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm
@@ -59,9 +59,9 @@
brass_floor = TRUE
if(W.use(2 - brass_floor))
if(anchored)
- T.ChangeTurf(/turf/closed/wall/clockwork)
+ T.PlaceOnTop(/turf/closed/wall/clockwork)
else
- T.ChangeTurf(/turf/open/floor/clockwork)
+ T.PlaceOnTop(/turf/open/floor/clockwork)
new /obj/structure/falsewall/brass(T)
qdel(src)
else
diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm
index 10f0b3393f..c1197a5742 100644
--- a/code/game/gamemodes/devil/true_devil/_true_devil.dm
+++ b/code/game/gamemodes/devil/true_devil/_true_devil.dm
@@ -67,10 +67,7 @@
//Left hand items
for(var/obj/item/I in held_items)
if(!(I.flags_1 & ABSTRACT_1))
- if(I.blood_DNA)
- msg += "It is holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!\n"
- else
- msg += "It is holding [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+ msg += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
//Braindead
if(!client && stat != DEAD)
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 21de0fc2f9..6c662fbc18 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -213,7 +213,7 @@
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
var/mob/living/carbon/human/target = null
var/list/mob/living/carbon/human/possible = list()
- var/obj/item/linked_item = null
+ var/obj/item/voodoo_link = null
var/cooldown_time = 30 //3s
var/cooldown = 0
max_integrity = 10
@@ -237,10 +237,10 @@
cooldown = world.time +cooldown_time
return
- if(!linked_item)
+ if(!voodoo_link)
if(I.loc == user && istype(I) && I.w_class <= WEIGHT_CLASS_SMALL)
if (user.transferItemToLoc(I,src))
- linked_item = I
+ voodoo_link = I
to_chat(user, "You attach [I] to the doll.")
update_targets()
@@ -255,11 +255,11 @@
return
if(user.zone_selected == "chest")
- if(linked_item)
+ if(voodoo_link)
target = null
- linked_item.forceMove(drop_location())
- to_chat(user, "You remove the [linked_item] from the doll.")
- linked_item = null
+ voodoo_link.forceMove(drop_location())
+ to_chat(user, "You remove the [voodoo_link] from the doll.")
+ voodoo_link = null
update_targets()
return
@@ -291,10 +291,13 @@
/obj/item/voodoo/proc/update_targets()
possible = list()
- if(!linked_item)
+ if(!voodoo_link)
return
+ var/list/prints = voodoo_link.return_fingerprints()
+ if(!length(prints))
+ return FALSE
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
- if(md5(H.dna.uni_identity) in linked_item.fingerprints)
+ if(prints[md5(H.dna.uni_identity)])
possible |= H
/obj/item/voodoo/proc/GiveHint(mob/victim,force=0)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 1e0b41bca0..3d3d929c81 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -149,8 +149,6 @@
if(href_list["make"])
- var/turf/T = loc
-
/////////////////
//href protection
being_built = stored_research.isDesignResearchedID(href_list["make"])
@@ -174,34 +172,8 @@
use_power(power)
icon_state = "autolathe"
flick("autolathe_n",src)
- if(is_stack)
- spawn(32*coeff)
- use_power(power)
- var/list/materials_used = list(MAT_METAL=metal_cost*multiplier, MAT_GLASS=glass_cost*multiplier)
- materials.use_amount(materials_used)
-
- var/obj/item/stack/N = new being_built.build_path(T, multiplier)
- N.update_icon()
- N.autolathe_crafted(src)
-
- for(var/obj/item/stack/S in T.contents - N)
- if(istype(S, N.merge_type))
- N.merge(S)
- busy = FALSE
- updateUsrDialog()
-
- else
- spawn(32*coeff*multiplier)
- use_power(power)
- var/list/materials_used = list(MAT_METAL=metal_cost*coeff*multiplier, MAT_GLASS=glass_cost*coeff*multiplier)
- materials.use_amount(materials_used)
- for(var/i=1, i<=multiplier, i++)
- var/obj/item/new_item = new being_built.build_path(T)
- for(var/mat in materials_used)
- new_item.materials[mat] = materials_used[mat] / multiplier
- new_item.autolathe_crafted(src)
- busy = FALSE
- updateUsrDialog()
+ var/time = is_stack ? 32 : 32*coeff*multiplier
+ addtimer(CALLBACK(src, .proc/make_item, power, metal_cost, glass_cost, multiplier, coeff, is_stack), time)
if(href_list["search"])
matching_designs.Cut()
@@ -218,6 +190,30 @@
return
+/obj/machinery/autolathe/proc/make_item(power, metal_cost, glass_cost, multiplier, coeff, is_stack)
+ GET_COMPONENT(materials, /datum/component/material_container)
+ var/atom/A = drop_location()
+ use_power(power)
+ var/list/materials_used = list(MAT_METAL=metal_cost*coeff*multiplier, MAT_GLASS=glass_cost*coeff*multiplier)
+ materials.use_amount(materials_used)
+
+ if(is_stack)
+ var/obj/item/stack/N = new being_built.build_path(A, multiplier)
+ N.update_icon()
+ N.autolathe_crafted(src)
+ for(var/obj/item/stack/S in (A.contents - N))
+ if(istype(S, N.merge_type))
+ N.merge(S)
+ else
+ for(var/i=1, i<=multiplier, i++)
+ var/obj/item/new_item = new being_built.build_path(A)
+ for(var/mat in materials_used)
+ new_item.materials[mat] = materials_used[mat] / multiplier
+ new_item.autolathe_crafted(src)
+
+ busy = FALSE
+ updateDialog()
+
/obj/machinery/autolathe/RefreshParts()
var/T = 0
for(var/obj/item/stock_parts/matter_bin/MB in component_parts)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 89a4e8b130..085b55c2e1 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -528,7 +528,7 @@
playsound(loc, 'sound/effects/bang.ogg', 100, 1)
var/turf/open/floor/F
for(F in orange(1, src))
- F.ChangeTurf(F.baseturf)
+ F.ScrapeAway()
say("Something slams into the floor around [src], exposing it to space!")
if(hull)
sleep(10)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 7831437dc2..41f093a6d2 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -121,7 +121,7 @@
to_chat(user, "You remove the glass panel.")
state = 3
icon_state = "3"
- var/obj/item/stack/sheet/glass/G = new (drop_location(), 2)
+ var/obj/item/stack/sheet/glass/G = new(drop_location(), 2)
G.add_fingerprint(user)
return
if(istype(P, /obj/item/screwdriver))
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 53426c83b0..ec89cc514d 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -135,7 +135,7 @@
for(var/turf/closed/T in range(2, src))
here.ChangeTurf(T.type)
return INITIALIZE_HINT_QDEL
- here.ChangeTurf(/turf/closed/wall)
+ here.PlaceOnTop(/turf/closed/wall)
if(9 to 11)
lights = FALSE
locked = TRUE
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index ee9b1ff31a..541c931593 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(allCasters)
var/creationTime
var/authorCensor
var/bodyCensor
+ var/photo_file
/datum/newscaster/feed_message/proc/returnAuthor(censor)
if(censor == -1)
@@ -97,6 +98,7 @@ GLOBAL_LIST_EMPTY(allCasters)
var/scannedUser
var/isAdminMsg
var/icon/img
+ var/photo_file
/datum/newscaster/feed_network
var/list/datum/newscaster/feed_channel/network_channels = list()
@@ -126,6 +128,7 @@ GLOBAL_LIST_EMPTY(allCasters)
if(photo)
newMsg.img = photo.img
newMsg.caption = photo.scribble
+ newMsg.photo_file = save_photo(photo.img)
for(var/datum/newscaster/feed_channel/FC in network_channels)
if(FC.channel_name == channel_name)
FC.messages += newMsg
@@ -143,6 +146,7 @@ GLOBAL_LIST_EMPTY(allCasters)
wanted_issue.isAdminMsg = adminMsg
if(photo)
wanted_issue.img = photo.img
+ wanted_issue.photo_file = save_photo(photo.img)
if(newMessage)
for(var/obj/machinery/newscaster/N in GLOB.allCasters)
N.newsAlert()
@@ -157,7 +161,12 @@ GLOBAL_LIST_EMPTY(allCasters)
for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
NEWSCASTER.update_icon()
-
+/datum/newscaster/feed_network/proc/save_photo(icon/photo)
+ var/photo_file = copytext(md5("\icon[photo]"), 1, 6)
+ if(!fexists("[GLOB.log_directory]/photos/[photo_file].png"))
+ var/icon/p = icon(photo, frame = 1)
+ fcopy(p, "[GLOB.log_directory]/photos/[photo_file].png")
+ return photo_file
/obj/item/wallframe/newscaster
name = "newscaster frame"
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index a67ce24c9c..f3d3933428 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -154,11 +154,8 @@
to_chat(usr, "There's not enough room to build that here!")
qdel(C)
return
-
-
if(href_list["dir"])
C.setDir(text2num(href_list["dir"]))
-
C.add_fingerprint(usr)
C.update_icon()
wait = world.time + 15
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 53c0b746bd..307107d517 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -236,8 +236,7 @@
visible_message("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.")
playsound(src, 'sound/machines/airlockclose.ogg', 25, 1)
for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
- I.clean_blood()
- I.fingerprints = list()
+ I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG)
var/datum/component/radioactive/contamination = I.GetComponent(/datum/component/radioactive)
if(contamination)
qdel(contamination)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index d3598d4866..1d0228d737 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -684,10 +684,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
desc = "Uh oh!"
/obj/machinery/vending/snack/random/Initialize()
- ..()
- var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
- new T(get_turf(src))
- return INITIALIZE_HINT_QDEL
+ ..()
+ var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
+ new T(loc)
+ return INITIALIZE_HINT_QDEL
/obj/machinery/vending/snack/blue
icon_state = "snackblue"
@@ -737,10 +737,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
desc = "Uh oh!"
/obj/machinery/vending/cola/random/Initialize()
- . = ..()
- var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
- new T(get_turf(src))
- return INITIALIZE_HINT_QDEL
+ ..()
+ var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
+ new T(loc)
+ return INITIALIZE_HINT_QDEL
/obj/machinery/vending/cola/blue
icon_state = "Cola_Machine"
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index f1384c0ea3..b48f14e508 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -12,6 +12,10 @@
var/obj/item/color_source
var/max_wash_capacity = 5
+/obj/machinery/washing_machine/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
+
/obj/machinery/washing_machine/examine(mob/user)
..()
to_chat(user, "Alt-click it to start a wash cycle.")
@@ -36,20 +40,17 @@
busy = TRUE
update_icon()
- sleep(200)
- wash_cycle()
+ addtimer(CALLBACK(src, .proc/wash_cycle), 200)
-/obj/machinery/washing_machine/clean_blood()
- ..()
+/obj/machinery/washing_machine/proc/clean_blood()
if(!busy)
- bloody_mess = 0
+ bloody_mess = FALSE
update_icon()
-
/obj/machinery/washing_machine/proc/wash_cycle()
for(var/X in contents)
var/atom/movable/AM = X
- AM.clean_blood()
+ AM.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
AM.machine_wash(src)
busy = FALSE
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index f076b723ae..a52c8d1438 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -222,14 +222,14 @@
occupant_message("Deconstructing [W]...")
if(do_after_cooldown(W))
chassis.spark_system.start()
- W.ChangeTurf(/turf/open/floor/plating)
+ W.ScrapeAway()
playsound(W, 'sound/items/deconstruct.ogg', 50, 1)
else if(isfloorturf(target))
var/turf/open/floor/F = target
occupant_message("Deconstructing [F]...")
if(do_after_cooldown(target))
chassis.spark_system.start()
- F.ChangeTurf(F.baseturf)
+ F.ScrapeAway()
playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
else if (istype(target, /obj/machinery/door/airlock))
occupant_message("Deconstructing [target]...")
@@ -242,14 +242,14 @@
var/turf/open/space/S = target
occupant_message("Building Floor...")
if(do_after_cooldown(S))
- S.ChangeTurf(/turf/open/floor/plating)
+ S.PlaceOnTop(/turf/open/floor/plating)
playsound(S, 'sound/items/deconstruct.ogg', 50, 1)
chassis.spark_system.start()
else if(isfloorturf(target))
var/turf/open/floor/F = target
occupant_message("Building Wall...")
if(do_after_cooldown(F))
- F.ChangeTurf(/turf/closed/wall)
+ F.PlaceOnTop(/turf/closed/wall)
playsound(F, 'sound/items/deconstruct.ogg', 50, 1)
chassis.spark_system.start()
if(2)
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index ccacd133e8..aabf382ff2 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -4,7 +4,7 @@
icon_state = "recharge_floor" // Some people just want to watch the world burn i guess
/turf/open/floor/mech_bay_recharge_floor/break_tile()
- src.ChangeTurf(/turf/open/floor/plating)
+ ScrapeAway()
/turf/open/floor/mech_bay_recharge_floor/airless
icon_state = "recharge_floor_asteroid"
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index f06525863d..d6b70604af 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -79,14 +79,11 @@
add_blood = bloodiness
bloodiness -= add_blood
S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS,S.bloody_shoes[blood_state]+add_blood)
- if(blood_DNA && blood_DNA.len)
- S.add_blood(blood_DNA)
+ S.add_blood_DNA(return_blood_DNA())
S.blood_state = blood_state
update_icon()
H.update_inv_shoes()
-
-
/obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))
return bloodiness
diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm
index 333da7f48a..55d5d32ffc 100644
--- a/code/game/objects/effects/decals/cleanable/aliens.dm
+++ b/code/game/objects/effects/decals/cleanable/aliens.dm
@@ -6,10 +6,13 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
- blood_DNA = list("UNKNOWN DNA" = "X*")
bloodiness = MAX_SHOE_BLOODINESS
blood_state = BLOOD_STATE_XENO
+/obj/effect/decal/cleanable/xenoblood/Initialize()
+ . = ..()
+ add_blood_DNA(list("UNKNOWN DNA" = "X*"))
+
/obj/effect/decal/cleanable/xenoblood/xsplatter
random_icon_states = list("xgibbl1", "xgibbl2", "xgibbl3", "xgibbl4", "xgibbl5")
@@ -62,4 +65,7 @@
/obj/effect/decal/cleanable/blood/xtracks
icon_state = "xtracks"
random_icon_states = null
- blood_DNA = list("UNKNOWN DNA" = "X*")
+
+/obj/effect/decal/cleanable/blood/xtracks/Initialize()
+ . = ..()
+ add_blood_DNA(list("Unknown DNA" = "X*"))
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index 42aec1582e..fbcf22fb90 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -4,13 +4,11 @@
icon = 'icons/effects/blood.dmi'
icon_state = "floor1"
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
- blood_DNA = list()
blood_state = BLOOD_STATE_HUMAN
bloodiness = MAX_SHOE_BLOODINESS
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
- if (C.blood_DNA)
- blood_DNA |= C.blood_DNA.Copy()
+ add_blood_DNA(C.return_blood_DNA())
..()
/obj/effect/decal/cleanable/blood/old
@@ -21,7 +19,7 @@
/obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
. = ..()
icon_state += "-old" //This IS necessary because the parent /blood type uses icon randomization.
- blood_DNA["Non-human DNA"] = "A+"
+ add_blood_DNA(list("Non-human DNA" = "A+"))
/obj/effect/decal/cleanable/blood/splatter
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
@@ -37,11 +35,9 @@
desc = "Your instincts say you shouldn't be following these."
random_icon_states = null
var/list/existing_dirs = list()
- blood_DNA = list()
/obj/effect/decal/cleanable/trail_holder/can_bloodcrawl_in()
- return 1
-
+ return TRUE
/obj/effect/decal/cleanable/blood/gibs
name = "gibs"
@@ -100,8 +96,7 @@
. = ..()
setDir(pick(1,2,4,8))
icon_state += "-old"
- blood_DNA["Non-human DNA"] = "A+"
-
+ add_blood_DNA(list("Non-human DNA" = "A+"))
/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
@@ -111,9 +106,8 @@
bloodiness = 0
var/drips = 1
-
/obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in()
- return 1
+ return TRUE
//BLOODY FOOTPRINTS
@@ -151,7 +145,7 @@
if (!(exited_dirs & H.dir))
exited_dirs |= H.dir
update_icon()
-
+
/obj/effect/decal/cleanable/blood/footprints/update_icon()
cut_overlays()
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 3459bfc954..d7b6340c26 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -76,7 +76,7 @@
if(metal)
var/turf/T = get_turf(src)
if(isspaceturf(T)) //Block up any exposed space
- T.ChangeTurf(/turf/open/floor/plating/foam)
+ T.PlaceOnTop(/turf/open/floor/plating/foam)
for(var/direction in GLOB.cardinals)
var/turf/cardinal_turf = get_step(T, direction)
if(get_area(cardinal_turf) != get_area(T)) //We're at an area boundary, so let's block off this turf!
diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm
index 43f10dc45e..79627a7a80 100644
--- a/code/game/objects/effects/spawners/gibspawner.dm
+++ b/code/game/objects/effects/spawners/gibspawner.dm
@@ -30,9 +30,9 @@
digester.stomach_contents += gib
if(MobDNA)
- gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type
+
else if(istype(src, /obj/effect/gibspawner/generic)) // Probably a monkey
- gib.blood_DNA["Non-human DNA"] = "A+"
+ gib.add_blood_DNA(list("Non-human DNA" = "A+"))
var/list/directions = gibdirections[i]
if(isturf(loc))
if(directions.len)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 34e6793d5b..a2ff5b0674 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -5,19 +5,29 @@
var/lootcount = 1 //how many items will be spawned
var/lootdoubles = TRUE //if the same item can be spawned twice
var/list/loot //a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
+ var/fan_out_items = FALSE //Whether the items should be distributed to offsets 0,3,-3,6,-6,9,-9.. This overrides pixel_x/y on the spawner itself
/obj/effect/spawner/lootdrop/Initialize(mapload)
..()
if(loot && loot.len)
var/turf/T = get_turf(src)
- while(lootcount && loot.len)
+ var/loot_spawned = 0
+ while((lootcount-loot_spawned) && loot.len)
var/lootspawn = pickweight(loot)
if(!lootdoubles)
loot.Remove(lootspawn)
if(lootspawn)
- new lootspawn(T)
- lootcount--
+ var/atom/movable/spawned_loot = new lootspawn(T)
+ if (!fan_out_items)
+ if (pixel_x != 0)
+ spawned_loot.pixel_x = pixel_x
+ if (pixel_y != 0)
+ spawned_loot.pixel_y = pixel_y
+ else
+ if (loot_spawned)
+ spawned_loot.pixel_x = spawned_loot.pixel_y = ((!(loot_spawned%2)*loot_spawned/2)*-3)+((loot_spawned%2)*(loot_spawned+1)/2*3)
+ loot_spawned++
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/lootdrop/armory_contraband
diff --git a/code/game/objects/effects/spawners/vaultspawner.dm b/code/game/objects/effects/spawners/vaultspawner.dm
index 0b39f3a5a5..9bdf0a673e 100644
--- a/code/game/objects/effects/spawners/vaultspawner.dm
+++ b/code/game/objects/effects/spawners/vaultspawner.dm
@@ -20,9 +20,9 @@
for(var/j = lowBoundY,j<=hiBoundY,j++)
var/turf/T = locate(i,j,z)
if(i == lowBoundX || i == hiBoundX || j == lowBoundY || j == hiBoundY)
- T.ChangeTurf(/turf/closed/wall/vault)
+ T.PlaceOnTop(/turf/closed/wall/vault)
else
- T.ChangeTurf(/turf/open/floor/vault)
+ T.PlaceOnTop(/turf/open/floor/vault)
T.icon_state = "[type]vault"
qdel(src)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index e03d8c1a7e..11edcb11b2 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -553,20 +553,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(M.become_blind())
to_chat(M, "You go blind!")
-/obj/item/clean_blood()
- . = ..()
- if(.)
- if(initial(icon) && initial(icon_state))
- var/index = blood_splatter_index()
- var/icon/blood_splatter_icon = GLOB.blood_splatter_icons[index]
- if(blood_splatter_icon)
- cut_overlay(blood_splatter_icon)
-
-/obj/item/clothing/gloves/clean_blood()
- . = ..()
- if(.)
- transfer_blood = 0
-
/obj/item/singularity_pull(S, current_size)
..()
if(current_size >= STAGE_FOUR)
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index f2a804e9e9..e9ccda03ea 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -86,7 +86,7 @@
var/obj/effect/decal/cleanable/C = locate() in target
qdel(C)
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- target.clean_blood()
+ target.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
target.wash_cream()
return
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 739ea246b7..7fc8df79ee 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -493,7 +493,7 @@
color = null
/obj/item/device/flashlight/glowstick/random/Initialize()
- . = ..()
+ ..()
var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
new T(loc)
return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 3e9ce8c341..9cd0ca5d29 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -139,8 +139,8 @@
else
icon_state = initial(icon_state)
-/obj/item/device/radio/intercom/add_blood(list/blood_dna)
- return 0
+/obj/item/device/radio/intercom/add_blood_DNA(list/blood_dna)
+ return FALSE
//Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
/obj/item/wallframe/intercom
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index 3a351a6514..8cc6d6b179 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -233,7 +233,7 @@
/obj/item/flamethrower/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
var/obj/item/projectile/P = hitby
if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15))
- owner.visible_message("[attack_text] hits the fueltank on [owner]'s [src], rupturing it! What a shot!")
+ owner.visible_message("\The [attack_text] hits the fueltank on [owner]'s [name], rupturing it! What a shot!")
var/target_turf = get_turf(owner)
igniter.ignite_turf(src,target_turf, release_amount = 100)
qdel(ptank)
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 32e0d937bd..2141fba7e8 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -77,3 +77,40 @@
if (!healthstring)
healthstring = "ERROR"
return healthstring
+
+/obj/item/implant/radio
+ name = "internal radio implant"
+ desc = "Are you there God? It's me, Syndicate Comms Agent."
+ activated = TRUE
+ var/obj/item/device/radio/radio
+ var/radio_key = /obj/item/device/encryptionkey/syndicate
+ icon = 'icons/obj/radio.dmi'
+ icon_state = "walkietalkie"
+
+/obj/item/implant/radio/activate()
+ // needs to be GLOB.deep_inventory_state otherwise it won't open
+ radio.ui_interact(usr, "main", null, FALSE, null, GLOB.deep_inventory_state)
+
+/obj/item/implant/radio/Initialize(mapload)
+ . = ..()
+
+ radio = new(src)
+ // almost like an internal headset, but without the
+ // "must be in ears to hear" restriction.
+ radio.name = "internal radio"
+ radio.subspace_transmission = TRUE
+ radio.canhear_range = 0
+ radio.keyslot = new radio_key
+ radio.recalculateChannels()
+
+
+/obj/item/implant/radio/get_data()
+ var/dat = {"Implant Specifications:
+ Name: Internal Radio Implant
+ Life: 24 hours
+ Implant Details: Allows user to use an internal radio, useful if user expects equipment loss, or cannot equip conventional radios."}
+ return dat
+
+/obj/item/implanter/radio
+ name = "implanter (internal radio)"
+ imp_type = /obj/item/implant/radio
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 6eaf3f08bd..146bcbb3c3 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -20,8 +20,8 @@
user.visible_message("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!")
return (BRUTELOSS|FIRELOSS)
-/obj/item/melee/transforming/energy/add_blood(list/blood_dna)
- return 0
+/obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
+ return FALSE
/obj/item/melee/transforming/energy/is_sharp()
return active * sharpness
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 823def4936..3f1b5cd54e 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -275,17 +275,18 @@
consume_turf(target)
/obj/item/melee/supermatter_sword/proc/consume_turf(turf/T)
- if(istype(T, T.baseturf))
- return //Can't void the void, baby!
+ var/oldtype = T.type
+ var/turf/newT = T.ScrapeAway()
+ if(newT.type == oldtype)
+ return
playsound(T, 'sound/effects/supermatter.ogg', 50, 1)
T.visible_message("[T] smacks into [src] and rapidly flashes to ash.",\
"You hear a loud crack as you are washed with a wave of heat.")
shard.Consume()
- T.ChangeTurf(T.baseturf)
T.CalculateAdjacentTurfs()
-/obj/item/melee/supermatter_sword/add_blood(list/blood_dna)
- return 0
+/obj/item/melee/supermatter_sword/add_blood_DNA(list/blood_dna)
+ return FALSE
/obj/item/melee/curator_whip
name = "curator's whip"
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index e47cafdea9..45c687a66f 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -23,7 +23,6 @@
/obj/item/mop/proc/clean(turf/A)
if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1) || reagents.has_reagent("cleaner", 1))
- A.clean_blood()
A.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
for(var/obj/effect/O in A)
if(is_cleanable(O))
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 5e80353db9..0e92d578a1 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -336,10 +336,10 @@
else
. = ..()
-/obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
- blood_DNA = from.blood_DNA
- fingerprints = from.fingerprints
- fingerprintshidden = from.fingerprintshidden
+/obj/item/stack/proc/copy_evidences(obj/item/stack/from)
+ add_blood_DNA(from.return_blood_DNA())
+ add_fingerprint_list(from.return_fingerprints())
+ add_hiddenprint_list(from.return_hiddenprints())
fingerprintslast = from.fingerprintslast
//TODO bloody overlay
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 4c85a3b0e9..c88dc51474 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -212,5 +212,5 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
else
return ..(M,user,heal_mode = FALSE)
-/obj/item/storage/book/bible/syndicate/add_blood(list/blood_dna)
+/obj/item/storage/book/bible/syndicate/add_blood_DNA(list/blood_dna)
return FALSE
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 3718ca1a0f..fb44d094c7 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -1,307 +1,310 @@
-/obj/item/storage/box/syndicate
-
-/obj/item/storage/box/syndicate/PopulateContents()
- switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1)))
- if("bloodyspai") // 27 tc now this is more right
- new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
- new /obj/item/clothing/mask/chameleon(src) // Goes with above
- new /obj/item/card/id/syndicate(src) // 2 tc
- new /obj/item/clothing/shoes/chameleon(src) // 2 tc
- new /obj/item/device/camera_bug(src) // 1 tc
- new /obj/item/device/multitool/ai_detect(src) // 1 tc
- new /obj/item/device/encryptionkey/syndicate(src) // 2 tc
- new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc
- new /obj/item/switchblade(src) //I'll count this as 2 tc
- new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
- new /obj/item/device/flashlight/emp(src) // 2 tc
- new /obj/item/device/chameleon(src) // 7 tc
-
- if("stealth") // 31 tc
- new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
- new /obj/item/pen/sleepy(src)
- new /obj/item/device/healthanalyzer/rad_laser(src)
- new /obj/item/device/chameleon(src)
- new /obj/item/soap/syndie(src)
- new /obj/item/clothing/glasses/thermal/syndi(src)
-
- if("bond") // 29 tc
- new /obj/item/gun/ballistic/automatic/pistol(src)
- new /obj/item/suppressor(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
- new /obj/item/ammo_box/magazine/m10mm(src)
- new /obj/item/clothing/under/chameleon(src)
- new /obj/item/card/id/syndicate(src)
- new /obj/item/reagent_containers/syringe/stimulants(src)
-
- if("screwed") // 29 tc
- new /obj/item/device/sbeacondrop/bomb(src)
- new /obj/item/grenade/syndieminibomb(src)
- new /obj/item/device/sbeacondrop/powersink(src)
- new /obj/item/clothing/suit/space/syndicate/black/red(src)
- new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
- new /obj/item/device/encryptionkey/syndicate(src)
-
- if("guns") // 28 tc now
- new /obj/item/gun/ballistic/revolver(src)
- new /obj/item/ammo_box/a357(src)
- new /obj/item/ammo_box/a357(src)
- new /obj/item/card/emag(src)
- new /obj/item/grenade/plastic/c4(src)
- new /obj/item/clothing/gloves/color/latex/nitrile(src)
- new /obj/item/clothing/mask/gas/clown_hat(src)
- new /obj/item/clothing/under/suit_jacket/really_black(src)
-
- if("murder") // 28 tc now
- new /obj/item/melee/transforming/energy/sword/saber(src)
- new /obj/item/clothing/glasses/thermal/syndi(src)
- new /obj/item/card/emag(src)
- new /obj/item/clothing/shoes/chameleon(src)
- new /obj/item/device/encryptionkey/syndicate(src)
- new /obj/item/grenade/syndieminibomb(src)
-
- if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
- new /obj/item/implanter/freedom(src)
- new /obj/item/implanter/uplink/precharged(src)
- new /obj/item/implanter/emp(src)
- new /obj/item/implanter/adrenalin(src)
- new /obj/item/implanter/explosive(src)
- new /obj/item/implanter/storage(src)
-
- if("hacker") // 26 tc
- new /obj/item/aiModule/syndicate(src)
- new /obj/item/card/emag(src)
- new /obj/item/device/encryptionkey/binary(src)
- new /obj/item/aiModule/toyAI(src)
- new /obj/item/device/multitool/ai_detect(src)
-
- if("lordsingulo") // 24 tc
- new /obj/item/device/sbeacondrop(src)
- new /obj/item/clothing/suit/space/syndicate/black/red(src)
- new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
- new /obj/item/card/emag(src)
-
- if("sabotage") // 26 tc now
- new /obj/item/grenade/plastic/c4 (src)
- new /obj/item/grenade/plastic/c4 (src)
- new /obj/item/device/doorCharge(src)
- new /obj/item/device/doorCharge(src)
- new /obj/item/device/camera_bug(src)
- new /obj/item/device/sbeacondrop/powersink(src)
- new /obj/item/cartridge/virus/syndicate(src)
- new /obj/item/storage/toolbox/syndicate(src) //To actually get to those places
- new /obj/item/pizzabox/bomb
-
- if("darklord") //20 tc + tk + summon item close enough for now
- new /obj/item/twohanded/dualsaber(src)
- new /obj/item/dnainjector/telemut/darkbundle(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
- new /obj/item/card/id/syndicate(src)
- new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks
- new /obj/item/spellbook/oneuse/summonitem(src)
-
- if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
- new /obj/item/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
- new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
- new /obj/item/clothing/glasses/thermal/syndi(src)
- new /obj/item/clothing/gloves/color/latex/nitrile(src)
- new /obj/item/clothing/mask/gas/clown_hat(src)
- new /obj/item/clothing/under/suit_jacket/really_black(src)
-
- if("metaops") // 30 tc
- new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
- new /obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted(src) // 8 tc
- new /obj/item/implanter/explosive(src) // 2 tc
- new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
- new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
- new /obj/item/grenade/plastic/c4 (src) // 1 tc
- new /obj/item/grenade/plastic/c4 (src) // 1 tc
- new /obj/item/card/emag(src) // 6 tc
-
- if("ninja") // 33 tc worth
- new /obj/item/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
- new /obj/item/implanter/adrenalin(src) // 8 tc
- new /obj/item/throwing_star(src) // ~5 tc for all 6
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/storage/belt/chameleon(src) // Unique but worth at least 2 tc
- new /obj/item/card/id/syndicate(src) // 2 tc
- new /obj/item/device/chameleon(src) // 7 tc
-
-/obj/item/storage/box/syndie_kit
- name = "box"
- desc = "A sleek, sturdy box."
- icon_state = "syndiebox"
- illustration = "writing_syndie"
-
-/obj/item/storage/box/syndie_kit/imp_freedom
- name = "boxed freedom implant (with injector)"
-
-/obj/item/storage/box/syndie_kit/imp_freedom/PopulateContents()
- var/obj/item/implanter/O = new(src)
- O.imp = new /obj/item/implant/freedom(O)
- O.update_icon()
-
-/obj/item/storage/box/syndie_kit/imp_microbomb
- name = "Microbomb Implant (with injector)"
-
-/obj/item/storage/box/syndie_kit/imp_microbomb/PopulateContents()
- var/obj/item/implanter/O = new(src)
- O.imp = new /obj/item/implant/explosive(O)
- O.update_icon()
-
-/obj/item/storage/box/syndie_kit/imp_macrobomb
- name = "Macrobomb Implant (with injector)"
-
-/obj/item/storage/box/syndie_kit/imp_macrobomb/PopulateContents()
- var/obj/item/implanter/O = new(src)
- O.imp = new /obj/item/implant/explosive/macro(O)
- O.update_icon()
-
-/obj/item/storage/box/syndie_kit/imp_uplink
- name = "boxed uplink implant (with injector)"
-
-/obj/item/storage/box/syndie_kit/imp_uplink/PopulateContents()
- ..()
- var/obj/item/implanter/O = new(src)
- O.imp = new /obj/item/implant/uplink(O)
- O.update_icon()
-
-/obj/item/storage/box/syndie_kit/bioterror
- name = "bioterror syringe box"
-
-/obj/item/storage/box/syndie_kit/bioterror/PopulateContents()
- for(var/i in 1 to 7)
- new /obj/item/reagent_containers/syringe/bioterror(src)
-
-/obj/item/storage/box/syndie_kit/imp_adrenal
- name = "boxed adrenal implant (with injector)"
-
-/obj/item/storage/box/syndie_kit/imp_adrenal/PopulateContents()
- var/obj/item/implanter/O = new(src)
- O.imp = new /obj/item/implant/adrenalin(O)
- O.update_icon()
-
-/obj/item/storage/box/syndie_kit/imp_storage
- name = "boxed storage implant (with injector)"
-
-/obj/item/storage/box/syndie_kit/imp_storage/PopulateContents()
- new /obj/item/implanter/storage(src)
-
-/obj/item/storage/box/syndie_kit/space
- name = "boxed space suit and helmet"
- can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)
- max_w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/storage/box/syndie_kit/space/PopulateContents()
- new /obj/item/clothing/suit/space/syndicate/black/red(src) // Black and red is so in right now
- new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
-
-/obj/item/storage/box/syndie_kit/emp
- name = "boxed EMP kit"
-
-/obj/item/storage/box/syndie_kit/emp/PopulateContents()
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/empgrenade(src)
- new /obj/item/implanter/emp(src)
-
-/obj/item/storage/box/syndie_kit/chemical
- name = "boxed chemical kit"
- storage_slots = 14
-
-/obj/item/storage/box/syndie_kit/chemical/PopulateContents()
- new /obj/item/reagent_containers/glass/bottle/polonium(src)
- new /obj/item/reagent_containers/glass/bottle/venom(src)
- new /obj/item/reagent_containers/glass/bottle/neurotoxin2(src)
- new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
- new /obj/item/reagent_containers/glass/bottle/spewium(src)
- new /obj/item/reagent_containers/glass/bottle/cyanide(src)
- new /obj/item/reagent_containers/glass/bottle/histamine(src)
- new /obj/item/reagent_containers/glass/bottle/initropidril(src)
- new /obj/item/reagent_containers/glass/bottle/pancuronium(src)
- new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src)
- new /obj/item/reagent_containers/glass/bottle/coniine(src)
- new /obj/item/reagent_containers/glass/bottle/curare(src)
- new /obj/item/reagent_containers/glass/bottle/amanitin(src)
- new /obj/item/reagent_containers/syringe(src)
-
-/obj/item/storage/box/syndie_kit/nuke
- name = "box"
-
-/obj/item/storage/box/syndie_kit/nuke/PopulateContents()
- new /obj/item/screwdriver/nuke(src)
- new /obj/item/nuke_core_container(src)
- new /obj/item/paper/guides/antag/nuke_instructions(src)
-
-/obj/item/storage/box/syndie_kit/supermatter
- name = "box"
-
-/obj/item/storage/box/syndie_kit/supermatter/PopulateContents()
- new /obj/item/scalpel/supermatter(src)
- new /obj/item/hemostat/supermatter(src)
- new /obj/item/nuke_core_container/supermatter(src)
- new /obj/item/paper/guides/antag/supermatter_sliver(src)
-
-/obj/item/storage/box/syndie_kit/tuberculosisgrenade
- name = "boxed virus grenade kit"
-
-/obj/item/storage/box/syndie_kit/tuberculosisgrenade/PopulateContents()
- new /obj/item/grenade/chem_grenade/tuberculosis(src)
- for(var/i in 1 to 5)
- new /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure(src)
- new /obj/item/reagent_containers/syringe(src)
- new /obj/item/reagent_containers/glass/bottle/tuberculosiscure(src)
-
-/obj/item/storage/box/syndie_kit/chameleon
- name = "chameleon kit"
-
-/obj/item/storage/box/syndie_kit/chameleon/PopulateContents()
- new /obj/item/clothing/under/chameleon(src)
- new /obj/item/clothing/suit/chameleon(src)
- new /obj/item/clothing/gloves/chameleon(src)
- new /obj/item/clothing/shoes/chameleon(src)
- new /obj/item/clothing/glasses/chameleon(src)
- new /obj/item/clothing/head/chameleon(src)
- new /obj/item/clothing/mask/chameleon(src)
- new /obj/item/storage/backpack/chameleon(src)
- new /obj/item/device/radio/headset/chameleon(src)
- new /obj/item/stamp/chameleon(src)
- new /obj/item/device/pda/chameleon(src)
- new /obj/item/gun/energy/laser/chameleon(src)
-
-//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars.
-//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance)
-/obj/item/storage/box/syndie_kit/throwing_weapons/PopulateContents()
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/throwing_star(src)
- new /obj/item/restraints/legcuffs/bola/tactical(src)
- new /obj/item/restraints/legcuffs/bola/tactical(src)
-
-/obj/item/storage/box/syndie_kit/cutouts/PopulateContents()
- for(var/i in 1 to 3)
- new/obj/item/cardboard_cutout/adaptive(src)
- new/obj/item/toy/crayon/rainbow(src)
-
-/obj/item/storage/box/syndie_kit/romerol/PopulateContents()
- new /obj/item/reagent_containers/glass/bottle/romerol(src)
- new /obj/item/reagent_containers/syringe(src)
- new /obj/item/reagent_containers/dropper(src)
-
-/obj/item/storage/box/syndie_kit/ez_clean/PopulateContents()
- for(var/i in 1 to 3)
- new/obj/item/grenade/chem_grenade/ez_clean(src)
-
-/obj/item/storage/box/hug/reverse_revolver/PopulateContents()
- new /obj/item/gun/ballistic/revolver/reverse(src)
-
-/obj/item/storage/box/syndie_kit/mimery/PopulateContents()
- new /obj/item/spellbook/oneuse/mimery_blockade(src)
- new /obj/item/spellbook/oneuse/mimery_guns(src)
+/obj/item/storage/box/syndicate
+
+/obj/item/storage/box/syndicate/PopulateContents()
+ switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1)))
+ if("bloodyspai") // 27 tc now this is more right
+ new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
+ new /obj/item/clothing/mask/chameleon(src) // Goes with above
+ new /obj/item/card/id/syndicate(src) // 2 tc
+ new /obj/item/clothing/shoes/chameleon(src) // 2 tc
+ new /obj/item/device/camera_bug(src) // 1 tc
+ new /obj/item/device/multitool/ai_detect(src) // 1 tc
+ new /obj/item/device/encryptionkey/syndicate(src) // 2 tc
+ new /obj/item/reagent_containers/syringe/mulligan(src) // 4 tc
+ new /obj/item/switchblade(src) //I'll count this as 2 tc
+ new /obj/item/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
+ new /obj/item/device/flashlight/emp(src) // 2 tc
+ new /obj/item/device/chameleon(src) // 7 tc
+
+ if("stealth") // 31 tc
+ new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
+ new /obj/item/pen/sleepy(src)
+ new /obj/item/device/healthanalyzer/rad_laser(src)
+ new /obj/item/device/chameleon(src)
+ new /obj/item/soap/syndie(src)
+ new /obj/item/clothing/glasses/thermal/syndi(src)
+
+ if("bond") // 29 tc
+ new /obj/item/gun/ballistic/automatic/pistol(src)
+ new /obj/item/suppressor(src)
+ new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/ammo_box/magazine/m10mm(src)
+ new /obj/item/clothing/under/chameleon(src)
+ new /obj/item/card/id/syndicate(src)
+ new /obj/item/reagent_containers/syringe/stimulants(src)
+
+ if("screwed") // 29 tc
+ new /obj/item/device/sbeacondrop/bomb(src)
+ new /obj/item/grenade/syndieminibomb(src)
+ new /obj/item/device/sbeacondrop/powersink(src)
+ new /obj/item/clothing/suit/space/syndicate/black/red(src)
+ new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+ new /obj/item/device/encryptionkey/syndicate(src)
+
+ if("guns") // 28 tc now
+ new /obj/item/gun/ballistic/revolver(src)
+ new /obj/item/ammo_box/a357(src)
+ new /obj/item/ammo_box/a357(src)
+ new /obj/item/card/emag(src)
+ new /obj/item/grenade/plastic/c4(src)
+ new /obj/item/clothing/gloves/color/latex/nitrile(src)
+ new /obj/item/clothing/mask/gas/clown_hat(src)
+ new /obj/item/clothing/under/suit_jacket/really_black(src)
+
+ if("murder") // 28 tc now
+ new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/clothing/glasses/thermal/syndi(src)
+ new /obj/item/card/emag(src)
+ new /obj/item/clothing/shoes/chameleon(src)
+ new /obj/item/device/encryptionkey/syndicate(src)
+ new /obj/item/grenade/syndieminibomb(src)
+
+ if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
+ new /obj/item/implanter/freedom(src)
+ new /obj/item/implanter/uplink/precharged(src)
+ new /obj/item/implanter/emp(src)
+ new /obj/item/implanter/adrenalin(src)
+ new /obj/item/implanter/explosive(src)
+ new /obj/item/implanter/storage(src)
+
+ if("hacker") // 26 tc
+ new /obj/item/aiModule/syndicate(src)
+ new /obj/item/card/emag(src)
+ new /obj/item/device/encryptionkey/binary(src)
+ new /obj/item/aiModule/toyAI(src)
+ new /obj/item/device/multitool/ai_detect(src)
+
+ if("lordsingulo") // 24 tc
+ new /obj/item/device/sbeacondrop(src)
+ new /obj/item/clothing/suit/space/syndicate/black/red(src)
+ new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+ new /obj/item/card/emag(src)
+
+ if("sabotage") // 26 tc now
+ new /obj/item/grenade/plastic/c4 (src)
+ new /obj/item/grenade/plastic/c4 (src)
+ new /obj/item/device/doorCharge(src)
+ new /obj/item/device/doorCharge(src)
+ new /obj/item/device/camera_bug(src)
+ new /obj/item/device/sbeacondrop/powersink(src)
+ new /obj/item/cartridge/virus/syndicate(src)
+ new /obj/item/storage/toolbox/syndicate(src) //To actually get to those places
+ new /obj/item/pizzabox/bomb
+
+ if("darklord") //20 tc + tk + summon item close enough for now
+ new /obj/item/twohanded/dualsaber(src)
+ new /obj/item/dnainjector/telemut/darkbundle(src)
+ new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
+ new /obj/item/card/id/syndicate(src)
+ new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks
+ new /obj/item/spellbook/oneuse/summonitem(src)
+
+ if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
+ new /obj/item/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
+ new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+ new /obj/item/clothing/glasses/thermal/syndi(src)
+ new /obj/item/clothing/gloves/color/latex/nitrile(src)
+ new /obj/item/clothing/mask/gas/clown_hat(src)
+ new /obj/item/clothing/under/suit_jacket/really_black(src)
+
+ if("metaops") // 30 tc
+ new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
+ new /obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted(src) // 8 tc
+ new /obj/item/implanter/explosive(src) // 2 tc
+ new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
+ new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
+ new /obj/item/grenade/plastic/c4 (src) // 1 tc
+ new /obj/item/grenade/plastic/c4 (src) // 1 tc
+ new /obj/item/card/emag(src) // 6 tc
+
+ if("ninja") // 33 tc worth
+ new /obj/item/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
+ new /obj/item/implanter/adrenalin(src) // 8 tc
+ new /obj/item/throwing_star(src) // ~5 tc for all 6
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/storage/belt/chameleon(src) // Unique but worth at least 2 tc
+ new /obj/item/card/id/syndicate(src) // 2 tc
+ new /obj/item/device/chameleon(src) // 7 tc
+
+/obj/item/storage/box/syndie_kit
+ name = "box"
+ desc = "A sleek, sturdy box."
+ icon_state = "syndiebox"
+ illustration = "writing_syndie"
+
+/obj/item/storage/box/syndie_kit/imp_freedom
+ name = "boxed freedom implant (with injector)"
+
+/obj/item/storage/box/syndie_kit/imp_freedom/PopulateContents()
+ var/obj/item/implanter/O = new(src)
+ O.imp = new /obj/item/implant/freedom(O)
+ O.update_icon()
+
+/obj/item/storage/box/syndie_kit/imp_microbomb
+ name = "Microbomb Implant (with injector)"
+
+/obj/item/storage/box/syndie_kit/imp_microbomb/PopulateContents()
+ var/obj/item/implanter/O = new(src)
+ O.imp = new /obj/item/implant/explosive(O)
+ O.update_icon()
+
+/obj/item/storage/box/syndie_kit/imp_macrobomb
+ name = "Macrobomb Implant (with injector)"
+
+/obj/item/storage/box/syndie_kit/imp_macrobomb/PopulateContents()
+ var/obj/item/implanter/O = new(src)
+ O.imp = new /obj/item/implant/explosive/macro(O)
+ O.update_icon()
+
+/obj/item/storage/box/syndie_kit/imp_uplink
+ name = "boxed uplink implant (with injector)"
+
+/obj/item/storage/box/syndie_kit/imp_uplink/PopulateContents()
+ ..()
+ var/obj/item/implanter/O = new(src)
+ O.imp = new /obj/item/implant/uplink(O)
+ O.update_icon()
+
+/obj/item/storage/box/syndie_kit/bioterror
+ name = "bioterror syringe box"
+
+/obj/item/storage/box/syndie_kit/bioterror/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/reagent_containers/syringe/bioterror(src)
+
+/obj/item/storage/box/syndie_kit/imp_adrenal
+ name = "boxed adrenal implant (with injector)"
+
+/obj/item/storage/box/syndie_kit/imp_adrenal/PopulateContents()
+ var/obj/item/implanter/O = new(src)
+ O.imp = new /obj/item/implant/adrenalin(O)
+ O.update_icon()
+
+/obj/item/storage/box/syndie_kit/imp_storage
+ name = "boxed storage implant (with injector)"
+
+/obj/item/storage/box/syndie_kit/imp_storage/PopulateContents()
+ new /obj/item/implanter/storage(src)
+
+/obj/item/storage/box/syndie_kit/space
+ name = "boxed space suit and helmet"
+ can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)
+ max_w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/storage/box/syndie_kit/space/PopulateContents()
+ new /obj/item/clothing/suit/space/syndicate/black/red(src) // Black and red is so in right now
+ new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+
+/obj/item/storage/box/syndie_kit/emp
+ name = "boxed EMP kit"
+
+/obj/item/storage/box/syndie_kit/emp/PopulateContents()
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/grenade/empgrenade(src)
+ new /obj/item/implanter/emp(src)
+
+/obj/item/storage/box/syndie_kit/chemical
+ name = "boxed chemical kit"
+ storage_slots = 14
+
+/obj/item/storage/box/syndie_kit/chemical/PopulateContents()
+ new /obj/item/reagent_containers/glass/bottle/polonium(src)
+ new /obj/item/reagent_containers/glass/bottle/venom(src)
+ new /obj/item/reagent_containers/glass/bottle/neurotoxin2(src)
+ new /obj/item/reagent_containers/glass/bottle/formaldehyde(src)
+ new /obj/item/reagent_containers/glass/bottle/spewium(src)
+ new /obj/item/reagent_containers/glass/bottle/cyanide(src)
+ new /obj/item/reagent_containers/glass/bottle/histamine(src)
+ new /obj/item/reagent_containers/glass/bottle/initropidril(src)
+ new /obj/item/reagent_containers/glass/bottle/pancuronium(src)
+ new /obj/item/reagent_containers/glass/bottle/sodium_thiopental(src)
+ new /obj/item/reagent_containers/glass/bottle/coniine(src)
+ new /obj/item/reagent_containers/glass/bottle/curare(src)
+ new /obj/item/reagent_containers/glass/bottle/amanitin(src)
+ new /obj/item/reagent_containers/syringe(src)
+
+/obj/item/storage/box/syndie_kit/nuke
+ name = "box"
+
+/obj/item/storage/box/syndie_kit/nuke/PopulateContents()
+ new /obj/item/screwdriver/nuke(src)
+ new /obj/item/nuke_core_container(src)
+ new /obj/item/paper/guides/antag/nuke_instructions(src)
+
+/obj/item/storage/box/syndie_kit/supermatter
+ name = "box"
+
+/obj/item/storage/box/syndie_kit/supermatter/PopulateContents()
+ new /obj/item/scalpel/supermatter(src)
+ new /obj/item/hemostat/supermatter(src)
+ new /obj/item/nuke_core_container/supermatter(src)
+ new /obj/item/paper/guides/antag/supermatter_sliver(src)
+
+/obj/item/storage/box/syndie_kit/tuberculosisgrenade
+ name = "boxed virus grenade kit"
+
+/obj/item/storage/box/syndie_kit/tuberculosisgrenade/PopulateContents()
+ new /obj/item/grenade/chem_grenade/tuberculosis(src)
+ for(var/i in 1 to 5)
+ new /obj/item/reagent_containers/hypospray/medipen/tuberculosiscure(src)
+ new /obj/item/reagent_containers/syringe(src)
+ new /obj/item/reagent_containers/glass/bottle/tuberculosiscure(src)
+
+/obj/item/storage/box/syndie_kit/chameleon
+ name = "chameleon kit"
+
+/obj/item/storage/box/syndie_kit/chameleon/PopulateContents()
+ new /obj/item/clothing/under/chameleon(src)
+ new /obj/item/clothing/suit/chameleon(src)
+ new /obj/item/clothing/gloves/chameleon(src)
+ new /obj/item/clothing/shoes/chameleon(src)
+ new /obj/item/clothing/glasses/chameleon(src)
+ new /obj/item/clothing/head/chameleon(src)
+ new /obj/item/clothing/mask/chameleon(src)
+ new /obj/item/storage/backpack/chameleon(src)
+ new /obj/item/device/radio/headset/chameleon(src)
+ new /obj/item/stamp/chameleon(src)
+ new /obj/item/device/pda/chameleon(src)
+ new /obj/item/gun/energy/laser/chameleon(src)
+
+//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars.
+//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance)
+/obj/item/storage/box/syndie_kit/throwing_weapons/PopulateContents()
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/throwing_star(src)
+ new /obj/item/restraints/legcuffs/bola/tactical(src)
+ new /obj/item/restraints/legcuffs/bola/tactical(src)
+
+/obj/item/storage/box/syndie_kit/cutouts/PopulateContents()
+ for(var/i in 1 to 3)
+ new/obj/item/cardboard_cutout/adaptive(src)
+ new/obj/item/toy/crayon/rainbow(src)
+
+/obj/item/storage/box/syndie_kit/romerol/PopulateContents()
+ new /obj/item/reagent_containers/glass/bottle/romerol(src)
+ new /obj/item/reagent_containers/syringe(src)
+ new /obj/item/reagent_containers/dropper(src)
+
+/obj/item/storage/box/syndie_kit/ez_clean/PopulateContents()
+ for(var/i in 1 to 3)
+ new/obj/item/grenade/chem_grenade/ez_clean(src)
+
+/obj/item/storage/box/hug/reverse_revolver/PopulateContents()
+ new /obj/item/gun/ballistic/revolver/reverse(src)
+
+/obj/item/storage/box/syndie_kit/mimery/PopulateContents()
+ new /obj/item/spellbook/oneuse/mimery_blockade(src)
+ new /obj/item/spellbook/oneuse/mimery_guns(src)
+
+/obj/item/storage/box/syndie_kit/imp_radio/PopulateContents()
+ new /obj/item/implanter/radio(src)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index b7b48ff043..539c3c70a0 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -293,7 +293,7 @@
icon_state = "dualsaber[item_color][wielded]"
else
icon_state = "dualsaber0"
- clean_blood()//blood overlays get weird otherwise, because the sprite changes.
+ SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/obj/item/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user)
if(user.has_dna())
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index aa9acae22c..e97aedaf98 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -231,10 +231,10 @@ LINEN BINS
desc = "If you're reading this description ingame, something has gone wrong! Honk!"
/obj/item/bedsheet/random/Initialize()
- . = INITIALIZE_HINT_QDEL
..()
var/type = pick(typesof(/obj/item/bedsheet) - /obj/item/bedsheet/random)
new type(loc)
+ return INITIALIZE_HINT_QDEL
/obj/structure/bedsheetbin
name = "linen bin"
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 770442f6c9..ebeb065b2a 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -85,7 +85,7 @@
/obj/structure/falsewall/proc/ChangeToWall(delete = 1)
var/turf/T = get_turf(src)
- T.ChangeTurf(walltype)
+ T.PlaceOnTop(walltype)
if(delete)
qdel(src)
return T
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 594dba355d..190dab7011 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -86,7 +86,7 @@
S.use(5)
to_chat(user, "You add the plating.")
var/turf/T = get_turf(src)
- T.ChangeTurf(/turf/closed/wall/mineral/iron)
+ T.PlaceOnTop(/turf/closed/wall/mineral/iron)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -120,7 +120,7 @@
S.use(2)
to_chat(user, "You add the plating.")
var/turf/T = get_turf(src)
- T.ChangeTurf(/turf/closed/wall)
+ T.PlaceOnTop(/turf/closed/wall)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -150,7 +150,7 @@
S.use(1)
to_chat(user, "You fully reinforce the wall.")
var/turf/T = get_turf(src)
- T.ChangeTurf(/turf/closed/wall/r_wall)
+ T.PlaceOnTop(/turf/closed/wall/r_wall)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -194,7 +194,7 @@
S.use(2)
to_chat(user, "You add the plating.")
var/turf/T = get_turf(src)
- T.ChangeTurf(text2path("/turf/closed/wall/mineral/[M]"))
+ T.PlaceOnTop(text2path("/turf/closed/wall/mineral/[M]"))
transfer_fingerprints_to(T)
qdel(src)
return
@@ -397,7 +397,7 @@
user.visible_message("[user] plates [src] with runed metal.", "You construct a runed wall.")
R.use(1)
var/turf/T = get_turf(src)
- T.ChangeTurf(/turf/closed/wall/mineral/cult)
+ T.PlaceOnTop(/turf/closed/wall/mineral/cult)
qdel(src)
else
@@ -424,7 +424,7 @@
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "You finish a wall.")
- T.ChangeTurf(/turf/closed/wall)
+ T.PlaceOnTop(/turf/closed/wall)
qdel(src)
return TRUE
if(RCD_DECONSTRUCT)
diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm
index ceef3ef0c0..afcace17a7 100644
--- a/code/game/objects/structures/manned_turret.dm
+++ b/code/game/objects/structures/manned_turret.dm
@@ -184,10 +184,10 @@
var/obj/machinery/manned_turret/turret
/obj/item/gun_control/Initialize()
- . = ..()
- turret = loc
- if(!istype(turret))
- return INITIALIZE_HINT_QDEL
+ . = ..()
+ turret = loc
+ if(!istype(turret))
+ return INITIALIZE_HINT_QDEL
/obj/item/gun_control/Destroy()
turret = null
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 77b992704a..ab0f676007 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -296,8 +296,7 @@
/obj/machinery/shower/proc/wash_obj(obj/O)
- O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
- . = O.clean_blood()
+ . = O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
if(isitem(O))
var/obj/item/I = O
@@ -310,7 +309,6 @@
var/turf/tile = loc
tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
tile.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- tile.clean_blood()
for(var/obj/effect/E in tile)
if(is_cleanable(E))
qdel(E)
@@ -361,7 +359,7 @@
else if(H.w_uniform && wash_obj(H.w_uniform))
H.update_inv_w_uniform()
if(washgloves)
- H.clean_blood()
+ H.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
if(H.shoes && washshoes && wash_obj(H.shoes))
H.update_inv_shoes()
if(H.wear_mask && washmask && wash_obj(H.wear_mask))
@@ -378,9 +376,9 @@
else
if(M.wear_mask && wash_obj(M.wear_mask))
M.update_inv_wear_mask(0)
- M.clean_blood()
+ M.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
else
- L.clean_blood()
+ L.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/obj/machinery/shower/proc/contamination_cleanse(atom/movable/thing)
var/datum/component/radioactive/healthy_green_glow = thing.GetComponent(/datum/component/radioactive)
@@ -473,8 +471,7 @@
H.regenerate_icons()
user.drowsyness = max(user.drowsyness - rand(2,3), 0) //Washing your face wakes you up if you're falling asleep
else
- user.clean_blood()
-
+ user.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/obj/structure/sink/attackby(obj/item/O, mob/living/user, params)
if(busy)
@@ -530,7 +527,7 @@
busy = FALSE
return 1
busy = FALSE
- O.clean_blood()
+ O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
O.acid_level = 0
create_reagents(5)
reagents.add_reagent(dispensedreagent, 5)
diff --git a/code/game/turfs/ChangeTurf.dm b/code/game/turfs/ChangeTurf.dm
new file mode 100644
index 0000000000..b3e542ca0f
--- /dev/null
+++ b/code/game/turfs/ChangeTurf.dm
@@ -0,0 +1,232 @@
+/turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, flags)
+ // Remove all atoms except observers, landmarks, docking ports
+ var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
+ var/list/allowed_contents = typecache_filter_list_reverse(GetAllContentsIgnoring(ignore_typecache), ignored_atoms)
+ allowed_contents -= src
+ for(var/i in 1 to allowed_contents.len)
+ var/thing = allowed_contents[i]
+ qdel(thing, force=TRUE)
+
+ var/turf/newT = ChangeTurf(turf_type, baseturf_type, flags)
+
+ SSair.remove_from_active(newT)
+ newT.CalculateAdjacentTurfs()
+ SSair.add_to_active(newT,1)
+
+/turf/proc/copyTurf(turf/T)
+ if(T.type != type)
+ var/obj/O
+ if(underlays.len) //we have underlays, which implies some sort of transparency, so we want to a snapshot of the previous turf as an underlay
+ O = new()
+ O.underlays.Add(T)
+ T.ChangeTurf(type)
+ for(var/group in decals)
+ T.add_decal(decals[group],group)
+ if(underlays.len)
+ T.underlays = O.underlays
+ if(T.icon_state != icon_state)
+ T.icon_state = icon_state
+ if(T.icon != icon)
+ T.icon = icon
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
+ if(T.dir != dir)
+ T.setDir(dir)
+ return T
+
+//wrapper for ChangeTurf()s that you want to prevent/affect without overriding ChangeTurf() itself
+/turf/proc/TerraformTurf(path, new_baseturf, flags)
+ return ChangeTurf(path, new_baseturf, flags)
+
+// Creates a new turf
+// new_baseturfs can be either a single type or list of types, formated the same as baseturfs. see turf.dm
+/turf/proc/ChangeTurf(path, list/new_baseturfs, flags)
+ if(!path)
+ return
+ if(!GLOB.use_preloader && path == type && !(flags & CHANGETURF_FORCEOP)) // Don't no-op if the map loader requires it to be reconstructed
+ return src
+
+ var/old_opacity = opacity
+ var/old_dynamic_lighting = dynamic_lighting
+ var/old_affecting_lights = affecting_lights
+ var/old_lighting_object = lighting_object
+ var/old_corners = corners
+
+ var/old_exl = explosion_level
+ var/old_exi = explosion_id
+ var/old_bp = blueprint_data
+ blueprint_data = null
+
+ var/list/old_baseturfs = baseturfs
+ changing_turf = TRUE
+
+ qdel(src) //Just get the side effects and call Destroy
+ var/turf/W = new path(src)
+
+ if(new_baseturfs)
+ W.baseturfs = new_baseturfs
+ else
+ W.baseturfs = old_baseturfs
+
+ W.explosion_id = old_exi
+ W.explosion_level = old_exl
+
+ if(!(flags & CHANGETURF_DEFER_CHANGE))
+ W.AfterChange(flags)
+
+ W.blueprint_data = old_bp
+
+ if(SSlighting.initialized)
+ recalc_atom_opacity()
+ lighting_object = old_lighting_object
+ affecting_lights = old_affecting_lights
+ corners = old_corners
+ if (old_opacity != opacity || dynamic_lighting != old_dynamic_lighting)
+ reconsider_lights()
+
+ if (dynamic_lighting != old_dynamic_lighting)
+ if (IS_DYNAMIC_LIGHTING(src))
+ lighting_build_overlay()
+ else
+ lighting_clear_overlay()
+
+ for(var/turf/open/space/S in RANGE_TURFS(1, src)) //RANGE_TURFS is in code\__HELPERS\game.dm
+ S.update_starlight()
+
+ return W
+
+// Take off the top layer turf and replace it with the next baseturf down
+/turf/proc/ScrapeAway()
+ if(length(baseturfs))
+ var/list/new_baseturfs = baseturfs
+ var/turf_type = new_baseturfs[new_baseturfs.len]
+ new_baseturfs.len--
+ switch(new_baseturfs.len)
+ if(1)
+ new_baseturfs = new_baseturfs[1]
+ if(0)
+ new_baseturfs = turf_type
+ // We must never end up with a situation where there is no baseturf
+ WARNING("turf of type [type] had a baseturfs length 1 still in list form.")
+ return ChangeTurf(turf_type, new_baseturfs)
+
+ if(baseturfs == type)
+ return src
+
+ return ChangeTurf(baseturfs, baseturfs) // The bottom baseturf will never go away
+
+// Take the input as baseturfs and put it underneath the current baseturfs
+// If fake_turf_type is provided and new_baseturfs is not the baseturfs list will be created identical to the turf type's
+// If both or just new_baseturfs is provided they will be inserted below the existing baseturfs
+/turf/proc/PlaceOnBottom(list/new_baseturfs, turf/fake_turf_type)
+ if(fake_turf_type)
+ if(!new_baseturfs)
+ var/list/old_baseturfs = baseturfs.Copy()
+ assemble_baseturfs(fake_turf_type)
+ if(!length(baseturfs))
+ baseturfs = list(baseturfs)
+ baseturfs += old_baseturfs
+ return
+ else if(!length(new_baseturfs))
+ new_baseturfs = list(new_baseturfs, fake_turf_type)
+ else
+ new_baseturfs += fake_turf_type
+ if(!length(baseturfs))
+ baseturfs = list(baseturfs)
+ baseturfs.Insert(1, new_baseturfs)
+
+// Make a new turf and put it on top
+// The args behave identical to PlaceOnBottom except they go on top
+/turf/proc/PlaceOnTop(list/new_baseturfs, turf/fake_turf_type)
+ if(fake_turf_type)
+ if(!new_baseturfs)
+ var/list/old_baseturfs = baseturfs.Copy()
+ assemble_baseturfs(fake_turf_type)
+ if(!length(baseturfs))
+ baseturfs = list(baseturfs)
+ baseturfs.Insert(1, old_baseturfs)
+ return
+ else if(!length(new_baseturfs))
+ new_baseturfs = list(new_baseturfs, fake_turf_type)
+ else
+ new_baseturfs += fake_turf_type
+ if(!length(baseturfs))
+ baseturfs = list(baseturfs)
+ baseturfs += new_baseturfs
+
+
+// Copy an existing turf and put it on top
+/turf/proc/CopyOnTop(turf/copytarget, ignore_bottom=1, depth=INFINITY) // x, 1, 0
+ var/list/new_baseturfs = list()
+ new_baseturfs += baseturfs
+ new_baseturfs += type
+
+ if(depth)
+ var/list/target_baseturfs = copytarget.baseturfs
+ var/base_len = length(target_baseturfs)
+ if(!base_len)
+ if(!ignore_bottom)
+ new_baseturfs += target_baseturfs
+ else if(base_len > ignore_bottom)
+ if(base_len - ignore_bottom <= depth)
+ new_baseturfs += target_baseturfs.Copy(ignore_bottom + 1)
+ else
+ new_baseturfs += target_baseturfs.Copy(base_len - depth)
+
+ var/turf/newT = copytarget.copyTurf(src)
+ newT.baseturfs = new_baseturfs
+ return newT
+
+/turf/proc/AfterChange(flags) //called after a turf has been replaced in ChangeTurf()
+ levelupdate()
+ CalculateAdjacentTurfs()
+
+ //update firedoor adjacency
+ var/list/turfs_to_check = get_adjacent_open_turfs(src) | src
+ for(var/I in turfs_to_check)
+ var/turf/T = I
+ for(var/obj/machinery/door/firedoor/FD in T)
+ FD.CalculateAffectingAreas()
+
+ queue_smooth_neighbors(src)
+
+ HandleTurfChange(src)
+
+/turf/open/AfterChange(flags)
+ ..()
+ RemoveLattice()
+ if(!(flags & CHANGETURF_IGNORE_AIR))
+ Assimilate_Air()
+
+//////Assimilate Air//////
+/turf/open/proc/Assimilate_Air()
+ var/turf_count = LAZYLEN(atmos_adjacent_turfs)
+ if(blocks_air || !turf_count) //if there weren't any open turfs, no need to update.
+ return
+
+ var/datum/gas_mixture/total = new//Holders to assimilate air from nearby turfs
+ var/list/total_gases = total.gases
+
+ for(var/T in atmos_adjacent_turfs)
+ var/turf/open/S = T
+ if(!S.air)
+ continue
+ var/list/S_gases = S.air.gases
+ for(var/id in S_gases)
+ ASSERT_GAS(id, total)
+ total_gases[id][MOLES] += S_gases[id][MOLES]
+ total.temperature += S.air.temperature
+
+ air.copy_from(total)
+
+ var/list/air_gases = air.gases
+ for(var/id in air_gases)
+ air_gases[id][MOLES] /= turf_count //Averages contents of the turfs, ignoring walls and the like
+
+ air.temperature /= turf_count
+ SSair.add_to_active(src)
+
+/turf/proc/ReplaceWithLattice()
+ ScrapeAway()
+ new /obj/structure/lattice(locate(x, y, z))
\ No newline at end of file
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 4d6727f5bc..c9848fb793 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -58,21 +58,6 @@
if("icon")
SStitle.icon = icon
-/turf/closed/indestructible/reebe
- name = "void"
- icon_state = "reebe"
- opacity = FALSE
- baseturf = /turf/closed/indestructible/reebe
-
-/turf/closed/indestructible/reebe/ratvar_act()
- return
-
-/turf/closed/indestructible/reebe/narsie_act()
- return
-
-/turf/closed/indestructible/reebe/CollidedWith(atom/movable/AM)
- playsound(src, 'sound/effects/bamf.ogg', 25, TRUE)
-
/turf/closed/indestructible/riveted
icon = 'icons/turf/walls/riveted.dmi'
icon_state = "riveted"
@@ -136,7 +121,7 @@
icon = 'icons/turf/walls.dmi'
icon_state = "necro"
explosion_block = 50
- baseturf = /turf/closed/indestructible/necropolis
+ baseturfs = /turf/closed/indestructible/necropolis
/turf/closed/indestructible/necropolis/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/floors.dmi'
@@ -150,7 +135,7 @@
icon_state = "wall"
canSmoothWith = list(/turf/closed/indestructible/riveted/boss, /turf/closed/indestructible/riveted/boss/see_through)
explosion_block = 50
- baseturf = /turf/closed/indestructible/riveted/boss
+ baseturfs = /turf/closed/indestructible/riveted/boss
/turf/closed/indestructible/riveted/boss/see_through
opacity = FALSE
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index c937a8a48f..b8d46977be 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -30,7 +30,7 @@
desc = "It's regarding you suspiciously."
icon = 'icons/turf/floors.dmi'
icon_state = "necro1"
- baseturf = /turf/open/indestructible/necropolis
+ baseturfs = /turf/open/indestructible/necropolis
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
/turf/open/indestructible/necropolis/Initialize()
@@ -45,7 +45,7 @@
name = "necropolis floor"
icon = 'icons/turf/boss_floors.dmi'
icon_state = "boss"
- baseturf = /turf/open/indestructible/boss
+ baseturfs = /turf/open/indestructible/boss
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
/turf/open/indestructible/boss/air
@@ -54,7 +54,7 @@
/turf/open/indestructible/hierophant
icon = 'icons/turf/floors/hierophant_floor.dmi'
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
- baseturf = /turf/open/indestructible/hierophant
+ baseturfs = /turf/open/indestructible/hierophant
smooth = SMOOTH_TRUE
/turf/open/indestructible/hierophant/two
@@ -71,7 +71,7 @@
name = "cogmetal"
desc = "Brass plating that gently radiates heat. For some reason, it reminds you of blood."
icon_state = "reebe"
- baseturf = /turf/open/indestructible/clock_spawn_room
+ baseturfs = /turf/open/indestructible/clock_spawn_room
/turf/open/indestructible/clock_spawn_room/Entered()
..()
@@ -173,7 +173,7 @@
for(var/mob/living/simple_animal/slime/M in src)
M.apply_water()
- clean_blood()
+ SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
for(var/obj/effect/O in src)
if(is_cleanable(O))
qdel(O)
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm
index 3f45d5e127..dec9deac51 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -2,7 +2,7 @@
/turf/open/chasm
name = "chasm"
desc = "Watch your step."
- baseturf = /turf/open/chasm
+ baseturfs = /turf/open/chasm
smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
icon = 'icons/turf/floors/chasms.dmi'
icon_state = "smooth"
@@ -55,7 +55,7 @@
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
to_chat(user, "You build a floor.")
// Create a floor, which has this chasm underneath it
- ChangeTurf(/turf/open/floor/plating, type)
+ PlaceOnTop(/turf/open/floor/plating)
else
to_chat(user, "You need one floor tile to build a floor!")
else
@@ -67,7 +67,7 @@
// Naive "down" which just subtracts a z-level
/turf/open/chasm/straight_down
- baseturf = /turf/open/chasm/straight_down
+ baseturfs = /turf/open/chasm/straight_down
/turf/open/chasm/straight_down/Initialize()
. = ..()
@@ -78,7 +78,7 @@
/turf/open/chasm/lavaland
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
- baseturf = /turf/open/chasm/lavaland
+ baseturfs = /turf/open/chasm/lavaland
light_range = 1.9 //slightly less range than lava
light_power = 0.65 //less bright, too
light_color = LIGHT_COLOR_LAVA //let's just say you're falling into lava, that makes sense right
@@ -89,7 +89,7 @@
icon = 'icons/turf/floors/junglechasm.dmi'
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
- baseturf = /turf/open/chasm/jungle
+ baseturfs = /turf/open/chasm/jungle
/turf/open/chasm/jungle/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/floors.dmi'
@@ -97,7 +97,7 @@
return TRUE
/turf/open/chasm/jungle/straight_down
- baseturf = /turf/open/chasm/jungle/straight_down
+ baseturfs = /turf/open/chasm/jungle/straight_down
/turf/open/chasm/jungle/straight_down/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 3978bc802d..db12cf3530 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -51,13 +51,13 @@
if(severity != 1 && shielded && target != src)
return
if(target == src)
- src.ChangeTurf(src.baseturf)
+ ScrapeAway()
if(target != null)
severity = 3
switch(severity)
if(1)
- src.ChangeTurf(src.baseturf)
+ ScrapeAway()
if(2)
switch(pick(1,2;75,3))
if(1)
@@ -65,7 +65,7 @@
if(prob(33))
new /obj/item/stack/sheet/metal(src)
if(2)
- src.ChangeTurf(src.baseturf)
+ ScrapeAway()
if(3)
if(prob(80))
src.break_tile_to_plating()
@@ -119,7 +119,7 @@
/turf/open/floor/proc/make_plating()
return ChangeTurf(/turf/open/floor/plating)
-/turf/open/floor/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
+/turf/open/floor/ChangeTurf(path, new_baseturf, flags)
if(!isfloorturf(src))
return ..() //fucking turfs switch the fucking src of the fucking running procs
if(!ispath(path, /turf/open/floor))
@@ -202,7 +202,7 @@
ChangeTurf(/turf/open/floor/clockwork)
/turf/open/floor/acid_melt()
- ChangeTurf(baseturf)
+ ScrapeAway()
/turf/open/floor/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
@@ -223,7 +223,7 @@
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "You build a wall.")
- ChangeTurf(/turf/closed/wall)
+ PlaceOnTop(/turf/closed/wall)
return TRUE
if(RCD_AIRLOCK)
if(locate(/obj/machinery/door/airlock) in src)
@@ -244,10 +244,9 @@
A.autoclose = TRUE
return TRUE
if(RCD_DECONSTRUCT)
- if(istype(src, baseturf))
+ if(ScrapeAway() == src)
return FALSE
to_chat(user, "You deconstruct [src].")
- ChangeTurf(baseturf)
return TRUE
if(RCD_WINDOWGRILLE)
if(locate(/obj/structure/grille) in src)
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm
index f0fb7c4448..889638b27e 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -47,7 +47,7 @@
icon_state = "light_off"
-/turf/open/floor/light/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
+/turf/open/floor/light/ChangeTurf(path, new_baseturf, flags)
set_light(0)
return ..()
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 3e7540cdf6..e9ff95af84 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -142,7 +142,7 @@
name = "clockwork floor"
desc = "Tightly-pressed brass tiles. They emit minute vibration."
icon_state = "plating"
- baseturf = /turf/open/floor/clockwork
+ baseturfs = /turf/open/floor/clockwork
var/uses_overlay = TRUE
var/obj/effect/clockwork/overlay/floor/realappearence
@@ -161,9 +161,7 @@
return ..()
/turf/open/floor/clockwork/ReplaceWithLattice()
- if(baseturf == type)
- return
- ..()
+ . = ..()
for(var/obj/structure/lattice/L in src)
L.ratvar_act()
@@ -196,7 +194,7 @@
L.adjustToxLoss(-3, TRUE, TRUE)
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
- if(baseturf == type)
+ if(baseturfs == type)
return
if(istype(I, /obj/item/crowbar))
user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...")
@@ -225,7 +223,7 @@
name = "cogplate"
desc = "Warm brass plating. You can feel it gently vibrating, as if machinery is on the other side."
icon_state = "reebe"
- baseturf = /turf/open/floor/clockwork/reebe
+ baseturfs = /turf/open/floor/clockwork/reebe
uses_overlay = FALSE
/turf/open/floor/bluespace
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 27afebef7c..a406f1e148 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -109,10 +109,10 @@
if(prob(I.force * 20 - 25))
user.visible_message("[user] smashes through [src]!", \
"You smash through [src] with [I]!")
- ChangeTurf(baseturf)
+ ScrapeAway()
else
to_chat(user, "You hit [src], to no effect!")
/turf/open/floor/plating/foam/ex_act()
..()
- ChangeTurf(baseturf)
+ ScrapeAway()
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 007a682ab8..8ffcab7949 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -5,7 +5,7 @@
/turf/open/floor/plating/asteroid //floor piece
name = "asteroid sand"
- baseturf = /turf/open/floor/plating/asteroid
+ baseturfs = /turf/open/floor/plating/asteroid
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
icon_plating = "asteroid"
@@ -61,7 +61,7 @@
/turf/open/floor/plating/asteroid/singularity_act()
if(is_planet_level(z))
return ..()
- ChangeTurf(/turf/open/space)
+ ScrapeAway()
/turf/open/floor/plating/asteroid/ex_act(severity, target)
. = SendSignal(COMSIG_ATOM_EX_ACT, severity, target)
@@ -70,7 +70,7 @@
/turf/open/floor/plating/asteroid/basalt
name = "volcanic floor"
- baseturf = /turf/open/floor/plating/asteroid/basalt
+ baseturfs = /turf/open/floor/plating/asteroid/basalt
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
icon_plating = "basalt"
@@ -79,7 +79,7 @@
floor_variance = 15
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
- baseturf = /turf/open/lava/smooth
+ baseturfs = /turf/open/lava/smooth
/turf/open/floor/plating/asteroid/basalt/airless
initial_gas_mix = "TEMP=2.7"
@@ -103,7 +103,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
- baseturf = /turf/open/lava/smooth/lava_land_surface
+ baseturfs = /turf/open/lava/smooth/lava_land_surface
@@ -206,7 +206,7 @@
if(istype(tunnel))
// Small chance to have forks in our tunnel; otherwise dig our tunnel.
if(i > 3 && prob(20))
- var/turf/open/floor/plating/asteroid/airless/cave/C = tunnel.ChangeTurf(data_having_type,FALSE,FALSE,TRUE)
+ var/turf/open/floor/plating/asteroid/airless/cave/C = tunnel.ChangeTurf(data_having_type, null, CHANGETURF_IGNORE_AIR)
C.going_backwards = FALSE
C.produce_tunnel_from_data(rand(10, 15), dir)
else
@@ -232,7 +232,7 @@
SpawnFlora(T)
SpawnMonster(T)
- T.ChangeTurf(turf_type,FALSE,FALSE,TRUE)
+ T.ChangeTurf(turf_type, null, CHANGETURF_IGNORE_AIR)
/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T)
if(prob(30))
@@ -279,7 +279,7 @@
name = "snow"
desc = "Looks cold."
icon = 'icons/turf/snow.dmi'
- baseturf = /turf/open/floor/plating/asteroid/snow
+ baseturfs = /turf/open/floor/plating/asteroid/snow
icon_state = "snow"
icon_plating = "snow"
initial_gas_mix = "TEMP=180"
diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/simulated/floor/plating/dirt.dm
index 3a02935657..a9ddd4180e 100644
--- a/code/game/turfs/simulated/floor/plating/dirt.dm
+++ b/code/game/turfs/simulated/floor/plating/dirt.dm
@@ -3,7 +3,7 @@
desc = "Upon closer examination, it's still dirt."
icon = 'icons/turf/floors.dmi'
icon_state = "dirt"
- baseturf = /turf/open/chasm/jungle/straight_down
+ baseturfs = /turf/open/chasm/jungle/straight_down
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
attachment_holes = FALSE
diff --git a/code/game/turfs/simulated/floor/plating/misc_plating.dm b/code/game/turfs/simulated/floor/plating/misc_plating.dm
index 259e374869..d08d93ef2c 100644
--- a/code/game/turfs/simulated/floor/plating/misc_plating.dm
+++ b/code/game/turfs/simulated/floor/plating/misc_plating.dm
@@ -37,7 +37,7 @@
smooth = SMOOTH_MORE|SMOOTH_BORDER
var/smooth_icon = 'icons/turf/floors/ash.dmi'
desc = "The ground is covered in volcanic ash."
- baseturf = /turf/open/floor/plating/ashplanet/wateryrock //I assume this will be a chasm eventually, once this becomes an actual surface
+ baseturfs = /turf/open/floor/plating/ashplanet/wateryrock //I assume this will be a chasm eventually, once this becomes an actual surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
attachment_holes = FALSE
@@ -91,24 +91,24 @@
name = "sand"
desc = "Surf's up."
icon_state = "sand"
- baseturf = /turf/open/floor/plating/beach/sand
+ baseturfs = /turf/open/floor/plating/beach/sand
/turf/open/floor/plating/beach/coastline_t
name = "coastline"
desc = "Tide's high tonight. Charge your batons."
icon_state = "sandwater_t"
- baseturf = /turf/open/floor/plating/beach/coastline_t
+ baseturfs = /turf/open/floor/plating/beach/coastline_t
/turf/open/floor/plating/beach/coastline_b
name = "coastline"
icon_state = "sandwater_b"
- baseturf = /turf/open/floor/plating/beach/coastline_b
+ baseturfs = /turf/open/floor/plating/beach/coastline_b
/turf/open/floor/plating/beach/water
name = "water"
desc = "You get the feeling that nobody's bothered to actually make this water functional..."
icon_state = "water"
- baseturf = /turf/open/floor/plating/beach/water
+ baseturfs = /turf/open/floor/plating/beach/water
/turf/open/floor/plating/ironsand
@@ -129,7 +129,7 @@
icon = 'icons/turf/snow.dmi'
icon_state = "ice"
temperature = 180
- baseturf = /turf/open/floor/plating/ice
+ baseturfs = /turf/open/floor/plating/ice
slowdown = 1
wet = TURF_WET_PERMAFROST
attachment_holes = FALSE
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm
index 74354e78c7..f53e62dba7 100644
--- a/code/game/turfs/simulated/floor/reinf_floor.dm
+++ b/code/game/turfs/simulated/floor/reinf_floor.dm
@@ -48,14 +48,14 @@
if(severity != 1 && shielded && target != src)
return
if(target == src)
- src.ChangeTurf(src.baseturf)
+ ScrapeAway()
return
switch(severity)
if(1)
if(prob(80))
ReplaceWithLattice()
else if(prob(50))
- ChangeTurf(src.baseturf)
+ ScrapeAway()
else
make_plating(1)
if(2)
@@ -122,7 +122,7 @@
be_removed()
return ..()
-/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
+/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, flags)
if(path != type)
be_removed()
return ..()
diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm
index d5dbd79ff5..42ede622a1 100644
--- a/code/game/turfs/simulated/lava.dm
+++ b/code/game/turfs/simulated/lava.dm
@@ -4,7 +4,7 @@
name = "lava"
icon_state = "lava"
gender = PLURAL //"That's some lava."
- baseturf = /turf/open/lava //lava all the way down
+ baseturfs = /turf/open/lava //lava all the way down
slowdown = 2
light_range = 2
@@ -128,7 +128,7 @@
/turf/open/lava/smooth
name = "lava"
- baseturf = /turf/open/lava/smooth
+ baseturfs = /turf/open/lava/smooth
icon = 'icons/turf/floors/lava.dmi'
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
@@ -137,7 +137,7 @@
/turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
- baseturf = /turf/open/chasm/lavaland
+ baseturfs = /turf/open/chasm/lavaland
/turf/open/lava/smooth/airless
initial_gas_mix = "TEMP=2.7"
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 2a0147c82a..c737848749 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -7,7 +7,7 @@
var/smooth_icon = 'icons/turf/smoothrocks.dmi'
smooth = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith
- baseturf = /turf/open/floor/plating/asteroid/airless
+ baseturfs = /turf/open/floor/plating/asteroid/airless
initial_gas_mix = "TEMP=2.7"
opacity = 1
density = TRUE
@@ -78,7 +78,10 @@
SSblackbox.record_feedback("tally", "ore_mined", 1, mineralType)
for(var/obj/effect/temp_visual/mining_overlay/M in src)
qdel(M)
- ChangeTurf(turf_type, FALSE, defer_change)
+ var/flags = NONE
+ if(defer_change) // TODO: make the defer change var a var for any changeturf flag
+ flags = CHANGETURF_DEFER_CHANGE
+ ChangeTurf(turf_type, null, flags)
addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
@@ -111,7 +114,7 @@
return
/turf/closed/mineral/acid_melt()
- ChangeTurf(baseturf)
+ ScrapeAway()
/turf/closed/mineral/ex_act(severity, target)
..()
@@ -153,7 +156,7 @@
M.mineralAmt = rand(1, 5)
M.environment_type = src.environment_type
M.turf_type = src.turf_type
- M.baseturf = src.baseturf
+ M.baseturfs = src.baseturfs
src = M
M.levelupdate()
@@ -168,7 +171,7 @@
/turf/closed/mineral/random/high_chance/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/lava/smooth/lava_land_surface
+ baseturfs = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
mineralSpawnChanceList = list(
@@ -189,7 +192,7 @@
/turf/closed/mineral/random/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/lava/smooth/lava_land_surface
+ baseturfs = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -211,7 +214,7 @@
/turf/closed/mineral/random/labormineral/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/lava/smooth/lava_land_surface
+ baseturfs = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
mineralSpawnChanceList = list(
@@ -230,7 +233,7 @@
/turf/closed/mineral/iron/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -244,7 +247,7 @@
/turf/closed/mineral/uranium/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -258,7 +261,7 @@
/turf/closed/mineral/diamond/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -272,7 +275,7 @@
/turf/closed/mineral/gold/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -286,7 +289,7 @@
/turf/closed/mineral/silver/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -300,7 +303,7 @@
/turf/closed/mineral/titanium/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -314,7 +317,7 @@
/turf/closed/mineral/plasma/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -337,7 +340,7 @@
/turf/closed/mineral/bscrystal/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -345,13 +348,13 @@
/turf/closed/mineral/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt
- baseturf = /turf/open/floor/plating/asteroid/basalt
+ baseturfs = /turf/open/floor/plating/asteroid/basalt
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
/turf/closed/mineral/volcanic/lava_land_surface
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/lava/smooth/lava_land_surface
+ baseturfs = /turf/open/lava/smooth/lava_land_surface
defer_change = 1
/turf/closed/mineral/ash_rock //wall piece
@@ -361,7 +364,7 @@
icon_state = "rock2"
smooth = SMOOTH_MORE|SMOOTH_BORDER
canSmoothWith = list (/turf/closed)
- baseturf = /turf/open/floor/plating/ashplanet/wateryrock
+ baseturfs = /turf/open/floor/plating/ashplanet/wateryrock
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
environment_type = "waste"
turf_type = /turf/open/floor/plating/ashplanet/rocky
@@ -459,13 +462,16 @@
G.quality = 2
G.icon_state = "Gibtonite ore 2"
- ChangeTurf(turf_type, FALSE, defer_change)
+ var/flags = NONE
+ if(defer_change)
+ flags = CHANGETURF_DEFER_CHANGE
+ ChangeTurf(turf_type, null, flags)
addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
/turf/closed/mineral/gibtonite/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
- baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+ baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
diff --git a/code/game/turfs/simulated/reebe_void.dm b/code/game/turfs/simulated/reebe_void.dm
index 2e0246df83..3e40ebed64 100644
--- a/code/game/turfs/simulated/reebe_void.dm
+++ b/code/game/turfs/simulated/reebe_void.dm
@@ -2,7 +2,7 @@
name = "void"
icon_state = "reebemap"
layer = SPACE_LAYER
- baseturf = /turf/open/indestructible/reebe_void
+ baseturfs = /turf/open/indestructible/reebe_void
planetary_atmos = TRUE
/turf/open/indestructible/reebe_void/Initialize(mapload)
diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm
index 9ce521a100..a5753edcd1 100644
--- a/code/game/turfs/simulated/river.dm
+++ b/code/game/turfs/simulated/river.dm
@@ -20,7 +20,7 @@
continue
W.connected = 1
var/turf/cur_turf = get_turf(W)
- cur_turf.ChangeTurf(turf_type,FALSE,FALSE,TRUE)
+ cur_turf.ChangeTurf(turf_type, null, CHANGETURF_IGNORE_AIR)
var/turf/target_turf = get_turf(pick(river_nodes - W))
if(!target_turf)
break
@@ -49,7 +49,7 @@
cur_turf = get_step(cur_turf, cur_dir)
continue
else
- var/turf/river_turf = cur_turf.ChangeTurf(turf_type,FALSE,FALSE,TRUE)
+ var/turf/river_turf = cur_turf.ChangeTurf(turf_type, null, CHANGETURF_IGNORE_AIR)
river_turf.Spread(25, 11, whitelist_area)
for(var/WP in river_nodes)
@@ -85,16 +85,16 @@
for(var/F in cardinal_turfs) //cardinal turfs are always changed but don't always spread
var/turf/T = F
- if(!istype(T, logged_turf_type) && T.ChangeTurf(type,FALSE,FALSE,TRUE) && prob(probability))
+ if(!istype(T, logged_turf_type) && T.ChangeTurf(type, null, CHANGETURF_IGNORE_AIR) && prob(probability))
T.Spread(probability - prob_loss, prob_loss, whitelisted_area)
for(var/F in diagonal_turfs) //diagonal turfs only sometimes change, but will always spread if changed
var/turf/T = F
- if(!istype(T, logged_turf_type) && prob(probability) && T.ChangeTurf(type,FALSE,FALSE,TRUE))
+ if(!istype(T, logged_turf_type) && prob(probability) && T.ChangeTurf(type, null, CHANGETURF_IGNORE_AIR))
T.Spread(probability - prob_loss, prob_loss, whitelisted_area)
else if(ismineralturf(T))
var/turf/closed/mineral/M = T
- M.ChangeTurf(M.turf_type,FALSE,FALSE,TRUE)
+ M.ChangeTurf(M.turf_type, null, CHANGETURF_IGNORE_AIR)
#undef RANDOM_UPPER_X
diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm
index ecc389af88..24056658c4 100644
--- a/code/game/turfs/simulated/wall/misc_walls.dm
+++ b/code/game/turfs/simulated/wall/misc_walls.dm
@@ -55,7 +55,7 @@
sheet_type = /obj/item/stack/tile/brass
sheet_amount = 1
girder_type = /obj/structure/destructible/clockwork/wall_gear
- baseturf = /turf/open/floor/clockwork/reebe
+ baseturfs = /turf/open/floor/clockwork/reebe
var/heated
var/obj/effect/clockwork/overlay/wall/realappearence
@@ -88,13 +88,13 @@
/turf/closed/wall/clockwork/dismantle_wall(devastated=0, explode=0)
if(devastated)
devastate_wall()
- ChangeTurf(/turf/open/floor/plating)
+ ScrapeAway()
else
playsound(src, 'sound/items/welder.ogg', 100, 1)
var/newgirder = break_wall()
if(newgirder) //maybe we want a gear!
transfer_fingerprints_to(newgirder)
- ChangeTurf(/turf/open/floor/clockwork)
+ ScrapeAway()
for(var/obj/O in src) //Eject contents!
if(istype(O, /obj/structure/sign/poster))
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 00377e4f3f..7da53425bd 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -10,6 +10,8 @@
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
+ baseturfs = /turf/open/floor/plating
+
var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through.
var/slicing_duration = 100 //default time taken to slice the wall
var/sheet_type = /obj/item/stack/sheet/metal
@@ -78,7 +80,7 @@
var/obj/structure/sign/poster/P = O
P.roll_and_drop(src)
- ChangeTurf(/turf/open/floor/plating)
+ ScrapeAway()
/turf/closed/wall/proc/break_wall()
new sheet_type(src, sheet_amount)
@@ -96,7 +98,7 @@
switch(severity)
if(1)
//SN src = null
- var/turf/NT = ChangeTurf(baseturf)
+ var/turf/NT = ScrapeAway()
NT.contents_explosion(severity, target)
return
if(2)
@@ -294,7 +296,7 @@
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, "You deconstruct the wall.")
- ChangeTurf(/turf/open/floor/plating)
+ ScrapeAway()
return TRUE
return FALSE
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index c67fdc83a1..104f8b4b53 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -3,7 +3,7 @@
desc = "Shallow water."
icon = 'icons/turf/floors.dmi'
icon_state = "riverwater"
- baseturf = /turf/open/chasm/lavaland
+ baseturfs = /turf/open/chasm/lavaland
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
slowdown = 1
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 5399b748e6..e446eb3b2c 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -118,7 +118,7 @@
qdel(L)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
to_chat(user, "You build a floor.")
- ChangeTurf(/turf/open/floor/plating)
+ PlaceOnTop(/turf/open/floor/plating)
else
to_chat(user, "You need one floor tile to build a floor!")
else
@@ -192,7 +192,7 @@
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "You build a floor.")
- ChangeTurf(/turf/open/floor/plating)
+ PlaceOnTop(/turf/open/floor/plating)
return TRUE
return FALSE
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index 2ba08fa2a9..a2f8d8262c 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -1,7 +1,7 @@
/turf/open/space/transit
icon_state = "black"
dir = SOUTH
- baseturf = /turf/open/space/transit
+ baseturfs = /turf/open/space/transit
flags_1 = NOJAUNT_1 //This line goes out to every wizard that ever managed to escape the den. I'm sorry.
explosion_block = INFINITY
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 36ba033eef..f0563ade79 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -3,7 +3,13 @@
level = 1
var/intact = 1
- var/turf/baseturf = /turf/open/space
+
+ // baseturfs can be either a list or a single turf type.
+ // In class definition like here it should always be a single type.
+ // A list will be created in initialization that figures out the baseturf's baseturf etc.
+ // In the case of a list it is sorted from bottom layer to top.
+ // This shouldn't be modified directly, use the helper procs.
+ var/list/baseturfs = /turf/open/space
var/temperature = T20C
var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
@@ -35,6 +41,8 @@
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
+ assemble_baseturfs()
+
levelupdate()
if(smooth)
queue_smooth(src)
@@ -180,6 +188,55 @@
/turf/proc/is_plasteel_floor()
return FALSE
+// A proc in case it needs to be recreated or badmins want to change the baseturfs
+/turf/proc/assemble_baseturfs(turf/fake_baseturf_type)
+ var/static/list/created_baseturf_lists = list()
+ var/turf/current_target
+ if(fake_baseturf_type)
+ if(length(fake_baseturf_type)) // We were given a list, just apply it and move on
+ baseturfs = fake_baseturf_type
+ return
+ current_target = fake_baseturf_type
+ else
+ if(length(baseturfs))
+ return // No replacement baseturf has been given and the current baseturfs value is already a list/assembled
+ if(!baseturfs)
+ current_target = initial(baseturfs) || type // This should never happen but just in case...
+ stack_trace("baseturfs var was null for [type]. Failsafe activated and it has been given a new baseturfs value of [current_target].")
+ else
+ current_target = baseturfs
+
+ // If we've made the output before we don't need to regenerate it
+ if(created_baseturf_lists[current_target])
+ var/list/premade_baseturfs = created_baseturf_lists[current_target]
+ if(length(premade_baseturfs))
+ baseturfs = premade_baseturfs.Copy()
+ else
+ baseturfs = premade_baseturfs
+ return baseturfs
+
+ var/turf/next_target = initial(current_target.baseturfs)
+ //Most things only have 1 baseturf so this loop won't run in most cases
+ if(current_target == next_target)
+ baseturfs = current_target
+ created_baseturf_lists[current_target] = current_target
+ return current_target
+ var/list/new_baseturfs = list(current_target)
+ for(var/i=0;current_target != next_target;i++)
+ if(i > 100)
+ // A baseturfs list over 100 members long is silly
+ // Because of how this is all structured it will only runtime/message once per type
+ stack_trace("A turf <[type]> created a baseturfs list over 100 members long. This is most likely an infinite loop.")
+ message_admins("A turf <[type]> created a baseturfs list over 100 members long. This is most likely an infinite loop.")
+ break
+ new_baseturfs.Insert(1, next_target)
+ current_target = next_target
+ next_target = initial(current_target.baseturfs)
+
+ baseturfs = new_baseturfs
+ created_baseturf_lists[new_baseturfs[new_baseturfs.len]] = new_baseturfs.Copy()
+ return new_baseturfs
+
/turf/proc/levelupdate()
for(var/obj/O in src)
if(O.level == 1)
@@ -197,119 +254,6 @@
if(L)
qdel(L)
-//wrapper for ChangeTurf()s that you want to prevent/affect without overriding ChangeTurf() itself
-/turf/proc/TerraformTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
- return ChangeTurf(path, new_baseturf, defer_change, ignore_air, forceop)
-
-//Creates a new turf
-/turf/proc/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
- if(!path)
- return
- if(!GLOB.use_preloader && path == type && !forceop) // Don't no-op if the map loader requires it to be reconstructed
- return src
-
- var/old_opacity = opacity
- var/old_dynamic_lighting = dynamic_lighting
- var/old_affecting_lights = affecting_lights
- var/old_lighting_object = lighting_object
- var/old_corners = corners
-
- var/old_exl = explosion_level
- var/old_exi = explosion_id
- var/old_bp = blueprint_data
- blueprint_data = null
-
- var/old_baseturf = baseturf
- changing_turf = TRUE
-
- qdel(src) //Just get the side effects and call Destroy
- var/turf/W = new path(src)
-
- if(new_baseturf)
- W.baseturf = new_baseturf
- else
- W.baseturf = old_baseturf
-
- W.explosion_id = old_exi
- W.explosion_level = old_exl
-
- if(!defer_change)
- W.AfterChange(ignore_air)
-
- W.blueprint_data = old_bp
-
- if(SSlighting.initialized)
- recalc_atom_opacity()
- lighting_object = old_lighting_object
- affecting_lights = old_affecting_lights
- corners = old_corners
- if (old_opacity != opacity || dynamic_lighting != old_dynamic_lighting)
- reconsider_lights()
-
- if (dynamic_lighting != old_dynamic_lighting)
- if (IS_DYNAMIC_LIGHTING(src))
- lighting_build_overlay()
- else
- lighting_clear_overlay()
-
- for(var/turf/open/space/S in RANGE_TURFS(1, src)) //RANGE_TURFS is in code\__HELPERS\game.dm
- S.update_starlight()
-
- return W
-
-/turf/proc/AfterChange(ignore_air = FALSE) //called after a turf has been replaced in ChangeTurf()
- levelupdate()
- CalculateAdjacentTurfs()
-
- //update firedoor adjacency
- var/list/turfs_to_check = get_adjacent_open_turfs(src) | src
- for(var/I in turfs_to_check)
- var/turf/T = I
- for(var/obj/machinery/door/firedoor/FD in T)
- FD.CalculateAffectingAreas()
-
- queue_smooth_neighbors(src)
-
- HandleTurfChange(src)
-
-/turf/open/AfterChange(ignore_air)
- ..()
- RemoveLattice()
- if(!ignore_air)
- Assimilate_Air()
-
-//////Assimilate Air//////
-/turf/open/proc/Assimilate_Air()
- var/turf_count = LAZYLEN(atmos_adjacent_turfs)
- if(blocks_air || !turf_count) //if there weren't any open turfs, no need to update.
- return
-
- var/datum/gas_mixture/total = new//Holders to assimilate air from nearby turfs
- var/list/total_gases = total.gases
-
- for(var/T in atmos_adjacent_turfs)
- var/turf/open/S = T
- if(!S.air)
- continue
- var/list/S_gases = S.air.gases
- for(var/id in S_gases)
- ASSERT_GAS(id, total)
- total_gases[id][MOLES] += S_gases[id][MOLES]
- total.temperature += S.air.temperature
-
- air.copy_from(total)
-
- var/list/air_gases = air.gases
- for(var/id in air_gases)
- air_gases[id][MOLES] /= turf_count //Averages contents of the turfs, ignoring walls and the like
-
- air.temperature /= turf_count
- SSair.add_to_active(src)
-
-/turf/proc/ReplaceWithLattice()
- ChangeTurf(baseturf)
- new /obj/structure/lattice(locate(x, y, z))
-
/turf/proc/phase_damage_creatures(damage,mob/U = null)//>Ninja Code. Hurts and knocks out creatures on this turf //NINJACODE
for(var/mob/living/M in src)
if(M==U)
@@ -361,7 +305,7 @@
continue
if(O.invisibility == INVISIBILITY_MAXIMUM)
O.singularity_act()
- ChangeTurf(src.baseturf)
+ ScrapeAway()
return(2)
/turf/proc/can_have_cabling()
@@ -437,21 +381,6 @@
if(!SSticker.HasRoundStarted())
add_blueprints(AM)
-/turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, forceop = FALSE)
- // Remove all atoms except observers, landmarks, docking ports
- var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
- var/list/allowed_contents = typecache_filter_list_reverse(GetAllContentsIgnoring(ignore_typecache), ignored_atoms)
- allowed_contents -= src
- for(var/i in 1 to allowed_contents.len)
- var/thing = allowed_contents[i]
- qdel(thing, force=TRUE)
-
- var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE, forceop)
-
- SSair.remove_from_active(newT)
- newT.CalculateAdjacentTurfs()
- SSair.add_to_active(newT,1)
-
/turf/proc/is_transition_turf()
return
@@ -473,33 +402,9 @@
if(!has_acid_effect)
new acid_type(src, acidpwr, acid_volume)
-
/turf/proc/acid_melt()
return
-
-/turf/proc/copyTurf(turf/T)
- if(T.type != type)
- var/obj/O
- if(underlays.len) //we have underlays, which implies some sort of transparency, so we want to a snapshot of the previous turf as an underlay
- O = new()
- O.underlays.Add(T)
- T.ChangeTurf(type)
- for(var/group in decals)
- T.add_decal(decals[group],group)
- if(underlays.len)
- T.underlays = O.underlays
- if(T.icon_state != icon_state)
- T.icon_state = icon_state
- if(T.icon != icon)
- T.icon = icon
- if(color)
- T.atom_colours = atom_colours.Copy()
- T.update_atom_colour()
- if(T.dir != dir)
- T.setDir(dir)
- return T
-
/turf/handle_fall(mob/faller, forced)
faller.lying = pick(90, 270)
if(!forced)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 8f13d887aa..b37ff9ceb4 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -472,7 +472,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!holder)
to_chat(src, "Only administrators may use this command.")
return
- var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
+ var/input = input(usr, "Enter a Command Report. Ensure it makes sense IC.", "What?", "") as message|null
if(!input)
return
@@ -523,7 +523,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
if(isturf(D))
var/turf/T = D
- T.ChangeTurf(T.baseturf)
+ T.ScrapeAway()
else
qdel(D)
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index d0c0979366..67e0381571 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -168,7 +168,7 @@
else
chance_of_deletion = 100
if(prob(chance_of_deletion))
- T.ChangeTurf(T.baseturf)
+ T.ScrapeAway()
else
T.to_be_destroyed = FALSE
T.max_fire_temperature_sustained = 0
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 407e9aa37c..0f7d501988 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -75,7 +75,8 @@
//Logs all hrefs, except chat pings
if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
- WRITE_FILE(GLOB.world_href_log, "[time_stamp(show_ds = TRUE)] [src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]
")
+ WRITE_FILE(GLOB.world_href_log, "[time_stamp(show_ds = TRUE)] [src] (usr:[usr]\[[COORD(usr)]\]) || [hsrc ? "[hsrc] " : ""][href]
")
+
// Admin PM
if(href_list["priv_msg"])
cmd_admin_pm(href_list["priv_msg"],null)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index dd876f3701..42a85efbc6 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -206,6 +206,7 @@
sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle??
random_sensor = FALSE
resistance_flags = NONE
+ can_adjust = FALSE
armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/datum/action/item_action/chameleon/change/chameleon_action
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 7dca5d9b3e..0bfb212e29 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -11,7 +11,7 @@
materials = list(MAT_GLASS = 250)
var/vision_flags = 0
var/darkness_view = 2//Base human is 2
- var/invis_view = SEE_INVISIBLE_LIVING
+ var/invis_view = SEE_INVISIBLE_LIVING //admin only for now
var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis
var/lighting_alpha
var/list/icon/current = list() //the current hud icons
@@ -261,7 +261,7 @@
icon_state = "thermal"
item_state = "glasses"
vision_flags = SEE_MOBS
- invis_view = 2
+ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
flash_protect = 0
glass_colour_type = /datum/client_colour/glass_colour/red
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 877a3bb458..4d59a893ea 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -174,7 +174,7 @@
icon_state = "thermal"
hud_type = DATA_HUD_SECURITY_ADVANCED
vision_flags = SEE_MOBS
- invis_view = 2
+ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
glass_colour_type = /datum/client_colour/glass_colour/red
/obj/item/clothing/glasses/hud/toggle/thermal/attack_self(mob/user)
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index c230b14295..39767234e5 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -11,13 +11,21 @@
strip_delay = 20
equip_delay_other = 40
+/obj/item/clothing/gloves/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
+
+/obj/item/clothing/gloves/proc/clean_blood(strength)
+ if(strength < CLEAN_STRENGTH_BLOOD)
+ return
+ transfer_blood = 0
/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
. = list()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
- if(blood_DNA)
+ IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 4f108a505f..86d4c3466c 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -192,7 +192,7 @@
item_state = "wgloves"
item_color = "mime"
-/obj/item/clothing/gloves/color/random/New()
+/obj/item/clothing/gloves/color/random/Initialize()
..()
var/list/gloves = list(
/obj/item/clothing/gloves/color/orange = 1,
@@ -202,12 +202,14 @@
/obj/item/clothing/gloves/color/green = 1,
/obj/item/clothing/gloves/color/grey = 1,
/obj/item/clothing/gloves/color/light_brown = 1,
- /obj/item/clothing/gloves/color/brown = 1)
+ /obj/item/clothing/gloves/color/brown = 1,
+ /obj/item/clothing/gloves/color/white = 1,
+ /obj/item/clothing/gloves/color/rainbow = 1)
var/obj/item/clothing/gloves/color/selected = pick(gloves)
-
- name = initial(selected.name)
- desc = initial(selected.desc)
- icon_state = initial(selected.icon_state)
- item_state = initial(selected.item_state)
- item_color = initial(selected.item_color)
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ H.equip_to_slot_or_del(new selected(H), slot_gloves)
+ else
+ new selected(loc)
+ return INITIALIZE_HINT_QDEL
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index 8bc8f12dec..9ec6542cf5 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -20,7 +20,7 @@
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
- if(blood_DNA)
+ IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "helmetblood")
/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index eacfa3faea..562375e897 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -15,7 +15,7 @@
if(body_parts_covered & HEAD)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
- if(blood_DNA)
+ IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 2baaf91135..b0f2a18a5b 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -12,7 +12,7 @@
if(body_parts_covered & HEAD)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
- if(blood_DNA)
+ IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
/obj/item/clothing/neck/tie
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index d71827df95..d058e82a3a 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -15,12 +15,16 @@
var/offset = 0
var/equipped_before_drop = FALSE
+/obj/item/clothing/shoes/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
+
/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
. = list()
if(!isinhands)
- var/bloody = 0
- if(blood_DNA)
- bloody = 1
+ var/bloody = FALSE
+ IF_HAS_BLOOD_DNA(src)
+ bloody = TRUE
else
bloody = bloody_shoes[BLOOD_STATE_HUMAN]
@@ -53,8 +57,9 @@
var/mob/M = loc
M.update_inv_shoes()
-/obj/item/clothing/shoes/clean_blood()
- ..()
+/obj/item/clothing/shoes/proc/clean_blood(strength)
+ if(strength < CLEAN_STRENGTH_BLOOD)
+ return
bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
blood_state = BLOOD_STATE_NOT_BLOODY
if(ismob(loc))
@@ -62,4 +67,4 @@
M.update_inv_shoes()
/obj/item/proc/negates_gravity()
- return 0
\ No newline at end of file
+ return FALSE
\ No newline at end of file
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
index e934b77f38..a2707de58b 100644
--- a/code/modules/clothing/suits/_suits.dm
+++ b/code/modules/clothing/suits/_suits.dm
@@ -14,7 +14,7 @@
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
- if(blood_DNA)
+ IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
var/mob/living/carbon/human/M = loc
if(ishuman(M) && M.w_uniform)
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 43da19896b..62fd5b5f5a 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -19,10 +19,9 @@
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = list()
if(!isinhands)
-
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
- if(blood_DNA)
+ IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood")
if(accessory_overlay)
. += accessory_overlay
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 2ff546a6eb..3a12f00a05 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -4,13 +4,15 @@
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
-/obj/item/clothing/under/color/random/New()
+/obj/item/clothing/under/color/random/Initialize()
..()
- var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random)
- name = initial(C.name)
- icon_state = initial(C.icon_state)
- item_state = initial(C.item_state)
- item_color = initial(C.item_color)
+ var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ H.equip_to_slot_or_del(new C(H), slot_w_uniform) //or else you end up with naked assistants running around everywhere...
+ else
+ new C(loc)
+ return INITIALIZE_HINT_QDEL
/obj/item/clothing/under/color/black
name = "black jumpsuit"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 899219c227..7686ba54ca 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -274,6 +274,7 @@
icon_state = "burial"
item_state = "burial"
item_color = "burial"
+ has_sensor = NO_SENSORS
/obj/item/clothing/under/skirt/black
name = "black skirt"
diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm
index d2d633d103..5bf4ad27b8 100644
--- a/code/modules/detectivework/detective_work.dm
+++ b/code/modules/detectivework/detective_work.dm
@@ -1,119 +1,102 @@
-//CONTAINS: Suit fibers and Detective's Scanning Computer
-
-/atom/var/list/suit_fibers
-
-/atom/proc/add_fibers(mob/living/carbon/human/M)
- if(M.gloves && istype(M.gloves, /obj/item/clothing/))
- var/obj/item/clothing/gloves/G = M.gloves
- if(G.transfer_blood > 1) //bloodied gloves transfer blood to touched objects
- if(add_blood(G.blood_DNA)) //only reduces the bloodiness of our gloves if the item wasn't already bloody
- G.transfer_blood--
- else if(M.bloody_hands > 1)
- if(add_blood(M.blood_DNA))
- M.bloody_hands--
- if(!suit_fibers)
- suit_fibers = list()
- var/fibertext
- var/item_multiplier = isitem(src)?1.2:1
- if(M.wear_suit)
- fibertext = "Material from \a [M.wear_suit]."
- if(prob(10*item_multiplier) && !(fibertext in suit_fibers))
- suit_fibers += fibertext
- if(!(M.wear_suit.body_parts_covered & CHEST))
- if(M.w_uniform)
- fibertext = "Fibers from \a [M.w_uniform]."
- if(prob(12*item_multiplier) && !(fibertext in suit_fibers)) //Wearing a suit means less of the uniform exposed.
- suit_fibers += fibertext
- if(!(M.wear_suit.body_parts_covered & HANDS))
- if(M.gloves)
- fibertext = "Material from a pair of [M.gloves.name]."
- if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
- suit_fibers += fibertext
- else if(M.w_uniform)
- fibertext = "Fibers from \a [M.w_uniform]."
- if(prob(15*item_multiplier) && !(fibertext in suit_fibers))
- // "Added fibertext: [fibertext]"
- suit_fibers += fibertext
- if(M.gloves)
- fibertext = "Material from a pair of [M.gloves.name]."
- if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
- suit_fibers += "Material from a pair of [M.gloves.name]."
- else if(M.gloves)
- fibertext = "Material from a pair of [M.gloves.name]."
- if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
- suit_fibers += "Material from a pair of [M.gloves.name]."
-
-
-/atom/proc/add_hiddenprint(mob/living/M)
- if(!M || !M.key)
- return
-
- if(!fingerprintshidden) //Add the list if it does not exist
- fingerprintshidden = list()
-
- var/hasgloves = ""
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.gloves)
- hasgloves = "(gloves)"
-
- var/current_time = time_stamp()
- if(!fingerprintshidden[M.key])
- fingerprintshidden[M.key] = "First: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"
- else
- var/laststamppos = findtext(fingerprintshidden[M.key], " Last: ")
- if(laststamppos)
- fingerprintshidden[M.key] = copytext(fingerprintshidden[M.key], 1, laststamppos)
- fingerprintshidden[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"
-
- fingerprintslast = M.ckey
-
-
-//Set ignoregloves to add prints irrespective of the mob having gloves on.
-/atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0)
- if(!M || !M.key)
- return
-
- add_hiddenprint(M)
-
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
-
- add_fibers(H)
-
- if(H.gloves) //Check if the gloves (if any) hide fingerprints
- var/obj/item/clothing/gloves/G = H.gloves
- if(G.transfer_prints)
- ignoregloves = 1
-
- if(!ignoregloves)
- H.gloves.add_fingerprint(H, 1) //ignoregloves = 1 to avoid infinite loop.
- return
-
- if(!fingerprints) //Add the list if it does not exist
- fingerprints = list()
- var/full_print = md5(H.dna.uni_identity)
- fingerprints[full_print] = full_print
-
-
-
-
-/atom/proc/transfer_fingerprints_to(atom/A)
-
- // Make sure everything are lists.
- if(!islist(A.fingerprints))
- A.fingerprints = list()
- if(!islist(A.fingerprintshidden))
- A.fingerprintshidden = list()
-
- if(!islist(fingerprints))
- fingerprints = list()
- if(!islist(fingerprintshidden))
- fingerprintshidden = list()
-
- // Transfer
- if(fingerprints)
- A.fingerprints |= fingerprints.Copy() //detective
- if(fingerprintshidden)
- A.fingerprintshidden |= fingerprintshidden.Copy() //admin
- A.fingerprintslast = fingerprintslast
+//CONTAINS: Suit fibers and Detective's Scanning Computer
+
+/atom/proc/return_fingerprints()
+ GET_COMPONENT(D, /datum/component/forensics)
+ if(D)
+ . = D.fingerprints
+
+/atom/proc/return_hiddenprints()
+ GET_COMPONENT(D, /datum/component/forensics)
+ if(D)
+ . = D.hiddenprints
+
+/atom/proc/return_blood_DNA()
+ GET_COMPONENT(D, /datum/component/forensics)
+ if(D)
+ . = D.blood_DNA
+
+/atom/proc/blood_DNA_length()
+ GET_COMPONENT(D, /datum/component/forensics)
+ if(D)
+ . = length(D.blood_DNA)
+
+/atom/proc/return_fibers()
+ GET_COMPONENT(D, /datum/component/forensics)
+ if(D)
+ . = D.fibers
+
+/atom/proc/add_fingerprint_list(list/fingerprints) //ASSOC LIST FINGERPRINT = FINGERPRINT
+ if(length(fingerprints))
+ . = AddComponent(/datum/component/forensics, fingerprints)
+
+//Set ignoregloves to add prints irrespective of the mob having gloves on.
+/atom/proc/add_fingerprint(mob/living/M, ignoregloves = FALSE)
+ var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
+ . = D.add_fingerprint(M, ignoregloves)
+
+/atom/proc/add_fiber_list(list/fibertext) //ASSOC LIST FIBERTEXT = FIBERTEXT
+ if(length(fibertext))
+ . = AddComponent(/datum/component/forensics, null, null, null, fibertext)
+
+/atom/proc/add_fibers(mob/living/carbon/human/M)
+ var/old = 0
+ if(M.gloves && istype(M.gloves, /obj/item/clothing))
+ var/obj/item/clothing/gloves/G = M.gloves
+ old = length(G.return_blood_DNA())
+ if(G.transfer_blood > 1) //bloodied gloves transfer blood to touched objects
+ if(add_blood_DNA(G.return_blood_DNA()) && length(G.return_blood_DNA()) > old) //only reduces the bloodiness of our gloves if the item wasn't already bloody
+ G.transfer_blood--
+ else if(M.bloody_hands > 1)
+ old = length(M.return_blood_DNA())
+ if(add_blood_DNA(M.return_blood_DNA()) && length(M.return_blood_DNA()) > old)
+ M.bloody_hands--
+ var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
+ . = D.add_fibers(M)
+
+/atom/proc/add_hiddenprint_list(list/hiddenprints) //NOTE: THIS IS FOR ADMINISTRATION FINGERPRINTS, YOU MUST CUSTOM SET THIS TO INCLUDE CKEY/REAL NAMES! CHECK FORENSICS.DM
+ if(length(hiddenprints))
+ . = AddComponent(/datum/component/forensics, null, hiddenprints)
+
+/atom/proc/add_hiddenprint(mob/living/M)
+ var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
+ . = D.add_hiddenprint(M)
+
+/atom/proc/add_blood_DNA(list/dna) //ASSOC LIST DNA = BLOODTYPE
+ return FALSE
+
+/obj/add_blood_DNA(list/dna)
+ . = ..()
+ if(length(dna))
+ . = AddComponent(/datum/component/forensics, null, null, dna)
+
+/obj/item/clothing/gloves/add_blood_DNA(list/blood_dna, list/datum/disease/diseases)
+ . = ..()
+ transfer_blood = rand(2, 4)
+
+/turf/add_blood_DNA(list/blood_dna, list/datum/disease/diseases)
+ var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
+ if(!B)
+ B = new /obj/effect/decal/cleanable/blood/splatter(src, diseases)
+ B.add_blood_DNA(blood_dna) //give blood info to the blood decal.
+ return TRUE //we bloodied the floor
+
+/mob/living/carbon/human/add_blood_DNA(list/blood_dna, list/datum/disease/diseases)
+ if(wear_suit)
+ wear_suit.add_blood_DNA(blood_dna)
+ update_inv_wear_suit()
+ else if(w_uniform)
+ w_uniform.add_blood_DNA(blood_dna)
+ update_inv_w_uniform()
+ if(gloves)
+ var/obj/item/clothing/gloves/G = gloves
+ G.add_blood_DNA(blood_dna)
+ else if(length(blood_dna))
+ AddComponent(/datum/component/forensics, null, null, dna)
+ bloody_hands = rand(2, 4)
+ update_inv_gloves() //handles bloody hands overlays and updating
+ return TRUE
+
+/atom/proc/transfer_fingerprints_to(atom/A)
+ A.add_fingerprint_list(return_fingerprints())
+ A.add_hiddenprint_list(return_hiddenprints())
+ A.fingerprintslast = fingerprintslast
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index 1400fdbe0c..9c98677291 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -23,7 +23,7 @@
icon_state = initial(icon_state)
desc = initial(desc)
-/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)
+/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)
if(!istype(I) || I.anchored == 1)
return
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index 793805977c..66405258b9 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -46,6 +46,5 @@
user.visible_message("[user] starts to wipe down [A] with [src]!", "You start to wipe down [A] with [src]...")
if(do_after(user,30, target = A))
user.visible_message("[user] finishes wiping off the [A]!", "You finish wiping off the [A].")
- A.clean_blood()
- A.wash_cream()
+ A.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
return
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index 8cb27ea4f3..fa6c1f88cb 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -67,20 +67,14 @@
//Make our lists
var/list/fingerprints = list()
- var/list/blood = list()
- var/list/fibers = list()
+ var/list/blood = A.return_blood_DNA()
+ var/list/fibers = A.return_fibers()
var/list/reagents = list()
var/target_name = A.name
// Start gathering
- if(A.blood_DNA && A.blood_DNA.len)
- blood = A.blood_DNA.Copy()
-
- if(A.suit_fibers && A.suit_fibers.len)
- fibers = A.suit_fibers.Copy()
-
if(ishuman(A))
var/mob/living/carbon/human/H = A
@@ -89,8 +83,7 @@
else if(!ismob(A))
- if(A.fingerprints && A.fingerprints.len)
- fingerprints = A.fingerprints.Copy()
+ fingerprints = A.return_fingerprints()
// Only get reagents from non-mobs.
if(A.reagents && A.reagents.reagent_list.len)
@@ -104,6 +97,7 @@
if(R.data["blood_DNA"] && R.data["blood_type"])
var/blood_DNA = R.data["blood_DNA"]
var/blood_type = R.data["blood_type"]
+ LAZYINITLIST(blood)
blood[blood_DNA] = blood_type
// We gathered everything. Create a fork and slowly display the results to the holder of the scanner.
@@ -112,7 +106,7 @@
add_log("[worldtime2text()][get_timestamp()] - [target_name]", 0)
// Fingerprints
- if(fingerprints && fingerprints.len)
+ if(length(fingerprints))
sleep(30)
add_log("Prints:")
for(var/finger in fingerprints)
@@ -120,7 +114,7 @@
found_something = 1
// Blood
- if (blood && blood.len)
+ if (length(blood))
sleep(30)
add_log("Blood:")
found_something = 1
@@ -128,7 +122,7 @@
add_log("Type: [blood[B]] DNA: [B]")
//Fibers
- if(fibers && fibers.len)
+ if(length(fibers))
sleep(30)
add_log("Fibers:")
for(var/fiber in fibers)
@@ -136,7 +130,7 @@
found_something = 1
//Reagents
- if(reagents && reagents.len)
+ if(length(reagents))
sleep(30)
add_log("Reagents:")
for(var/R in reagents)
diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm
index 15f76281ef..c5336094f1 100644
--- a/code/modules/integrated_electronics/core/printer.dm
+++ b/code/modules/integrated_electronics/core/printer.dm
@@ -101,6 +101,7 @@
return
if(..())
return TRUE
+ add_fingerprint(usr)
if(href_list["category"])
current_category = href_list["category"]
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 0b8c648817..120a000f07 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -13,11 +13,15 @@
. = ..()
var/area/thearea = get_area(src)
for(var/turf/T in get_area_turfs(thearea, z))
- if(T.baseturf != T.type) //Don't break indestructible walls and the like
- T.baseturf = baseturf
+ if(T.baseturfs != T.type) //Don't break indestructible walls and the like
+ T.baseturfs = baseturf
return INITIALIZE_HINT_QDEL
+/obj/effect/baseturf_helper/space
+ name = "space baseturf editor"
+ baseturf = /turf/open/space
+
/obj/effect/baseturf_helper/asteroid
name = "asteroid baseturf editor"
baseturf = /turf/open/floor/plating/asteroid
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 559a93b87f..e73782edbc 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -339,7 +339,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
if(crds)
if(!no_changeturf && ispath(path, /turf))
- . = crds.ChangeTurf(path, FALSE, TRUE)
+ . = crds.ChangeTurf(path, null, CHANGETURF_DEFER_CHANGE)
else
. = create_atom(path, crds)//first preloader pass
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 84e5bdeed1..fe94d88168 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -257,9 +257,8 @@
if("Release")
if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user
- var/out = get_step(src, output_dir)
if(params["id"] == "all")
- materials.retrieve_all(out)
+ materials.retrieve_all(get_step(src, output_dir))
else
var/mat_id = params["id"]
if(!materials.materials[mat_id])
@@ -277,7 +276,7 @@
desired = input("How many sheets?", "How many sheets would you like to smelt?", 1) as null|num
var/sheets_to_remove = round(min(desired,50,stored_amount))
- materials.retrieve_sheets(sheets_to_remove, mat_id, out)
+ materials.retrieve_sheets(sheets_to_remove, mat_id, get_step(src, output_dir))
else
to_chat(usr, "Required access not found.")
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index efb7887da2..6d0fc988c7 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -251,8 +251,7 @@
drop.transfer_mob_blood_dna(src)
return
else
- temp_blood_DNA = list()
- temp_blood_DNA |= drop.blood_DNA.Copy() //we transfer the dna from the drip to the splatter
+ temp_blood_DNA = drop.return_blood_DNA() //we transfer the dna from the drip to the splatter
qdel(drop)//the drip is replaced by a bigger splatter
else
drop = new(T, get_static_viruses())
@@ -265,7 +264,7 @@
B = new /obj/effect/decal/cleanable/blood/splatter(T, get_static_viruses())
B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
if(temp_blood_DNA)
- B.blood_DNA |= temp_blood_DNA
+ B.add_blood_DNA(temp_blood_DNA)
/mob/living/carbon/human/add_splatter_floor(turf/T, small_drip)
if(!(NOBLOOD in dna.species.species_traits))
@@ -277,7 +276,7 @@
var/obj/effect/decal/cleanable/xenoblood/B = locate() in T.contents
if(!B)
B = new(T)
- B.blood_DNA["UNKNOWN DNA"] = "X*"
+ B.add_blood_DNA(list("UNKNOWN DNA" = "X*"))
/mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip)
if(!T)
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index 5ef14d5d09..99bb6d2250 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -11,21 +11,18 @@
if (handcuffed)
msg += "[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!\n"
if (head)
- msg += "[t_He] [t_is] wearing [icon2html(head, user)] \a [src.head] on [t_his] head. \n"
+ msg += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head. \n"
if (wear_mask)
- msg += "[t_He] [t_is] wearing [icon2html(wear_mask, user)] \a [src.wear_mask] on [t_his] face.\n"
+ msg += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face.\n"
if (wear_neck)
- msg += "[t_He] [t_is] wearing [icon2html(wear_neck, user)] \a [src.wear_neck] around [t_his] neck.\n"
+ msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
for(var/obj/item/I in held_items)
if(!(I.flags_1 & ABSTRACT_1))
- if(I.blood_DNA)
- msg += "[t_He] [t_is] holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!\n"
- else
- msg += "[t_He] [t_is] holding [icon2html(I, user)] \a [I] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
+ msg += "[t_He] [t_is] holding [I.get_examine_string(user)] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
if (back)
- msg += "[t_He] [t_has] [icon2html(back, user)] \a [src.back] on [t_his] back.\n"
+ msg += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back.\n"
var/appears_dead = 0
if (stat == DEAD)
appears_dead = 1
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index bc4fd83334..4a2ac98dbf 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -21,54 +21,30 @@
if(U.attached_accessory)
accessory_msg += " with [icon2html(U.attached_accessory, user)] \a [U.attached_accessory]"
- if(w_uniform.blood_DNA)
- msg += "[t_He] [t_is] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][accessory_msg]!\n"
- else
- msg += "[t_He] [t_is] wearing [icon2html(w_uniform, user)] \a [w_uniform][accessory_msg].\n"
-
+ msg += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg].\n"
//head
if(head)
- if(head.blood_DNA)
- msg += "[t_He] [t_is] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] blood-stained [head.name] on [t_his] head!\n"
- else
- msg += "[t_He] [t_is] wearing [icon2html(head, user)] \a [head] on [t_his] head.\n"
-
+ msg += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head.\n"
//suit/armor
if(wear_suit)
- if(wear_suit.blood_DNA)
- msg += "[t_He] [t_is] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] blood-stained [wear_suit.name]!\n"
- else
- msg += "[t_He] [t_is] wearing [icon2html(wear_suit, user)] \a [wear_suit].\n"
-
+ msg += "[t_He] [t_is] wearing [wear_suit.get_examine_string(user)].\n"
//suit/armor storage
if(s_store)
- if(s_store.blood_DNA)
- msg += "[t_He] [t_is] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] blood-stained [s_store.name] on [t_his] [wear_suit.name]!\n"
- else
- msg += "[t_He] [t_is] carrying [icon2html(s_store, user)] \a [s_store] on [t_his] [wear_suit.name].\n"
-
+ msg += "[t_He] [t_is] carrying [s_store.get_examine_string(user)] on [t_his] [wear_suit.name].\n"
//back
if(back)
- if(back.blood_DNA)
- msg += "[t_He] [t_has] [icon2html(back, user)] [back.gender==PLURAL?"some":"a"] blood-stained [back] on [t_his] back.\n"
- else
- msg += "[t_He] [t_has] [icon2html(back, user)] \a [back] on [t_his] back.\n"
+ msg += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back.\n"
//Hands
for(var/obj/item/I in held_items)
if(!(I.flags_1 & ABSTRACT_1))
- if(I.blood_DNA)
- msg += "[t_He] [t_is] holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!\n"
- else
- msg += "[t_He] [t_is] holding [icon2html(I, user)] \a [I] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
+ msg += "[t_He] [t_is] holding [I.get_examine_string(user)] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
+ GET_COMPONENT(FR, /datum/component/forensics)
//gloves
if(gloves && !(slot_gloves in obscured))
- if(gloves.blood_DNA)
- msg += "[t_He] [t_has] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] blood-stained [gloves.name] on [t_his] hands!\n"
- else
- msg += "[t_He] [t_has] [icon2html(gloves, user)] \a [gloves] on [t_his] hands.\n"
- else if(blood_DNA)
+ msg += "[t_He] [t_has] [gloves.get_examine_string(user)] on [t_his] hands.\n"
+ else if(FR && length(FR.blood_DNA))
var/hand_number = get_num_arms()
if(hand_number)
msg += "[t_He] [t_has] [hand_number > 1 ? "" : "a"] blood-stained hand[hand_number > 1 ? "s" : ""]!\n"
@@ -84,42 +60,33 @@
//belt
if(belt)
- if(belt.blood_DNA)
- msg += "[t_He] [t_has] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] blood-stained [belt.name] about [t_his] waist!\n"
- else
- msg += "[t_He] [t_has] [icon2html(belt, user)] \a [belt] about [t_his] waist.\n"
+ msg += "[t_He] [t_has] [belt.get_examine_string(user)] about [t_his] waist.\n"
//shoes
if(shoes && !(slot_shoes in obscured))
- if(shoes.blood_DNA)
- msg += "[t_He] [t_is] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] blood-stained [shoes.name] on [t_his] feet!\n"
- else
- msg += "[t_He] [t_is] wearing [icon2html(shoes, user)] \a [shoes] on [t_his] feet.\n"
+ msg += "[t_He] [t_is] wearing [shoes.get_examine_string(user)] on [t_his] feet.\n"
//mask
if(wear_mask && !(slot_wear_mask in obscured))
- if(wear_mask.blood_DNA)
- msg += "[t_He] [t_has] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] blood-stained [wear_mask.name] on [t_his] face!\n"
- else
- msg += "[t_He] [t_has] [icon2html(wear_mask, user)] \a [wear_mask] on [t_his] face.\n"
+ msg += "[t_He] [t_has] [wear_mask.get_examine_string(user)] on [t_his] face.\n"
if (wear_neck && !(slot_neck in obscured))
- msg += "[t_He] [t_is] wearing [icon2html(wear_neck, user)] \a [src.wear_neck] around [t_his] neck.\n"
+ msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
//eyes
if(glasses && !(slot_glasses in obscured))
- if(glasses.blood_DNA)
- msg += "[t_He] [t_has] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] blood-stained [glasses] covering [t_his] eyes!\n"
- else
- msg += "[t_He] [t_has] [icon2html(glasses, user)] \a [glasses] covering [t_his] eyes.\n"
+ msg += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes.\n"
//ears
if(ears && !(slot_ears in obscured))
- msg += "[t_He] [t_has] [icon2html(ears, user)] \a [ears] on [t_his] ears.\n"
+ msg += "[t_He] [t_has] [ears.get_examine_string(user)] on [t_his] ears.\n"
//ID
if(wear_id)
- msg += "[t_He] [t_is] wearing [icon2html(wear_id, user)] \a [wear_id].\n"
+ msg += "[t_He] [t_is] wearing [wear_id.get_examine_string(user)].\n"
+
+ //Status effects
+ msg += status_effect_examines()
//Jitters
switch(jitteriness)
@@ -354,3 +321,16 @@
msg += "*---------*"
to_chat(user, msg)
+
+/mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!
+ var/list/dat = list()
+ if(!pronoun_replacement)
+ pronoun_replacement = p_they(TRUE)
+ for(var/V in status_effects)
+ var/datum/status_effect/E = V
+ if(E.examine_text)
+ var/new_text = replacetext(E.examine_text, "SUBJECTPRONOUN", pronoun_replacement)
+ new_text = replacetext(new_text, "[pronoun_replacement] is", "[pronoun_replacement] [p_are()]") //To make sure something become "They are" or "She is", not "They are" and "She are"
+ dat += "[new_text]\n" //dat.Join("\n") doesn't work here, for some reason
+ if(dat.len)
+ return dat.Join()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index f0c630421d..926d8e2e77 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -25,6 +25,7 @@
create_internal_organs() //most of it is done in set_species now, this is only for parent call
handcrafting = new()
+ AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
. = ..()
@@ -683,19 +684,18 @@
if(..())
dropItemToGround(I)
-/mob/living/carbon/human/clean_blood()
- var/mob/living/carbon/human/H = src
- if(H.gloves)
- if(H.gloves.clean_blood())
- H.update_inv_gloves()
+/mob/living/carbon/human/proc/clean_blood(strength)
+ if(strength < CLEAN_STRENGTH_BLOOD)
+ return
+ if(gloves)
+ if(gloves.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ update_inv_gloves()
else
- ..() // Clear the Blood_DNA list
- if(H.bloody_hands)
- H.bloody_hands = 0
- H.update_inv_gloves()
+ if(bloody_hands)
+ bloody_hands = 0
+ update_inv_gloves()
update_icons() //apply the now updated overlays to the mob
-
/mob/living/carbon/human/wash_cream()
if(creamed) //clean both to prevent a rare bug
cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard"))
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index c90d1a0231..9480445ceb 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -51,8 +51,7 @@
FP.blood_state = S.blood_state
FP.entered_dirs |= dir
FP.bloodiness = S.bloody_shoes[S.blood_state] - BLOOD_LOSS_IN_SPREAD
- if(S.blood_DNA && S.blood_DNA.len)
- FP.transfer_blood_dna(S.blood_DNA)
+ FP.add_blood_DNA(S.return_blood_DNA())
FP.update_icon()
update_inv_shoes()
//End bloody footprints
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 46b193cdec..b9b89ce991 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -72,6 +72,10 @@
else if(eye_blurry) //blurry eyes heal slowly
adjust_blurriness(-1)
+ if(has_disability(DISABILITY_PACIFISM) && a_intent == INTENT_HARM)
+ to_chat(src, "You don't feel like harming anybody.")
+ a_intent_change(INTENT_HELP)
+
/mob/living/carbon/human/handle_mutations_and_radiation()
if(!dna || !dna.species.handle_mutations_and_radiation(src))
..()
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 5684d8eb68..266afffed2 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -175,7 +175,8 @@ There are several things that need to be remembered:
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_gloves]
inv.update_icon()
- if(!gloves && blood_DNA)
+ GET_COMPONENT(FR, /datum/component/forensics)
+ if(!gloves && FR && length(FR.blood_DNA))
var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER)
if(get_num_arms() < 2)
if(has_left_hand())
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index fa315068ac..29eb521af4 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -20,11 +20,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"t" = "Syndicate",
"y" = "CentCom",
- // Species
- "b" = "binary",
- "g" = "changeling",
- "a" = "alientalk",
-
// Admin
"p" = "admin",
"d" = "deadmin",
@@ -55,11 +50,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"å" = "Syndicate",
"í" = "CentCom",
- // Species
- "è" = "binary",
- "ï" = "changeling",
- "ô" = "alientalk",
-
// Admin
"ç" = "admin",
"â" = "deadmin",
@@ -81,13 +71,14 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(!message || message == "")
return
+ var/datum/saymode/saymode = SSradio.saymodes[talk_key]
var/message_mode = get_message_mode(message)
var/original_message = message
var/in_critical = InCritical()
if(one_character_prefix[message_mode])
message = copytext(message, 2)
- else if(message_mode)
+ else if(message_mode || saymode)
message = copytext(message, 3)
if(findtext(message, " ", 1, 2))
message = copytext(message, 2)
@@ -135,8 +126,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// AIs use inherent channels for the holopad. Most inherent channels
// ignore the language argument however.
- var/datum/saymode/SM = SSradio.saymodes[talk_key]
- if(SM && !SM.handle_message(src, message, language))
+ if(saymode && !saymode.handle_message(src, message, language))
return
if(!can_speak_vocal(message))
@@ -341,6 +331,15 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return message
/mob/living/proc/radio(message, message_mode, list/spans, language)
+ var/obj/item/implant/radio/imp = locate() in src
+ if(imp && imp.radio.on)
+ if(message_mode == MODE_HEADSET)
+ imp.radio.talk_into(src, message, , spans, language)
+ return ITALICS | REDUCE_RANGE
+ if(message_mode == MODE_DEPARTMENT || message_mode in GLOB.radiochannels)
+ imp.radio.talk_into(src, message, message_mode, spans, language)
+ return ITALICS | REDUCE_RANGE
+
switch(message_mode)
if(MODE_WHISPER)
return ITALICS
@@ -362,6 +361,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(MODE_BINARY)
return ITALICS | REDUCE_RANGE //Does not return 0 since this is only reached by humans, not borgs or AIs.
+
return 0
/mob/living/say_mod(input, message_mode)
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index 788a8f4255..3f5b12ae20 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -6,6 +6,7 @@
var/obj/act_module = get_active_held_item()
if(act_module)
msg += "It is holding [icon2html(act_module, user)] \a [act_module].\n"
+ msg += status_effect_examines()
msg += ""
if (src.getBruteLoss())
if (src.getBruteLoss() < maxHealth*0.5)
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 707d77e2ac..2d1b7d1fe5 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -321,9 +321,9 @@
sleep(50)
if(mode == BOT_REPAIRING && src.loc == target_turf)
if(autotile) //Build the floor and include a tile.
- target_turf.ChangeTurf(/turf/open/floor/plasteel)
+ target_turf.PlaceOnTop(/turf/open/floor/plasteel)
else //Build a hull plating without a floor tile.
- target_turf.ChangeTurf(/turf/open/floor/plating)
+ target_turf.PlaceOnTop(/turf/open/floor/plating)
else
var/turf/open/floor/F = target_turf
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 98d4557037..917211736b 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -472,8 +472,7 @@
if(isturf(next))
if(bloodiness)
var/obj/effect/decal/cleanable/blood/tracks/B = new(loc)
- if(blood_DNA && blood_DNA.len)
- B.blood_DNA |= blood_DNA.Copy()
+ B.add_blood_DNA(return_blood_DNA())
var/newdir = get_dir(next, loc)
if(newdir == dir)
B.setDir(newdir)
@@ -655,8 +654,7 @@
T.add_mob_blood(H)
var/list/blood_dna = H.get_blood_dna_list()
- if(blood_dna)
- transfer_blood_dna(blood_dna)
+ add_blood_DNA(blood_dna)
bloodiness += 4
// player on mulebot attempted to move
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 5266f44e98..0f265bdb07 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -177,24 +177,15 @@
//Hands
for(var/obj/item/I in held_items)
if(!(I.flags_1 & ABSTRACT_1))
- if(I.blood_DNA)
- msg += "It has [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!\n"
- else
- msg += "It has [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+ msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
//Internal storage
if(internal_storage && !(internal_storage.flags_1&ABSTRACT_1))
- if(internal_storage.blood_DNA)
- msg += "It is holding [icon2html(internal_storage, user)] [internal_storage.gender==PLURAL?"some":"a"] blood-stained [internal_storage.name] in its internal storage!\n"
- else
- msg += "It is holding [icon2html(internal_storage, user)] \a [internal_storage] in its internal storage.\n"
+ msg += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
//Cosmetic hat - provides no function other than looks
if(head && !(head.flags_1&ABSTRACT_1))
- if(head.blood_DNA)
- msg += "It is wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] blood-stained [head.name] on its head!\n"
- else
- msg += "It is wearing [icon2html(head, user)] \a [head] on its head.\n"
+ msg += "It is wearing [head.get_examine_string(user)] on its head.\n"
//Braindead
if(!client && stat != DEAD)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
index 2f3ee4cefb..f36a30ccae 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
@@ -31,16 +31,9 @@
for(var/obj/item/I in held_items)
if(!(I.flags_1 & ABSTRACT_1))
- if(I.blood_DNA)
- msg += "It has [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!\n"
- else
- msg += "It has [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
-
+ msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
if(internal_storage && !(internal_storage.flags_1&ABSTRACT_1))
- if(internal_storage.blood_DNA)
- msg += "It is holding [icon2html(internal_storage, user)] [internal_storage.gender==PLURAL?"some":"a"] blood-stained [internal_storage.name] in its internal storage!\n"
- else
- msg += "It is holding [icon2html(internal_storage, user)] \a [internal_storage] in its internal storage.\n"
+ msg += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
msg += "*---------*"
to_chat(user, msg)
else
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 2651065b75..f9c9ae6ae4 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -173,6 +173,6 @@
qdel(target)
return TRUE
var/atom/movable/M = target
- M.clean_blood()
+ M.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
visible_message("[src] polishes \the [target].")
return TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index c677cd7035..d93b8596fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -235,7 +235,8 @@
LoseTarget()
return 0
if(target in possible_targets)
- if(target.z != z)
+ var/turf/T = get_turf(src)
+ if(target.z != T.z)
LoseTarget()
return 0
var/target_distance = get_dist(targets_from,target)
@@ -417,7 +418,7 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega
if(buckled)
buckled.attack_animal(src)
if(!isturf(targets_from.loc) && targets_from.loc != null)//Did someone put us in something?
- var/atom/A = get_turf(targets_from)
+ var/atom/A = targets_from.loc
A.attack_animal(src)//Bang on it till we get out
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
index 923c34fef2..f03cc476fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
@@ -39,7 +39,7 @@
for(var/F in RANGE_TURFS(1, src))
if(ismineralturf(F))
var/turf/closed/mineral/M = F
- M.ChangeTurf(M.turf_type,FALSE,FALSE,TRUE)
+ M.ChangeTurf(M.turf_type, null, CHANGETURF_IGNORE_AIR)
gps = new /obj/item/device/gps/internal(src)
/mob/living/simple_animal/hostile/spawner/lavaland/Destroy()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a818a01764..1bc7552c3f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -254,24 +254,43 @@
return 0
+// reset_perspective(thing) set the eye to the thing (if it's equal to current default reset to mob perspective)
+// reset_perspective() set eye to common default : mob on turf, loc otherwise
/mob/proc/reset_perspective(atom/A)
if(client)
- if(ismovableatom(A))
- client.perspective = EYE_PERSPECTIVE
- client.eye = A
+ if(A)
+ if(ismovableatom(A))
+ //Set the the thing unless it's us
+ if(A != src)
+ client.perspective = EYE_PERSPECTIVE
+ client.eye = A
+ else
+ client.eye = client.mob
+ client.perspective = MOB_PERSPECTIVE
+ else if(isturf(A))
+ //Set to the turf unless it's our current turf
+ if(A != loc)
+ client.perspective = EYE_PERSPECTIVE
+ client.eye = A
+ else
+ client.eye = client.mob
+ client.perspective = MOB_PERSPECTIVE
+ else
+ //Do nothing
else
- if(isturf(loc) && (!A || loc == A))
+ //Reset to common defaults: mob if on turf, otherwise current loc
+ if(isturf(loc))
client.eye = client.mob
client.perspective = MOB_PERSPECTIVE
else
client.perspective = EYE_PERSPECTIVE
- client.eye = A
+ client.eye = loc
return 1
/mob/living/reset_perspective(atom/A)
if(..())
update_sight()
- if(client.eye != src)
+ if(client.eye && client.eye != src)
var/atom/AT = client.eye
AT.get_remote_view_fullscreens(src)
else
diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm
index c49ca072e8..ef02a8a792 100644
--- a/code/modules/ninja/suit/gloves.dm
+++ b/code/modules/ninja/suit/gloves.dm
@@ -40,26 +40,26 @@
/obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity)
if(!candrain || draining)
- return 0
+ return FALSE
if(!ishuman(loc))
- return 0 //Only works while worn
+ return FALSE //Only works while worn
var/mob/living/carbon/human/H = loc
var/obj/item/clothing/suit/space/space_ninja/suit = H.wear_suit
if(!istype(suit))
- return 0
+ return FALSE
if(isturf(A))
- return 0
+ return FALSE
if(!proximity)
- return 0
+ return FALSE
A.add_fingerprint(H)
- draining = 1
+ draining = TRUE
. = A.ninjadrain_act(suit,H,src)
- draining = 0
+ draining = FALSE
if(isnum(.)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking)
if(.)
@@ -67,7 +67,7 @@
else
to_chat(H, "\The [A] has run dry of energy, you must find another source!")
else
- . = 0 //as to not cancel attack_hand()
+ . = FALSE //as to not cancel attack_hand()
/obj/item/clothing/gloves/space_ninja/proc/toggledrain()
diff --git a/code/modules/orbit/orbit.dm b/code/modules/orbit/orbit.dm
index 02a80675aa..540e0cf7d5 100644
--- a/code/modules/orbit/orbit.dm
+++ b/code/modules/orbit/orbit.dm
@@ -33,7 +33,9 @@
orbiting = null
return ..()
-/datum/orbit/proc/Check(turf/targetloc)
+/datum/orbit/proc/Check(turf/targetloc, list/checked_already = list())
+ //Avoid infinite loops for people who end up orbiting themself through another orbiter
+ checked_already[src] = TRUE
if (!orbiter)
qdel(src)
return
@@ -55,9 +57,10 @@
lastloc = orbiter.loc
for(var/other_orbit in orbiter.orbiters)
var/datum/orbit/OO = other_orbit
- if(OO == src)
+ //Skip if checked already
+ if(checked_already[OO])
continue
- OO.Check(targetloc)
+ OO.Check(targetloc, checked_already)
/atom/movable/var/datum/orbit/orbiting = null
/atom/var/list/orbiters = null
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index ca424cb80d..3ada84d601 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -665,7 +665,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
NC.d1 = 0
NC.d2 = fdirn
- NC.add_fingerprint()
+ NC.add_fingerprint(user)
NC.update_icon()
//create a new powernet with the cable, if needed it will be merged later
@@ -716,7 +716,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
//updates the stored cable coil
C.update_stored(2, item_color)
- C.add_fingerprint()
+ C.add_fingerprint(user)
C.update_icon()
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 680c86ff5c..35599553d7 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -164,7 +164,7 @@
if(iscarbon(user))
var/mob/living/carbon/C = user
user_dna = C.dna
- B.add_blood(user_dna)
+ B.add_blood_DNA(user_dna)
var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, list(user_dna))
B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner)
return(BRUTELOSS)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 219d9df8ef..8f0fb11e32 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -79,8 +79,7 @@
if(!B)
B = new(T)
if(data["blood_DNA"])
- B.blood_DNA[data["blood_DNA"]] = data["blood_type"]
-
+ B.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
/datum/reagent/liquidgibs
name = "Liquid gibs"
@@ -941,12 +940,12 @@
else
if(O)
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- O.clean_blood()
+ O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/datum/reagent/space_cleaner/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 1)
T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- T.clean_blood()
+ T.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
for(var/obj/effect/decal/cleanable/C in T)
qdel(C)
@@ -964,26 +963,26 @@
H.lip_style = null
H.update_body()
for(var/obj/item/I in C.held_items)
- I.clean_blood()
+ I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
if(C.wear_mask)
- if(C.wear_mask.clean_blood())
+ if(C.wear_mask.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
C.update_inv_wear_mask()
if(ishuman(M))
var/mob/living/carbon/human/H = C
if(H.head)
- if(H.head.clean_blood())
+ if(H.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_head()
if(H.wear_suit)
- if(H.wear_suit.clean_blood())
+ if(H.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_wear_suit()
else if(H.w_uniform)
- if(H.w_uniform.clean_blood())
+ if(H.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_w_uniform()
if(H.shoes)
- if(H.shoes.clean_blood())
+ if(H.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_shoes()
H.wash_cream()
- M.clean_blood()
+ M.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/datum/reagent/space_cleaner/ez_clean
name = "EZ Clean"
@@ -1688,3 +1687,23 @@
description = "blue sparkles that get everywhere"
color = "#4040FF" //A blueish color
glitter_type = /obj/effect/decal/cleanable/glitter/blue
+
+/datum/reagent/pax
+ name = "pax"
+ id = "pax"
+ description = "A colorless liquid that suppresses violence on the subjects."
+ color = "#AAAAAA55"
+ taste_description = "water"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+/datum/reagent/pax/on_mob_add(mob/M)
+ ..()
+ if(isliving(M))
+ var/mob/living/L = M
+ L.add_disability(DISABILITY_PACIFISM, CHEMICAL_DISABILITY)
+
+/datum/reagent/pax/on_mob_delete(mob/M)
+ if(isliving(M))
+ var/mob/living/L = M
+ L.remove_disability(DISABILITY_PACIFISM, CHEMICAL_DISABILITY)
+ ..()
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index b41d61be84..526a2602b6 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -51,7 +51,7 @@
if(isplatingturf(T))
var/turf/open/floor/plating/F = T
if(prob(10 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed
- F.ChangeTurf(F.baseturf)
+ F.ScrapeAway()
if(isfloorturf(T))
var/turf/open/floor/F = T
if(prob(reac_volume))
@@ -65,7 +65,7 @@
if(iswallturf(T))
var/turf/closed/wall/W = T
if(prob(reac_volume))
- W.ChangeTurf(/turf/open/floor/plating)
+ W.ScrapeAway()
/datum/reagent/clf3/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(istype(M))
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 222f88ba8b..8ebc470c5f 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -671,3 +671,9 @@
var/location = get_turf(holder.my_atom)
for(var/i in 1 to 10)
new /obj/item/stack/sheet/plastic(location)
+
+/datum/chemical_reaction/pax
+ name = "pax"
+ id = "pax"
+ results = list("pax" = 3)
+ required_reagents = list("mindbreaker" = 1, "synaptizine" = 1, "water" = 1)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 8e2ce4b7a0..5bcbaff705 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -199,12 +199,24 @@
to_chat(SM, "You are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
to_chat(user, "[SM] accepts [src] and suddenly becomes attentive and aware. It worked!")
SM.copy_known_languages_from(user, TRUE)
+ after_success(user, SM)
qdel(src)
else
to_chat(user, "[SM] looks interested for a moment, but then looks back down. Maybe you should try again later.")
being_used = 0
..()
+/obj/item/slimepotion/sentience/proc/after_success(mob/living/user, mob/living/simple_animal/SM)
+ return
+
+/obj/item/slimepotion/sentience/nuclear
+ name = "syndicate intelligence potion"
+ desc = "A miraculous chemical mix that grants human like intelligence to living beings. It has been modified with Syndicate technology to also grant an internal radio implant to the target."
+
+/obj/item/slimepotion/sentience/nuclear/after_success(mob/living/user, mob/living/simple_animal/SM)
+ var/obj/item/implant/radio/imp = new(src)
+ imp.implant(SM, user)
+
/obj/item/slimepotion/transference
name = "consciousness transference potion"
desc = "A strange slime-based chemical that, when used, allows the user to transfer their consciousness to a lesser being."
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index 3c40996029..216aea306a 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -14,6 +14,7 @@
if(..(user))
return
add_fingerprint(usr)
+
var/list/options = params2list(possible_destinations)
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
var/dat = "Status: [M ? M.getStatusText() : "*Missing*"]
"
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index b0e5c2dc00..e42224db46 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -7,8 +7,15 @@ All ShuttleMove procs go here
// Called on every turf in the shuttle region, returns a bitflag for allowed movements of that turf
// returns the new move_mode (based on the old)
/turf/proc/fromShuttleMove(turf/newT, turf_type, list/baseturf_cache, move_mode)
- if(!(move_mode & MOVE_AREA) || (istype(src, turf_type) && baseturf_cache[baseturf]))
+ if(!(move_mode & MOVE_AREA))
return move_mode
+ if(istype(src, turf_type))
+ if(length(baseturfs))
+ if(baseturf_cache[baseturfs[1]])
+ return move_mode
+ else if(baseturf_cache[baseturfs])
+ return move_mode
+
return move_mode | MOVE_TURF | MOVE_CONTENTS
// Called from the new turf before anything has been moved
@@ -45,9 +52,7 @@ All ShuttleMove procs go here
if(newT == src) // In case of in place shuttle rotation shenanigans.
return
//Destination turf changes
- var/destination_turf_type = newT.type
- newT = copyTurf(newT)
- newT.baseturf = destination_turf_type
+ newT.CopyOnTop(src, 1, 0) // We only want a surface copy
//Air stuff
newT.blocks_air = TRUE
newT.air_update_turf(TRUE)
@@ -63,9 +68,8 @@ All ShuttleMove procs go here
/turf/proc/afterShuttleMove(turf/oldT, turf_type, baseturf_type, rotation)
//Dealing with the turf we left behind
oldT.TransferComponents(src)
- oldT.ChangeTurf(turf_type, baseturf_type, FALSE, TRUE)
+ oldT.ChangeTurf(turf_type, baseturf_type, CHANGETURF_IGNORE_AIR) // TODO: make this oldT.ScrapeAway() which requires templating all shuttles
- // Rotate and let the air move again
if(rotation)
shuttleRotate(rotation) //see shuttle_rotate.dm
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index f2bbd96943..695045f7dc 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -465,7 +465,7 @@
var/turf/T1 = L1[i]
if(!T1)
continue
- if(T0.type != T0.baseturf)
+ if(T0.type != T0.baseturfs)
ripple_turfs += T1
return ripple_turfs
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 49c7396dba..28cb089597 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -104,4 +104,10 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
//prevents shuttles attempting to rotate this since it messes up sprites
/obj/machinery/gravity_generator/shuttleRotate(rotation, params)
params = NONE
- return ..()
\ No newline at end of file
+ return ..()
+
+/obj/machinery/door/airlock/shuttleRotate(rotation, params)
+ . = ..()
+ if(cyclelinkeddir)
+ cyclelinkeddir = angle2dir(rotation+dir2angle(cyclelinkeddir))
+ cyclelinkairlock()
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index ebff0fdbeb..6ced230134 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1059,9 +1059,9 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/device_tools/potion
- name = "Sentience Potion"
- item = /obj/item/slimepotion/sentience
- desc = "A potion recovered at great risk by undercover syndicate operatives. Using it will make any animal sentient, and bound to serve you."
+ name = "Syndicate Sentience Potion"
+ item = /obj/item/slimepotion/sentience/nuclear
+ desc = "A potion recovered at great risk by undercover syndicate operatives and then subsequently modified with syndicate technology. Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication."
cost = 4
include_modes = list(/datum/game_mode/nuclear)
@@ -1152,6 +1152,12 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cost = 20
include_modes = list(/datum/game_mode/nuclear)
+/datum/uplink_item/implants/radio
+ name = "Internal Syndicate Radio Implant"
+ desc = "An implant injected into the body, allowing the use of an internal syndicate radio. Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
+ item = /obj/item/storage/box/syndie_kit/imp_radio
+ cost = 4
+
// Cybernetics
/datum/uplink_item/cyber_implants
diff --git a/html/changelogs/AutoChangeLog-pr-4530.yml b/html/changelogs/AutoChangeLog-pr-4530.yml
new file mode 100644
index 0000000000..7fcc6e4c71
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4530.yml
@@ -0,0 +1,4 @@
+author: "ninjanomnom"
+delete-after: True
+changes:
+ - bugfix: "Things like thermite which burned through walls straight to space now stop on plating. You'll have to thermite it again to get to space."
diff --git a/html/changelogs/AutoChangeLog-pr-4533.yml b/html/changelogs/AutoChangeLog-pr-4533.yml
new file mode 100644
index 0000000000..6bbeeb37c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4533.yml
@@ -0,0 +1,4 @@
+author: "ninjanomnom"
+delete-after: True
+changes:
+ - bugfix: "Cycling airlocks on shuttles should work correctly when rotated now."
diff --git a/html/changelogs/AutoChangeLog-pr-4555.yml b/html/changelogs/AutoChangeLog-pr-4555.yml
new file mode 100644
index 0000000000..6197224d10
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4555.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - code_imp: "Forensics is now a datum component."
+ - balance: "NPC humans will now start leaving fingerprints on things they touch!"
diff --git a/html/changelogs/AutoChangeLog-pr-4579.yml b/html/changelogs/AutoChangeLog-pr-4579.yml
new file mode 100644
index 0000000000..69327324f6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4579.yml
@@ -0,0 +1,5 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - rscadd: "Added a new reagent: Pax."
+ - rscadd: "Pax is made with Mindbreaker, Synaptizine and Water, and those affected by it are forced to be nonviolent against living beings. At least, not directly."
diff --git a/html/changelogs/AutoChangeLog-pr-4580.yml b/html/changelogs/AutoChangeLog-pr-4580.yml
new file mode 100644
index 0000000000..6ccaebd033
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4580.yml
@@ -0,0 +1,9 @@
+author: "coiax"
+delete-after: True
+changes:
+ - rscadd: "Adds an internal radio implant, allowing the use of the radio if
+you expect to have your headset removed. Or if you don't have any ears
+or hands. It can be purchased for 4 TC from any Syndicate uplink."
+ - rscadd: "Nuke ops now buy special \"syndicate intelligence potions\" that automatically
+insert an internal radio implant when used successfully. Cayenne can now
+participate in your high level discussions."
diff --git a/html/changelogs/AutoChangeLog-pr-4590.yml b/html/changelogs/AutoChangeLog-pr-4590.yml
new file mode 100644
index 0000000000..ed62412909
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4590.yml
@@ -0,0 +1,5 @@
+author: "More Robust Than You"
+delete-after: True
+changes:
+ - bugfix: "Monkey chat should no longer have .k prefixed"
+ - bugfix: "Monkey leaders should actually get jungle fever now"
diff --git a/html/changelogs/AutoChangeLog-pr-4596.yml b/html/changelogs/AutoChangeLog-pr-4596.yml
new file mode 100644
index 0000000000..17bb98f350
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4596.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "Burial jumpsuits no longer have suit sensors"
diff --git a/html/changelogs/AutoChangeLog-pr-4599.yml b/html/changelogs/AutoChangeLog-pr-4599.yml
new file mode 100644
index 0000000000..a458b7dcf2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4599.yml
@@ -0,0 +1,4 @@
+author: "Cebutris"
+delete-after: True
+changes:
+ - bugfix: "Holoparasite injectors can no longer be discounted"
diff --git a/html/changelogs/AutoChangeLog-pr-4607.yml b/html/changelogs/AutoChangeLog-pr-4607.yml
new file mode 100644
index 0000000000..1ce8e2136e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4607.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "The chemistry job has been removed from Omegastation. Medical doctors still have full chemistry access"
diff --git a/html/changelogs/AutoChangeLog-pr-4608.yml b/html/changelogs/AutoChangeLog-pr-4608.yml
new file mode 100644
index 0000000000..dc7a2844d9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4608.yml
@@ -0,0 +1,4 @@
+author: "MrDoomBringer"
+delete-after: True
+changes:
+ - imageadd: "NanoTrasen has sent the station new spaceheaters! They look nicer now!"
diff --git a/html/changelogs/AutoChangeLog-pr-4609.yml b/html/changelogs/AutoChangeLog-pr-4609.yml
new file mode 100644
index 0000000000..9f47aa2917
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4609.yml
@@ -0,0 +1,8 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - balance: "Vitality matrices now apply Ichorial Stain when reviving a dead servant, which prevents that servant from being revived again by vitality matrices for a full minute."
+ - balance: "Vitality matrices can't be placed adjacent to one another."
+ - balance: "Brass skewers now damage and stun cyborgs."
+ - balance: "Vitality matrices no longer drain people impaled on brass skewers."
+ - balance: "Pressure sensors have 5 health again (down from 25.)"
diff --git a/html/changelogs/AutoChangeLog-pr-4610.yml b/html/changelogs/AutoChangeLog-pr-4610.yml
new file mode 100644
index 0000000000..cdcfbde61b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4610.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "Vore is no longer restricted to monkeys."
diff --git a/html/changelogs/AutoChangeLog-pr-4611.yml b/html/changelogs/AutoChangeLog-pr-4611.yml
new file mode 100644
index 0000000000..135f53690f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4611.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Viewing photos sent by PDA message works again."
diff --git a/html/changelogs/AutoChangeLog-pr-4612.yml b/html/changelogs/AutoChangeLog-pr-4612.yml
new file mode 100644
index 0000000000..1bb68ce590
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4612.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Last resort now requires a confirmation"
diff --git a/html/changelogs/AutoChangeLog-pr-4613.yml b/html/changelogs/AutoChangeLog-pr-4613.yml
new file mode 100644
index 0000000000..871d1fc7ac
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4613.yml
@@ -0,0 +1,5 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - code_imp: "loot drop spawners now assign their pixel offsets to the items they spawn, also have a \"fanout\" setting to distribute items in a neat fashion like in omega/delta's core and some tech storages."
+ - tweak: "replaced several law boards in uploads with spawners, the net result being one more board in uploads that may be a duplicate asimov (but hopefully isn't)"
diff --git a/html/changelogs/AutoChangeLog-pr-4615.yml b/html/changelogs/AutoChangeLog-pr-4615.yml
new file mode 100644
index 0000000000..f7e0e15470
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4615.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Explosions now cause camera shake based on intensity and distance"
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index ef680c266a..e6d40977a7 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi
index 1abc0b5ca7..fcd971c674 100644
Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ
diff --git a/modular_citadel/code/datums/uplink_items_cit.dm b/modular_citadel/code/datums/uplink_items_cit.dm
index 26591c72ef..392e26ba71 100644
--- a/modular_citadel/code/datums/uplink_items_cit.dm
+++ b/modular_citadel/code/datums/uplink_items_cit.dm
@@ -16,6 +16,7 @@
NOTE: The precise nature of the symbiosis required by the parasites renders them incompatible with changelings" //updated to actually describe what they do and warn traitorchans not to buy it
item = /obj/item/storage/box/syndie_kit/holoparasite
refundable = TRUE
+ cant_discount = TRUE
cost = 15
surplus = 20 //Nobody needs a ton of parasites
exclude_modes = list(/datum/game_mode/nuclear)
diff --git a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
index 385e9cd9d4..3c564f1807 100644
--- a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
+++ b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
@@ -273,7 +273,7 @@
var/mob/M = loc
M.update_inv_hands()
- clean_blood()//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
+ SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
/obj/item/twohanded/hypereutactic/AltClick(mob/living/user)
if(!in_range(src, user)) //Basic checks to prevent abuse
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm
new file mode 100644
index 0000000000..b61df944d1
--- /dev/null
+++ b/modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm
@@ -0,0 +1,5 @@
+/mob/living/human/grabbedby(mob/living/carbon/user, supress_message = 0)
+ if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
+ vore_attack(user, pulling)
+ else
+ ..()
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index f12e79325f..3dbf6168f1 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -43,6 +43,7 @@
#include "code\__DEFINES\events.dm"
#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\food.dm"
+#include "code\__DEFINES\forensics.dm"
#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\integrated_electronics.dm"
#include "code\__DEFINES\inventory.dm"
@@ -85,6 +86,7 @@
#include "code\__DEFINES\tgui.dm"
#include "code\__DEFINES\time.dm"
#include "code\__DEFINES\tools.dm"
+#include "code\__DEFINES\turf_flags.dm"
#include "code\__DEFINES\typeids.dm"
#include "code\__DEFINES\voreconstants.dm"
#include "code\__DEFINES\vv.dm"
@@ -351,6 +353,7 @@
#include "code\datums\components\chasm.dm"
#include "code\datums\components\cleaning.dm"
#include "code\datums\components\decal.dm"
+#include "code\datums\components\forensics.dm"
#include "code\datums\components\infective.dm"
#include "code\datums\components\jousting.dm"
#include "code\datums\components\knockoff.dm"
@@ -365,6 +368,7 @@
#include "code\datums\components\spooky.dm"
#include "code\datums\components\squeek.dm"
#include "code\datums\components\thermite.dm"
+#include "code\datums\components\decals\blood.dm"
#include "code\datums\diseases\_disease.dm"
#include "code\datums\diseases\_MobProcs.dm"
#include "code\datums\diseases\anxiety.dm"
@@ -1122,6 +1126,7 @@
#include "code\game\objects\structures\transit_tubes\transit_tube.dm"
#include "code\game\objects\structures\transit_tubes\transit_tube_construction.dm"
#include "code\game\objects\structures\transit_tubes\transit_tube_pod.dm"
+#include "code\game\turfs\ChangeTurf.dm"
#include "code\game\turfs\closed.dm"
#include "code\game\turfs\open.dm"
#include "code\game\turfs\turf.dm"
@@ -2471,5 +2476,6 @@
#include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm"
#include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm"
#include "modular_citadel\code\modules\crafting\recipes.dm"
+#include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
#include "modular_citadel\code\modules\mob\living\silicon\robot\robot_modules.dm"
// END_INCLUDE
diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index a97b9db1c2..e6956dfb85 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -220,7 +220,7 @@ function tag_pr($payload, $opened) {
else if ($mergeable === FALSE)
$tags[] = 'Merge Conflict';
- $treetags = array('_maps' => 'Map Edit', 'tools' => 'Tools', 'SQL' => 'SQL');
+ $treetags = array('_maps' => 'Map Edit', 'tools' => 'Tools', 'SQL' => 'SQL', '.github' => 'GitHub');
$addonlytags = array('icons' => 'Sprites', 'sound' => 'Sound', 'config' => 'Config Update', 'code/controllers/configuration/entries' => 'Config Update', 'tgui' => 'UI');
foreach($treetags as $tree => $tag)
if(has_tree_been_edited($payload, $tree))