diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm
index f48bcfc3177..c489b284221 100644
--- a/_maps/RandomZLevels/Cabin.dmm
+++ b/_maps/RandomZLevels/Cabin.dmm
@@ -778,9 +778,7 @@
/turf/open/floor/plasteel/freezer,
/area/awaymission/cabin)
"cH" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/wood,
/area/awaymission/cabin)
"cI" = (
@@ -974,12 +972,7 @@
/turf/open/floor/plating/snowed/temperatre,
/area/awaymission/snowforest)
"dt" = (
-/obj/effect/landmark/mapGenerator/snowy{
- endTurfX = 159;
- endTurfY = 157;
- startTurfX = 37;
- startTurfY = 35
- },
+/obj/effect/landmark/mapGenerator/snowy,
/turf/open/floor/plating/asteroid/snow/temperatre,
/area/awaymission/snowforest)
"du" = (
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 19b2c6579bf..91bbcdf0263 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1175,9 +1175,7 @@
},
/area/awaymission/BMPship)
"cz" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
@@ -1337,9 +1335,7 @@
name = "\improper BMP Asteroid Level 2"
})
"cR" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
@@ -1635,9 +1631,7 @@
"dw" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -1718,9 +1712,7 @@
"dH" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -1833,9 +1825,7 @@
/obj/structure/bed,
/obj/item/weapon/bedsheet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -1874,9 +1864,7 @@
/area/awaymission/northblock)
"ed" = (
/obj/structure/bed,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
baseturf = /turf/open/floor/plating/asteroid/basalt;
initial_gas_mix = "n2=23;o2=14"
@@ -2082,9 +2070,7 @@
},
/area/awaymission/BMPship)
"eE" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -2151,9 +2137,7 @@
},
/area/awaymission/listeningpost)
"eO" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
@@ -2630,9 +2614,7 @@
},
/area/awaymission/BMPship)
"fU" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/elevatorshaft{
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
@@ -2768,9 +2750,7 @@
},
/area/awaymission/BMPship)
"gk" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14"
},
diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm
index 6f125ecfee5..71e62321371 100644
--- a/_maps/RandomZLevels/challenge.dmm
+++ b/_maps/RandomZLevels/challenge.dmm
@@ -43,9 +43,7 @@
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/start)
"aj" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/airless{
icon_state = "damaged3"
},
@@ -57,9 +55,7 @@
},
/area/awaymission/challenge/start)
"al" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/airless,
/area/awaymission/challenge/start)
"am" = (
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 2ad6bc5eb53..9c681caa3e9 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -9085,9 +9085,7 @@
name = "MO19 Arrivals"
})
"ms" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
@@ -9097,9 +9095,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/blue,
/area/awaycontent/a1{
has_gravity = 1;
@@ -9269,9 +9265,7 @@
name = "MO19 Arrivals"
})
"mI" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
@@ -9284,9 +9278,7 @@
icon_state = "beacon";
name = "tracking beacon"
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/mineral/titanium/yellow,
/area/awaycontent/a1{
has_gravity = 1;
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 123561932b2..283bb53322f 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -614,9 +614,7 @@
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"bR" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"bS" = (
@@ -686,9 +684,7 @@
/area/awaymission/research/interior/gateway)
"bZ" = (
/obj/machinery/gateway,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
@@ -774,9 +770,7 @@
/area/awaymission/research/interior/gateway)
"cj" = (
/obj/structure/window/reinforced,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"ck" = (
@@ -785,9 +779,7 @@
icon_state = "right";
dir = 2
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/gateway)
"cl" = (
@@ -3299,9 +3291,7 @@
icon_state = "toilet00";
dir = 8
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/obj/machinery/light/small{
dir = 4
},
@@ -3746,9 +3736,7 @@
"jU" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/blue,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"jV" = (
@@ -4489,9 +4477,7 @@
"lT" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/patriot,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"lU" = (
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index ef33d0f935a..8810ffa44d4 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -579,18 +579,14 @@
},
/area/awaymission/snowdin/base)
"bw" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
},
/area/awaymission/snowdin/base)
"bx" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -608,9 +604,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -710,9 +704,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -724,9 +716,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -739,9 +729,7 @@
/area/awaymission/snowdin/base)
"bK" = (
/obj/item/trash/pistachios,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -753,9 +741,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/asteroid/snow;
wet = 0
@@ -780,9 +766,7 @@
"bP" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -1164,9 +1148,7 @@
},
/area/awaymission/snowdin/igloo)
"cU" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
temperature = 220
},
@@ -2021,9 +2003,7 @@
},
/area/awaymission/snowdin/post)
"ft" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -4222,9 +4202,7 @@
"lf" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/asteroid/snow
},
@@ -4442,9 +4420,7 @@
icon_state = "tube1";
dir = 4
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/carpet{
baseturf = /turf/open/floor/plating/asteroid/snow
},
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index df0ed07de0a..d9e218d057c 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -828,9 +828,7 @@
},
/area/awaymission/spacebattle/cruiser)
"cO" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
"cP" = (
@@ -1053,9 +1051,7 @@
},
/area/awaymission/spacebattle/cruiser)
"dA" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -1747,9 +1743,7 @@
/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"fI" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/cafeteria{
dir = 2
},
@@ -2331,9 +2325,7 @@
/area/awaymission/spacebattle/cruiser)
"hC" = (
/obj/structure/chair,
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
"hD" = (
@@ -2928,9 +2920,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
"jD" = (
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index a9bfeab8cf2..db8cfe012c9 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -250,9 +250,7 @@
name = "UO45 Central Hall"
})
"ax" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -265,9 +263,7 @@
icon_state = "comfychair";
dir = 4
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/grimy{
heat_capacity = 1e+006
},
@@ -282,9 +278,7 @@
icon_state = "beacon";
name = "tracking beacon"
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/neutral/side{
dir = 4;
heat_capacity = 1e+006
@@ -309,9 +303,7 @@
scrub_N2O = 0;
scrub_Toxins = 0
},
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/neutral/side{
dir = 4;
heat_capacity = 1e+006
@@ -498,9 +490,7 @@
name = "UO45 Central Hall"
})
"aT" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/grimy{
heat_capacity = 1e+006
},
diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm
index afc9addebb8..93a2bf679af 100644
--- a/_maps/RandomZLevels/wildwest.dmm
+++ b/_maps/RandomZLevels/wildwest.dmm
@@ -2165,9 +2165,7 @@
},
/area/awaymission/wwrefine)
"gV" = (
-/obj/effect/landmark{
- name = "awaystart"
- },
+/obj/effect/landmark/awaystart,
/turf/open/floor/plating/ironsand{
icon_state = "ironsand1"
},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 5dda2eaf432..753d4453d89 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -29,9 +29,7 @@
/turf/open/space,
/area/space)
"aad" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aae" = (
@@ -158,10 +156,7 @@
/area/space)
"aar" = (
/obj/structure/lattice/catwalk,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/space,
/area/solar/auxstarboard)
"aas" = (
@@ -696,9 +691,7 @@
icon_state = "0-4";
d2 = 4
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/auxsolarstarboard)
"abx" = (
@@ -1512,9 +1505,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry{
@@ -1622,9 +1613,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry{
@@ -1772,9 +1761,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/holopad,
/obj/structure/cable/white{
icon_state = "1-2"
@@ -2063,9 +2050,7 @@
name = "Arrivals"
})
"aeb" = (
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel/neutral,
/area/shuttle/arrival)
"aec" = (
@@ -2646,9 +2631,7 @@
/area/maintenance/starboard/fore_starboard_maintenance)
"afo" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/fore_starboard_maintenance)
@@ -2799,9 +2782,7 @@
/turf/open/floor/plasteel/redyellow,
/area/maintenance/starboard/fore_starboard_maintenance)
"afI" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -3467,9 +3448,7 @@
name = "Arrivals"
})
"agY" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -4579,9 +4558,7 @@
})
"aju" = (
/obj/structure/chair/comfy/brown,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/entry{
name = "Arrivals"
@@ -5523,9 +5500,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard/fore_starboard_maintenance)
"alA" = (
@@ -6461,9 +6436,7 @@
buildstackamount = 0;
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/airalarm{
dir = 1;
icon_state = "alarm0";
@@ -7030,10 +7003,7 @@
/area/shuttle/syndicate)
"aoG" = (
/obj/structure/lattice/catwalk,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/space,
/area/solar/auxport)
"aoH" = (
@@ -9665,9 +9635,7 @@
/area/maintenance/fpmaint2/fore_port_maintenance)
"atu" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -9797,9 +9765,7 @@
/area/janitor)
"atI" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -9826,9 +9792,7 @@
/area/janitor)
"atL" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
on = 1;
@@ -9850,9 +9814,7 @@
/turf/open/floor/plasteel/neutral,
/area/janitor)
"atN" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
@@ -11249,9 +11211,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"awF" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -11442,9 +11402,7 @@
/area/maintenance/fpmaint2/fore_port_maintenance)
"awZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fpmaint2/fore_port_maintenance)
"axa" = (
@@ -11553,9 +11511,7 @@
pixel_x = -32
},
/obj/machinery/light/small,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/crew_quarters/toilet{
@@ -11615,9 +11571,7 @@
})
"axq" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
icon_state = "manifold";
dir = 8
@@ -11628,9 +11582,7 @@
})
"axr" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -13380,9 +13332,7 @@
/area/quartermaster/storage)
"aAN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -15440,9 +15390,7 @@
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/bar)
"aDZ" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 1
@@ -15474,9 +15422,7 @@
/turf/open/floor/plasteel/black,
/area/crew_quarters/bar)
"aEe" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -15494,9 +15440,7 @@
},
/area/crew_quarters/bar)
"aEh" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -15844,9 +15788,7 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/auxsolarport)
"aER" = (
@@ -16317,9 +16259,7 @@
},
/area/hallway/primary/fore)
"aFF" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
on = 1;
@@ -16479,9 +16419,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aFV" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -17009,9 +16947,7 @@
/area/crew_quarters/bar/atrium)
"aGZ" = (
/obj/structure/chair/stool/bar,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aHa" = (
@@ -17045,9 +16981,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/brown{
icon_state = "brown";
dir = 9
@@ -17069,9 +17003,7 @@
name = "\improper Cargo Office"
})
"aHf" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -19138,9 +19070,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/office{
name = "\improper Cargo Office"
@@ -19825,9 +19755,7 @@
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"aMw" = (
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"aMx" = (
@@ -20855,9 +20783,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/bar/atrium)
"aOr" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aOs" = (
@@ -21475,9 +21401,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral,
/area/atmos)
@@ -21692,9 +21616,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/theatre)
"aPM" = (
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -22033,9 +21955,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -22226,9 +22146,7 @@
"aQJ" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/brown,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -22270,9 +22188,7 @@
/obj/structure/bed,
/obj/item/weapon/bedsheet/brown,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -22729,9 +22645,7 @@
/area/crew_quarters/bar/atrium)
"aRE" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"aRF" = (
@@ -22802,9 +22716,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -22996,9 +22908,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Quartermaster"
- },
+/obj/effect/landmark/start/quartermaster,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23125,9 +23035,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Quartermaster"
- },
+/obj/effect/landmark/start/quartermaster,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/qm)
"aSl" = (
@@ -23163,9 +23071,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Quartermaster"
- },
+/obj/effect/landmark/start/quartermaster,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/qm)
"aSo" = (
@@ -24478,9 +24384,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 4
@@ -25658,9 +25562,7 @@
})
"aWZ" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/brown,
/area/quartermaster/office{
name = "\improper Cargo Office"
@@ -25893,9 +25795,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -26125,9 +26025,7 @@
/area/atmos)
"aXP" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/neutral,
/area/atmos)
"aXQ" = (
@@ -26149,9 +26047,7 @@
/area/atmos)
"aXS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -26180,9 +26076,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/neutral,
/area/atmos)
"aXW" = (
@@ -27155,9 +27049,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Chef"
- },
+/obj/effect/landmark/start/cook,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 1
@@ -27543,9 +27435,7 @@
pixel_y = 26
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/light/small{
dir = 1
},
@@ -27897,9 +27787,7 @@
/area/crew_quarters/kitchen)
"bbr" = (
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
@@ -27933,9 +27821,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/brown{
icon_state = "brown";
dir = 8
@@ -28058,9 +27944,7 @@
})
"bbL" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -28069,9 +27953,7 @@
name = "\improper Mining Office"
})
"bbM" = (
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -28081,9 +27963,7 @@
name = "\improper Mining Office"
})
"bbN" = (
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -28631,9 +28511,7 @@
})
"bcR" = (
/obj/machinery/holopad,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -29708,9 +29586,7 @@
pixel_x = 26;
pixel_y = 26
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -30206,9 +30082,7 @@
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"bfR" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -30691,9 +30565,7 @@
/area/security/main)
"bgD" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side,
/area/security/main)
"bgE" = (
@@ -30967,9 +30839,7 @@
/turf/open/floor/plating,
/area/maintenance/fpmaint2/fore_port_maintenance)
"bhl" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fpmaint2/fore_port_maintenance)
"bhm" = (
@@ -31293,9 +31163,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/brown,
/area/hallway/primary/fore)
"bhW" = (
@@ -31575,9 +31443,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -32037,9 +31903,7 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"bjr" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/neutral,
/area/hydroponics)
"bjs" = (
@@ -32350,9 +32214,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -33077,9 +32939,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"blt" = (
@@ -33218,9 +33078,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
+/obj/effect/landmark/start/head_of_security,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -33273,9 +33131,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/plasteel/grimy,
/area/security/hos)
"blL" = (
@@ -33504,9 +33360,7 @@
icon_state = "intact";
dir = 1
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/neutral,
/area/atmos)
"bmi" = (
@@ -33750,9 +33604,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hydroponics)
@@ -33897,9 +33749,7 @@
},
/area/hallway/primary/central)
"bmS" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "4-8"
},
@@ -34163,9 +34013,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -34233,9 +34081,7 @@
},
/area/security/main)
"bnz" = (
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -34892,9 +34738,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel{
icon_state = "L8"
},
@@ -35253,9 +35097,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -35334,9 +35176,7 @@
},
/area/security/main)
"bpz" = (
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35524,9 +35364,7 @@
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/neutral,
/area/atmos)
"bpU" = (
@@ -36002,9 +35840,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -36032,9 +35868,7 @@
},
/area/security/main)
"bqV" = (
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/obj/machinery/light/small{
dir = 4
},
@@ -36700,9 +36534,7 @@
/obj/item/weapon/storage/pod{
pixel_x = 32
},
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -38418,9 +38250,7 @@
icon_state = "1-4"
},
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/effect/turf_decal/bot,
/obj/structure/cable/white{
icon_state = "1-8"
@@ -40717,9 +40547,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -41235,9 +41063,7 @@
pixel_x = 4;
req_access_txt = "16"
},
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bAd" = (
@@ -41352,9 +41178,7 @@
pixel_x = -3;
req_access_txt = "16"
},
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bAk" = (
@@ -42264,9 +42088,7 @@
pixel_y = -23;
req_access_txt = "16"
},
-/obj/effect/landmark/start{
- name = "AI"
- },
+/obj/effect/landmark/start/ai,
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bBO" = (
@@ -43137,9 +42959,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -43441,9 +43261,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/engine/break_room)
"bEb" = (
@@ -43615,9 +43433,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bEo" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/storage/primary)
"bEp" = (
@@ -43635,9 +43451,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bEr" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -45958,9 +45772,7 @@
icon_state = "comfychair";
dir = 4
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/captain)
"bID" = (
@@ -47192,9 +47004,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
/area/security/detectives_office)
@@ -47220,18 +47030,14 @@
/area/security/detectives_office)
"bKZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/security/detectives_office)
"bLa" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/starboard)
"bLb" = (
@@ -47298,9 +47104,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Warden"
- },
+/obj/effect/landmark/start/warden,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -47564,9 +47368,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Chief Engineer"
- },
+/obj/effect/landmark/start/chief_engineer,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/chief)
"bLG" = (
@@ -48127,9 +47929,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -49861,9 +49661,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Chief Engineer"
- },
+/obj/effect/landmark/start/chief_engineer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 8
@@ -50315,9 +50113,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet,
@@ -50753,9 +50549,7 @@
icon_state = "4-8"
},
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -51619,9 +51413,7 @@
icon_state = "tube1";
dir = 8
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/plasteel/white,
/area/crew_quarters/captain/captains_quarters)
"bSP" = (
@@ -51661,9 +51453,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-4"
},
@@ -52712,9 +52502,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -53147,9 +52935,7 @@
pixel_y = -36;
req_access_txt = "63"
},
-/obj/effect/landmark/start{
- name = "Warden"
- },
+/obj/effect/landmark/start/warden,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -54440,9 +54226,7 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"bXZ" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/blue/corner,
/area/hallway/primary/central)
@@ -55254,9 +55038,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/turf/open/floor/plasteel/black,
/area/library)
"bZI" = (
@@ -55565,9 +55347,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
@@ -55636,9 +55416,7 @@
/obj/machinery/newscaster{
pixel_x = 32
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/carpet,
/area/crew_quarters/captain/captains_quarters)
"cap" = (
@@ -55780,9 +55558,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 4
@@ -55811,9 +55587,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 2;
on = 1
@@ -55887,9 +55661,7 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -56248,9 +56020,7 @@
/area/engine/engineering)
"cbq" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -56606,9 +56376,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -56887,9 +56655,7 @@
pixel_x = -32;
pixel_y = -64
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -56902,9 +56668,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
on = 1;
@@ -56916,9 +56680,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"ccC" = (
@@ -56933,9 +56695,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -57280,9 +57040,7 @@
},
/area/maintenance/fpmaint2/port_maintenance)
"cdk" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/neutral/side{
dir = 8
},
@@ -57324,9 +57082,7 @@
/area/library)
"cdq" = (
/obj/structure/chair/comfy/brown,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/library)
"cdr" = (
@@ -57390,9 +57146,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/wood,
/area/crew_quarters/heads)
"cdz" = (
@@ -57583,9 +57337,7 @@
pixel_x = -26;
pixel_y = 3
},
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1;
on = 1;
@@ -57976,9 +57728,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"ceG" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/neutral,
/area/engine/engineering)
"ceH" = (
@@ -58007,9 +57757,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"ceJ" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
@@ -58315,9 +58063,7 @@
},
/area/crew_quarters/courtroom)
"cfv" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -58339,9 +58085,7 @@
/area/crew_quarters/courtroom)
"cfy" = (
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/crew_quarters/courtroom)
@@ -58671,9 +58415,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/neutral,
/area/engine/engineering)
"cgg" = (
@@ -58731,9 +58473,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/library)
"cgn" = (
@@ -58757,9 +58497,7 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"cgq" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -59326,10 +59064,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/maintenance/fpmaint2/port_maintenance)
@@ -59715,9 +59450,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
icon_state = "manifold";
dir = 4
@@ -59777,9 +59510,7 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
@@ -59861,9 +59592,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -60025,9 +59754,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/security/range)
"ciO" = (
@@ -60354,9 +60081,7 @@
pixel_x = 26;
pixel_y = 26
},
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -60461,10 +60186,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -61096,9 +60818,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 10
@@ -62194,9 +61914,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cno" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/yellow,
/area/engine/engineering)
"cnp" = (
@@ -62294,10 +62012,7 @@
/area/maintenance/fpmaint2/port_maintenance)
"cny" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -63457,9 +63172,7 @@
icon_state = "4-8"
},
/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -64123,9 +63836,7 @@
icon_state = "1-2"
},
/obj/machinery/holopad,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/bridge/meeting_room{
@@ -64388,9 +64099,7 @@
/area/crew_quarters/locker)
"crn" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -64835,9 +64544,7 @@
/obj/structure/chair/comfy/black{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/blue/corner,
/area/bridge/meeting_room{
name = "\improper Command Hallway"
@@ -65006,9 +64713,7 @@
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"csx" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"csy" = (
@@ -65487,9 +65192,7 @@
},
/area/library)
"ctx" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1;
on = 1;
@@ -65499,9 +65202,7 @@
/area/library)
"cty" = (
/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start{
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 5
@@ -65973,9 +65674,7 @@
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/locker)
"cup" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
icon_state = "manifold";
dir = 1
@@ -66361,9 +66060,7 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"cva" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -66906,9 +66603,7 @@
/area/engine/engineering)
"cwd" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/neutral,
/area/engine/engineering)
"cwe" = (
@@ -67652,9 +67347,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -67974,9 +67667,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
@@ -68472,9 +68163,7 @@
name = "\improper Restrooms"
})
"cyG" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/locker/locker_toilet{
name = "\improper Restrooms"
@@ -68660,9 +68349,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/corner{
dir = 4
@@ -68763,9 +68450,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"czp" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 8
@@ -68882,10 +68567,7 @@
"czy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -68893,9 +68575,7 @@
/turf/open/floor/plasteel/yellow,
/area/maintenance/fpmaint2/port_maintenance)
"czz" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -69053,9 +68733,7 @@
/area/maintenance/fpmaint2/port_maintenance)
"czN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/neutral,
/area/maintenance/fpmaint2/port_maintenance)
"czO" = (
@@ -70224,9 +69902,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/central)
"cBS" = (
@@ -70958,9 +70634,7 @@
pixel_x = -32
},
/obj/machinery/light/small,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/crew_quarters/locker/locker_toilet{
@@ -71147,9 +70821,7 @@
/turf/closed/wall,
/area/maintenance/fpmaint2/port_maintenance)
"cDG" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -72147,9 +71819,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -72558,9 +72228,7 @@
/area/maintenance/starboard/aft_starboard_maintenance)
"cFU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -72642,9 +72310,7 @@
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/sleep)
"cGf" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/sleep)
"cGg" = (
@@ -72715,9 +72381,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/neutral,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -73131,9 +72795,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -73376,9 +73038,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/structure/disposalpipe/junction{
dir = 1;
@@ -74311,9 +73971,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 8
@@ -74435,9 +74093,7 @@
})
"cJT" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/whitepurple/corner{
icon_state = "whitepurplecorner";
dir = 1
@@ -74512,9 +74168,7 @@
})
"cKa" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 4
},
@@ -74564,9 +74218,7 @@
})
"cKh" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/whiteblue/corner{
dir = 1
},
@@ -74627,9 +74279,7 @@
})
"cKn" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/whiteblue/corner{
dir = 4
},
@@ -76179,9 +75829,7 @@
name = "Research Division"
})
"cNl" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -76512,9 +76160,7 @@
name = "Medbay Storage"
})
"cNM" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/cmo,
/area/medical/medbay2{
name = "Medbay Storage"
@@ -77219,9 +76865,7 @@
},
/area/hallway/primary/aft)
"cPh" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -77320,9 +76964,7 @@
name = "Medbay Central"
})
"cPq" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -77543,10 +77185,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -77709,9 +77348,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/light{
dir = 4
@@ -78595,9 +78232,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 8
@@ -78726,9 +78361,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -78782,9 +78415,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/neutral,
/area/toxins/xenobiology)
"cRX" = (
@@ -79295,9 +78926,7 @@
/area/maintenance/starboard/aft_starboard_maintenance)
"cSV" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -80585,9 +80214,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral,
/area/toxins/xenobiology)
@@ -80876,9 +80503,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/medical/chemistry)
@@ -81018,9 +80643,7 @@
name = "Medbay Central"
})
"cWf" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/blue,
/area/medical/medbay{
name = "Medbay Central"
@@ -81055,9 +80678,7 @@
})
"cWj" = (
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 6
@@ -81234,9 +80855,7 @@
},
/area/maintenance/fpmaint2/port_maintenance)
"cWC" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 8
@@ -81752,9 +81371,7 @@
/turf/open/floor/plasteel/neutral,
/area/toxins/lab)
"cXt" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/neutral,
/area/toxins/lab)
"cXu" = (
@@ -81886,9 +81503,7 @@
})
"cXJ" = (
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/neutral,
/area/medical/medbay{
name = "Medbay Central"
@@ -83165,9 +82780,7 @@
/obj/machinery/holopad{
pixel_x = -16
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 4
@@ -83411,10 +83024,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/medical/medbay3{
name = "Abandoned Medbay"
@@ -84558,9 +84168,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 2;
on = 1;
@@ -84626,9 +84234,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/medical/chemistry)
@@ -84720,9 +84326,7 @@
icon_state = "4-8"
},
/obj/item/device/radio/beacon,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/whiteblue,
/area/medical/medbay{
@@ -85044,10 +84648,7 @@
dir = 1;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"ddV" = (
@@ -85931,10 +85532,7 @@
"dfB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -85948,9 +85546,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/wood,
/area/maintenance/starboard/aft_starboard_maintenance)
"dfD" = (
@@ -87424,10 +87020,7 @@
"diD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -87535,10 +87128,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/neutral,
/area/medical/research{
name = "Abandoned Research Lab"
@@ -87694,9 +87284,7 @@
/area/toxins/explab)
"dje" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -87788,9 +87376,7 @@
})
"djl" = (
/obj/machinery/holopad,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -88026,9 +87612,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -88264,9 +87848,7 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel,
/area/medical/medbay{
name = "Medbay Central"
@@ -88362,9 +87944,7 @@
},
/area/hallway/secondary/construction)
"dko" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/aft_starboard_maintenance)
@@ -88435,9 +88015,7 @@
/area/crew_quarters/abandoned_gambling_den)
"dky" = (
/obj/effect/decal/cleanable/vomit/old,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -89059,9 +88637,7 @@
/turf/open/floor/plating,
/area/hallway/primary/aft)
"dlB" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -89244,9 +88820,7 @@
"dlY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -89616,9 +89190,7 @@
/area/assembly/chargebay)
"dmM" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel/neutral,
/area/assembly/chargebay)
"dmN" = (
@@ -90382,9 +89954,7 @@
/turf/open/floor/plasteel/blue,
/area/medical/surgery)
"dot" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "intact";
dir = 5
@@ -90698,9 +90268,7 @@
},
/area/toxins/explab)
"doZ" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -90731,10 +90299,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -90842,9 +90407,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Research Director"
- },
+/obj/effect/landmark/start/research_director,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/whitepurple/corner,
/area/crew_quarters/hor)
@@ -90927,9 +90490,7 @@
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -91264,9 +90825,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 1
@@ -91523,9 +91082,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 4
@@ -91941,9 +91498,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -92171,9 +91726,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -92326,10 +91879,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft_starboard_maintenance)
"drX" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -92474,9 +92024,7 @@
name = "\improper Toxins Lab"
})
"dsp" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral,
/area/toxins/mixing{
@@ -92786,9 +92334,7 @@
icon_state = "1-8"
},
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 9
@@ -93146,10 +92692,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/neutral,
/area/medical/research{
name = "Abandoned Research Lab"
@@ -93564,9 +93107,7 @@
/area/medical/genetics)
"dum" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/whitepurple/side{
dir = 10
},
@@ -93955,9 +93496,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Research Director"
- },
+/obj/effect/landmark/start/research_director,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 9
@@ -94047,9 +93586,7 @@
icon_state = "officechair_white";
dir = 4
},
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -94949,9 +94486,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chief Medical Officer"
- },
+/obj/effect/landmark/start/chief_medical_officer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/cmo,
/area/medical/cmo)
@@ -94997,9 +94532,7 @@
name = "Medbay Central"
})
"dwX" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -95487,9 +95020,7 @@
/turf/open/floor/plasteel/neutral,
/area/assembly/robotics)
"dxN" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
icon_state = "intact";
dir = 8
@@ -95583,16 +95114,12 @@
/area/medical/morgue)
"dxV" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/medical/morgue)
"dxW" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -95600,9 +95127,7 @@
"dxX" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -95778,9 +95303,7 @@
name = "Medbay Central"
})
"dyp" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 8
@@ -95905,9 +95428,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
@@ -96091,9 +95612,7 @@
/turf/open/floor/plasteel,
/area/assembly/robotics)
"dyV" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -96149,10 +95668,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/neutral,
/area/medical/morgue)
"dze" = (
@@ -96869,9 +96385,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -96883,9 +96397,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -96951,9 +96463,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 1
@@ -97265,10 +96775,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/neutral/side{
dir = 1;
heat_capacity = 1e+006
@@ -97550,9 +97057,7 @@
},
/area/assembly/robotics)
"dBC" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 4
},
@@ -97608,9 +97113,7 @@
/area/medical/morgue)
"dBI" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -97726,9 +97229,7 @@
/turf/open/floor/plasteel/neutral,
/area/medical/cmo)
"dBV" = (
-/obj/effect/landmark/start{
- name = "Chief Medical Officer"
- },
+/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/plasteel/blue,
/area/medical/cmo)
"dBW" = (
@@ -97834,10 +97335,7 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -97916,9 +97414,7 @@
name = "\improper Toxins Lab"
})
"dCo" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -97989,9 +97485,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/item/device/radio/beacon,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/effect/turf_decal/bot,
@@ -98396,9 +97890,7 @@
"dDa" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/medical/morgue)
"dDb" = (
@@ -98631,10 +98123,7 @@
})
"dDz" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -99091,10 +98580,7 @@
name = "Medbay Central"
})
"dEp" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -99538,9 +99024,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 1;
@@ -99978,10 +99462,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/neutral,
/area/medical/research{
name = "Research Division"
@@ -100392,9 +99873,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -100634,10 +100113,7 @@
})
"dHm" = (
/obj/structure/lattice/catwalk,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/space,
/area/solar/starboard)
"dHn" = (
@@ -101131,9 +100607,7 @@
pixel_x = 28
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -101177,9 +100651,7 @@
name = "Research Division"
})
"dIr" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -101532,9 +101004,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 4
@@ -101860,9 +101330,7 @@
"dJL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/neutral/side{
dir = 1
},
@@ -102041,9 +101509,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
@@ -102616,9 +102082,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Virologist"
- },
+/obj/effect/landmark/start/virologist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -103264,9 +102728,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Virologist"
- },
+/obj/effect/landmark/start/virologist,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1;
on = 1;
@@ -103301,10 +102763,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/library/abandoned_library)
"dMx" = (
@@ -103329,9 +102788,7 @@
/area/library/abandoned_library)
"dMA" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/library/abandoned_library)
"dMB" = (
@@ -104802,9 +104259,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/green,
/area/medical/virology)
"dPN" = (
@@ -104886,9 +104341,7 @@
"dPV" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/library/abandoned_library)
"dPW" = (
@@ -104925,9 +104378,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -104956,9 +104407,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
icon_state = "manifold";
dir = 4
@@ -105195,9 +104644,7 @@
},
/area/medical/virology)
"dQG" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/medical/virology)
@@ -105249,10 +104696,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -105756,9 +105200,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
@@ -105865,9 +105307,7 @@
})
"dRX" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/camera{
c_tag = "Departures - Center";
dir = 2;
@@ -105933,9 +105373,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Virologist"
- },
+/obj/effect/landmark/start/virologist,
/turf/open/floor/plasteel/whitegreen/corner{
dir = 8
},
@@ -106484,9 +105922,7 @@
icon_state = "1-8"
},
/obj/machinery/holopad,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -106597,9 +106033,7 @@
name = "\improper Departure Lounge"
})
"dTu" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -106800,9 +106234,7 @@
/area/maintenance/fpmaint2/aft_port_maintenance)
"dTN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -106921,9 +106353,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit{
@@ -107685,9 +107115,7 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/portsolar)
"dVB" = (
@@ -107701,10 +107129,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -107846,9 +107271,7 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/main)
"dVQ" = (
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/grimy,
/area/chapel/main)
@@ -109815,9 +109238,7 @@
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
"dZG" = (
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -109893,9 +109314,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
icon_state = "intact";
dir = 9
@@ -110309,10 +109728,7 @@
/area/shuttle/escape)
"eaK" = (
/obj/structure/lattice/catwalk,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/space,
/area/solar/port)
"eaL" = (
@@ -111980,9 +111396,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/sign/poster/official/cleanliness{
pixel_y = 32
},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 00e9a2ef582..47f5e3ed15e 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -16,9 +16,7 @@
/turf/open/space,
/area/space)
"aac" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aad" = (
@@ -183,9 +181,7 @@
/turf/open/floor/plasteel/airless/solarpanel,
/area/solar/auxport)
"aav" = (
-/obj/effect/landmark{
- name = "Marauder Entry"
- },
+/obj/effect/landmark/marauder_entry,
/turf/open/space,
/area/space)
"aaw" = (
@@ -206,10 +202,7 @@
/turf/open/floor/plating,
/area/security/prison)
"aaz" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/auxport)
@@ -913,9 +906,7 @@
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/clothing/mask/muzzle,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/item/device/electropack,
/turf/open/floor/plasteel/black,
/area/prison/solitary{
@@ -1657,9 +1648,7 @@
/obj/item/clothing/suit/straight_jacket,
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/clothing/mask/muzzle,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/white,
/area/security/prison)
"adh" = (
@@ -1680,9 +1669,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/white,
/area/security/prison)
"adj" = (
@@ -2449,9 +2436,7 @@
"aeD" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
-/obj/effect/landmark{
- name = "Syndicate Breach Area"
- },
+/obj/effect/landmark/syndicate_breach_area,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -2470,10 +2455,7 @@
name = "\improper Recreation Area"
})
"aeF" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/solar/auxstarboard)
@@ -3323,9 +3305,7 @@
dir = 2;
initialize_directions = 11
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/red/corner{
dir = 1
},
@@ -3982,9 +3962,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/carpet,
/area/security/hos)
"aha" = (
@@ -4070,9 +4048,7 @@
})
"ahj" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -4147,10 +4123,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/auxsolarport)
"aht" = (
@@ -4817,9 +4790,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/camera{
c_tag = "Evidence Storage";
dir = 2;
@@ -5096,9 +5067,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness{
name = "\improper Recreation Area"
@@ -5378,16 +5347,12 @@
on = 1;
pressure_checks = 1
},
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/vault,
/area/security/main)
"ajF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/vault,
/area/security/main)
"ajG" = (
@@ -5401,9 +5366,7 @@
/area/security/main)
"ajH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/vault,
/area/security/main)
"ajI" = (
@@ -5413,9 +5376,7 @@
scrub_N2O = 0;
scrub_Toxins = 0
},
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/vault,
/area/security/main)
"ajJ" = (
@@ -5789,10 +5750,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -6226,9 +6184,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/corner{
dir = 8
},
@@ -6280,10 +6236,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fore)
"ald" = (
@@ -6612,9 +6565,7 @@
})
"alI" = (
/obj/item/weapon/grown/log,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -6960,9 +6911,7 @@
/area/security/main)
"amj" = (
/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/plasteel,
/area/security/main)
"amk" = (
@@ -7124,9 +7073,7 @@
"amt" = (
/obj/structure/rack,
/obj/item/weapon/storage/box/lights/mixed,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fore)
"amu" = (
@@ -7337,10 +7284,7 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"amS" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/storage/box/lights/mixed,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
@@ -7443,9 +7387,7 @@
dir = 1
},
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/security/brig)
"ane" = (
@@ -7921,10 +7863,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -8231,9 +8170,7 @@
/turf/open/floor/plasteel,
/area/security/main)
"aoD" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red,
/area/security/main)
"aoE" = (
@@ -8758,10 +8695,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -9314,10 +9248,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/auxsolarstarboard)
"aqA" = (
@@ -9662,9 +9593,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Warden"
- },
+/obj/effect/landmark/start/warden,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -9694,9 +9623,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -9727,9 +9654,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side,
/area/security/main)
"aro" = (
@@ -9745,9 +9670,7 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side,
/area/security/main)
"arp" = (
@@ -9757,9 +9680,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side,
/area/security/main)
"arq" = (
@@ -9777,9 +9698,7 @@
dir = 2;
initialize_directions = 11
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side,
/area/security/main)
"ars" = (
@@ -9917,9 +9836,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"arK" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -9929,10 +9846,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/starboard)
"arM" = (
@@ -10065,10 +9979,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -10187,10 +10098,7 @@
on = 1
},
/obj/machinery/light,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -10376,9 +10284,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"asq" = (
-/obj/effect/landmark/start{
- name = "Warden"
- },
+/obj/effect/landmark/start/warden,
/obj/structure/chair/office/dark,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
@@ -11484,10 +11390,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"aug" = (
@@ -11520,9 +11423,7 @@
dir = 4;
initialize_directions = 11
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/crew_quarters/sleep)
"auj" = (
@@ -11551,10 +11452,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/sleep)
"aum" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -11567,9 +11465,7 @@
"auo" = (
/obj/structure/mopbucket,
/obj/item/weapon/mop,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
@@ -11584,10 +11480,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/starboard)
"aur" = (
@@ -12821,9 +12714,7 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/security/brig)
"awn" = (
@@ -13539,10 +13430,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/carpet,
/area/crew_quarters/sleep)
"axF" = (
@@ -13594,10 +13482,7 @@
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"axK" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -14191,9 +14076,7 @@
icon_state = "shower";
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/locker/locker_toilet{
name = "\improper Restrooms"
@@ -14891,10 +14774,7 @@
name = "\improper Restrooms"
})
"aAb" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/bikehorn/rubberducky,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/locker/locker_toilet{
@@ -15139,9 +15019,7 @@
/obj/structure/disposalpipe/sortjunction{
sortType = 4
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aAv" = (
@@ -15260,9 +15138,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -15597,9 +15473,7 @@
/area/security/brig)
"aBk" = (
/obj/structure/closet/secure_closet/detective,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/camera{
c_tag = "Detective's Office";
dir = 4;
@@ -15629,9 +15503,7 @@
/turf/open/floor/carpet,
/area/security/detectives_office)
"aBo" = (
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/obj/structure/chair/office/dark{
dir = 8
},
@@ -15684,9 +15556,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
@@ -16692,9 +16562,7 @@
})
"aDi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -16738,9 +16606,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/sorting{
name = "\improper Warehouse"
@@ -17122,9 +16988,7 @@
req_access_txt = "0";
specialfunctions = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/locker/locker_toilet{
name = "\improper Restrooms"
@@ -17275,10 +17139,7 @@
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"aEe" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -17316,9 +17177,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aEj" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -17483,9 +17342,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock{
name = "\improper Mining Office"
@@ -17591,9 +17448,7 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/sorting{
name = "\improper Warehouse"
@@ -18755,9 +18610,7 @@
/area/security/brig)
"aGu" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/security/detectives_office)
"aGv" = (
@@ -18823,9 +18676,7 @@
pixel_x = 0;
pixel_y = -32
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/button/door{
id = "Toilet2";
name = "Lock Control";
@@ -18971,10 +18822,7 @@
name = "Port Maintenance"
})
"aGO" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -19109,9 +18957,7 @@
/area/engine/engineering)
"aGW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aGX" = (
@@ -20380,9 +20226,7 @@
pixel_x = 0;
pixel_y = -32
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/button/door{
id = "Toilet1";
name = "Lock Control";
@@ -20424,9 +20268,7 @@
req_access_txt = "0";
specialfunctions = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/locker/locker_toilet{
name = "\improper Restrooms"
@@ -20817,9 +20659,7 @@
/turf/open/floor/plasteel/black,
/area/crew_quarters/courtroom)
"aKf" = (
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/obj/structure/chair/office/dark{
dir = 4
},
@@ -21032,9 +20872,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"aKy" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/engine/engineering)
"aKz" = (
@@ -21263,9 +21101,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -21512,9 +21348,7 @@
},
/area/crew_quarters/courtroom)
"aLB" = (
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/turf/open/floor/plasteel,
/area/crew_quarters/courtroom)
"aLC" = (
@@ -21731,9 +21565,7 @@
name = "\improper Garden"
})
"aLZ" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -21743,9 +21575,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"aMb" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/engine/engineering)
"aMc" = (
@@ -21876,9 +21706,7 @@
/area/quartermaster/storage)
"aMx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -22078,9 +21906,7 @@
/turf/open/floor/wood,
/area/lawoffice)
"aMS" = (
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
@@ -22463,9 +22289,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aNF" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aNG" = (
@@ -22887,9 +22711,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/floorgrime,
/area/crew_quarters/locker)
"aOA" = (
@@ -23362,9 +23184,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aPj" = (
-/obj/effect/landmark/start{
- name = "Quartermaster"
- },
+/obj/effect/landmark/start/quartermaster,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
@@ -23911,9 +23731,7 @@
/turf/open/floor/plating,
/area/quartermaster/storage)
"aQj" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel{
name = "floor"
@@ -24511,9 +24329,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"aRj" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/machinery/light{
dir = 8
},
@@ -24629,9 +24445,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -24718,9 +24532,7 @@
},
/area/mining_construction)
"aRG" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -26293,9 +26105,7 @@
pixel_x = -24;
pixel_y = 24
},
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
@@ -26339,9 +26149,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/machinery/light/small{
dir = 4
},
@@ -26996,9 +26804,7 @@
},
/area/quartermaster/storage)
"aVI" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -27006,9 +26812,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aVK" = (
@@ -27838,9 +27642,7 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -28135,9 +27937,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel{
icon_state = "L7"
},
@@ -28265,9 +28065,7 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard)
"aYb" = (
@@ -29142,9 +28940,7 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -29290,9 +29086,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aZJ" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9;
@@ -29377,9 +29171,7 @@
/turf/open/floor/wood,
/area/library)
"aZQ" = (
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -29485,9 +29277,7 @@
},
/area/ai_monitored/turret_protected/ai)
"aZY" = (
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -30279,10 +30069,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"bbi" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/cigbutt,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -30439,9 +30226,7 @@
},
/area/engine/chiefs_office)
"bbu" = (
-/obj/effect/landmark/start{
- name = "Chief Engineer"
- },
+/obj/effect/landmark/start/chief_engineer,
/obj/structure/chair/office/light{
dir = 1;
pixel_y = 3
@@ -30761,9 +30546,7 @@
name = "\improper Cargo Office"
})
"bbU" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/structure/chair/office/dark{
dir = 4
},
@@ -30804,9 +30587,7 @@
"bbZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bca" = (
@@ -31037,10 +30818,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -32451,9 +32229,7 @@
name = "Port Maintenance"
})
"beT" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -32835,9 +32611,7 @@
name = "\improper Captain's Quarters"
})
"bfz" = (
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/chair/comfy/brown{
icon_state = "comfychair";
@@ -32867,9 +32641,7 @@
"bfD" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/captain,
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/machinery/camera{
c_tag = "Captain's Quarters";
dir = 8;
@@ -33570,9 +33342,7 @@
})
"bgR" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -33736,9 +33506,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/turf/open/floor/plasteel/floorgrime,
/area/janitor)
"bhd" = (
@@ -33764,9 +33532,7 @@
name = "Central Maintenance"
})
"bhf" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/power/apc{
cell_type = 2500;
dir = 4;
@@ -34725,9 +34491,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -35522,9 +35286,7 @@
"bki" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/arrival{
dir = 2
},
@@ -35900,10 +35662,7 @@
},
/area/bridge)
"bkJ" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/soap/deluxe,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
@@ -35927,9 +35686,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/white,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -35942,9 +35699,7 @@
dir = 2;
icon_state = "tube1"
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/machinery/light_switch{
pixel_y = -25
},
@@ -35981,9 +35736,7 @@
name = "\improper Captain's Quarters"
})
"bkP" = (
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
@@ -37584,9 +37337,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -38021,9 +37772,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads)
"bon" = (
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/obj/structure/chair/office/dark{
dir = 8
},
@@ -39100,9 +38849,7 @@
dir = 4;
network = list("SS13")
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/grimy,
/area/hallway/primary/port)
"bqf" = (
@@ -39651,9 +39398,7 @@
name = "\improper Captain's Quarters"
})
"bqY" = (
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/structure/chair/comfy/brown,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
@@ -39751,9 +39496,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"brh" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"bri" = (
@@ -40539,9 +40282,7 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry{
name = "Arrivals"
@@ -40588,9 +40329,7 @@
dir = 4;
icon_state = "tube1"
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/grimy,
/area/hallway/primary/port)
"bst" = (
@@ -41070,9 +40809,7 @@
d2 = 4;
icon_state = "2-4"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -41170,10 +40907,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
@@ -41315,9 +41049,7 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"btE" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/item/device/radio/intercom{
freerange = 0;
frequency = 1459;
@@ -42125,9 +41857,7 @@
pixel_x = 27;
pixel_y = -7
},
-/obj/effect/landmark/start{
- name = "AI"
- },
+/obj/effect/landmark/start/ai,
/obj/machinery/button/door{
id = "AI Core shutters";
name = "AI Core shutters control";
@@ -42148,9 +41878,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard)
"bvh" = (
@@ -42432,9 +42160,7 @@
})
"bvD" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -42774,9 +42500,7 @@
/area/crew_quarters/heads)
"bwo" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -43768,10 +43492,7 @@
name = "old sink";
pixel_y = 28
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/crew_quarters/toilet{
name = "\improper Auxiliary Restrooms"
@@ -43823,9 +43544,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/turf/open/floor/wood,
/area/library)
"bxW" = (
@@ -44099,9 +43818,7 @@
},
/area/ai_monitored/turret_protected/ai)
"byy" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"byz" = (
@@ -44110,9 +43827,7 @@
/area/crew_quarters/bar)
"byA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"byB" = (
@@ -45290,9 +45005,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/atmos)
"bAF" = (
@@ -45685,9 +45398,7 @@
/area/library)
"bBv" = (
/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/library)
"bBw" = (
@@ -46044,9 +45755,7 @@
/area/crew_quarters/bar)
"bBV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/structure/chair/stool/bar,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
@@ -46075,9 +45784,7 @@
"bCa" = (
/obj/structure/chair/wood/wings,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"bCb" = (
@@ -46153,9 +45860,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -46586,9 +46291,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
@@ -46811,9 +46514,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
@@ -46968,9 +46669,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bDE" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"bDF" = (
@@ -47000,9 +46699,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"bDJ" = (
@@ -47113,9 +46810,7 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 6
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/atmos)
"bEa" = (
@@ -47282,9 +46977,7 @@
/turf/open/floor/wood,
/area/security/vacantoffice)
"bEr" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/wood,
/area/security/vacantoffice)
"bEs" = (
@@ -48177,9 +47870,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"bFx" = (
@@ -49377,9 +49068,7 @@
dir = 4
},
/obj/machinery/light/small,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/blood/gibs/old,
/turf/open/floor/plasteel/floorgrime,
@@ -49429,9 +49118,7 @@
pixel_x = 0;
pixel_y = -32
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/crew_quarters/toilet{
name = "\improper Auxiliary Restrooms"
@@ -50334,9 +50021,7 @@
/turf/open/floor/wood,
/area/library)
"bJB" = (
-/obj/effect/landmark/start{
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/obj/structure/chair/office/dark{
dir = 1
},
@@ -50936,9 +50621,7 @@
/turf/open/floor/plasteel,
/area/atmos)
"bKD" = (
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/atmos)
"bKE" = (
@@ -51082,9 +50765,7 @@
})
"bKT" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/light{
dir = 1
},
@@ -51251,9 +50932,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
req_access_txt = 1
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/carpet,
/area/library)
"bLk" = (
@@ -51548,9 +51227,7 @@
icon_state = "1-2"
},
/obj/item/weapon/cigbutt,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/maintcentral{
name = "Central Maintenance"
@@ -52752,9 +52429,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"bNK" = (
@@ -52871,9 +52546,7 @@
/turf/open/floor/plasteel,
/area/atmos)
"bNT" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/atmos)
"bNU" = (
@@ -53439,9 +53112,7 @@
},
/area/crew_quarters/kitchen)
"bOR" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"bOS" = (
@@ -53539,9 +53210,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"bPe" = (
@@ -53646,10 +53315,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/starboard)
"bPm" = (
@@ -53770,10 +53436,7 @@
/turf/open/floor/engine/plasma,
/area/atmos)
"bPz" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/plasma,
/area/atmos)
"bPA" = (
@@ -53987,9 +53650,7 @@
/turf/open/floor/engine/cult,
/area/library)
"bPX" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/light/small{
dir = 1
},
@@ -54493,17 +54154,12 @@
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"bQJ" = (
-/obj/effect/landmark/start{
- name = "Chef"
- },
+/obj/effect/landmark/start/cook,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"bQK" = (
@@ -55342,9 +54998,7 @@
/area/maintenance/starboard)
"bSe" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard)
"bSf" = (
@@ -55882,9 +55536,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -57487,10 +57139,7 @@
icon_state = "4-8";
pixel_y = 0
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -57521,10 +57170,7 @@
dir = 1;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -57575,9 +57221,7 @@
name = "Aft Maintenance"
})
"bWa" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -57836,9 +57480,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel{
icon_state = "L8"
},
@@ -58031,9 +57673,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/green/side{
dir = 10
},
@@ -58303,9 +57943,7 @@
/turf/open/floor/plasteel,
/area/atmos)
"bXk" = (
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/machinery/atmospherics/pipe/simple/general/visible{
color = "#330000";
dir = 4
@@ -58730,9 +58368,7 @@
/turf/open/floor/plasteel/green,
/area/hydroponics)
"bYg" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/hydroponics)
@@ -58756,9 +58392,7 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"bYk" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/green/side{
dir = 4
},
@@ -58806,9 +58440,7 @@
icon_state = "alarm0";
pixel_x = 24
},
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics)
"bYo" = (
@@ -59486,9 +59118,7 @@
},
/area/hydroponics)
"bZu" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/green/side{
dir = 8
},
@@ -59943,9 +59573,7 @@
})
"can" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
@@ -60021,9 +59649,7 @@
})
"cav" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -60953,9 +60579,7 @@
name = "Medbay Storage"
})
"cbL" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 2
},
@@ -60973,9 +60597,7 @@
})
"cbN" = (
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -61820,10 +61442,7 @@
name = "Aft Maintenance"
})
"cdo" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/maintenance/aft{
@@ -62604,9 +62223,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/button/door{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyer";
@@ -63151,10 +62768,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/incinerator)
"cfp" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
@@ -64050,9 +63664,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/whiteblue/side{
dir = 1
},
@@ -64231,9 +63843,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/whiteyellow{
dir = 4
},
@@ -64462,9 +64072,7 @@
/area/toxins/explab)
"chB" = (
/obj/machinery/space_heater,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -65187,17 +64795,13 @@
name = "Research Division"
})
"ciL" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
})
"ciM" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -65392,10 +64996,7 @@
/turf/open/floor/engine/o2,
/area/atmos)
"cji" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/air,
/area/atmos)
"cjj" = (
@@ -65520,9 +65121,7 @@
dir = 4;
on = 1
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/surgery)
"cjx" = (
@@ -65881,9 +65480,7 @@
/turf/open/floor/plasteel/white,
/area/toxins/lab)
"ckb" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -66008,9 +65605,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/device/flashlight,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -66415,9 +66010,7 @@
/obj/structure/sign/nosmoking_2{
pixel_x = 28
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/black,
/area/medical/surgery)
"cld" = (
@@ -66615,9 +66208,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 8
},
@@ -66628,9 +66219,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"clv" = (
@@ -66996,10 +66585,7 @@
name = "Aft Maintenance"
})
"clZ" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
@@ -68299,9 +67885,7 @@
/turf/open/floor/plasteel/white,
/area/toxins/explab)
"con" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/structure/chair/office/light{
dir = 1;
pixel_y = 3
@@ -68442,9 +68026,7 @@
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"coA" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"coB" = (
@@ -68550,9 +68132,7 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 2
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel,
/area/medical/cryo)
"coL" = (
@@ -68600,9 +68180,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chief Medical Officer"
- },
+/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/plasteel/barber{
dir = 8
},
@@ -68687,9 +68265,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 4
},
@@ -68765,9 +68341,7 @@
/turf/open/floor/plating,
/area/toxins/lab)
"cpd" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
@@ -68979,9 +68553,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/medical/research{
name = "Research Division"
@@ -69237,10 +68809,7 @@
name = "Aft Maintenance"
})
"cpK" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -69389,9 +68958,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
@@ -70080,10 +69647,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -70992,9 +70556,7 @@
pixel_x = 0;
pixel_y = -32
},
-/obj/effect/landmark/start{
- name = "Chief Medical Officer"
- },
+/obj/effect/landmark/start/chief_medical_officer,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
@@ -71031,9 +70593,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -71804,9 +71364,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Research Director"
- },
+/obj/effect/landmark/start/research_director,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/cafeteria{
dir = 5
@@ -72460,10 +72018,7 @@
},
/area/toxins/storage)
"cuX" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -72476,9 +72031,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -72792,9 +72345,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/whiteblue/side{
dir = 9
},
@@ -72813,9 +72364,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/whiteblue/side{
dir = 5
},
@@ -72844,9 +72393,7 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/blue/side{
dir = 4
},
@@ -72912,9 +72459,7 @@
})
"cvK" = (
/obj/machinery/magnetic_module,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/target_stake,
/obj/effect/turf_decal/bot{
dir = 9
@@ -73078,9 +72623,7 @@
"cvW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -73275,9 +72818,7 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -73376,9 +72917,7 @@
},
/area/medical/genetics_cloning)
"cww" = (
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -73701,9 +73240,7 @@
"cwX" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -73755,9 +73292,7 @@
})
"cxd" = (
/obj/structure/reagent_dispensers/watertank,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -73848,9 +73383,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/medical/medbay3{
name = "Medbay Aft"
@@ -74385,9 +73918,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"cyg" = (
@@ -74499,9 +74030,7 @@
icon_state = "alarm0";
pixel_x = 24
},
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/machinery/light{
icon_state = "tube1";
dir = 4
@@ -74859,9 +74388,7 @@
},
/area/medical/genetics_cloning)
"cyW" = (
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
@@ -75949,9 +75476,7 @@
dir = 4
},
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -75990,9 +75515,7 @@
name = "\improper Toxins Lab"
})
"cAI" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
@@ -76431,9 +75954,7 @@
})
"cBu" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -76664,10 +76185,7 @@
/turf/open/floor/plating/airless,
/area/toxins/test_area)
"cBQ" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/cable,
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -76816,15 +76334,11 @@
/area/medical/morgue)
"cCf" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cCg" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cCi" = (
@@ -76852,9 +76366,7 @@
/obj/item/weapon/paper/morguereminder{
pixel_x = -4
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cCl" = (
@@ -77307,9 +76819,7 @@
dir = 8
},
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cCV" = (
@@ -77317,10 +76827,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cCW" = (
@@ -77333,9 +76840,7 @@
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cCX" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
@@ -77654,9 +77159,7 @@
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"cDC" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"cDD" = (
@@ -77900,9 +77403,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/white,
/area/medical/medbay3{
name = "Medbay Aft"
@@ -78098,9 +77599,7 @@
/turf/open/floor/plating,
/area/assembly/robotics)
"cEk" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/structure/chair/office/light{
dir = 8
},
@@ -78434,9 +77933,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Virologist"
- },
+/obj/effect/landmark/start/virologist,
/turf/open/floor/plasteel/whitegreen/corner{
dir = 1
},
@@ -78561,9 +78058,7 @@
pixel_y = 0
},
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"cEV" = (
@@ -78648,9 +78143,7 @@
/turf/open/floor/plasteel,
/area/assembly/robotics)
"cFf" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/assembly/robotics)
@@ -78758,9 +78251,7 @@
frequency = 1449;
id = "tox_airlock_pump"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/toxins/mixing{
name = "\improper Toxins Lab"
@@ -79251,9 +78742,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/white,
/area/medical/research{
name = "Research Division"
@@ -79491,9 +78980,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/medical/virology)
@@ -79838,9 +79325,7 @@
/turf/open/floor/plasteel,
/area/assembly/robotics)
"cGW" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -80600,9 +80085,7 @@
d2 = 8;
icon_state = "0-8"
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/toxins/server{
name = "\improper Research Division Server Room"
@@ -80976,9 +80459,7 @@
},
/area/assembly/robotics)
"cIJ" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/structure/sink{
dir = 8;
icon_state = "sink";
@@ -81145,9 +80626,7 @@
name = "\improper Research Division Server Room"
})
"cIZ" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/manifold{
dir = 4
},
@@ -81827,10 +81306,7 @@
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"cKh" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -82932,13 +82408,8 @@
/turf/open/floor/plasteel/black,
/area/chapel/office)
"cLU" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/blobstart,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine,
/area/toxins/explab)
"cLV" = (
@@ -83020,9 +82491,7 @@
},
/obj/item/organ/heart,
/obj/item/device/soulstone/anybody/chaplain,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/cult{
dir = 2
},
@@ -83132,9 +82601,7 @@
})
"cMl" = (
/obj/machinery/space_heater,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -83202,10 +82669,7 @@
/turf/open/floor/plating,
/area/maintenance/starboardsolar)
"cMr" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -83306,9 +82770,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
@@ -83324,9 +82786,7 @@
/area/chapel/office)
"cMF" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
@@ -83468,9 +82928,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -84017,9 +83475,7 @@
name = "\improper Departure Lounge"
})
"cNM" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -84185,10 +83641,7 @@
on = 1;
pressure_checks = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/black,
/area/chapel/office)
"cOc" = (
@@ -84510,10 +83963,7 @@
dir = 1;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/aft{
name = "Aft Maintenance"
@@ -84593,9 +84043,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/turf/open/floor/plasteel/black,
/area/chapel/office)
"cOM" = (
@@ -84912,9 +84360,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -85461,9 +84907,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 2
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -85693,9 +85137,7 @@
/turf/open/floor/plasteel/black,
/area/chapel/main)
"cQW" = (
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/turf/open/floor/plasteel/black,
/area/chapel/main)
"cQX" = (
@@ -86042,9 +85484,7 @@
/area/chapel/main)
"cRI" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/turf/open/floor/plasteel/vault,
/area/chapel/main)
"cRJ" = (
@@ -86348,9 +85788,7 @@
/turf/open/floor/engine,
/area/toxins/xenobiology)
"cSo" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/engine,
/area/toxins/xenobiology)
"cSp" = (
@@ -87723,9 +87161,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
@@ -87746,9 +87182,7 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
"cUO" = (
@@ -90418,9 +89852,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -90580,9 +90012,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -91769,9 +91199,7 @@
/area/toxins/xenobiology)
"dcC" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
"dcD" = (
@@ -92359,9 +91787,7 @@
},
/area/crew_quarters/kitchen)
"ddE" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/obj/machinery/holopad,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
@@ -94628,9 +94054,7 @@
/obj/structure/closet/crate,
/obj/item/weapon/poster/random_official,
/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -94763,9 +94187,10 @@
/turf/open/floor/plating,
/area/engine/engineering)
"djv" = (
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "engsm";
- name = "Radiation Chamber Shutters"
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/open/floor/plating,
/area/engine/supermatter)
@@ -94835,9 +94260,7 @@
d1 = 1;
d2 = 4
},
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel{
icon_state = "L8"
},
@@ -139174,7 +138597,7 @@ aBQ
dee
aEr
aKL
-djv
+djt
daY
deS
dbb
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 908db94b393..2dbf89536a7 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -3,9 +3,7 @@
/turf/open/space/basic,
/area/space)
"aab" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aac" = (
@@ -943,9 +941,7 @@
icon_state = "1-4"
},
/obj/machinery/holopad,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/vault,
/area/bridge)
"abF" = (
@@ -1204,9 +1200,7 @@
dir = 4
},
/obj/item/weapon/bedsheet/captain,
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -1387,9 +1381,7 @@
dir = 8
},
/obj/item/weapon/bedsheet/hop,
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/wood,
/area/crew_quarters/heads)
"acq" = (
@@ -1438,9 +1430,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads)
"acu" = (
@@ -1488,10 +1478,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/primary/central{
@@ -1596,9 +1583,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/obj/item/weapon/bedsheet/brown,
/turf/open/floor/wood,
/area/security/detectives_office)
@@ -1634,15 +1619,11 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/turf/open/floor/plasteel/white,
/area/security/detectives_office)
"acN" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -2084,9 +2065,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/space/orange,
/obj/item/clothing/head/helmet/space/orange,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/neutral,
/area/ruin/unpowered{
name = "Asteroid"
@@ -2158,10 +2137,7 @@
dir = 2;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/hallway/primary/central{
name = "Primary Hallway"
@@ -2181,9 +2157,7 @@
req_access_txt = "0";
use_power = 0
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/plasteel/white,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -2814,9 +2788,7 @@
pixel_y = -40;
req_access_txt = "16"
},
-/obj/effect/landmark/start{
- name = "AI"
- },
+/obj/effect/landmark/start/ai,
/obj/structure/cable/white{
tag = "icon-1-4";
icon_state = "1-4"
@@ -3481,9 +3453,7 @@
/area/crew_quarters/heads)
"afB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/hallway/primary/central{
name = "Primary Hallway"
@@ -3508,9 +3478,7 @@
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"afF" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"afG" = (
@@ -3959,9 +3927,7 @@
pixel_x = 42;
pixel_y = -42
},
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -4160,9 +4126,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
on = 1;
@@ -4244,9 +4208,7 @@
icon_state = "intact";
dir = 4
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/carpet,
/area/crew_quarters/captain{
name = "\improper Captain's Quarters"
@@ -4407,9 +4369,7 @@
tag = "icon-2-4";
icon_state = "2-4"
},
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -6149,9 +6109,7 @@
icon_state = "manifold";
dir = 4
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"ajM" = (
@@ -6388,9 +6346,7 @@
name = "Primary Hallway"
})
"akd" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -6734,9 +6690,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
tag = "icon-1-4";
icon_state = "1-4"
@@ -7512,9 +7466,7 @@
tag = "icon-2-4";
icon_state = "2-4"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/storage)
"alF" = (
@@ -7539,9 +7491,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/ruin/unpowered{
name = "Asteroid"
@@ -7628,9 +7578,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral/side{
dir = 4
},
@@ -8088,9 +8036,7 @@
/area/quartermaster/storage)
"amw" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/brown,
/area/quartermaster/storage)
"amx" = (
@@ -8749,9 +8695,7 @@
pixel_x = 38;
pixel_y = 38
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -9214,9 +9158,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel/loadingarea{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
dir = 8
@@ -9240,9 +9182,7 @@
tag = "icon-1-2";
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/turf/open/floor/plasteel/brown{
tag = "icon-brown (NORTHEAST)";
icon_state = "brown";
@@ -9439,9 +9379,7 @@
pixel_x = -32
},
/obj/machinery/light/small,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/hallway/primary/central{
name = "Primary Hallway"
@@ -9457,9 +9395,7 @@
pixel_x = -32
},
/obj/machinery/light/small,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/primary/central{
@@ -9476,9 +9412,7 @@
pixel_x = -32
},
/obj/machinery/light/small,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/primary/central{
@@ -9786,9 +9720,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -10122,9 +10054,7 @@
/turf/open/floor/plasteel,
/area/security/brig)
"apz" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
tag = "icon-manifold (WEST)";
icon_state = "manifold";
@@ -10651,9 +10581,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/hallway/primary/central{
@@ -11557,9 +11485,7 @@
tag = "icon-1-4";
icon_state = "1-4"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -11637,9 +11563,7 @@
tag = "icon-1-4";
icon_state = "1-4"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/red/corner{
dir = 1
@@ -11732,9 +11656,7 @@
tag = "icon-2-8";
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
tag = "icon-intact (SOUTHWEST)";
icon_state = "intact";
@@ -11780,9 +11702,7 @@
},
/area/storage/primary)
"arR" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/yellow/side{
dir = 1
},
@@ -12784,10 +12704,7 @@
dir = 8;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -13151,9 +13068,7 @@
name = "Central Port Maintenance"
})
"atW" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -13335,9 +13250,7 @@
/turf/closed/wall,
/area/crew_quarters/bar)
"aun" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
tag = "icon-1-2";
@@ -13587,9 +13500,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/blood/splatter,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/hallway/primary/central{
name = "Primary Hallway"
@@ -13611,9 +13522,7 @@
name = "Primary Hallway"
})
"auL" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/cable/white{
tag = "icon-4-8";
icon_state = "4-8"
@@ -13760,9 +13669,7 @@
/turf/open/floor/plasteel/yellow/side,
/area/storage/primary)
"auV" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1;
on = 1;
@@ -13940,9 +13847,7 @@
/turf/open/floor/plasteel/black,
/area/crew_quarters/bar)
"avp" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -14077,9 +13982,7 @@
/area/atmos)
"avB" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/neutral,
/area/atmos)
"avC" = (
@@ -14471,9 +14374,7 @@
/area/crew_quarters/theatre)
"awh" = (
/obj/structure/chair/comfy/brown,
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
tag = "icon-1-2";
@@ -14502,9 +14403,7 @@
})
"awk" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
tag = "icon-1-2";
@@ -14563,9 +14462,7 @@
},
/area/crew_quarters/bar)
"awq" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
tag = "icon-2-4";
@@ -15410,9 +15307,7 @@
/obj/structure/chair/comfy/brown{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
tag = "icon-1-2";
@@ -15774,9 +15669,7 @@
},
/area/crew_quarters/sleep)
"ayw" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/neutral/corner{
dir = 1
},
@@ -16510,9 +16403,7 @@
name = "Central Starboard Maintenance"
})
"azP" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -16784,9 +16675,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/structure/cable/white{
tag = "icon-1-4";
icon_state = "1-4"
@@ -16910,9 +16799,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel/neutral,
/area/atmos)
"aAB" = (
@@ -17077,9 +16964,7 @@
},
/obj/structure/table/wood,
/obj/item/weapon/kitchen/fork,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/structure/cable/white{
tag = "icon-4-8";
icon_state = "4-8"
@@ -17548,9 +17433,7 @@
/area/atmos)
"aBH" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -17611,9 +17494,7 @@
name = "Primary Hallway"
})
"aBL" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -18313,9 +18194,7 @@
},
/area/crew_quarters/theatre)
"aCQ" = (
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -18710,9 +18589,7 @@
},
/area/crew_quarters/sleep)
"aDE" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -18770,9 +18647,7 @@
},
/area/crew_quarters/theatre)
"aDK" = (
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/theatre)
"aDL" = (
@@ -18897,9 +18772,7 @@
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"aDU" = (
-/obj/effect/landmark/start{
- name = "Chef"
- },
+/obj/effect/landmark/start/cook,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
tag = "icon-manifold (NORTH)";
icon_state = "manifold";
@@ -19258,9 +19131,7 @@
on = 1;
scrub_Toxins = 0
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -19565,9 +19436,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aEZ" = (
-/obj/effect/landmark/start{
- name = "Chef"
- },
+/obj/effect/landmark/start/cook,
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"aFa" = (
@@ -19672,9 +19541,7 @@
tag = "icon-2-8";
icon_state = "2-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard{
name = "Central Starboard Maintenance"
@@ -20174,9 +20041,7 @@
/turf/open/floor/plasteel/red,
/area/crew_quarters/kitchen)
"aFV" = (
-/obj/effect/landmark/start{
- name = "Chef"
- },
+/obj/effect/landmark/start/cook,
/turf/open/floor/plasteel/white,
/area/crew_quarters/kitchen)
"aFW" = (
@@ -20200,9 +20065,7 @@
})
"aFY" = (
/obj/machinery/holopad,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
tag = "icon-1-2";
@@ -20737,9 +20600,7 @@
})
"aGP" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
tag = "icon-manifold (EAST)";
icon_state = "manifold";
@@ -21411,9 +21272,7 @@
name = "Central Port Maintenance"
})
"aHK" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -21801,9 +21660,7 @@
pixel_x = 0;
tag = ""
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/engine/engineering)
@@ -21882,9 +21739,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -22606,9 +22461,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/yellow,
/area/engine/engineering)
"aJH" = (
@@ -22742,9 +22595,7 @@
},
/area/hydroponics)
"aJQ" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/greenblue/side{
tag = "icon-greenblue (NORTH)";
icon_state = "greenblue";
@@ -22787,9 +22638,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel/greenblue,
/area/hydroponics)
"aJV" = (
@@ -23381,9 +23230,7 @@
/turf/open/floor/plasteel,
/area/janitor)
"aKQ" = (
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -24025,9 +23872,7 @@
},
/area/janitor)
"aMg" = (
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
tag = "icon-manifold (WEST)";
icon_state = "manifold";
@@ -24106,9 +23951,7 @@
/turf/open/floor/plasteel/greenblue/side,
/area/hydroponics)
"aMn" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
layer = 2.4;
@@ -24275,9 +24118,7 @@
dir = 1;
on = 1
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/neutral,
/area/hallway/secondary/exit{
name = "\improper Departure Lounge"
@@ -24867,9 +24708,7 @@
name = "Central Starboard Maintenance"
})
"aNB" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -25766,9 +25605,7 @@
})
"aOU" = (
/obj/machinery/door/firedoor,
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
tag = "icon-4-8";
@@ -26759,15 +26596,11 @@
},
/area/hallway/primary/central)
"aQp" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel{
icon_state = "L8"
},
@@ -26902,18 +26735,13 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/wood,
/area/maintenance/starboard)
"aQD" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
@@ -27542,9 +27370,7 @@
/turf/open/floor/plasteel/neutral,
/area/engine/engineering)
"aRO" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -27693,9 +27519,7 @@
/area/library)
"aSe" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -27783,9 +27607,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/medical/chemistry)
@@ -27881,9 +27703,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -28244,9 +28064,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/black,
/area/library)
"aTd" = (
@@ -28297,10 +28115,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- dir = 4;
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/turf/open/floor/plasteel/black,
/area/library)
"aTj" = (
@@ -28415,9 +28230,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -28477,9 +28290,7 @@
/area/hallway/primary/central)
"aTB" = (
/obj/structure/chair/comfy/brown,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/grimy,
/area/hallway/primary/central)
"aTC" = (
@@ -28520,9 +28331,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -28665,9 +28474,7 @@
tag = "icon-4-8";
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/maintenance/starboard)
@@ -28762,9 +28569,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/neutral/corner,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -28849,9 +28654,7 @@
/area/library)
"aUk" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/decal/cleanable/dirt,
/obj/item/device/radio/intercom{
name = "Station Intercom";
@@ -29128,10 +28931,7 @@
layer = 2.4;
on = 1
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
@@ -29272,9 +29072,7 @@
/area/library)
"aVc" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/machinery/light{
dir = 8
},
@@ -29335,9 +29133,7 @@
/area/medical/medbay3)
"aVh" = (
/obj/machinery/holopad,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
tag = "icon-manifold (EAST)";
icon_state = "manifold";
@@ -29366,9 +29162,7 @@
/turf/open/floor/plasteel,
/area/medical/chemistry)
"aVk" = (
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/whiteyellow/corner{
tag = "icon-whiteyellowcorner (WEST)";
icon_state = "whiteyellowcorner";
@@ -29464,9 +29258,7 @@
/turf/open/floor/plasteel,
/area/toxins/lab)
"aVu" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
@@ -30074,10 +29866,7 @@
},
/area/library)
"aWB" = (
-/obj/effect/landmark/start{
- dir = 4;
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/obj/structure/chair/office/dark{
dir = 4
},
@@ -30122,9 +29911,7 @@
/area/library)
"aWH" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc{
dir = 2;
@@ -30224,9 +30011,7 @@
buildstackamount = 0;
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/airalarm{
dir = 1;
icon_state = "alarm0";
@@ -30652,9 +30437,7 @@
tag = "icon-1-4";
icon_state = "1-4"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 1
},
@@ -31222,10 +31005,7 @@
/turf/open/floor/plasteel/grimy,
/area/library)
"aYx" = (
-/obj/effect/landmark/start{
- dir = 4;
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1;
on = 1;
@@ -31371,9 +31151,7 @@
/turf/open/floor/plasteel,
/area/medical/medbay3)
"aYH" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/cmo,
/area/medical/medbay3)
"aYI" = (
@@ -31907,9 +31685,7 @@
tag = "icon-2-4";
icon_state = "2-4"
},
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/blue,
/area/medical/medbay3)
"aZK" = (
@@ -31925,9 +31701,7 @@
/turf/open/floor/plasteel,
/area/medical/medbay3)
"aZL" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/structure/cable/white{
tag = "icon-4-8";
icon_state = "4-8"
@@ -32040,9 +31814,7 @@
"aZU" = (
/obj/machinery/recharge_station,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm{
@@ -32068,9 +31840,7 @@
"aZV" = (
/obj/machinery/recharge_station,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -32254,10 +32024,7 @@
name = "Port Maintenance"
})
"bal" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
layer = 2.4;
@@ -32730,9 +32497,7 @@
/area/assembly/robotics)
"baZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -32820,9 +32585,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -32886,9 +32649,7 @@
})
"bbm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/bar,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -33189,9 +32950,7 @@
/turf/open/floor/plasteel,
/area/assembly/robotics)
"bbL" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -33229,9 +32988,7 @@
tag = "icon-1-2";
icon_state = "1-2"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/maintenance/starboard)
@@ -33749,9 +33506,7 @@
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/maintenance/fpmaint2{
@@ -33797,9 +33552,7 @@
},
/area/medical/medbay3)
"bcV" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/neutral,
/area/medical/medbay3)
"bcW" = (
@@ -33858,9 +33611,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -34126,9 +33877,7 @@
},
/area/assembly/robotics)
"bdx" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel/whitepurple/corner{
dir = 4
},
@@ -34174,10 +33923,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
layer = 2.4;
@@ -34206,9 +33952,7 @@
})
"bdE" = (
/obj/structure/chair/stool/bar,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/wood{
icon_state = "wood-broken"
},
@@ -34226,9 +33970,7 @@
})
"bdG" = (
/obj/structure/chair/stool/bar,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/wood{
tag = "icon-wood-broken2";
icon_state = "wood-broken2"
@@ -34286,9 +34028,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -34307,10 +34047,7 @@
name = "Port Maintenance"
})
"bdM" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -35300,9 +35037,7 @@
tag = "icon-4-8";
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard)
"bfl" = (
@@ -35557,9 +35292,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/neutral,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -35847,9 +35580,7 @@
pixel_x = 0;
pixel_y = 25
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
tag = "icon-0-2";
@@ -35957,9 +35688,7 @@
},
/area/hallway/primary/central)
"bgh" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -36529,9 +36258,7 @@
/turf/open/floor/circuit/green,
/area/toxins/xenobiology)
"bhh" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/circuit/green,
/area/toxins/xenobiology)
"bhi" = (
@@ -36565,10 +36292,7 @@
/area/maintenance/starboard)
"bhm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -37368,9 +37092,7 @@
/obj/machinery/newscaster{
pixel_x = -32
},
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
layer = 2.4;
@@ -37823,9 +37545,7 @@
},
/area/toxins/xenobiology)
"bjt" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/whitepurple/side{
dir = 5;
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
@@ -37887,9 +37607,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/turf/open/floor/plasteel/grimy,
/area/chapel/main)
"bjA" = (
@@ -37933,9 +37651,7 @@
/area/toxins/xenobiology)
"bjE" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/structure/cable/white{
tag = "icon-1-2";
icon_state = "1-2"
@@ -38523,9 +38239,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry{
@@ -38610,9 +38324,7 @@
},
/area/shuttle/arrival)
"bkL" = (
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel/neutral,
/area/shuttle/arrival)
"bkM" = (
@@ -40838,9 +40550,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 94b70c5c371..13de429501e 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -3,9 +3,7 @@
/turf/open/space/basic,
/area/space)
"aab" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aac" = (
@@ -128,9 +126,7 @@
icon_state = "2-4";
tag = ""
},
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
anyai = 1;
broadcasting = 0;
@@ -182,9 +178,7 @@
name = "AI Chamber APC";
pixel_y = 24
},
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
anyai = 1;
broadcasting = 0;
@@ -326,9 +320,7 @@
/turf/open/floor/circuit,
/area/wreck/ai)
"aaI" = (
-/obj/effect/landmark/start{
- name = "AI"
- },
+/obj/effect/landmark/start/ai,
/obj/item/device/radio/intercom{
broadcasting = 0;
freerange = 1;
@@ -1333,10 +1325,7 @@
/turf/open/floor/plasteel/black,
/area/security/prison)
"adc" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/black,
/area/security/prison)
"add" = (
@@ -1659,9 +1648,7 @@
},
/area/ai_monitored/turret_protected/aisat_interior)
"adF" = (
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/obj/item/device/radio/beacon,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -2014,9 +2001,7 @@
/area/security/transfer)
"aeC" = (
/obj/structure/bed,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/security/transfer)
"aeD" = (
@@ -3453,9 +3438,7 @@
/turf/open/floor/plasteel/black,
/area/security/armory)
"ahk" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/red,
/area/security/main)
@@ -3521,9 +3504,7 @@
},
/area/security/main)
"ahq" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32;
@@ -3777,16 +3758,12 @@
},
/area/security/main)
"ahQ" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel,
/area/security/main)
"ahR" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel,
/area/security/main)
"ahS" = (
@@ -3972,9 +3949,7 @@
})
"aik" = (
/obj/structure/bodycontainer/crematorium,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/item/device/radio/intercom{
dir = 0;
name = "Station Intercom (General)";
@@ -4133,9 +4108,7 @@
c_tag = "Brig Evidence Room";
dir = 8
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/red/side{
tag = "icon-red (EAST)";
dir = 4
@@ -4374,10 +4347,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fsmaint)
"aiV" = (
@@ -4711,9 +4681,7 @@
},
/area/maintenance/fsmaint)
"ajF" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
/area/maintenance/fsmaint)
@@ -4827,9 +4795,7 @@
dir = 1;
layer = 2.9
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/security/brig)
"ajS" = (
@@ -5045,9 +5011,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
tag = "icon-intact (EAST)";
icon_state = "intact";
@@ -5072,9 +5036,7 @@
dir = 4;
icon_state = "pipe-c"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
tag = "icon-intact (EAST)";
icon_state = "intact";
@@ -5176,9 +5138,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
+/obj/effect/landmark/start/head_of_security,
/turf/open/floor/carpet,
/area/security/hos)
"ako" = (
@@ -5767,9 +5727,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel,
/area/security/main)
"aly" = (
@@ -5777,9 +5735,7 @@
dir = 1
},
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel,
/area/security/main)
"alz" = (
@@ -6338,9 +6294,7 @@
/area/security/warden)
"amw" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Warden"
- },
+/obj/effect/landmark/start/warden,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"amx" = (
@@ -7606,9 +7560,7 @@
/turf/open/floor/plasteel/barber,
/area/crew_quarters/sleep)
"apb" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
on = 1
},
@@ -8824,9 +8776,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/circuit/green{
luminosity = 2
},
@@ -9215,9 +9165,7 @@
},
/obj/item/weapon/soap/deluxe,
/obj/item/weapon/bikehorn/rubberducky,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/structure/curtain,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/captain)
@@ -9946,9 +9894,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/sleep)
"atI" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -10022,10 +9968,7 @@
dir = 9;
pixel_y = 0
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness{
name = "Recreation Room"
@@ -10725,9 +10668,7 @@
/area/crew_quarters/captain)
"avw" = (
/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/turf/open/floor/carpet,
/area/crew_quarters/captain)
"avx" = (
@@ -11674,9 +11615,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/sleep)
"axp" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/structure/chair/comfy/brown{
dir = 1
},
@@ -12649,9 +12588,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/wood,
/area/crew_quarters/heads)
"azk" = (
@@ -12759,9 +12696,7 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -12981,9 +12916,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"azQ" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/storage/primary)
"azR" = (
@@ -13369,10 +13302,7 @@
/obj/structure/urinal{
pixel_y = 32
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/locker/locker_toilet{
name = "\improper Restrooms"
@@ -13400,9 +13330,7 @@
name = "\improper Restrooms"
})
"aAB" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/item/toy/beach_ball/holoball,
/turf/open/floor/plating,
/area/crew_quarters/locker/locker_toilet{
@@ -13903,9 +13831,7 @@
/area/maintenance/apmaint)
"aBz" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/security/detectives_office)
"aBA" = (
@@ -13928,9 +13854,7 @@
buildstackamount = 0;
dir = 1
},
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/turf/open/floor/carpet,
/area/security/detectives_office)
"aBE" = (
@@ -14496,9 +14420,7 @@
/turf/open/floor/plating,
/area/maintenance/apmaint)
"aCS" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/apmaint)
"aCT" = (
@@ -16668,9 +16590,7 @@
dir = 8;
name = "Defense"
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 1
@@ -16713,10 +16633,7 @@
/obj/machinery/airalarm{
pixel_y = 22
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet{
name = "\improper Auxiliary Restroom"
@@ -17461,9 +17378,7 @@
/obj/structure/toilet{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet{
name = "\improper Auxiliary Restroom"
@@ -18332,9 +18247,7 @@
dir = 2;
icon_state = "pipe-c"
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"aKw" = (
@@ -18841,9 +18754,7 @@
/area/maintenance/disposal)
"aLK" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -19006,9 +18917,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating{
burnt = 1;
icon_state = "panelscorched"
@@ -19777,10 +19686,7 @@
/turf/open/floor/plating,
/area/maintenance/apmaint)
"aNz" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/disposal)
"aNA" = (
@@ -20001,10 +19907,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aNY" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/storage/box/beanbag,
/turf/open/floor/wood,
/area/crew_quarters/bar)
@@ -21258,9 +21161,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aQw" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -21646,9 +21547,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -21893,9 +21792,7 @@
"aRI" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/turf/open/floor/plasteel/black,
/area/janitor)
"aRJ" = (
@@ -22113,9 +22010,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/turf/open/floor/plasteel/redblue,
/area/crew_quarters/theatre)
"aSh" = (
@@ -22545,9 +22440,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel/brown{
dir = 1
},
@@ -23346,9 +23239,7 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"aUE" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel,
/area/hydroponics)
"aUF" = (
@@ -23395,9 +23286,7 @@
},
/area/crew_quarters/bar)
"aUN" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/structure/chair/wood/normal,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
@@ -23855,9 +23744,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aVF" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
@@ -23889,9 +23776,7 @@
/turf/open/floor/plasteel/hydrofloor,
/area/crew_quarters/kitchen)
"aVJ" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -23908,9 +23793,7 @@
/area/crew_quarters/bar)
"aVL" = (
/obj/structure/chair/stool/bar,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -23970,9 +23853,7 @@
},
/area/crew_quarters/bar)
"aVT" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/structure/chair/stool,
/turf/open/floor/carpet{
icon_state = "carpetsymbol"
@@ -24920,9 +24801,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -25216,9 +25095,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aYx" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -25374,9 +25251,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Quartermaster"
- },
+/obj/effect/landmark/start/quartermaster,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aYN" = (
@@ -25399,9 +25274,7 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
@@ -25797,9 +25670,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -26256,9 +26127,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"baF" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
external_pressure_bound = 101.325;
@@ -26730,9 +26599,7 @@
/turf/open/floor/plating,
/area/maintenance/apmaint)
"bbt" = (
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"bbu" = (
@@ -26959,9 +26826,7 @@
name = "Lounge"
})
"bbT" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -28063,9 +27928,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating{
broken = 1;
icon_state = "platingdmg1"
@@ -28198,9 +28061,7 @@
/area/storage/emergency2)
"beD" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"beE" = (
@@ -28422,9 +28283,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel,
/area/assembly/robotics)
"bff" = (
@@ -28519,13 +28378,8 @@
/turf/open/floor/engine,
/area/toxins/explab)
"bfo" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/blobstart,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine,
/area/toxins/explab)
"bfp" = (
@@ -28809,9 +28663,7 @@
/area/storage/emergency2)
"bfS" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/machinery/light/small{
brightness = 3;
dir = 8
@@ -29065,9 +28917,7 @@
/area/toxins/explab)
"bgr" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/components/trinary/filter,
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
@@ -29121,9 +28971,7 @@
/area/toxins/xenobiology)
"bgA" = (
/obj/effect/decal/cleanable/ash,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/maintenance/apmaint)
"bgB" = (
@@ -29563,9 +29411,7 @@
},
/area/toxins/xenobiology)
"bhu" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/engine,
/area/toxins/xenobiology)
"bhv" = (
@@ -29836,9 +29682,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/whiteblue/side{
tag = "icon-whiteblue (NORTHEAST)";
dir = 5
@@ -29927,9 +29771,7 @@
},
/area/assembly/robotics)
"bii" = (
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/assembly/robotics)
@@ -30092,9 +29934,7 @@
/obj/structure/chair/comfy/beige{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
"biz" = (
@@ -30616,9 +30456,7 @@
/area/toxins/explab)
"bjy" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -31206,9 +31044,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 1
},
@@ -32354,10 +32190,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/floorgrime,
/area/toxins/xenobiology)
"bmH" = (
@@ -33075,9 +32908,7 @@
dir = 4;
initialize_directions = 11
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/floorgrime,
/area/toxins/xenobiology)
"bnX" = (
@@ -33325,9 +33156,7 @@
/area/toxins/explab)
"boD" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -34554,9 +34383,7 @@
/area/medical/genetics)
"bqD" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -35717,9 +35544,7 @@
/area/medical/genetics)
"bsK" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -35899,9 +35724,7 @@
name = "Chief Medical Office"
})
"bta" = (
-/obj/effect/landmark/start{
- name = "Chief Medical Officer"
- },
+/obj/effect/landmark/start/chief_medical_officer,
/obj/structure/chair/office/light{
dir = 1
},
@@ -36205,9 +36028,7 @@
name = "\improper Toxins Lab"
})
"btD" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/toxins/xenobiology)
@@ -36951,9 +36772,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay)
"buW" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
layer = 2.4;
@@ -37578,9 +37397,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/item/weapon/melee/baton/cattleprod{
bcell = new /obj/item/weapon/stock_parts/cell/high()
},
@@ -37607,10 +37424,7 @@
scrub_N2O = 0;
scrub_Toxins = 0
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/black,
/area/medical/exam_room)
"bwi" = (
@@ -37741,9 +37555,7 @@
/area/crew_quarters/hor)
"bwt" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Research Director"
- },
+/obj/effect/landmark/start/research_director,
/turf/open/floor/plasteel/white,
/area/crew_quarters/hor)
"bwu" = (
@@ -37853,9 +37665,7 @@
})
"bwG" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
@@ -38139,10 +37949,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/asmaint2)
"bxb" = (
@@ -38193,10 +38000,7 @@
icon_state = "intact";
dir = 8
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"bxh" = (
@@ -38287,9 +38091,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/exam_room)
"bxr" = (
@@ -38298,9 +38100,7 @@
/obj/effect/decal/cleanable/blood/drip,
/obj/item/weapon/restraints/handcuffs,
/obj/item/clothing/mask/muzzle,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/exam_room)
"bxs" = (
@@ -38682,9 +38482,7 @@
"byd" = (
/obj/structure/closet/masks,
/obj/item/trash/deadmouse,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating,
/area/maintenance/aft)
"bye" = (
@@ -38714,9 +38512,7 @@
/area/medical/virology)
"byi" = (
/obj/structure/window/reinforced,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"byj" = (
@@ -38779,9 +38575,7 @@
"byn" = (
/obj/item/weapon/bedsheet/medical,
/obj/structure/bed,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/structure/mirror{
pixel_x = -28
},
@@ -39506,9 +39300,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/item/chair/stool,
/turf/open/floor/plating,
/area/maintenance/maintcentral{
@@ -40353,9 +40145,7 @@
/area/medical/surgery)
"bBp" = (
/obj/structure/table/optable,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"bBq" = (
@@ -40625,9 +40415,7 @@
/turf/open/floor/engine,
/area/maintenance/aft)
"bBU" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/engine,
/area/maintenance/aft)
"bBV" = (
@@ -40654,9 +40442,7 @@
/obj/item/weapon/bedsheet/medical,
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"bCa" = (
@@ -40666,9 +40452,7 @@
"bCb" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet/medical,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/freezer,
/area/medical/virology)
"bCc" = (
@@ -40678,9 +40462,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bCd" = (
-/obj/effect/landmark/start{
- name = "Virologist"
- },
+/obj/effect/landmark/start/virologist,
/obj/structure/chair/office/light{
dir = 8
},
@@ -40783,9 +40565,7 @@
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"bCo" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -41845,9 +41625,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft)
"bEH" = (
@@ -42621,9 +42399,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/atmos)
"bGp" = (
@@ -42887,9 +42663,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/atmos)
"bGV" = (
@@ -43316,10 +43090,7 @@
/turf/open/floor/engine/plasma,
/area/atmos)
"bHL" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/plasma,
/area/atmos)
"bHM" = (
@@ -43366,9 +43137,7 @@
/area/maintenance/aft)
"bHR" = (
/obj/machinery/atmospherics/components/binary/valve,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft)
"bHS" = (
@@ -44762,9 +44531,7 @@
/turf/open/floor/plasteel,
/area/engine/chiefs_office)
"bKL" = (
-/obj/effect/landmark/start{
- name = "Chief Engineer"
- },
+/obj/effect/landmark/start/chief_engineer,
/turf/open/floor/plasteel,
/area/engine/chiefs_office)
"bKM" = (
@@ -45219,9 +44986,7 @@
icon_state = "2-4";
tag = ""
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
@@ -46438,9 +46203,7 @@
/area/engine/engineering)
"bNW" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"bNX" = (
@@ -46790,9 +46553,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"bOE" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -46829,10 +46590,7 @@
/turf/open/floor/engine/o2,
/area/atmos)
"bOL" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/air,
/area/atmos)
"bOM" = (
@@ -47264,9 +47022,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"bPM" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plating,
/area/engine/engineering)
"bPN" = (
@@ -47440,10 +47196,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"bQf" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/aft)
"bQg" = (
@@ -48233,9 +47986,7 @@
})
"bRU" = (
/obj/item/device/radio/beacon,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plating/airless,
/area/mine/explored{
name = "Bomb Testing Asteroid"
@@ -49298,9 +49049,7 @@
},
/area/maintenance/fsmaint)
"bUw" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -49310,9 +49059,7 @@
/turf/open/floor/plasteel,
/area/security/main)
"bUx" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -50132,9 +49879,7 @@
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/primary/central)
"bWj" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/hydroponics)
@@ -50194,9 +49939,7 @@
},
/area/crew_quarters/bar)
"bWr" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/structure/chair/wood/normal{
icon_state = "wooden_chair";
dir = 1
@@ -50492,9 +50235,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark{
- name = "JoinLate"
- },
+/obj/effect/landmark/latejoin,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9;
pixel_y = 0
@@ -52474,9 +52215,7 @@
name = "Monastery"
})
"cbU" = (
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -55619,9 +55358,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"cik" = (
diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
index bb89658c4e4..0accb792c88 100644
--- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm
+++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
@@ -24,9 +24,7 @@
},
/area/shuttle/syndicate)
"aae" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aaf" = (
@@ -815,9 +813,7 @@
/area/security/transfer)
"acc" = (
/obj/structure/bed,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/security/transfer)
"acd" = (
@@ -930,9 +926,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"acq" = (
-/obj/effect/landmark{
- name = "secequipment"
- },
+/obj/effect/landmark/secequipment,
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"acr" = (
@@ -2421,25 +2415,19 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"aff" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 9
},
/area/security/main)
"afg" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 1
},
/area/security/main)
"afh" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/red/side{
dir = 1
@@ -2450,9 +2438,7 @@
dir = 4;
icon_state = "pipe-c"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -2473,9 +2459,7 @@
dir = 8;
icon_state = "pipe-c"
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -2771,9 +2755,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/main)
"afT" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -2798,16 +2780,12 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Head of Security"
- },
+/obj/effect/landmark/start/head_of_security,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/main)
"afY" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/structure/chair{
dir = 8
},
@@ -3038,9 +3016,7 @@
},
/area/security/main)
"agz" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/red/corner{
dir = 1
},
@@ -3282,9 +3258,7 @@
/turf/open/floor/plasteel,
/area/security/main)
"ahb" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel,
/area/security/main)
"ahc" = (
@@ -3325,9 +3299,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/obj/structure/chair{
dir = 8
},
@@ -3719,9 +3691,7 @@
},
/obj/structure/chair,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
+/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel,
/area/security/main)
"ahL" = (
@@ -3791,9 +3761,7 @@
/area/security/warden)
"ahR" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Warden"
- },
+/obj/effect/landmark/start/warden,
/obj/machinery/button/door{
id = "Prison Gate";
name = "Prison Wing Lockdown";
@@ -6072,10 +6040,7 @@
/area/maintenance/fpmaint2)
"amE" = (
/obj/structure/bed,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/bedsheet,
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
@@ -7152,10 +7117,7 @@
/area/maintenance/fpmaint2)
"aoU" = (
/obj/structure/bed,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
"aoV" = (
@@ -7357,9 +7319,7 @@
name = "Air In";
on = 1
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -7776,9 +7736,7 @@
/area/crew_quarters/fitness)
"aqt" = (
/obj/structure/grille,
-/obj/effect/landmark{
- name = "Syndicate Breach Area"
- },
+/obj/effect/landmark/syndicate_breach_area,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -7858,10 +7816,7 @@
/turf/open/floor/plating,
/area/maintenance/fsmaint2)
"aqE" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/fsmaint2)
"aqF" = (
@@ -7981,9 +7936,7 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"aqV" = (
@@ -8408,9 +8361,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
@@ -8842,9 +8793,7 @@
/area/mining_construction)
"atc" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Lawyer"
- },
+/obj/effect/landmark/start/lawyer,
/turf/open/floor/wood,
/area/lawoffice)
"atd" = (
@@ -8857,10 +8806,7 @@
},
/area/hallway/primary/fore)
"ate" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -9141,9 +9087,7 @@
/turf/open/floor/wood,
/area/crew_quarters/sleep)
"atR" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
@@ -9841,9 +9785,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -10162,9 +10104,7 @@
/turf/open/floor/plating,
/area/maintenance/fpmaint)
"awh" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -10356,9 +10296,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"awB" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/green/side{
dir = 4
},
@@ -10645,9 +10583,7 @@
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
"axf" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
"axg" = (
@@ -10957,9 +10893,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/sleep)
"axP" = (
@@ -12139,9 +12073,7 @@
/area/maintenance/fsmaint2)
"aAv" = (
/obj/structure/closet,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka,
/turf/open/floor/plating,
@@ -12537,9 +12469,7 @@
/turf/open/floor/plating,
/area/security/checkpoint2)
"aBm" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
@@ -12693,9 +12623,7 @@
/obj/item/clothing/under/rank/mailman,
/obj/item/clothing/head/mailman,
/obj/structure/closet,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/fsmaint2)
"aBF" = (
@@ -12747,9 +12675,7 @@
/turf/open/floor/plating,
/area/maintenance/fpmaint2)
"aBM" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -12913,10 +12839,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/sleep)
"aCe" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/item/weapon/bikehorn/rubberducky,
/obj/structure/cable{
d1 = 1;
@@ -13768,9 +13691,7 @@
/area/maintenance/fsmaint2)
"aDY" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Mime"
- },
+/obj/effect/landmark/start/mime,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -14670,9 +14591,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"aFS" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/storage/primary)
"aFT" = (
@@ -14682,9 +14601,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"aFU" = (
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4;
on = 1;
@@ -14839,9 +14756,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aGo" = (
@@ -14886,9 +14801,7 @@
/area/ai_monitored/storage/eva)
"aGr" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Clown"
- },
+/obj/effect/landmark/start/clown,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
on = 1
@@ -15439,9 +15352,7 @@
/turf/open/floor/plating,
/area/chapel/main)
"aHr" = (
-/obj/effect/landmark{
- name = "Marauder Entry"
- },
+/obj/effect/landmark/marauder_entry,
/turf/open/space,
/area/space)
"aHs" = (
@@ -15451,9 +15362,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"aHt" = (
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"aHu" = (
@@ -15543,9 +15452,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/storage/primary)
"aHE" = (
@@ -15698,9 +15605,7 @@
/obj/structure/mirror{
pixel_x = -28
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"aHV" = (
@@ -15967,9 +15872,7 @@
dir = 4;
icon_state = "pipe-c"
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -16006,16 +15909,12 @@
/area/chapel/office)
"aIB" = (
/obj/structure/bodycontainer/crematorium,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/black,
/area/chapel/office)
"aIC" = (
-/obj/effect/landmark/start{
- name = "Chaplain"
- },
+/obj/effect/landmark/start/chaplain,
/obj/structure/chair,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
@@ -17283,9 +17182,7 @@
/area/hallway/primary/central)
"aLy" = (
/obj/structure/chair/comfy/beige,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/entry)
"aLz" = (
@@ -17546,10 +17443,7 @@
/area/hallway/primary/central)
"aMi" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
/area/crew_quarters/bar)
@@ -17841,9 +17735,7 @@
/area/hallway/primary/port)
"aMW" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/chapel/office)
"aMX" = (
@@ -18005,9 +17897,7 @@
},
/area/hallway/primary/central)
"aNx" = (
-/obj/effect/landmark{
- name = "Observer-Start"
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel{
icon_state = "L8"
},
@@ -18623,9 +18513,7 @@
},
/area/crew_quarters/bar)
"aOP" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/item/toy/beach_ball/holoball,
/turf/open/floor/plating,
/area/crew_quarters/bar)
@@ -18689,9 +18577,7 @@
dir = 1;
icon_state = "comfychair"
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/entry)
@@ -19128,9 +19014,7 @@
/area/crew_quarters/bar)
"aQd" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aQe" = (
@@ -19232,9 +19116,7 @@
/turf/open/floor/engine/cult,
/area/library)
"aQt" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/chair/comfy/brown{
dir = 1
},
@@ -19594,9 +19476,7 @@
/obj/structure/chair{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aRx" = (
@@ -19886,9 +19766,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSj" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aSk" = (
@@ -20065,9 +19943,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/kitchen)
"aSJ" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -20190,9 +20066,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aSZ" = (
-/obj/effect/landmark/start{
- name = "Bartender"
- },
+/obj/effect/landmark/start/bartender,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aTa" = (
@@ -20262,9 +20136,7 @@
"aTi" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/chapel{
dir = 8
},
@@ -20376,9 +20248,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
@@ -20683,9 +20553,7 @@
/obj/structure/chair/stool{
pixel_y = 8
},
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -20766,9 +20634,7 @@
/area/library)
"aUC" = (
/obj/structure/chair/comfy/black,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/library)
"aUD" = (
@@ -20784,9 +20650,7 @@
/turf/open/floor/wood,
/area/library)
"aUF" = (
-/obj/effect/landmark/start{
- name = "Librarian"
- },
+/obj/effect/landmark/start/librarian,
/obj/structure/chair/office/dark,
/turf/open/floor/wood,
/area/library)
@@ -20800,9 +20664,7 @@
/area/chapel/main)
"aUH" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/chapel{
dir = 4
},
@@ -21297,9 +21159,7 @@
/turf/open/floor/plasteel/black,
/area/hydroponics)
"aVK" = (
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel,
/area/hydroponics)
"aVL" = (
@@ -22092,9 +21952,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aXm" = (
-/obj/effect/landmark/start{
- name = "Cook"
- },
+/obj/effect/landmark/start/cook,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"aXn" = (
@@ -22453,10 +22311,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"aYg" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -22703,9 +22558,7 @@
/area/crew_quarters/locker)
"aYI" = (
/obj/structure/chair/stool/bar,
-/obj/effect/landmark/start{
- name = "Assistant"
- },
+/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"aYJ" = (
@@ -22763,9 +22616,7 @@
/area/hydroponics)
"aYR" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Botanist"
- },
+/obj/effect/landmark/start/botanist,
/turf/open/floor/plasteel,
/area/hydroponics)
"aYS" = (
@@ -23595,9 +23446,7 @@
/area/security/detectives_office)
"baX" = (
/obj/structure/chair/comfy/brown,
-/obj/effect/landmark/start{
- name = "Detective"
- },
+/obj/effect/landmark/start/detective,
/turf/open/floor/carpet,
/area/security/detectives_office)
"baY" = (
@@ -23665,9 +23514,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bbg" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
@@ -24161,10 +24008,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bct" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/locker/locker_toilet)
"bcu" = (
@@ -24729,9 +24573,7 @@
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bdL" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/item/clothing/suit/ianshirt,
/obj/structure/closet,
/turf/open/floor/plating,
@@ -26050,9 +25892,7 @@
/obj/structure/chair/comfy/brown{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Captain"
- },
+/obj/effect/landmark/start/captain,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/wood,
/area/crew_quarters/captain)
@@ -26733,9 +26573,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Chemist"
- },
+/obj/effect/landmark/start/chemist,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 4
},
@@ -26781,9 +26619,7 @@
/area/security/checkpoint/medical)
"biz" = (
/obj/structure/bodycontainer/morgue,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/black,
/area/medical/morgue)
"biA" = (
@@ -26899,9 +26735,7 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel/white,
/area/assembly/robotics)
"biN" = (
@@ -26990,9 +26824,7 @@
/area/toxins/lab)
"biV" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -28002,9 +27834,7 @@
/turf/open/floor/plating,
/area/bridge/meeting_room)
"bkY" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -28414,9 +28244,7 @@
/area/toxins/lab)
"blM" = (
/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel,
/area/assembly/robotics)
"blN" = (
@@ -28862,9 +28690,7 @@
pixel_x = -26;
req_access_txt = "5"
},
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/white,
/area/medical/medbay)
"bmM" = (
@@ -29213,9 +29039,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bnz" = (
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/obj/structure/chair/office/dark{
dir = 4
},
@@ -30102,9 +29926,7 @@
},
/obj/item/weapon/soap/deluxe,
/obj/item/weapon/bikehorn/rubberducky,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/obj/structure/curtain,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/captain)
@@ -30942,9 +30764,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"brd" = (
@@ -31926,9 +31746,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Head of Personnel"
- },
+/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/plasteel,
/area/crew_quarters/heads)
"bsZ" = (
@@ -33157,9 +32975,7 @@
/area/medical/genetics)
"bvq" = (
/obj/structure/chair,
-/obj/effect/landmark/start{
- name = "Geneticist"
- },
+/obj/effect/landmark/start/geneticist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -33361,9 +33177,7 @@
/area/toxins/explab)
"bvN" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/white,
/area/toxins/explab)
"bvO" = (
@@ -33931,9 +33745,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -34640,9 +34452,7 @@
/obj/structure/chair/office/light{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Research Director"
- },
+/obj/effect/landmark/start/research_director,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/hor)
"byr" = (
@@ -35328,9 +35138,7 @@
/area/medical/sleeper)
"bzT" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark/start{
- name = "Quartermaster"
- },
+/obj/effect/landmark/start/quartermaster,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -35392,9 +35200,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
@@ -35620,9 +35426,7 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bAy" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/black{
name = "Server Walkway";
initial_gas_mix = "n2=500;TEMP=80"
@@ -35798,13 +35602,8 @@
},
/area/hallway/primary/aft)
"bAQ" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/blobstart,
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine,
/area/toxins/explab)
"bAR" = (
@@ -35887,9 +35686,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bBb" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -36843,9 +36640,7 @@
/area/medical/cmo)
"bCZ" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Chief Medical Officer"
- },
+/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/plasteel/barber,
/area/medical/cmo)
"bDa" = (
@@ -37242,9 +37037,7 @@
/turf/open/floor/plasteel/barber,
/area/medical/cmo)
"bDT" = (
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
+/obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bDU" = (
@@ -37297,10 +37090,7 @@
icon_state = "4-8";
pixel_y = 0
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/floorgrime,
/area/toxins/storage)
"bDZ" = (
@@ -37719,9 +37509,7 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bEQ" = (
-/obj/effect/landmark/start{
- name = "Shaft Miner"
- },
+/obj/effect/landmark/start/shaft_miner,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
@@ -37847,9 +37635,7 @@
icon_state = "4-8";
pixel_x = 0
},
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -37880,9 +37666,7 @@
/area/storage/tech)
"bFf" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Janitor"
- },
+/obj/effect/landmark/start/janitor,
/turf/open/floor/plasteel,
/area/janitor)
"bFg" = (
@@ -38325,9 +38109,7 @@
/area/quartermaster/miningdock)
"bGk" = (
/obj/structure/chair/stool,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/white,
/area/toxins/mixing)
"bGl" = (
@@ -39018,9 +38800,7 @@
/turf/open/floor/plating,
/area/maintenance/asmaint)
"bHC" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/aft)
"bHD" = (
@@ -39091,10 +38871,7 @@
icon_state = "4-8";
pixel_x = 0
},
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/storage/tech)
"bHK" = (
@@ -40131,9 +39908,7 @@
},
/area/hallway/primary/aft)
"bJA" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -40580,9 +40355,7 @@
/area/maintenance/asmaint)
"bKx" = (
/obj/structure/closet/crate,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -40649,9 +40422,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Cargo Technician"
- },
+/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bKG" = (
@@ -42912,9 +42683,7 @@
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
"bPy" = (
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -43397,9 +43166,7 @@
/turf/open/floor/plasteel,
/area/toxins/misc_lab)
"bQJ" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bQK" = (
@@ -43682,9 +43449,7 @@
/obj/structure/chair{
dir = 8
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/atmos)
@@ -43721,9 +43486,7 @@
/obj/structure/chair/office/dark{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Atmospheric Technician"
- },
+/obj/effect/landmark/start/atmospheric_technician,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
external_pressure_bound = 101.325;
@@ -44074,9 +43837,7 @@
/area/toxins/misc_lab)
"bSk" = (
/obj/machinery/magnetic_module,
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/structure/target_stake,
/obj/effect/turf_decal/bot{
dir = 2
@@ -44473,9 +44234,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bSZ" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/engine,
/area/toxins/xenobiology)
"bTa" = (
@@ -45948,9 +45707,7 @@
"bWk" = (
/obj/structure/bed,
/obj/item/weapon/bedsheet,
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bWl" = (
@@ -46015,9 +45772,7 @@
/area/toxins/misc_lab)
"bWp" = (
/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
- name = "Scientist"
- },
+/obj/effect/landmark/start/scientist,
/turf/open/floor/plasteel/floorgrime,
/area/toxins/misc_lab)
"bWq" = (
@@ -46333,9 +46088,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Virologist"
- },
+/obj/effect/landmark/start/virologist,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -46367,9 +46120,7 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bXe" = (
-/obj/effect/landmark{
- name = "revenantspawn"
- },
+/obj/effect/landmark/revenantspawn,
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/toxins/xenobiology)
@@ -46611,9 +46362,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/aft)
"bXx" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/aft)
"bXy" = (
@@ -46836,10 +46585,7 @@
/turf/open/floor/engine/plasma,
/area/atmos)
"bXY" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/plasma,
/area/atmos)
"bXZ" = (
@@ -49431,9 +49177,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cdp" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
+/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
@@ -50122,9 +49866,7 @@
/turf/open/floor/plasteel,
/area/toxins/misc_lab)
"ceR" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/asmaint2)
"ceS" = (
@@ -50673,10 +50415,7 @@
/turf/open/floor/plating,
/area/maintenance/incinerator)
"cgc" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -51819,9 +51558,7 @@
/obj/structure/chair/office/light{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Chief Engineer"
- },
+/obj/effect/landmark/start/chief_engineer,
/turf/open/floor/plasteel/neutral{
dir = 2
},
@@ -52093,9 +51830,7 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"ciW" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/engine/engineering)
"ciX" = (
@@ -52183,9 +51918,7 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cjg" = (
@@ -53039,9 +52772,7 @@
/turf/open/floor/engine/air,
/area/atmos)
"cld" = (
-/obj/effect/landmark{
- name = "blobstart"
- },
+/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/components/binary/pump{
dir = 4;
@@ -53418,10 +53149,7 @@
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
"clY" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine/air,
/area/atmos)
"clZ" = (
@@ -53540,10 +53268,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate)
"cmq" = (
-/obj/effect/landmark{
- name = "xeno_spawn";
- pixel_x = -1
- },
+/obj/effect/landmark/xeno_spawn,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating{
icon_state = "platingdmg3"
@@ -54081,9 +53806,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel/yellow/corner{
dir = 1
},
@@ -54121,9 +53844,7 @@
/turf/open/floor/engine,
/area/engine/engineering)
"cny" = (
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cnz" = (
@@ -56519,9 +56240,7 @@
/turf/open/floor/plating,
/area/maintenance/asmaint2)
"csz" = (
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space/nearstation)
"csA" = (
@@ -57030,9 +56749,7 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/landmark/start{
- name = "Cyborg"
- },
+/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctK" = (
@@ -58086,9 +57803,7 @@
name = "AI Satellite Hallway"
})
"cvx" = (
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -58136,9 +57851,7 @@
name = "AI Satellite Hallway"
})
"cvA" = (
-/obj/effect/landmark{
- name = "tripai"
- },
+/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -59005,9 +58718,7 @@
/area/shuttle/escape)
"cxn" = (
/obj/structure/lattice,
-/obj/effect/landmark{
- name = "carpspawn"
- },
+/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"cxo" = (
@@ -60506,9 +60217,7 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"cAS" = (
-/obj/effect/landmark/start{
- name = "AI"
- },
+/obj/effect/landmark/start/ai,
/obj/item/device/radio/intercom{
broadcasting = 0;
freerange = 1;
@@ -61413,9 +61122,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cCZ" = (
@@ -61686,9 +61393,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/landmark/start{
- name = "Station Engineer"
- },
+/obj/effect/landmark/start/station_engineer,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cDC" = (
@@ -63636,9 +63341,7 @@
"cIc" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start{
- name = "Roboticist"
- },
+/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel,
/area/assembly/robotics)
"cId" = (
diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm
index 4d1b2ea5422..7c9956e00cc 100644
--- a/_maps/map_files/generic/Centcomm.dmm
+++ b/_maps/map_files/generic/Centcomm.dmm
@@ -2297,7 +2297,7 @@
/turf/closed/indestructible/riveted,
/area/start)
"gd" = (
-/obj/effect/landmark/start,
+/obj/effect/landmark/start/new_player,
/turf/open/floor/plating,
/area/start)
"ge" = (
@@ -2992,9 +2992,7 @@
/turf/closed/indestructible/riveted,
/area/centcom/control)
"iv" = (
-/obj/effect/landmark{
- name = "prisonwarp"
- },
+/obj/effect/landmark/prisonwarp,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -6494,9 +6492,7 @@
/area/syndicate_mothership/control)
"qp" = (
/obj/structure/chair/stool,
-/obj/effect/landmark{
- name = "Syndicate-Spawn"
- },
+/obj/effect/landmark/syndicate_spawn,
/turf/open/floor/plasteel/bar{
dir = 2
},
@@ -8111,9 +8107,7 @@
/turf/open/floor/wood,
/area/syndicate_mothership/control)
"tT" = (
-/obj/effect/landmark{
- name = "Syndicate-Spawn"
- },
+/obj/effect/landmark/syndicate_spawn,
/turf/open/floor/wood,
/area/syndicate_mothership/control)
"tU" = (
@@ -9049,16 +9043,12 @@
/area/centcom/ferry)
"wo" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark{
- name = "Emergencyresponseteam"
- },
+/obj/effect/landmark/ert_spawn,
/turf/open/floor/plasteel/black,
/area/centcom/ferry)
"wp" = (
/obj/structure/chair/office/dark,
-/obj/effect/landmark{
- name = "Emergencyresponseteam"
- },
+/obj/effect/landmark/ert_spawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -9204,9 +9194,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark{
- name = "Emergencyresponseteam"
- },
+/obj/effect/landmark/ert_spawn,
/turf/open/floor/plasteel/black,
/area/centcom/ferry)
"wK" = (
@@ -9294,9 +9282,7 @@
},
/area/wizard_station)
"wY" = (
-/obj/effect/landmark/start{
- name = "wizard"
- },
+/obj/effect/landmark/start/wizard,
/turf/open/floor/engine/cult,
/area/wizard_station)
"wZ" = (
@@ -9357,9 +9343,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
-/obj/effect/landmark{
- name = "Emergencyresponseteam"
- },
+/obj/effect/landmark/ert_spawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -9697,18 +9681,14 @@
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark{
- name = "Emergencyresponseteam"
- },
+/obj/effect/landmark/ert_spawn,
/turf/open/floor/plasteel/black,
/area/centcom/ferry)
"xV" = (
/obj/structure/chair/office/dark{
dir = 1
},
-/obj/effect/landmark{
- name = "Emergencyresponseteam"
- },
+/obj/effect/landmark/ert_spawn,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -10328,9 +10308,7 @@
/area/wizard_station)
"zj" = (
/obj/structure/table/wood,
-/obj/effect/landmark{
- name = "Teleport-Scroll"
- },
+/obj/effect/landmark/teleport_scroll,
/obj/item/weapon/dice/d20,
/obj/item/weapon/dice,
/turf/open/floor/carpet,
@@ -11791,9 +11769,7 @@
/turf/open/space,
/area/space)
"CV" = (
-/obj/effect/landmark{
- name = "Holding Facility"
- },
+/obj/effect/landmark/holding_facility,
/turf/open/floor/engine,
/area/centcom/holding)
"CW" = (
@@ -11837,9 +11813,7 @@
/area/tdome/tdomeobserve)
"Da" = (
/obj/structure/chair,
-/obj/effect/landmark{
- name = "tdomeobserve"
- },
+/obj/effect/landmark/thunderdome/observe,
/obj/structure/sign/barsign{
pixel_y = 32
},
@@ -11849,9 +11823,7 @@
/area/tdome/tdomeobserve)
"Db" = (
/obj/structure/chair,
-/obj/effect/landmark{
- name = "tdomeobserve"
- },
+/obj/effect/landmark/thunderdome/observe,
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -12189,27 +12161,21 @@
},
/area/tdome/arena)
"DO" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"DP" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"DQ" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -12262,27 +12228,21 @@
},
/area/tdome/arena)
"DZ" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"Ea" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"Eb" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -12336,9 +12296,7 @@
},
/area/tdome/tdomeadmin)
"Eh" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -12348,22 +12306,16 @@
/obj/machinery/recharger{
pixel_y = 4
},
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/tdome/arena)
"Ej" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/turf/open/floor/plasteel/neutral,
/area/tdome/arena)
"Ek" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -12380,9 +12332,7 @@
},
/area/tdome/arena)
"En" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -12392,22 +12342,16 @@
/obj/machinery/recharger{
pixel_y = 4
},
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/tdome/arena)
"Ep" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/turf/open/floor/plasteel/neutral,
/area/tdome/arena)
"Eq" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -12441,9 +12385,7 @@
network = list("thunder");
c_tag = "Red Team"
},
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/turf/open/floor/plasteel/neutral,
/area/tdome/arena)
"Ev" = (
@@ -12474,9 +12416,7 @@
network = list("thunder");
c_tag = "Green Team"
},
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/turf/open/floor/plasteel/neutral,
/area/tdome/arena)
"EA" = (
@@ -12516,50 +12456,38 @@
/turf/open/floor/plasteel/green/corner,
/area/tdome/arena)
"EG" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"EH" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/arena)
"EI" = (
-/obj/effect/landmark{
- name = "tdome2"
- },
+/obj/effect/landmark/thunderdome/two,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"EJ" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/plasteel,
/area/tdome/arena)
"EK" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/tdome/arena)
"EL" = (
-/obj/effect/landmark{
- name = "tdome1"
- },
+/obj/effect/landmark/thunderdome/one,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -12644,9 +12572,7 @@
},
/area/tdome/tdomeadmin)
"EV" = (
-/obj/effect/landmark{
- name = "tdomeadmin"
- },
+/obj/effect/landmark/thunderdome/admin,
/obj/structure/chair/comfy/black{
dir = 1
},
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index e9a3b21bbbc..372deb5b36d 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -19,6 +19,8 @@
#define ismineralturf(A) (istype(A, /turf/closed/mineral))
+#define islava(A) (istype(A, /turf/open/floor/plating/lava))
+
//Mobs
#define isliving(A) (istype(A, /mob/living))
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index d35219d58cd..5c2bd6a8887 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1313,7 +1313,7 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
else
. = ""
-var/mob/dead/dview/dview_mob = new
+var/mob/dview/dview_mob = new
//Version of view() which ignores darkness, because BYOND doesn't have it (I actually suggested it but it was tagged redundant, BUT HEARERS IS A T- /rant).
/proc/dview(var/range = world.view, var/center, var/invis_flags = 0)
@@ -1327,7 +1327,7 @@ var/mob/dead/dview/dview_mob = new
. = view(range, dview_mob)
dview_mob.loc = null
-/mob/dead/dview
+/mob/dview
name = "INTERNAL DVIEW MOB"
invisibility = 101
density = FALSE
@@ -1335,7 +1335,7 @@ var/mob/dead/dview/dview_mob = new
anchored = TRUE
var/ready_to_die = FALSE
-/mob/dead/dview/Destroy(force = FALSE)
+/mob/dview/Destroy(force = FALSE)
if(!ready_to_die)
stack_trace("ALRIGHT WHICH FUCKER TRIED TO DELETE *MY* DVIEW?")
diff --git a/code/__PATH_COMPATIBILITY/path_compatibility.dm b/code/__PATH_COMPATIBILITY/path_compatibility.dm
deleted file mode 100644
index 2d50b3ec3a8..00000000000
--- a/code/__PATH_COMPATIBILITY/path_compatibility.dm
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-
- This is a smart+stupid method of maintaining paths during refactors.
- At this point in time we have more maps than ever, and our tools just aren't that great.
- So instead of repathing all the maps...
-
- Keep the old path defined, just as an empty type with that path, and then define it's
- parent_type as the new path, effectively maintaining the object/mob w/e without having
- to touch all the maps, avoiding all those nasty conflicts!
-
- Ideally the old paths would be cleaned out as mappers go about their usual routine of
- updating old maps.
-
- tl;dr TYPEFUCKERY, because fuck updating all these maps
-
- Example:
-
- /obj/structure/bed/chair/janicart/secway
- parent_type = /obj/vehicle/secway
-
-*/
diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
index c406757a443..a92c9b36301 100644
--- a/code/_globalvars/lists/mapping.dm
+++ b/code/_globalvars/lists/mapping.dm
@@ -30,7 +30,6 @@ var/list/start_landmarks_list = list() //list of all spawn points created
var/list/department_security_spawns = list() //list of all department security spawns
var/list/generic_event_spawns = list() //list of all spawns for events
-var/list/monkeystart = list()
var/list/wizardstart = list()
var/list/newplayer_start = list()
var/list/latejoin = list()
@@ -41,7 +40,6 @@ var/list/tdome1 = list()
var/list/tdome2 = list()
var/list/tdomeobserve = list()
var/list/tdomeadmin = list()
-var/list/prisonsecuritywarp = list() //prison security goes to these
var/list/prisonwarped = list() //list of players already warped
var/list/blobstart = list()
var/list/secequipment = list()
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f1ebd40c873..9bda2364623 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -117,7 +117,7 @@
if(A.ClickAccessible(src, depth=INVENTORY_DEPTH))
// No adjacency needed
if(W)
- melee_item_attack_chain(src, W, A)
+ melee_item_attack_chain(src, W, A, params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
@@ -131,7 +131,7 @@
if(isturf(A) || isturf(A.loc) || (A.loc && isturf(A.loc.loc)))
if(Adjacent(A) || (W && CheckReach(src, A, W.reach))) //Adjacent or reaching attacks
if(W)
- melee_item_attack_chain(src, W, A)
+ melee_item_attack_chain(src, W, A, params)
else
if(ismob(A))
changeNext_move(CLICK_CD_MELEE)
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 303c0877b02..2cd840ca978 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -68,7 +68,7 @@
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
if(A == loc || (A in loc) || (A in contents))
- melee_item_attack_chain(src, W, A)
+ melee_item_attack_chain(src, W, A, params)
return
if(!isturf(loc))
@@ -77,7 +77,7 @@
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
if(isturf(A) || isturf(A.loc))
if(A.Adjacent(src)) // see adjacent.dm
- melee_item_attack_chain(src, W, A)
+ melee_item_attack_chain(src, W, A, params)
return
else
W.afterattack(A, src, 0, params)
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 2135ca27d95..616037c13e8 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -684,14 +684,18 @@
if(SStitle.icon)
icon = SStitle.icon
else
- if(SStitle.previous_icon)
- icon = SStitle.previous_icon
+ if(!SStitle.previous_icon)
+ qdel(src)
+ return
+ icon = SStitle.previous_icon
holder.screen += src
..()
/obj/screen/splash/proc/Fade(out, qdel_after = TRUE)
+ if(QDELETED(src))
+ return
if(out)
animate(src, alpha = 0, time = 30)
else
@@ -704,4 +708,4 @@
if(holder)
holder.screen -= src
holder = null
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index d90e1a34653..41318281821 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -125,7 +125,7 @@ var/const/tk_maxrange = 15
if(!isturf(target) && istype(focus,/obj/item) && target.Adjacent(focus))
apply_focus_overlay()
- melee_item_attack_chain(tk_user, focus, target) //isn't copying the attack chain fun. we should do it more often.
+ melee_item_attack_chain(tk_user, focus, target, params) //isn't copying the attack chain fun. we should do it more often.
if(check_if_focusable(focus))
focus.do_attack_animation(target, null, focus)
else
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index b11dca74f93..f7eb03eb437 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -523,7 +523,6 @@ SUBSYSTEM_DEF(garbage)
SearchVar(start_landmarks_list)
SearchVar(department_security_spawns)
SearchVar(generic_event_spawns)
- SearchVar(monkeystart)
SearchVar(wizardstart)
SearchVar(newplayer_start)
SearchVar(latejoin)
@@ -534,7 +533,6 @@ SUBSYSTEM_DEF(garbage)
SearchVar(tdome2)
SearchVar(tdomeobserve)
SearchVar(tdomeadmin)
- SearchVar(prisonsecuritywarp)
SearchVar(prisonwarped)
SearchVar(blobstart)
SearchVar(secequipment)
@@ -927,10 +925,6 @@ SUBSYSTEM_DEF(garbage)
SearchVar(GALOSHES_DONT_HELP)
SearchVar(SLIDE_ICE)
SearchVar(limb_icon_cache)
- SearchVar(MIN_IMPREGNATION_TIME)
- SearchVar(MAX_IMPREGNATION_TIME)
- SearchVar(MIN_ACTIVE_TIME)
- SearchVar(MAX_ACTIVE_TIME)
SearchVar(default_martial_art)
SearchVar(plasmaman_on_fire)
SearchVar(ai_list)
diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/processing/overlays.dm
index 8649ed98165..c28dc245fae 100644
--- a/code/controllers/subsystem/processing/overlays.dm
+++ b/code/controllers/subsystem/processing/overlays.dm
@@ -168,7 +168,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
var/list/cached_other = other.our_overlays
if(cached_other)
- if(cut_old)
+ if(cut_old || !LAZYLEN(our_overlays))
our_overlays = cached_other.Copy()
else
our_overlays |= cached_other
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 205ddbb8c68..1cbfe75ab2d 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -56,6 +56,8 @@ SUBSYSTEM_DEF(ticker)
var/late_join_disabled
+ var/list/round_start_events
+
/datum/controller/subsystem/ticker/Initialize(timeofday)
var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n")
login_music = pick(music)
@@ -197,6 +199,11 @@ SUBSYSTEM_DEF(ticker)
transfer_characters() //transfer keys to the new mobs
Master.RoundStart() //let the party begin...
+
+ for(var/I in round_start_events)
+ var/datum/callback/cb = I
+ cb.InvokeAsync()
+ LAZYCLEARLIST(round_start_events)
log_world("Game start took [(world.timeofday - init_start)/10]s")
round_start_time = world.time
@@ -229,6 +236,12 @@ SUBSYSTEM_DEF(ticker)
var/list/allmins = adm["present"]
send2irc("Server", "Round of [hide_mode ? "secret":"[mode.name]"] has started[allmins.len ? ".":" with no active admins online!"]")
+/datum/controller/subsystem/ticker/proc/OnRoundstart(datum/callback/cb)
+ if(current_state < GAME_STATE_PLAYING)
+ LAZYADD(round_start_events, cb)
+ else
+ cb.InvokeAsync()
+
/datum/controller/subsystem/ticker/proc/station_explosion_detonation(atom/bomb)
if(bomb) //BOOM
var/turf/epi = bomb.loc
diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index cb139ca29a1..344a421617d 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -12,8 +12,10 @@ SUBSYSTEM_DEF(title)
return
if(fexists("data/previous_title.dat"))
- previous_icon = new("data/previous_title.dat")
- fdel("data/previous_title.dat") //linger not
+ var/previous_path = file2text("data/previous_title.dat")
+ if(istext(previous_path))
+ previous_icon = new(previous_icon)
+ fdel("data/previous_title.dat")
var/list/provisional_title_screens = flist("config/title_screens/images/")
var/list/title_screens = list()
@@ -41,7 +43,8 @@ SUBSYSTEM_DEF(title)
/datum/controller/subsystem/title/Shutdown()
if(file_path)
- fcopy(file_path, "data/previous_title.dat")
+ var/F = "data/previous_title.dat"
+ F << file_path
/datum/controller/subsystem/title/Recover()
icon = SStitle.icon
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 4cab12a6ef3..aba167ec7c1 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -78,6 +78,7 @@
/datum/beam/proc/Reset()
for(var/obj/effect/ebeam/B in elements)
qdel(B)
+ elements.Cut()
/datum/beam/Destroy()
Reset()
@@ -99,7 +100,7 @@
for(N in 0 to length-1 step 32)//-1 as we want < not <=, but we want the speed of X in Y to Z and step X
var/obj/effect/ebeam/X = new beam_type(origin_oldloc)
X.owner = src
- elements |= X
+ elements += X
//Assign icon, for main segments it's base_icon, for the end, it's icon+icon_state
//cropped by a transparent box of length-N pixel size
diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm
index 949d2f5f0f4..90bfcbc6e3b 100644
--- a/code/datums/diseases/advance/symptoms/fire.dm
+++ b/code/datums/diseases/advance/symptoms/fire.dm
@@ -45,7 +45,7 @@ Bonus
return
/datum/symptom/fire/proc/Firestacks_stage_4(mob/living/M, datum/disease/advance/A)
- var/get_stacks = (sqrt(20+A.totalStageSpeed()*2))-(sqrt(16+A.totalStealth()))
+ var/get_stacks = (sqrt(20+A.totalStageSpeed()*2))-(sqrt(max(0, 16+A.totalStealth())))
M.adjust_fire_stacks(get_stacks)
M.adjustFireLoss(get_stacks/2)
return 1
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index c2652709a12..ff40a96b1bc 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -203,7 +203,7 @@ var/list/teleportlocs = list()
if(A.fire)
cont = FALSE
break
- if(cont)
+ if(cont && D.is_operational())
if(D.operating)
D.nextstate = opening ? OPEN : CLOSED
else if(!(D.density ^ opening))
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 63f2f9ef2f9..b09cbf2a2e4 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -457,6 +457,12 @@ var/list/blood_splatter_icons = list()
//This proc is called on the location of an atom when the atom is Destroy()'d
/atom/proc/handle_atom_del(atom/A)
+//called when the turf the atom resides on is ChangeTurfed
+/atom/proc/HandleTurfChange(turf/T)
+ for(var/a in src)
+ var/atom/A = a
+ A.HandleTurfChange(T)
+
// Byond seemingly calls stat, each tick.
// Calling things each tick can get expensive real quick.
// So we slow this down a little.
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index b5055fe8bc8..80d4a58d45e 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -136,9 +136,9 @@
icon_state = "zombie"
H.hair_style = null
H.update_hair()
- update_icons()
H.forceMove(src)
oldguy = H
+ update_icons()
visible_message("The corpse of [H.name] suddenly rises!")
/mob/living/simple_animal/hostile/blob/blobspore/death(gibbed)
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm
index e04edc42c3e..be2df3697f1 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm
@@ -37,8 +37,6 @@
return "Replicant Alloy"
if(HIEROPHANT_ANSIBLE)
return "Hierophant Ansible"
- else
- return null
//returns a component acronym from a component id
/proc/get_component_acronym(id)
@@ -53,8 +51,6 @@
return "RA"
if(HIEROPHANT_ANSIBLE)
return "HA"
- else
- return null
//returns a component id from a component name
/proc/get_component_id(name)
@@ -69,8 +65,6 @@
return REPLICANT_ALLOY
if("Hierophant Ansible")
return HIEROPHANT_ANSIBLE
- else
- return null
//returns a component spanclass from a component id
/proc/get_component_span(id)
@@ -127,8 +121,6 @@
return /obj/effect/overlay/temp/ratvar/component/alloy
if(HIEROPHANT_ANSIBLE)
return /obj/effect/overlay/temp/ratvar/component/ansible
- else
- return null
//returns a type for a component from a component id
/proc/get_component_type(id)
@@ -142,6 +134,4 @@
if(REPLICANT_ALLOY)
return /obj/item/clockwork/component/replicant_alloy
if(HIEROPHANT_ANSIBLE)
- return /obj/item/clockwork/component/hierophant_ansible
- else
- return null
\ No newline at end of file
+ return /obj/item/clockwork/component/hierophant_ansible
\ No newline at end of file
diff --git a/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm b/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm
index 56e2736cd4b..40721b42892 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm
@@ -19,9 +19,9 @@
var/interdiction_range = 14 //how large an area it drains and disables in
var/static/list/rage_messages = list("...", "Disgusting.", "Die.", "Foul.", "Worthless.", "Mortal.", "Unfit.", "Weak.", "Fragile.", "Useless.", "Leave my sight!")
-/obj/structure/destructible/clockwork/powered/interdiction_lens/New()
+/obj/structure/destructible/clockwork/powered/interdiction_lens/Initialize()
..()
- set_light(1.4, 0.8, "#F42B9D")
+ update_current_glow()
/obj/structure/destructible/clockwork/powered/interdiction_lens/examine(mob/user)
..()
@@ -30,12 +30,25 @@
if(is_servant_of_ratvar(user) || isobserver(user))
to_chat(user, "If it fails to drain any electronics or has nothing to return power to, it will disable itself for [round(recharge_time/600, 1)] minutes.")
+/obj/structure/destructible/clockwork/powered/interdiction_lens/update_anchored(mob/user, do_damage)
+ ..()
+ update_current_glow()
+
/obj/structure/destructible/clockwork/powered/interdiction_lens/toggle(fast_process, mob/living/user)
. = ..()
+ update_current_glow()
+
+/obj/structure/destructible/clockwork/powered/interdiction_lens/proc/update_current_glow()
if(active)
- set_light(2, 1.6, "#EE54EE")
+ if(disabled)
+ set_light(2, 1.6, "#151200")
+ else
+ set_light(2, 1.6, "#EE54EE")
else
- set_light(1.4, 0.8, "#F42B9D")
+ if(anchored)
+ set_light(1.4, 0.8, "#F42B9D")
+ else
+ set_light(0)
/obj/structure/destructible/clockwork/powered/interdiction_lens/attack_hand(mob/living/user)
if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY))
@@ -45,7 +58,7 @@
toggle(0, user)
/obj/structure/destructible/clockwork/powered/interdiction_lens/forced_disable(bad_effects)
- if(disabled)
+ if(disabled || !anchored)
return FALSE
if(!active)
toggle(0)
@@ -53,8 +66,8 @@
recharging = world.time + recharge_time
flick("interdiction_lens_discharged", src)
icon_state = "interdiction_lens_inactive"
- set_light(2, 1.6, "#151200")
disabled = TRUE
+ update_current_glow()
return TRUE
/obj/structure/destructible/clockwork/powered/interdiction_lens/process()
diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm
index 3a70735e1ef..4c2083384e8 100644
--- a/code/game/gamemodes/cult/cult_comms.dm
+++ b/code/game/gamemodes/cult/cult_comms.dm
@@ -17,7 +17,6 @@
return
cultist_commune(usr, input)
- return
/proc/cultist_commune(mob/living/user, message)
if(!message)
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 1402c13b2f0..f3f17410d93 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -403,5 +403,4 @@
else
..()
to_chat(user, "\The [src] can only transport items!")
- return
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 43b5972aa8a..b4c4ddb4aa4 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -58,13 +58,10 @@ To draw a rune, use an arcane tome.
if(istype(I, /obj/item/weapon/tome) && iscultist(user))
to_chat(user, "You carefully erase the [lowertext(cultist_name)] rune.")
qdel(src)
- return
else if(istype(I, /obj/item/weapon/nullrod))
user.say("BEGONE FOUL MAGIKS!!")
to_chat(user, "You disrupt the magic of [src] with [I].")
qdel(src)
- return
- return
/obj/effect/rune/attack_hand(mob/living/user)
if(!iscultist(user))
@@ -510,13 +507,11 @@ var/list/teleport_runes = list()
log_game("Summon Narsie rune erased by [user.mind.key] (ckey) with a tome")
message_admins("[key_name_admin(user)] erased a Narsie rune with a tome")
..()
- return
else
if(istype(I, /obj/item/weapon/nullrod)) //Begone foul magiks. You cannot hinder me.
log_game("Summon Narsie rune erased by [user.mind.key] (ckey) using a null rod")
message_admins("[key_name_admin(user)] erased a Narsie rune with a null rod")
..()
- return
//Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people sacrificed
/obj/effect/rune/raise_dead
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index d8722acb731..2aa98c194cf 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -421,7 +421,6 @@
if(uses <= 0)
user.drop_item()
qdel(src)
- return
/obj/item/weapon/restraints/handcuffs/energy/cult //For the talisman of shackling
name = "cult shackles"
diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm
index c7af40414b5..5fbf329141c 100644
--- a/code/game/gamemodes/devil/true_devil/_true_devil.dm
+++ b/code/game/gamemodes/devil/true_devil/_true_devil.dm
@@ -153,7 +153,6 @@
S.mind.objectives += newobjective
to_chat(S, S.playstyle_string)
to_chat(S, "Objective #[1]: [newobjective.explanation_text]")
- return
else
return ..()
diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm
index 7b9b84037d7..3b2a317d349 100644
--- a/code/game/gamemodes/gang/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -16,7 +16,8 @@
var/free_pen = 0
var/promotable = 0
-/obj/item/device/gangtool/New() //Initialize supply point income if it hasn't already been started
+/obj/item/device/gangtool/Initialize() //Initialize supply point income if it hasn't already been started
+ ..()
if(!SSticker.mode.gang_points)
SSticker.mode.gang_points = new /datum/gang_points(SSticker.mode)
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index 1e433403d51..e926ee847b0 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -133,6 +133,28 @@ var/total_borer_hosts_needed = 10
GrantBorerActions()
+/mob/living/simple_animal/borer/Destroy()
+ borers -= src
+
+ host_brain = null
+ victim = null
+
+ QDEL_NULL(talk_to_host_action)
+ QDEL_NULL(infest_host_action)
+ QDEL_NULL(toggle_hide_action)
+ QDEL_NULL(talk_to_borer_action)
+ QDEL_NULL(talk_to_brain_action)
+ QDEL_NULL(take_control_action)
+ QDEL_NULL(give_back_control_action)
+ QDEL_NULL(leave_body_action)
+ QDEL_NULL(make_chems_action)
+ QDEL_NULL(make_larvae_action)
+ QDEL_NULL(freeze_victim_action)
+ QDEL_NULL(punish_victim_action)
+ QDEL_NULL(jumpstart_host_action)
+
+ return ..()
+
/mob/living/simple_animal/borer/Topic(href, href_list)//not entirely sure if this is even required
if(href_list["ghostjoin"])
var/mob/dead/observer/ghost = usr
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 7ba22f263b0..582c847928c 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -483,9 +483,7 @@ var/global/list/possible_items = list()
if (new_target == "custom") //Can set custom items.
var/obj/item/custom_target = input("Select type:","Type") as null|anything in typesof(/obj/item)
if (!custom_target) return
- var/tmp_obj = new custom_target
- var/custom_name = tmp_obj:name
- qdel(tmp_obj)
+ var/custom_name = initial(custom_target.name)
custom_name = stripped_input("Enter target name:", "Objective target", custom_name)
if (!custom_name) return
steal_target = custom_target
@@ -530,8 +528,8 @@ var/global/list/possible_items_special = list()
/datum/objective/steal/special/New()
..()
if(!possible_items_special.len)
- init_subtypes(/datum/objective_item/special,possible_items)
- init_subtypes(/datum/objective_item/stack,possible_items)
+ init_subtypes(/datum/objective_item/special,possible_items_special)
+ init_subtypes(/datum/objective_item/stack,possible_items_special)
/datum/objective/steal/special/find_target()
return set_target(pick(possible_items_special))
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 85ee18b451f..34e63fe385e 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -10,6 +10,7 @@
light_color = LIGHT_COLOR_BLUE
/obj/machinery/computer/operating/Initialize()
+ ..()
find_table()
/obj/machinery/computer/operating/proc/find_table()
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index dff0d29ee76..043e1c8d7f9 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -211,7 +211,7 @@
signal.data += list("tag" = output_tag, "power_toggle" = TRUE)
. = TRUE
if("pressure")
- var/target = input("New target pressure:", name, output_info["internal"]) as num|null
+ var/target = input("New target pressure:", name, output_info ? output_info["internal"] : 0) as num|null
if(!isnull(target) && !..())
target = Clamp(target, 0, 50 * ONE_ATMOSPHERE)
signal.data += list("tag" = output_tag, "set_internal_pressure" = target)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 71ed914bfeb..4c370c4b75c 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/secure_data//TODO:SANITY
name = "security records console"
- desc = "Used to view and edit personnel's security records"
+ desc = "Used to view and edit personnel's security records."
icon_screen = "security"
icon_keyboard = "security_key"
req_one_access = list(access_security, access_forensics_lockers)
diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm
index 76401bc61cd..75e163a9c46 100644
--- a/code/game/machinery/computer/telecrystalconsoles.dm
+++ b/code/game/machinery/computer/telecrystalconsoles.dm
@@ -21,16 +21,13 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
var/obj/item/uplinkholder = null
var/obj/machinery/computer/telecrystals/boss/linkedboss = null
-/obj/machinery/computer/telecrystals/uplinker/New()
+/obj/machinery/computer/telecrystals/uplinker/Initialize()
..()
- var/ID
- if(possible_uplinker_IDs.len)
- ID = pick(possible_uplinker_IDs)
- possible_uplinker_IDs -= ID
- name = "[name] [ID]"
- else
- name = "[name] [rand(1,999)]"
+ var/ID = pick_n_take(possible_uplinker_IDs)
+ if(!ID)
+ ID = rand(1,999)
+ name = "[name] [ID]"
/obj/machinery/computer/telecrystals/uplinker/attackby(obj/item/O, mob/user, params)
if(uplinkholder)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 29c14934ecc..29a3a57b987 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -311,9 +311,11 @@
if(prob(30))
spark_system.start()
if(on && !attacked && !emagged)
- attacked = 1
- spawn(60)
- attacked = 0
+ attacked = TRUE
+ addtimer(CALLBACK(src, .proc/reset_attacked), 60)
+
+/obj/machinery/porta_turret/proc/reset_attacked()
+ attacked = FALSE
/obj/machinery/porta_turret/deconstruct(disassembled = TRUE)
qdel(src)
@@ -911,4 +913,4 @@
if(istype(P, /obj/item/projectile/beam/lasertag/bluetag))
on = 0
spawn(100)
- on = 1
\ No newline at end of file
+ on = 1
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 540f4439d26..5a924b2bfa2 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -375,18 +375,13 @@
if("dispense")
if(!state_open)
return
- switch(params["item"])
- if("helmet")
- helmet.loc = loc
- helmet = null
- if("suit")
- suit.loc = loc
- suit = null
- if("mask")
- mask.loc = loc
- mask = null
- if("storage")
- storage.loc = loc
- storage = null
+
+ var/static/list/valid_items = list("helmet", "suit", "mask", "storage")
+ var/item_name = params["item"]
+ if(item_name in valid_items)
+ var/obj/item/I = vars[item_name]
+ vars[item_name] = null
+ if(I)
+ I.forceMove(loc)
. = TRUE
update_icon()
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 696cc09ba47..b81522d5bbf 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -57,7 +57,7 @@
var/obj/item/weapon/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
-/obj/machinery/vending/New()
+/obj/machinery/vending/Initialize()
..()
wires = new /datum/wires/vending(src)
if(refill_canister) //constructable vending machine
@@ -691,7 +691,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/snack
name = "\improper Getmore Chocolate Corp"
- desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars"
+ desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars."
product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
icon_state = "snack"
@@ -706,7 +706,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
name = "\improper Random Snackies"
desc = "Uh oh!"
-/obj/machinery/vending/snack/random/New()
+/obj/machinery/vending/snack/random/Initialize()
..()
var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
new T(get_turf(src))
@@ -758,7 +758,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
name = "\improper Random Drinkies"
desc = "Uh oh!"
-/obj/machinery/vending/cola/random/New()
+/obj/machinery/vending/cola/random/Initialize()
..()
var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
new T(get_turf(src))
@@ -912,7 +912,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/hydronutrients
name = "\improper NutriMax"
- desc = "A plant nutrients vendor"
+ desc = "A plant nutrients vendor."
product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
icon_state = "nutri"
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index ab4c6e858be..d94a68a1afc 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -50,7 +50,7 @@
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
mergeable_decal = 0
-/obj/effect/decal/cleanable/blood/gibs/New()
+/obj/effect/decal/cleanable/blood/gibs/Initialize()
..()
reagents.add_reagent("liquidgibs", 5)
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index d59f9bc2a2d..1ad2b2e0804 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -11,7 +11,7 @@
icon_state = "ash"
mergeable_decal = 0
-/obj/effect/decal/cleanable/ash/New()
+/obj/effect/decal/cleanable/ash/Initialize()
..()
reagents.add_reagent("ash", 30)
pixel_x = rand(-5, 5)
@@ -21,7 +21,7 @@
name = "large pile of ashes"
icon_state = "big_ash"
-/obj/effect/decal/cleanable/ash/large/New()
+/obj/effect/decal/cleanable/ash/large/Initialize()
..()
reagents.add_reagent("ash", 30) //double the amount of ash.
@@ -149,7 +149,7 @@
if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
qdel(src)
-/obj/effect/decal/cleanable/shreds/New()
+/obj/effect/decal/cleanable/shreds/Initialize()
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
..()
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index ebcf6f9f7ca..862d21ad6b3 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -48,7 +48,7 @@
blood_state = BLOOD_STATE_OIL
bloodiness = MAX_SHOE_BLOODINESS
-/obj/effect/decal/cleanable/oil/New()
+/obj/effect/decal/cleanable/oil/Initialize()
..()
reagents.add_reagent("oil", 30)
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index e7cea3cbab6..0b80d6b0d92 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -6,10 +6,9 @@
gender = NEUTER
var/do_icon_rotate = TRUE
-/obj/effect/decal/cleanable/crayon/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
+/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
..()
- loc = location
-
+
name = e_name
desc = "A [name] vandalizing the station."
if(type == "poseur tag")
@@ -32,17 +31,17 @@
do_icon_rotate = FALSE //These are designed to always face south, so no rotation please.
var/datum/gang/gang
-/obj/effect/decal/cleanable/crayon/gang/New(location, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0)
+/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0)
if(!type || !G)
qdel(src)
- var/area/territory = get_area(location)
+ var/area/territory = get_area(src)
gang = G
var/newcolor = G.color_hex
icon_state = G.name
G.territory_new |= list(territory.type = territory.name)
- ..(location, newcolor, icon_state, e_name, rotation)
+ ..(mapload, newcolor, icon_state, e_name, rotation)
/obj/effect/decal/cleanable/crayon/gang/Destroy()
var/area/territory = get_area(src)
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index 47f7d26fce7..da7ec15691b 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -10,6 +10,10 @@
if(!(resistance_flags & FIRE_PROOF)) //non fire proof decal or being burned by lava
qdel(src)
+/obj/effect/decal/HandleTurfChange(turf/T)
+ ..()
+ if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || istype(T, /turf/open/chasm)))
+ qdel(src)
/obj/effect/turf_decal
var/group = TURF_DECAL_PAINT
diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm
index 762c702df1c..2994a6a629e 100644
--- a/code/game/objects/effects/decals/misc.dm
+++ b/code/game/objects/effects/decals/misc.dm
@@ -5,11 +5,12 @@
layer = POINT_LAYER
duration = 25
-/obj/effect/overlay/temp/point/New(atom/target, set_invis = 0)
+/obj/effect/overlay/temp/point/Initialize(mapload, set_invis = 0)
..()
- loc = get_turf(target)
- pixel_x = target.pixel_x
- pixel_y = target.pixel_y
+ var/atom/old_loc = loc
+ loc = get_turf(src)
+ pixel_x = old_loc.pixel_x
+ pixel_y = old_loc.pixel_y
invisibility = set_invis
//Used by spraybottles.
@@ -30,4 +31,4 @@
desc = "A lightweight support lattice."
icon = 'icons/obj/smooth_structures/lattice.dmi'
icon_state = "lattice"
- density = 1
\ No newline at end of file
+ density = 1
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index d2c75e57cc1..3bb66f30095 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -10,59 +10,6 @@
tag = text("landmark*[]", name)
landmarks_list += src
- switch(name) //some of these are probably obsolete
- if("monkey")
- monkeystart += loc
- qdel(src)
- return
- if("start")
- newplayer_start += loc
- qdel(src)
- return
- if("wizard")
- wizardstart += loc
- qdel(src)
- return
- if("JoinLate")
- latejoin += loc
- qdel(src)
- return
- if("prisonwarp")
- prisonwarp += loc
- qdel(src)
- return
- if("Holding Facility")
- holdingfacility += loc
- if("tdome1")
- tdome1 += loc
- if("tdome2")
- tdome2 += loc
- if("tdomeadmin")
- tdomeadmin += loc
- if("tdomeobserve")
- tdomeobserve += loc
- if("prisonsecuritywarp")
- prisonsecuritywarp += loc
- qdel(src)
- return
- if("blobstart")
- blobstart += loc
- qdel(src)
- return
- if("secequipment")
- secequipment += loc
- qdel(src)
- return
- if("Emergencyresponseteam")
- emergencyresponseteamspawn += loc
- qdel(src)
- return
- if("xeno_spawn")
- xeno_spawn += loc
- qdel(src)
- return
- return 1
-
/obj/effect/landmark/Destroy()
landmarks_list -= src
return ..()
@@ -76,14 +23,112 @@
/obj/effect/landmark/start/New()
start_landmarks_list += src
..()
- if(name != initial(name))
+ if(name != "start")
tag = "start*[name]"
- return 1
/obj/effect/landmark/start/Destroy()
start_landmarks_list -= src
return ..()
+// START LANDMARKS FOLLOW. Don't change the names unless
+// you are refactoring shitty landmark code.
+
+/obj/effect/landmark/start/assistant
+ name = "Assistant"
+
+/obj/effect/landmark/start/janitor
+ name = "Janitor"
+
+/obj/effect/landmark/start/cargo_technician
+ name = "Cargo Technician"
+
+/obj/effect/landmark/start/bartender
+ name = "Bartender"
+
+/obj/effect/landmark/start/clown
+ name = "Clown"
+
+/obj/effect/landmark/start/mime
+ name = "Mime"
+
+/obj/effect/landmark/start/quartermaster
+ name = "Quartermaster"
+
+/obj/effect/landmark/start/atmospheric_technician
+ name = "Atmospheric Technician"
+
+/obj/effect/landmark/start/cook
+ name = "Cook"
+
+/obj/effect/landmark/start/shaft_miner
+ name = "Shaft Miner"
+
+/obj/effect/landmark/start/security_officer
+ name = "Security Officer"
+
+/obj/effect/landmark/start/botanist
+ name = "Botanist"
+
+/obj/effect/landmark/start/head_of_security
+ name = "Head of Security"
+
+/obj/effect/landmark/start/ai
+ name = "AI"
+
+/obj/effect/landmark/start/captain
+ name = "Captain"
+
+/obj/effect/landmark/start/detective
+ name = "Detective"
+
+/obj/effect/landmark/start/warden
+ name = "Warden"
+
+/obj/effect/landmark/start/chief_engineer
+ name = "Chief Engineer"
+
+/obj/effect/landmark/start/cyborg
+ name = "Cyborg"
+
+/obj/effect/landmark/start/head_of_personnel
+ name = "Head of Personnel"
+
+/obj/effect/landmark/start/librarian
+ name = "Librarian"
+
+/obj/effect/landmark/start/lawyer
+ name = "Lawyer"
+
+/obj/effect/landmark/start/station_engineer
+ name = "Station Engineer"
+
+/obj/effect/landmark/start/medical_doctor
+ name = "Medical Doctor"
+
+/obj/effect/landmark/start/scientist
+ name = "Scientist"
+
+/obj/effect/landmark/start/chemist
+ name = "Chemist"
+
+/obj/effect/landmark/start/roboticist
+ name = "Roboticist"
+
+/obj/effect/landmark/start/research_director
+ name = "Research Director"
+
+/obj/effect/landmark/start/geneticist
+ name = "Geneticist"
+
+/obj/effect/landmark/start/chief_medical_officer
+ name = "Chief Medical Officer"
+
+/obj/effect/landmark/start/virologist
+ name = "Virologist"
+
+/obj/effect/landmark/start/chaplain
+ name = "Chaplain"
+
//Department Security spawns
/obj/effect/landmark/start/depsec
@@ -109,14 +154,162 @@
/obj/effect/landmark/start/depsec/science
name = "science_sec"
+/obj/effect/landmark/start/wizard
+ name = "wizard"
+
+/obj/effect/landmark/start/wizard/Initialize(mapload)
+ ..()
+ wizardstart += loc
+ qdel(src)
+
+/obj/effect/landmark/start/new_player
+ name = "New Player"
+
+// Must be on New() rather than Initialize, because players will
+// join before SSatom initializes everything.
+/obj/effect/landmark/start/new_player/New(loc)
+ ..()
+ newplayer_start += loc
+
+/obj/effect/landmark/start/new_player/Initialize(mapload)
+ ..()
+ qdel(src)
+
+
+
/obj/effect/landmark/latejoin
name = "JoinLate"
+/obj/effect/landmark/latejoin/Initialize(mapload)
+ ..()
+ latejoin += loc
+ qdel(src)
+
+// carp.
+/obj/effect/landmark/carpspawn
+ name = "carpspawn"
+
+// lightsout.
+/obj/effect/landmark/lightsout
+ name = "lightsout"
+
+// observer-start.
+/obj/effect/landmark/observer_start
+ name = "Observer-Start"
+
+// revenant spawn.
+/obj/effect/landmark/revenantspawn
+ name = "revnantspawn"
+
+// triple ais.
+/obj/effect/landmark/tripai
+ name = "tripai"
+
+// marauder entry (XXX WTF IS MAURADER ENTRY???)
+
+/obj/effect/landmark/marauder_entry
+ name = "Marauder Entry"
+
+// syndicate breach area (XXX I DON'T KNOW WHAT THIS IS EITHER)
+
+/obj/effect/landmark/syndicate_breach_area
+ name = "Syndicate Breach Area"
+
+// teleport scroll landmark, XXX DOES THIS DO ANYTHING?
+/obj/effect/landmark/teleport_scroll
+ name = "Teleport-Scroll"
+
+/obj/effect/landmark/syndicate_spawn
+ name = "Syndicate-Spawn"
+
+// xenos.
+/obj/effect/landmark/xeno_spawn
+ name = "xeno_spawn"
+
+/obj/effect/landmark/xeno_spawn/Initialize(mapload)
+ ..()
+ xeno_spawn += loc
+ qdel(src)
+
+// blobs.
+/obj/effect/landmark/blobstart
+ name = "blobstart"
+
+/obj/effect/landmark/blobstart/Initialize(mapload)
+ ..()
+ blobstart += loc
+ qdel(src)
+
+/obj/effect/landmark/secequipment
+ name = "secequipment"
+
+/obj/effect/landmark/secequipment/Initialize(mapload)
+ ..()
+ secequipment += loc
+ qdel(src)
+
+/obj/effect/landmark/prisonwarp
+ name = "prisonwarp"
+
+/obj/effect/landmark/prisonwarp/Initialize(mapload)
+ ..()
+ prisonwarp += loc
+ qdel(src)
+
+/obj/effect/landmark/ert_spawn
+ name = "Emergencyresponseteam"
+
+/obj/effect/landmark/ert_spawn/Initialize(mapload)
+ ..()
+ emergencyresponseteamspawn += loc
+ qdel(src)
+
+/obj/effect/landmark/holding_facility
+ name = "Holding Facility"
+
+/obj/effect/landmark/holding_facility/Initialize(mapload)
+ ..()
+ holdingfacility += loc
+ qdel(src)
+
+/obj/effect/landmark/thunderdome/observe
+ name = "tdomeobserve"
+
+/obj/effect/landmark/thunderdome/observe/Initialize(mapload)
+ ..()
+ tdomeobserve += loc
+ qdel(src)
+
+/obj/effect/landmark/thunderdome/one
+ name = "tdome1"
+
+/obj/effect/landmark/thunderdome/one/Initialize(mapload)
+ ..()
+ tdome1 += loc
+ qdel(src)
+
+/obj/effect/landmark/thunderdome/two
+ name = "tdome2"
+
+/obj/effect/landmark/thunderdome/two/Initialize(mapload)
+ ..()
+ tdome2 += loc
+ qdel(src)
+
+/obj/effect/landmark/thunderdome/admin
+ name = "tdomeadmin"
+
+/obj/effect/landmark/thunderdome/admin/Initialize(mapload)
+ ..()
+ tdomeadmin += loc
+ qdel(src)
+
//generic event spawns
/obj/effect/landmark/event_spawn
name = "generic event spawn"
icon_state = "x4"
+
/obj/effect/landmark/event_spawn/New()
..()
generic_event_spawns += src
diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
index 639df98214c..91db494d9b8 100644
--- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm
+++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
@@ -16,5 +16,5 @@
message_admins("An alien egg has been delivered to [A] at [ADMIN_COORDJMP(T)].")
log_game("An alien egg has been delivered to [A] at [COORD(T)]")
var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen."
- addtimer(CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time))
qdel(src)
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 3e2ae9adbcd..90ef6857d47 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -51,6 +51,7 @@ var/explosionid = 1
if(!silent)
var/frequency = get_rand_frequency()
+ var/ex_sound = get_sfx("explosion")
for(var/mob/M in player_list)
// Double check for client
if(M && M.client)
@@ -59,7 +60,7 @@ var/explosionid = 1
var/dist = get_dist(M_turf, epicenter)
// If inside the blast radius + world.view - 2
if(dist <= round(max_range + world.view - 2, 1))
- M.playsound_local(epicenter, get_sfx("explosion"), 100, 1, frequency, falloff = 5) // get_sfx() is so that everyone gets the same sound
+ M.playsound_local(epicenter, ex_sound, 100, 1, frequency, falloff = 5)
// 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
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 5099e03ee4c..3e335aa2227 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -6,7 +6,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
/obj/item/stack/rods
name = "metal rod"
- desc = "Some rods. Can be used for building, or something."
+ desc = "Some rods. Can be used for building or something."
singular_name = "metal rod"
icon_state = "rods"
item_state = "rods"
diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm
index 014a35c6ff4..9814d9091c1 100644
--- a/code/game/objects/items/weapons/implants/implant_chem.dm
+++ b/code/game/objects/items/weapons/implants/implant_chem.dm
@@ -57,7 +57,7 @@
/obj/item/weapon/implantcase/chem/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/reagent_containers/syringe) && imp)
- W.afterattack(imp, user, params)
+ W.afterattack(imp, user, TRUE, params)
return TRUE
else
return ..()
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 218f56a70e3..8089c152b02 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -238,9 +238,6 @@
icon_state_on = "cutlass1"
light_color = "#ff0000"
-/obj/item/weapon/melee/energy/sword/pirate/New()
- return
-
/obj/item/weapon/melee/energy/blade
name = "energy blade"
desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index ec3b418a4ad..02dff1b445d 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -1,12 +1,12 @@
/obj
languages_spoken = HUMAN
languages_understood = HUMAN
- var/crit_fail = 0
+ var/crit_fail = FALSE
animate_movement = 2
var/throwforce = 0
var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
- var/damtype = "brute"
+ var/damtype = BRUTE
var/force = 0
var/list/armor
@@ -18,13 +18,13 @@
var/acid_level = 0 //how much acid is on that obj
- var/being_shocked = 0
+ var/being_shocked = FALSE
var/on_blueprints = FALSE //Are we visible on the station blueprints at roundstart?
var/force_blueprints = FALSE //forces the obj to be on the blueprints, regardless of when it was created.
- var/persistence_replacement = null //have something WAY too amazing to live to the next round? Set a new path here. Overuse of this var will make me upset.
- var/unique_rename = 0 // can you customize the description/name of the thing?
+ var/persistence_replacement //have something WAY too amazing to live to the next round? Set a new path here. Overuse of this var will make me upset.
+ var/unique_rename = FALSE // can you customize the description/name of the thing?
var/dangerous_possession = FALSE //Admin possession yes/no
diff --git a/code/game/objects/radiation.dm b/code/game/objects/radiation.dm
index 1b522d69715..4e763a7b5f6 100644
--- a/code/game/objects/radiation.dm
+++ b/code/game/objects/radiation.dm
@@ -50,4 +50,7 @@
. = ..(amount, TRUE)
/mob/living/simple_animal/bot/rad_act(amount)
- . = ..(amount, TRUE)
\ No newline at end of file
+ . = ..(amount, TRUE)
+
+/mob/living/simple_animal/drone/rad_act(amount)
+ . = ..(amount, TRUE)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 5987208cc67..12f971549f2 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -37,11 +37,7 @@
/obj/structure/closet/Initialize(mapload)
if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents
- . = TRUE //late initialize so we come back here
- else if(initialized)
- //we were late initialized, so now it's time to...
- take_contents()
- return
+ addtimer(CALLBACK(src, .proc/take_contents), 0)
..()
update_icon()
@@ -122,7 +118,7 @@
/obj/structure/closet/proc/take_contents()
var/turf/T = get_turf(src)
for(var/atom/movable/AM in T)
- if(insert(AM) == -1) // limit reached
+ if(AM != src && insert(AM) == -1) // limit reached
break
/obj/structure/closet/proc/open(mob/living/user)
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 016ed5a4970..421bc0d6996 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -82,9 +82,7 @@
var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
S.name = "statue of [name]"
bleedsuppress = 1
- S.icon = icon
- S.icon_state = icon_state
- S.copy_overlays(overlays)
+ S.copy_overlays(src)
var/newcolor = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
return 1
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 7b4d3f62699..e90f387a8d9 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -21,7 +21,7 @@
..()
for(var/obj/structure/lattice/LAT in loc)
if(LAT != src)
- qdel(LAT)
+ QDEL_IN(LAT, 0)
/obj/structure/lattice/blob_act(obj/structure/blob/B)
return
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index cc5e7b4fb89..5c2ac5c7eee 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -182,6 +182,27 @@
popup.set_title_image(user.browse_rsc_icon(instrumentObj.icon, instrumentObj.icon_state))
popup.open()
+/datum/song/proc/ParseSong(text)
+ set waitfor = FALSE
+ //split into lines
+ lines = splittext(text, "\n")
+ if(lines.len)
+ if(copytext(lines[1],1,6) == "BPM: ")
+ tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
+ lines.Cut(1,2)
+ else
+ tempo = sanitize_tempo(5) // default 120 BPM
+ if(lines.len > 50)
+ to_chat(usr, "Too many lines!")
+ lines.Cut(51)
+ var/linenum = 1
+ for(var/l in lines)
+ if(lentext(l) > 50)
+ to_chat(usr, "Line [linenum] too long!")
+ lines.Remove(l)
+ else
+ linenum++
+ updateDialog(usr) // make sure updates when complete
/datum/song/Topic(href, href_list)
if(!usr.canUseTopic(instrumentObj))
@@ -208,26 +229,7 @@
if(cont == "no")
break
while(lentext(t) > 3072)
-
- //split into lines
- spawn()
- lines = splittext(t, "\n")
- if(copytext(lines[1],1,6) == "BPM: ")
- tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
- lines.Cut(1,2)
- else
- tempo = sanitize_tempo(5) // default 120 BPM
- if(lines.len > 50)
- to_chat(usr, "Too many lines!")
- lines.Cut(51)
- var/linenum = 1
- for(var/l in lines)
- if(lentext(l) > 50)
- to_chat(usr, "Line [linenum] too long!")
- lines.Remove(l)
- else
- linenum++
- updateDialog(usr) // make sure updates when complete
+ ParseSong(t)
else if(href_list["help"])
help = text2num(href_list["help"]) - 1
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm
index 8690982f261..d3f7ba8c644 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -16,6 +16,11 @@
..()
update_icon()
+/turf/open/floor/light/break_tile()
+ ..()
+ light_range = 0
+ update_light()
+
/turf/open/floor/light/update_icon()
..()
if(on)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index cdddbeb62b5..cd25b28b774 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -76,11 +76,14 @@
/turf/open/space/attack_paw(mob/user)
return src.attack_hand(user)
-/turf/open/space/attackby(obj/item/C, mob/user, params, area/area_restriction)
+/turf/open/space/proc/CanBuildHere()
+ return TRUE
+
+/turf/open/space/attackby(obj/item/C, mob/user, params)
..()
+ if(!CanBuildHere())
+ return
if(istype(C, /obj/item/stack/rods))
- if(istype(area_restriction) && !istype(get_area(src), area_restriction))
- return
var/obj/item/stack/rods/R = C
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src)
@@ -194,6 +197,8 @@
/turf/open/space/rcd_vals(mob/user, obj/item/weapon/rcd/the_rcd)
+ if(!CanBuildHere())
+ return FALSE
switch(the_rcd.mode)
if(RCD_FLOORWALL)
return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 2)
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index 5cea451da26..b3a322d4073 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -58,9 +58,8 @@
AM.loc = T
AM.newtonian_move(dir)
-//Overwrite because we dont want people building rods
-/turf/open/space/transit/attackby(obj/item/C, mob/user, params)
- ..(C, user, params, /area/shuttle)
+/turf/open/space/transit/CanBuildHere()
+ return istype(get_area(src), /area/shuttle)
/turf/open/space/transit/Initialize()
..()
@@ -90,4 +89,4 @@
state = ((p*x+y) % 15) + 1
icon_state = "speedspace_ns_[state]"
- transform = turn(matrix(), angle)
+ transform = turn(matrix(), angle)
\ No newline at end of file
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 98b4b733fd3..62141ce38ba 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -249,6 +249,8 @@
queue_smooth_neighbors(src)
+ HandleTurfChange(src)
+
/turf/open/AfterChange(ignore_air)
..()
RemoveLattice()
diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm
index 6a8352ad0a3..cef424d4b28 100644
--- a/code/modules/admin/verbs/individual_logging.dm
+++ b/code/modules/admin/verbs/individual_logging.dm
@@ -23,8 +23,9 @@
else
dat += "[type] of [key_name(M)]
"
var/list/reversed = M.logging[type]
- reversed = reverseRange(reversed.Copy())
- for(var/entry in reversed)
- dat += "[entry]: [reversed[entry]]
"
+ if(reversed)
+ reversed = reverseRange(reversed.Copy())
+ for(var/entry in reversed)
+ dat += "[entry]: [reversed[entry]]
"
usr << browse(dat, "window=invidual_logging;size=600x480")
\ No newline at end of file
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 62169c40abd..a74c63cd379 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -91,7 +91,7 @@
/turf/open/archive()
air.archive()
archived_cycle = SSair.times_fired
- ..()
+ temperature_archived = temperature
/////////////////////////GAS OVERLAYS//////////////////////////////
@@ -117,11 +117,23 @@
var/list/gases = air.gases
for(var/id in gases)
var/gas = gases[id]
- if(gas[GAS_META][META_GAS_OVERLAY] && gas[MOLES] > gas[GAS_META][META_GAS_MOLES_VISIBLE])
- . += gas[GAS_META][META_GAS_OVERLAY]
+ var/gas_meta = gas[GAS_META]
+ var/gas_overlay = gas_meta[META_GAS_OVERLAY]
+ if(gas_overlay && gas[MOLES] > gas_meta[META_GAS_MOLES_VISIBLE])
+ . += gas_overlay
/////////////////////////////SIMULATION///////////////////////////////////
+#define LAST_SHARE_CHECK \
+ var/last_share = our_air.last_share;\
+ if(last_share > MINIMUM_AIR_TO_SUSPEND){\
+ our_excited_group.reset_cooldowns();\
+ cached_atmos_cooldown = 0;\
+ } else if(last_share > MINIMUM_MOLES_DELTA_TO_MOVE) {\
+ our_excited_group.dismantle_cooldown = 0;\
+ cached_atmos_cooldown = 0;\
+ }
+
/turf/proc/process_cell(fire_count)
SSair.remove_from_active(src)
@@ -130,15 +142,18 @@
archive()
current_cycle = fire_count
- var/remove = 1 //set by non simulated turfs who are sharing with this turf
//cache for sanic speed
var/list/adjacent_turfs = atmos_adjacent_turfs
var/datum/excited_group/our_excited_group = excited_group
var/adjacent_turfs_length = LAZYLEN(adjacent_turfs)
- atmos_cooldown++
- if (planetary_atmos)
+ var/cached_atmos_cooldown = atmos_cooldown + 1
+
+ var/planet_atmos = planetary_atmos
+ if (planet_atmos)
adjacent_turfs_length++
+
+ var/datum/gas_mixture/our_air = air
for(var/t in adjacent_turfs)
var/turf/open/enemy_tile = t
@@ -148,6 +163,8 @@
/******************* GROUP HANDLING START *****************************************************************/
+ var/should_share_air = FALSE
+ var/datum/gas_mixture/enemy_air = enemy_tile.air
if(enemy_tile.excited)
//cache for sanic speed
var/datum/excited_group/enemy_excited_group = enemy_tile.excited_group
@@ -157,26 +174,26 @@
//combine groups (this also handles updating the excited_group var of all involved turfs)
our_excited_group.merge_groups(enemy_excited_group)
our_excited_group = excited_group //update our cache
- share_air(enemy_tile, fire_count, adjacent_turfs_length) //share
+ should_share_air = TRUE
else
- if((recently_active == 1 && enemy_tile.recently_active == 1) || air.compare(enemy_tile.air))
+ if((recently_active == 1 && enemy_tile.recently_active == 1) || our_air.compare(enemy_air))
our_excited_group.add_turf(enemy_tile) //add enemy to our group
- share_air(enemy_tile, fire_count, adjacent_turfs_length) //share
+ should_share_air = TRUE
else
if(enemy_excited_group)
- if((recently_active == 1 && enemy_tile.recently_active == 1) || air.compare(enemy_tile.air))
+ if((recently_active == 1 && enemy_tile.recently_active == 1) || our_air.compare(enemy_air))
enemy_excited_group.add_turf(src) //join self to enemy group
our_excited_group = excited_group //update our cache
- share_air(enemy_tile, fire_count, adjacent_turfs_length) //share
+ should_share_air = TRUE
else
- if((recently_active == 1 && enemy_tile.recently_active == 1) || air.compare(enemy_tile.air))
+ if((recently_active == 1 && enemy_tile.recently_active == 1) || our_air.compare(enemy_air))
var/datum/excited_group/EG = new //generate new group
EG.add_turf(src)
EG.add_turf(enemy_tile)
our_excited_group = excited_group //update our cache
- share_air(enemy_tile, fire_count, adjacent_turfs_length) //share
+ should_share_air = TRUE
else
- if(air.compare(enemy_tile.air)) //compare if
+ if(our_air.compare(enemy_air)) //compare if
SSair.add_to_active(enemy_tile) //excite enemy
if(our_excited_group)
our_excited_group.add_turf(enemy_tile) //add enemy to group
@@ -185,51 +202,55 @@
EG.add_turf(src)
EG.add_turf(enemy_tile)
our_excited_group = excited_group //update our cache
- share_air(enemy_tile, fire_count, adjacent_turfs_length) //share
+ should_share_air = TRUE
+
+ //air sharing
+ if(should_share_air)
+ var/difference = our_air.share(enemy_air, adjacent_turfs_length)
+ if(difference)
+ if(difference > 0)
+ consider_pressure_difference(enemy_tile, difference)
+ else
+ enemy_tile.consider_pressure_difference(src, -difference)
+ LAST_SHARE_CHECK
+
/******************* GROUP HANDLING FINISH *********************************************************************/
- if (planetary_atmos) //share our air with the "atmosphere" "above" the turf
+ if (planet_atmos) //share our air with the "atmosphere" "above" the turf
var/datum/gas_mixture/G = new
G.copy_from_turf(src)
G.archive()
- if(air.compare(G))
+ if(our_air.compare(G))
if(!our_excited_group)
var/datum/excited_group/EG = new
EG.add_turf(src)
our_excited_group = excited_group
- air.share(G, adjacent_turfs_length)
- last_share_check()
+ our_air.share(G, adjacent_turfs_length)
+ LAST_SHARE_CHECK
- air.react()
+ our_air.react()
update_visuals()
- if(air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
- hotspot_expose(air.temperature, CELL_VOLUME)
- for(var/atom/movable/item in src)
- item.temperature_expose(air, air.temperature, CELL_VOLUME)
- temperature_expose(air, air.temperature, CELL_VOLUME)
+ var/our_temperature = our_air.temperature
- if(air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION)
+ var/remove = TRUE
+ if(our_temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
+ hotspot_expose(our_temperature, CELL_VOLUME)
+ for(var/I in src)
+ var/atom/movable/item = I
+ item.temperature_expose(our_air, our_temperature, CELL_VOLUME)
+ temperature_expose(our_air, our_temperature, CELL_VOLUME)
+
+ if(our_temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION)
if(consider_superconductivity(starting = 1))
- remove = 0
+ remove = FALSE
- if (atmos_cooldown > EXCITED_GROUP_DISMANTLE_CYCLES*2)
+ if ((!our_excited_group && remove) || (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
SSair.remove_from_active(src)
- if(!our_excited_group && remove == 1)
- SSair.remove_from_active(src)
-
-
-/turf/open/proc/share_air(turf/open/T, fire_count, adjacent_turfs_length)
- if(T.current_cycle < fire_count)
- var/difference = air.share(T.air, adjacent_turfs_length)
- if(difference)
- if(difference > 0)
- consider_pressure_difference(T, difference)
- else
- T.consider_pressure_difference(src, -difference)
- last_share_check()
+
+ atmos_cooldown = cached_atmos_cooldown
//////////////////////////SPACEWIND/////////////////////////////
@@ -239,14 +260,6 @@
pressure_direction = get_dir(src, T)
pressure_difference = difference
-/turf/open/proc/last_share_check()
- if(air.last_share > MINIMUM_AIR_TO_SUSPEND)
- excited_group.reset_cooldowns()
- atmos_cooldown = 0
- else if(air.last_share > MINIMUM_MOLES_DELTA_TO_MOVE)
- excited_group.dismantle_cooldown = 0
- atmos_cooldown = 0
-
/turf/open/proc/high_pressure_movements()
for(var/atom/movable/M in src)
M.experience_pressure_difference(pressure_difference, pressure_direction)
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 0c9649bc92d..d65657a45b8 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -6,30 +6,24 @@ What are the archived variables for?
#define MINIMUM_HEAT_CAPACITY 0.0003
#define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
+
var/list/meta_gas_info = meta_gas_list() //see ATMOSPHERICS/gas_types.dm
+var/list/gaslist_cache = init_gaslist_cache()
-var/list/gaslist_cache = null
-/proc/gaslist(id)
- var/list/cached_gas
+/proc/init_gaslist_cache()
+ . = list()
+ for(var/id in meta_gas_info)
+ var/list/cached_gas = new(3)
- //only instantiate the first time it's needed
- if(!gaslist_cache)
- gaslist_cache = new(meta_gas_info.len)
-
- //only setup the individual lists the first time they're needed
- if(!gaslist_cache[id])
- if(!meta_gas_info[id])
- CRASH("Gas [id] does not exist!")
- cached_gas = new(3)
- gaslist_cache[id] = cached_gas
+ .[id] = cached_gas
cached_gas[MOLES] = 0
cached_gas[ARCHIVE] = 0
cached_gas[GAS_META] = meta_gas_info[id]
- else
- cached_gas = gaslist_cache[id]
- //Copy() it because only GAS_META is static
- return cached_gas.Copy()
+
+#define GASLIST(id, out_list)\
+ var/list/tmp_gaslist = gaslist_cache[id];\
+ out_list = tmp_gaslist.Copy();
/datum/gas_mixture
var/list/gases
@@ -57,7 +51,7 @@ var/list/gaslist_cache = null
var/cached_gases = gases
if(cached_gases[gas_id])
return
- cached_gases[gas_id] = gaslist(gas_id)
+ GASLIST(gas_id, cached_gases[gas_id])
//assert_gases(args) - shorthand for calling assert_gas() once for each gas type.
/datum/gas_mixture/proc/assert_gases()
@@ -68,12 +62,13 @@ var/list/gaslist_cache = null
//gas list for this id. This can clobber existing gases.
//Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas().
/datum/gas_mixture/proc/add_gas(gas_id)
- gases[gas_id] = gaslist(gas_id)
+ GASLIST(gas_id, gases[gas_id])
//add_gases(args) - shorthand for calling add_gas() once for each gas_type.
/datum/gas_mixture/proc/add_gases()
+ var/cached_gases = gases
for(var/id in args)
- add_gas(id)
+ GASLIST(id, cached_gases[id])
//garbage_collect() - removes any gas list which is empty.
//If called with a list as an argument, only removes gas lists with IDs from that list.
@@ -91,23 +86,33 @@ var/list/gaslist_cache = null
var/list/cached_gases = gases
. = 0
for(var/id in cached_gases)
- . += cached_gases[id][MOLES] * cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT]
+ var/gas_data = cached_gases[id]
+ . += gas_data[MOLES] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
/datum/gas_mixture/proc/heat_capacity_archived() //joules per kelvin
var/list/cached_gases = gases
. = 0
for(var/id in cached_gases)
- . += cached_gases[id][ARCHIVE] * cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT]
+ var/gas_data = cached_gases[id]
+ . += gas_data[ARCHIVE] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
-/datum/gas_mixture/proc/total_moles() //moles
- var/list/cached_gases = gases
- . = 0
- for(var/id in cached_gases)
- . += cached_gases[id][MOLES]
+//prefer this in performance critical areas
+#define TOTAL_MOLES(cached_gases, out_var)\
+ out_var = 0;\
+ for(var/total_moles_id in cached_gases){\
+ out_var += cached_gases[total_moles_id][MOLES];\
+ }
+
+/datum/gas_mixture/proc/total_moles()
+ var/cached_gases = gases
+ TOTAL_MOLES(cached_gases, .)
/datum/gas_mixture/proc/return_pressure() //kilopascals
if(volume > 0) // to prevent division by zero
- return total_moles() * R_IDEAL_GAS_EQUATION * temperature / volume
+ var/cached_gases = gases
+ TOTAL_MOLES(cached_gases, .)
+ . *= R_IDEAL_GAS_EQUATION * temperature / volume
+ return
return 0
/datum/gas_mixture/proc/return_temperature() //kelvins
@@ -340,11 +345,12 @@ var/list/gaslist_cache = null
return 1
/datum/gas_mixture/remove(amount)
- var/sum = total_moles()
+ var/sum
+ var/list/cached_gases = gases
+ TOTAL_MOLES(cached_gases, sum)
amount = min(amount, sum) //Can not take more air than tile has!
if(amount <= 0)
return null
- var/list/cached_gases = gases
var/datum/gas_mixture/removed = new
var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
@@ -495,7 +501,11 @@ var/list/gaslist_cache = null
sharer.garbage_collect(sharer_gases - cached_gases) //the reverse is equally true
sharer.after_share(src, atmos_adjacent_turfs)
if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE)
- var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - sharer.temperature_archived*(sharer.total_moles() - moved_moles)
+ var/our_moles
+ TOTAL_MOLES(cached_gases,our_moles)
+ var/their_moles
+ TOTAL_MOLES(sharer_gases,their_moles)
+ var/delta_pressure = temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)
return delta_pressure * R_IDEAL_GAS_EQUATION / volume
/datum/gas_mixture/after_share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
@@ -521,33 +531,28 @@ var/list/gaslist_cache = null
return sharer_temperature
//thermal energy of the system (self and sharer) is unchanged
-/datum/gas_mixture/compare(datum/gas_mixture/sample, datatype = MOLES, adjacents = 0)
+/datum/gas_mixture/compare(datum/gas_mixture/sample)
var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars
var/list/cached_gases = gases
for(var/id in cached_gases | sample_gases) // compare gases from either mixture
- var/gas_moles = cached_gases[id] ? cached_gases[id][datatype] : 0
- var/sample_moles = sample_gases[id] ? sample_gases[id][datatype] : 0
- var/delta = abs(gas_moles - sample_moles)/(adjacents+1)
+ var/gas_moles = cached_gases[id]
+ gas_moles = gas_moles ? gas_moles[MOLES] : 0
+ var/sample_moles = sample_gases[id]
+ sample_moles = sample_moles ? sample_moles[MOLES] : 0
+ var/delta = abs(gas_moles - sample_moles)
if(delta > MINIMUM_MOLES_DELTA_TO_MOVE && \
delta > gas_moles * MINIMUM_AIR_RATIO_TO_MOVE)
return id
- if(total_moles() > MINIMUM_MOLES_DELTA_TO_MOVE)
- var/temp
- var/sample_temp
-
- switch(datatype)
- if(MOLES)
- temp = temperature
- sample_temp = sample.temperature
- if(ARCHIVE)
- temp = temperature_archived
- sample_temp = sample.temperature_archived
+ var/our_moles
+ TOTAL_MOLES(cached_gases, our_moles)
+ if(our_moles > MINIMUM_MOLES_DELTA_TO_MOVE)
+ var/temp = temperature
+ var/sample_temp = sample.temperature
var/temperature_delta = abs(temp - sample_temp)
- if((temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && \
- temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND * temp)
+ if(temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND)
return "temp"
return ""
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index d5a37fa150d..771e718e0df 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -7,7 +7,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump
name = "air vent"
- desc = "Has a valve and pump attached to it"
+ desc = "Has a valve and pump attached to it."
icon_state = "vent_map"
use_power = 1
can_unwrench = 1
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index fea01d9868d..4a3d6fbc195 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -3,7 +3,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber
name = "air scrubber"
- desc = "Has a valve and pump attached to it"
+ desc = "Has a valve and pump attached to it."
icon_state = "scrub_map"
use_power = 1
idle_power_usage = 10
diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm
index a2aff01baa1..188f5ca3f8f 100644
--- a/code/modules/atmospherics/machinery/pipes/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple.dm
@@ -8,7 +8,7 @@ The regular pipe you see everywhere, including bent ones.
icon_state = "intact"
name = "pipe"
- desc = "A one meter section of regular pipe"
+ desc = "A one meter section of regular pipe."
dir = SOUTH
initialize_directions = SOUTH|NORTH
diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm
index 358ccc5d85d..be16bfba885 100644
--- a/code/modules/awaymissions/mission_code/Cabin.dm
+++ b/code/modules/awaymissions/mission_code/Cabin.dm
@@ -117,3 +117,7 @@
/obj/effect/landmark/mapGenerator/snowy
mapGeneratorType = /datum/mapGenerator/snowy
+ endTurfX = 159
+ endTurfY = 157
+ startTurfX = 37
+ startTurfY = 35
diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm
index ad1f6a01d9b..c2a07349584 100644
--- a/code/modules/cargo/exports/materials.dm
+++ b/code/modules/cargo/exports/materials.dm
@@ -79,6 +79,12 @@
material_id = MAT_TITANIUM
message = "cm3 of titanium"
+// Plastitanium.
+/datum/export/material/plastitanium
+ cost = 750
+ material_id = MAT_TITANIUM // code can only check for one material_id; plastitanium is half plasma, half titanium, so ((250 x 250) + (250 x 500)) / 250
+ message = "cm3 of plastitanium"
+
// Metal. Common building material.
/datum/export/material/metal
message = "cm3 of metal"
diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm
index 5ed73a3cf6a..707dab703c6 100644
--- a/code/modules/cargo/exports/sheets.dm
+++ b/code/modules/cargo/exports/sheets.dm
@@ -79,6 +79,13 @@
message = "of reinforced glass"
export_types = list(/obj/item/stack/sheet/rglass)
+// Bluespace Polycrystals. About as common on the asteroid as
+
+/datum/export/stack/bscrystal
+ cost = 750
+ message = "of bluespace crystals"
+ export_types = list(/obj/item/stack/sheet/bluespace_crystal)
+
// Wood. Quite expensive in the grim and dark 26 century.
/datum/export/stack/wood
cost = 25
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index fc8b7e21bc7..308126dea3f 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -37,6 +37,19 @@
/datum/supply_pack/emergency
group = "Emergency"
+/datum/supply_pack/emergency/spacesuit
+ name = "Space Suit Crate"
+ cost = 3000
+ access = access_eva
+ contains = list(/obj/item/clothing/suit/space,
+ /obj/item/clothing/suit/space,
+ /obj/item/clothing/head/helmet/space,
+ /obj/item/clothing/head/helmet/space,
+ /obj/item/clothing/mask/breath,
+ /obj/item/clothing/mask/breath)
+ crate_name = "space suit crate"
+ crate_type = /obj/structure/closet/crate/secure
+
/datum/supply_pack/emergency/vehicle
name = "Biker Gang Kit" //TUNNEL SNAKES OWN THIS TOWN
cost = 2000
@@ -549,18 +562,6 @@
/obj/item/clothing/glasses/meson/engine)
crate_name = "engineering gear crate"
-/datum/supply_pack/engineering/engine/spacesuit
- name = "Space Suit Crate"
- cost = 3000
- access = access_eva
- contains = list(/obj/item/clothing/suit/space,
- /obj/item/clothing/suit/space,
- /obj/item/clothing/head/helmet/space,
- /obj/item/clothing/head/helmet/space,
- /obj/item/clothing/mask/breath,
- /obj/item/clothing/mask/breath)
- crate_name = "space suit crate"
- crate_type = /obj/structure/closet/crate/secure
/datum/supply_pack/engineering/shieldgen
name = "Anti-breach Shield Projector Crate"
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 7be0544a3e2..7a14e07f97d 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -194,8 +194,36 @@ var/next_external_rsc = 0
vars["fps"] = prefs.clientfps
sethotkeys(1) //set hoykeys from preferences (from_pref = 1)
+ log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[byond_version]")
+ var/alert_mob_dupe_login = FALSE
+ if(config.log_access)
+ for(var/I in clients)
+ if(I == src)
+ continue
+ var/client/C = I
+ if(C.key && (C.key != key) )
+ var/matches
+ if( (C.address == address) )
+ matches += "IP ([address])"
+ if( (C.computer_id == computer_id) )
+ if(matches)
+ matches += " and "
+ matches += "ID ([computer_id])"
+ alert_mob_dupe_login = TRUE
+ if(matches)
+ if(C)
+ message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(C)].")
+ log_access("Notice: [key_name(src)] has the same [matches] as [key_name(C)].")
+ else
+ message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(C)] (no longer logged in). ")
+ log_access("Notice: [key_name(src)] has the same [matches] as [key_name(C)] (no longer logged in).")
+
. = ..() //calls mob.Login()
+ if(alert_mob_dupe_login)
+ set waitfor = FALSE
+ alert(mob, "You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
+
connection_time = world.time
connection_realtime = world.realtime
connection_timeofday = world.timeofday
@@ -307,6 +335,7 @@ var/next_external_rsc = 0
//////////////
/client/Del()
+ log_access("Logout: [key_name(src)]")
if(holder)
adminGreet(1)
holder.owner = null
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 79435974149..3d900f52301 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -79,47 +79,42 @@
if(button)
button.name = "Change [chameleon_name] Appearance"
-
chameleon_blacklist |= typecacheof(target.type)
for(var/V in typesof(chameleon_type))
- if(ispath(V, /obj/item))
+ if(ispath(V) && ispath(V, /obj/item))
var/obj/item/I = V
if(chameleon_blacklist[V] || (initial(I.flags) & ABSTRACT))
continue
- chameleon_list += I
+ if(!initial(I.icon_state) || !initial(I.item_state))
+ continue
+ var/chameleon_item_name = "[initial(I.name)] ([initial(I.icon_state)])"
+ chameleon_list[chameleon_item_name] = I
+
/datum/action/item_action/chameleon/change/proc/select_look(mob/user)
- var/list/item_names = list()
var/obj/item/picked_item
- for(var/U in chameleon_list)
- var/obj/item/I = U
- item_names += initial(I.name)
var/picked_name
- picked_name = input("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", picked_name) in item_names
+ picked_name = input("Select [chameleon_name] to change into", "Chameleon [chameleon_name]", picked_name) as null|anything in chameleon_list
if(!picked_name)
return
- for(var/V in chameleon_list)
- var/obj/item/I = V
- if(initial(I.name) == picked_name)
- picked_item = V
- break
+ picked_item = chameleon_list[picked_name]
if(!picked_item)
return
update_look(user, picked_item)
/datum/action/item_action/chameleon/change/proc/random_look(mob/user)
- var/picked_item = pick(chameleon_list)
+ var/picked_name = pick(chameleon_list)
// If a user is provided, then this item is in use, and we
// need to update our icons and stuff
if(user)
- update_look(user, picked_item)
+ update_look(user, chameleon_list[picked_name])
// Otherwise, it's likely a random initialisation, so we
// don't have to worry
else
- update_item(picked_item)
+ update_item(chameleon_list[picked_name])
/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item)
if(istype(target, /obj/item/weapon/gun/energy/laser/chameleon))
diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm
index 8ddeed2bc53..4984b392a8b 100644
--- a/code/modules/events/false_alarm.dm
+++ b/code/modules/events/false_alarm.dm
@@ -4,25 +4,18 @@
weight = 20
max_occurrences = 5
+/datum/round_event_control/canSpawnEvent(players_amt, gamemode)
+ return ..() && length(gather_false_events())
+
/datum/round_event/falsealarm
announceWhen = 0
endWhen = 1
/datum/round_event/falsealarm/announce()
- var/list/events_list = list()
-
var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
var/gamemode = SSticker.mode.config_tag
- for(var/datum/round_event_control/E in SSevents.control)
- if(!E.canSpawnEvent(players_amt, gamemode))
- continue
-
- var/datum/round_event/event = E.typepath
- if(initial(event.announceWhen) <= 0)
- continue
- events_list += E
-
+ var/events_list = gather_false_events(players_amt, gamemode)
var/datum/round_event_control/event_control = pick(events_list)
if(event_control)
var/datum/round_event/Event = new event_control.typepath()
@@ -30,4 +23,13 @@
Event.kill() //do not process this event - no starts, no ticks, no ends
Event.announce() //just announce it like it's happening
+/proc/gather_false_events(players_amt, gamemode)
+ . = list()
+ for(var/datum/round_event_control/E in SSevents.control)
+ if(!E.canSpawnEvent(players_amt, gamemode))
+ continue
+ var/datum/round_event/event = E.typepath
+ if(initial(event.announceWhen) <= 0)
+ continue
+ . += E
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 244b675a2bb..7e2deff368b 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -15,528 +15,20 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
cut_overlays()
- if (reagents.reagent_list.len > 0)
- switch(reagents.get_master_reagent_id())
- if("beer")
- icon_state = "beerglass"
- name = "glass of beer"
- desc = "A freezing pint of beer."
- if("beer2")
- icon_state = "beerglass"
- name = "glass of beer"
- desc = "A freezing pint of beer."
- if("greenbeer")
- icon_state = "greenbeerglass"
- name = "glass of green beer"
- desc = "A freezing pint of green beer. Festive."
- if("ale")
- icon_state = "aleglass"
- name = "glass of ale"
- desc = "A freezing pint of delicious Ale."
- if("milk")
- icon_state = "glass_white"
- name = "glass of milk"
- desc = "White and nutritious goodness!"
- if("cream")
- icon_state = "glass_white"
- name = "glass of cream"
- desc = "Ewwww..."
- if("hot_coco")
- icon_state = "chocolateglass"
- name = "glass of chocolate"
- desc = "Tasty."
- if("lemonjuice")
- icon_state = "lemonglass"
- name = "glass of lemon juice"
- desc = "Sour..."
- if("holywater")
- icon_state = "glass_clear"
- name = "glass of Holy Water"
- desc = "A glass of holy water."
- if("potato")
- icon_state = "glass_brown"
- name = "glass of potato juice"
- desc = "Bleh..."
- if("watermelonjuice")
- icon_state = "glass_red"
- name = "glass of watermelon juice"
- desc = "A glass of watermelon juice."
- if("cola")
- icon_state = "glass_brown"
- name = "glass of space Cola"
- desc = "A glass of refreshing Space Cola."
- if("nuka_cola")
- icon_state = "nuka_colaglass"
- name = "Nuka Cola"
- desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
- if("orangejuice")
- icon_state = "glass_orange"
- name = "glass of orange juice"
- desc = "Vitamins! Yay!"
- if("tomatojuice")
- icon_state = "glass_red"
- name = "glass of tomato juice"
- desc = "Are you sure this is tomato juice?"
- if("blood")
- icon_state = "glass_red"
- name = "glass of tomato juice"
- desc = "Are you sure this is tomato juice?"
- if("limejuice")
- icon_state = "glass_green"
- name = "glass of lime juice"
- desc = "A glass of sweet-sour lime juice."
- if("whiskey")
- icon_state = "whiskeyglass"
- name = "glass of whiskey"
- desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
- if("gin")
- icon_state = "ginvodkaglass"
- name = "glass of gin"
- desc = "A crystal clear glass of Griffeater gin."
- if("vodka")
- icon_state = "ginvodkaglass"
- name = "glass of vodka"
- desc = "The glass contain wodka. Xynta."
- if("goldschlager")
- icon_state = "goldschlagerglass"
- name = "glass of Goldschlager"
- desc = "100% proof that teen girls will drink anything with gold in it."
- if("wine")
- icon_state = "wineglass"
- name = "glass of wine"
- desc = "A very classy looking drink."
- if("cognac")
- icon_state = "cognacglass"
- name = "glass of cognac"
- desc = "Damn, you feel like some kind of French aristocrat just by holding this."
- if ("kahlua")
- icon_state = "kahluaglass"
- name = "glass of RR Coffee Liquor"
- desc = "DAMN, THIS THING LOOKS ROBUST!"
- if("vermouth")
- icon_state = "vermouthglass"
- name = "glass of vermouth"
- desc = "You wonder why you're even drinking this straight."
- if("tequila")
- icon_state = "tequilaglass"
- name = "glass of tequila"
- desc = "Now all that's missing is the weird colored shades!"
- if("patron")
- icon_state = "patronglass"
- name = "glass of patron"
- desc = "Drinking patron in the bar, with all the subpar ladies."
- if("rum")
- icon_state = "rumglass"
- name = "glass of rum"
- desc = "Now you want to Pray for a pirate suit, don't you?"
- if("gintonic")
- icon_state = "gintonicglass"
- name = "Gin and Tonic"
- desc = "A mild but still great cocktail. Drink up, like a true Englishman."
- if("whiskeycola")
- icon_state = "whiskeycolaglass"
- name = "Whiskey Cola"
- desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
- if("whiterussian")
- icon_state = "whiterussianglass"
- name = "White Russian"
- desc = "A very nice looking drink. But that's just, like, your opinion, man."
- if("screwdrivercocktail")
- icon_state = "screwdriverglass"
- name = "Screwdriver"
- desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
- if("bloodymary")
- icon_state = "bloodymaryglass"
- name = "Bloody Mary"
- desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
- if("martini")
- icon_state = "martiniglass"
- name = "Classic Martini"
- desc = "Damn, the bartender even stirred it, not shook it."
- if("vodkamartini")
- icon_state = "martiniglass"
- name = "Vodka martini"
- desc ="A bastardisation of the classic martini. Still great."
- if("gargleblaster")
- icon_state = "gargleblasterglass"
- name = "Pan-Galactic Gargle Blaster"
- desc = "Like having your brain smashed out by a slice of lemon wrapped around a large gold brick."
- if("bravebull")
- icon_state = "bravebullglass"
- name = "Brave Bull"
- desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
- if("tequilasunrise")
- icon_state = "tequilasunriseglass"
- name = "tequila Sunrise"
- desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
- if("beepskysmash")
- icon_state = "beepskysmashglass"
- name = "Beepsky Smash"
- desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
- if("doctorsdelight")
- icon_state = "doctorsdelightglass"
- name = "Doctor's Delight"
- desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
- if("manlydorf")
- icon_state = "manlydorfglass"
- name = "The Manly Dorf"
- desc = "A manly concoction made from Ale and Beer. Intended for true men only."
- if("irishcream")
- icon_state = "irishcreamglass"
- name = "Irish Cream"
- desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
- if("cubalibre")
- icon_state = "cubalibreglass"
- name = "Cuba Libre"
- desc = "A classic mix of rum and cola."
- if("atomicbomb")
- icon_state = "atomicbombglass"
- name = "Atomic Bomb"
- desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
- if("longislandicedtea")
- icon_state = "longislandicedteaglass"
- name = "Long Island Iced Tea"
- desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
- if("threemileisland")
- icon_state = "threemileislandglass"
- name = "Three Mile Island Ice Tea"
- desc = "A glass of this is sure to prevent a meltdown."
- if("margarita")
- icon_state = "margaritaglass"
- name = "Margarita"
- desc = "On the rocks with salt on the rim. Arriba~!"
- if("blackrussian")
- icon_state = "blackrussianglass"
- name = "Black Russian"
- desc = "For the lactose-intolerant. Still as classy as a White Russian."
- if("vodkatonic")
- icon_state = "vodkatonicglass"
- name = "Vodka and Tonic"
- desc = "For when a gin and tonic isn't Russian enough."
- if("manhattan")
- icon_state = "manhattanglass"
- name = "Manhattan"
- desc = "The Detective's undercover drink of choice. He never could stomach gin..."
- if("manhattan_proj")
- icon_state = "proj_manhattanglass"
- name = "Manhattan Project"
- desc = "A scientist's drink of choice, for thinking how to blow up the station."
- if("ginfizz")
- icon_state = "ginfizzglass"
- name = "Gin Fizz"
- desc = "Refreshingly lemony, deliciously dry."
- if("irishcoffee")
- icon_state = "irishcoffeeglass"
- name = "Irish Coffee"
- desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
- if("hooch")
- icon_state = "glass_brown2"
- name = "Hooch"
- desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- if("whiskeysoda")
- icon_state = "whiskeysodaglass2"
- name = "Whiskey Soda"
- desc = "Ultimate refreshment."
- if("tonic")
- icon_state = "glass_clear"
- name = "glass of Tonic Water"
- desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
- if("sodawater")
- icon_state = "glass_clear"
- name = "glass of Soda Water"
- desc = "Soda water. Why not make a scotch and soda?"
- if("water")
- icon_state = "glass_clear"
- name = "glass of Water"
- desc = "The father of all refreshments."
- if("spacemountainwind")
- icon_state = "Space_mountain_wind_glass"
- name = "glass of Space Mountain Wind"
- desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
- if("thirteenloko")
- icon_state = "thirteen_loko_glass"
- name = "glass of Thirteen Loko"
- desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
- if("dr_gibb")
- icon_state = "dr_gibb_glass"
- name = "glass of Dr. Gibb"
- desc = "Dr. Gibb. Not as dangerous as the name might imply."
- if("space_up")
- icon_state = "space-up_glass"
- name = "glass of Space-up"
- desc = "Space-up. It helps you keep your cool."
- if("pwr_game")
- icon_state = "glass_red"
- name = "glass of Pwr Game"
- desc = "Goes well with a Vlad's salad."
- if("shamblers")
- icon_state = "glass_red"
- name = "glass of Shambler's Juice"
- desc = "Mmm mm, shambly."
- if("lemon_lime")
- icon_state = "glass_yellow"
- name = "glass of Lemon-Lime"
- desc = "You're pretty certain a real fruit has never actually touched this."
- if("moonshine")
- icon_state = "glass_clear"
- name = "Moonshine"
- desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- if("soymilk")
- icon_state = "glass_white"
- name = "glass of soy milk"
- desc = "White and nutritious soy goodness!"
- if("berryjuice")
- icon_state = "berryjuice"
- name = "glass of berry juice"
- desc = "Berry juice. Or maybe it's jam. Who cares?"
- if("poisonberryjuice")
- icon_state = "poisonberryjuice"
- name = "glass of berry juice"
- desc = "Berry juice. Or maybe it's poison. Who cares?"
- if("carrotjuice")
- icon_state = "carrotjuice"
- name = "glass of carrot juice"
- desc = "It's just like a carrot but without crunching."
- if("banana")
- icon_state = "banana"
- name = "glass of banana juice"
- desc = "The raw essence of a banana. HONK."
- if("bahama_mama")
- icon_state = "bahama_mama"
- name = "Bahama Mama"
- desc = "Tropical cocktail."
- if("singulo")
- icon_state = "singulo"
- name = "Singulo"
- desc = "A blue-space beverage."
- if("alliescocktail")
- icon_state = "alliescocktail"
- name = "Allies cocktail"
- desc = "A drink made from your allies."
- if("antifreeze")
- icon_state = "antifreeze"
- name = "Anti-freeze"
- desc = "The ultimate refreshment."
- if("barefoot")
- icon_state = "b&p"
- name = "Barefoot"
- desc = "Barefoot and pregnant."
- if("demonsblood")
- icon_state = "demonsblood"
- name = "Demons Blood"
- desc = "Just looking at this thing makes the hair at the back of your neck stand up."
- if("booger")
- icon_state = "booger"
- name = "Booger"
- desc = "Ewww..."
- if("snowwhite")
- icon_state = "snowwhite"
- name = "Snow White"
- desc = "A cold refreshment."
- if("aloe")
- icon_state = "aloe"
- name = "Aloe"
- desc = "Very, very, very good."
- if("andalusia")
- icon_state = "andalusia"
- name = "Andalusia"
- desc = "A nice, strangely named drink."
- if("sbiten")
- icon_state = "sbitenglass"
- name = "Sbiten"
- desc = "A spicy mix of Vodka and Spice. Very hot."
- if("red_mead")
- icon_state = "red_meadglass"
- name = "Red Mead"
- desc = "A True Viking's Beverage, though its color is strange."
- if("mead")
- icon_state = "meadglass"
- name = "Mead"
- desc = "A Viking's Beverage, though a cheap one."
- if("iced_beer")
- icon_state = "iced_beerglass"
- name = "Iced Beer"
- desc = "A beer so frosty, the air around it freezes."
- if("grog")
- icon_state = "grogglass"
- name = "Grog"
- desc = "A fine and cepa drink for Space."
- if("soy_latte")
- icon_state = "soy_latte"
- name = "Soy Latte"
- desc = "A nice and refreshing beverage while you're reading."
- if("cafe_latte")
- icon_state = "cafe_latte"
- name = "Cafe Latte"
- desc = "A nice, strong and refreshing beverage while you're reading."
- if("acidspit")
- icon_state = "acidspitglass"
- name = "Acid Spit"
- desc = "A drink from Nanotrasen. Made from live aliens."
- if("amasec")
- icon_state = "amasecglass"
- name = "Amasec"
- desc = "Always handy before COMBAT!!!"
- if("neurotoxin")
- icon_state = "neurotoxinglass"
- name = "Neurotoxin"
- desc = "A drink that is guaranteed to knock you silly."
- if("hippiesdelight")
- icon_state = "hippiesdelightglass"
- name = "Hippie's Delight"
- desc = "A drink enjoyed by people during the 1960's."
- if("bananahonk")
- icon_state = "bananahonkglass"
- name = "Banana Honk"
- desc = "A drink from Clown Heaven."
- if("silencer")
- icon_state = "silencerglass"
- name = "Silencer"
- desc = "A drink from Mime Heaven."
- if("nothing")
- icon_state = "nothing"
- name = "Nothing"
- desc = "Absolutely nothing."
- if("devilskiss")
- icon_state = "devilskiss"
- name = "Devils Kiss"
- desc = "Creepy time!"
- if("changelingsting")
- icon_state = "changelingsting"
- name = "Changeling Sting"
- desc = "A stingy drink."
- if("irishcarbomb")
- icon_state = "irishcarbomb"
- name = "Irish Car Bomb"
- desc = "An Irish car bomb."
- if("syndicatebomb")
- icon_state = "syndicatebomb"
- name = "Syndicate Bomb"
- desc = "A syndicate bomb."
- if("erikasurprise")
- icon_state = "erikasurprise"
- name = "Erika Surprise"
- desc = "The surprise is, it's green!"
- if("driestmartini")
- icon_state = "driestmartiniglass"
- name = "Driest Martini"
- desc = "Only for the experienced. You think you see sand floating in the glass."
- if("ice")
- icon_state = "iceglass"
- name = "glass of ice"
- desc = "Generally, you're supposed to put something else in there too..."
- if("icecoffee")
- icon_state = "icedcoffeeglass"
- name = "Iced Coffee"
- desc = "A drink to perk you up and refresh you!"
- if("icetea")
- icon_state = "icedteaglass"
- name = "Iced Tea"
- desc = "All natural, antioxidant-rich flavour sensation."
- if("coffee")
- icon_state = "glass_brown"
- name = "glass of coffee"
- desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
- if("tea")
- icon_state = "teaglass"
- name = "glass of tea"
- desc = "Drinking it from here would not seem right."
- if("bilk")
- icon_state = "glass_brown"
- name = "glass of bilk"
- desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
- if("welding_fuel")
- icon_state = "dr_gibb_glass"
- name = "glass of welder fuel"
- desc = "Unless you're an industrial tool, this is probably not safe for consumption."
- if("b52")
- icon_state = "b52glass"
- name = "B-52"
- desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
- if("toxinsspecial")
- icon_state = "toxinsspecialglass"
- name = "Toxins Special"
- desc = "Whoah, this thing is on FIRE!"
- if("chocolatepudding")
- icon_state = "chocolatepudding"
- name = "Chocolate Pudding"
- desc = "Tasty."
- if("vanillapudding")
- icon_state = "vanillapudding"
- name = "Vanilla Pudding"
- desc = "Tasty."
- if("cherryshake")
- icon_state = "cherryshake"
- name = "Cherry Shake"
- desc = "A cherry flavored milkshake."
- if("bluecherryshake")
- icon_state = "bluecherryshake"
- name = "Blue Cherry Shake"
- desc = "An exotic blue milkshake."
- if("drunkenblumpkin")
- icon_state = "drunkenblumpkin"
- name = "Drunken Blumpkin"
- desc = "A drink for the drunks."
- if("pumpkin_latte")
- icon_state = "pumpkin_latte"
- name = "Pumpkin Latte"
- desc = "A mix of coffee and pumpkin juice."
- if("gibbfloats")
- icon_state = "gibbfloats"
- name = "Gibbfloat"
- desc = "Dr. Gibb with ice cream on top."
- if("whiskey_sour")
- icon_state = "whiskey_sour"
- name = "Whiskey Sour"
- desc = "Lemon juice mixed with whiskey and a dash of sugar. Surprisingly satisfying."
- if("fetching_fizz")
- icon_state = "fetching_fizz"
- name = "Fetching Fizz"
- desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
- if("hearty_punch")
- icon_state = "hearty_punch"
- name = "Hearty Punch"
- desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
- if("absinthe")
- icon_state = "absinthe"
- name = "glass of absinthe"
- desc = "It's as strong as it smells."
- if("bacchus_blessing")
- icon_state = "glass_brown2"
- name = "Bacchus' Blessing"
- desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
- if("arnold_palmer")
- icon_state = "arnold_palmer"
- name = "Arnold Palmer"
- desc = "You feel like taking a few golf swings after a few swigs of this."
- if("hcider")
- icon_state = "whiskeyglass"
- name = "Hard Cider"
- desc = "Tastes like autumn."
- if("triple_citrus")
- icon_state = "triplecitrus" //needs own sprite mine are trash
- name = "glass of triple citrus"
- desc = "A mixture of citrus juices. Tangy, yet smooth."
- if("grappa")
- icon_state = "grappa"
- name = "glass of grappa"
- desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
- if("eggnog")
- icon_state = "glass_yellow"
- name = "Eggnog"
- desc = "For enjoying the most wonderful time of the year."
- else
- icon_state ="glass_brown"
- var/image/I = image(icon, "glassoverlay")
- I.color = mix_color_from_reagents(reagents.reagent_list)
- add_overlay(I)
- name = "glass of ..what?"
- desc = "You can't really tell what this is."
+ if(reagents.reagent_list.len)
+ var/datum/reagent/R = reagents.get_master_reagent()
+ name = R.glass_name
+ desc = R.glass_desc
+ if(R.glass_icon_state)
+ icon_state = R.glass_icon_state
+ else
+ var/image/I = image(icon, "glassoverlay")
+ I.color = mix_color_from_reagents(reagents.reagent_list)
+ add_overlay(I)
else
icon_state = "glass_empty"
name = "drinking glass"
desc = "Your standard drinking glass."
- return
//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
@@ -556,89 +48,27 @@
materials = list(MAT_GLASS=100)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
+ cut_overlays()
+
if (gulp_size < 15)
gulp_size = 15
else
gulp_size = max(round(reagents.total_volume / 15), 15)
if (reagents.reagent_list.len > 0)
- switch(reagents.get_master_reagent_id())
- if("vodka")
- icon_state = "shotglassclear"
- name = "shot of vodka"
- desc = "Good for cold weather."
- if("water")
- icon_state = "shotglassclear"
- name = "shot of water"
- desc = "You're not sure why someone would drink this from a shot glass."
- if("whiskey")
- icon_state = "shotglassbrown"
- name = "shot of whiskey"
- desc = "Just like the old west."
- if("hcider")
- icon_state = "shotglassbrown"
- name = "shot of hard cider"
- desc = "Not meant to be drunk from a shot glass."
- if("rum")
- icon_state = "shotglassbrown"
- name = "shot of rum"
- desc = "You dirty pirate."
- if("b52")
- icon_state = "b52glass"
- name = "B-52"
- desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
- if("toxinsspecial")
- icon_state = "toxinsspecialglass"
- name = "Toxins Special"
- desc = "Whoah, this thing is on FIRE!"
- if ("vermouth")
- icon_state = "shotglassclear"
- name = "shot of vermouth"
- desc = "This better be going in a martini."
- if ("tequila")
- icon_state = "shotglassgold"
- name = "shot of tequila"
- desc = "Bad decisions ahead!"
- if ("patron")
- icon_state = "shotglassclear"
- name = "shot of patron"
- desc = "The good stuff. Goes great with a lime wedge."
- if ("kahlua")
- icon_state = "shotglasscream"
- name = "shot of coffee liqueur"
- desc = "Doesn't look too appetizing..."
- if ("nothing")
- icon_state = "shotglass"
- name = "shot of nothing"
- desc = "The mime insists there's booze in the glass. You're not so sure."
- if ("goldschlager")
- icon_state = "shotglassgold"
- name = "shot of goldschlager"
- desc = "Yup. You're officially a college girl."
- if ("cognac")
- icon_state = "shotglassbrown"
- name = "shot of cognac"
- desc = "You get the feeling this would piss off a rich person somewhere."
- if ("wine")
- icon_state = "shotglassred"
- name = "shot of wine"
- desc = "What kind of craven oaf would drink wine from a shot glass?"
- if ("blood")
- icon_state = "shotglassred"
- name = "shot of blood"
- desc = "If you close your eyes it sort of tastes like wine..."
- if ("liquidgibs")
- icon_state = "shotglassred"
- name = "shot of gibs"
- desc = "...Let's not talk about this."
- if ("absinthe")
- icon_state = "shotglassgreen"
- name = "shot of absinthe"
- desc = "I am stuck in the cycles of my guilt..."
- else
- icon_state = "shotglassbrown"
- name = "shot of... what?"
- desc = "You can't really tell what's in the glass."
+ var/datum/reagent/largest_reagent = reagents.get_master_reagent()
+ name = "filled shot glass"
+ desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out."
+
+ if(largest_reagent.shot_glass_icon_state)
+ icon_state = largest_reagent.shot_glass_icon_state
+ else
+ icon_state = "shotglassclear"
+ var/image/I = image(icon, "shotglassoverlay")
+ I.color = mix_color_from_reagents(reagents.reagent_list)
+ add_overlay(I)
+
+
else
icon_state = "shotglass"
name = "shot glass"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 068c41a4056..1b41cd45cd5 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -16,7 +16,7 @@
var/icon_on = "smartfridge"
var/icon_off = "smartfridge-off"
-/obj/machinery/smartfridge/New()
+/obj/machinery/smartfridge/Initialize()
..()
create_reagents()
reagents.set_reacting(FALSE)
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index 87196414841..11b016fd228 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -124,10 +124,10 @@
if(istype(I, /obj/item/projectile))
return
if(prob(50))
- I.loc = src.loc
- visible_message(" Swish! \the [I] lands in \the [src].")
+ I.forceMove(get_turf(src))
+ visible_message("Swish! [I] lands in [src].")
else
- visible_message(" \the [I] bounces off of \the [src]'s rim!")
+ visible_message("[I] bounces off of [src]'s rim!")
return 0
else
return ..()
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 65f95645d21..729ee970fae 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -389,16 +389,18 @@
name = "dusty survival pod storage"
desc = "A heated storage unit. This one's seen better days."
-/obj/machinery/smartfridge/survival_pod/empty/New()
- return()
+/obj/machinery/smartfridge/survival_pod/empty/Initialize(mapload)
+ ..(mapload, TRUE)
/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
if(istype(O, /obj/item))
return 1
return 0
-/obj/machinery/smartfridge/survival_pod/New()
+/obj/machinery/smartfridge/survival_pod/Initialize(mapload, empty)
..()
+ if(empty)
+ return
for(var/i in 1 to 5)
var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm/W = new(src)
load(W)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index a5725ad08d6..3b0fe882fa9 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -595,7 +595,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(src, "This creature is too powerful for you to possess!")
return 0
- if(can_reenter_corpse || (mind && mind.current))
+ if(can_reenter_corpse && mind && mind.current)
if(alert(src, "Your soul is still tied to your former life as [mind.current.name], if you go forward there is no going back to that life. Are you sure you wish to continue?", "Move On", "Yes", "No") == "No")
return 0
if(target.key)
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index fb99df8267a..570b2e13128 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -2,11 +2,11 @@
//TODO: Make these simple_animals
-var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
-var/const/MAX_IMPREGNATION_TIME = 150
+#define MIN_IMPREGNATION_TIME 100 //time it takes to impregnate someone
+#define MAX_IMPREGNATION_TIME 150
-var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle
-var/const/MAX_ACTIVE_TIME = 400
+#define MIN_ACTIVE_TIME 200 //time between being dropped and going idle
+#define MAX_ACTIVE_TIME 400
/obj/item/clothing/mask/facehugger
name = "alien"
@@ -152,14 +152,6 @@ var/const/MAX_ACTIVE_TIME = 400
// probiscis-blocker handling
if(iscarbon(M))
var/mob/living/carbon/target = M
- if(target.wear_mask)
- var/obj/item/clothing/W = target.wear_mask
- if(W.flags & NODROP)
- return FALSE
- if(!istype(W,/obj/item/clothing/mask/facehugger))
- target.dropItemToGround(W)
- target.visible_message("[src] tears [W] off of [target]'s face!", \
- "[src] tears [W] off of [target]'s face!")
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -168,6 +160,12 @@ var/const/MAX_ACTIVE_TIME = 400
"[src] smashes against [H]'s [H.head]!")
Die()
return FALSE
+
+ if(target.wear_mask)
+ var/obj/item/clothing/W = target.wear_mask
+ if(!istype(W,/obj/item/clothing/mask/facehugger) && target.dropItemToGround(W))
+ target.visible_message("[src] tears [W] off of [target]'s face!", \
+ "[src] tears [W] off of [target]'s face!")
forceMove(target)
target.equip_to_slot_if_possible(src, slot_wear_mask, 0, 1, 1)
// early returns and validity checks done: attach.
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 2573ebce862..1691703ba12 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -17,6 +17,9 @@
args[1] = FALSE
Initialize(arglist(args))
+/mob/living/carbon/human/dummy/Life()
+ return
+
/mob/living/carbon/human/Initialize()
verbs += /mob/living/proc/mob_sleep
verbs += /mob/living/proc/lay_down
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 6461045cc51..72f9c0928b9 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -885,6 +885,8 @@
return 1
/datum/species/proc/go_bald(mob/living/carbon/human/H)
+ if(QDELETED(H)) //may be called from a timer
+ return
H.facial_hair_style = "Shaved"
H.hair_style = "Bald"
H.update_hair()
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 7bfb41ebce7..115a985710d 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -44,6 +44,8 @@
message = Ellipsis(message, 10, 1)
message = treat_message(message)
+ if(!message)
+ return
var/list/listening_dead = list()
for(var/mob/M in player_list)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 398ad7fc89b..35183bbe4a2 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -112,6 +112,8 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
if(message_mode != MODE_WHISPER) //whisper() calls treat_message(); double process results in "hisspering"
message = treat_message(message)
+ if(!message)
+ return
spans += get_spans()
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index 07d95c713e2..8d2d059a0ba 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -4,6 +4,8 @@
stat = DEAD
canmove = 0
card.removePersonality()
+ if(holoform)
+ card.forceMove(loc)
update_sight()
clear_fullscreens()
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 73bf7bac3bb..95e62a556d3 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -419,8 +419,7 @@
return
build_step++
to_chat(user, "You complete the Securitron! Beep boop.")
- var/mob/living/simple_animal/bot/secbot/S = new /mob/living/simple_animal/bot/secbot
- S.loc = get_turf(src)
+ var/mob/living/simple_animal/bot/secbot/S = new /mob/living/simple_animal/bot/secbot(get_turf(src))
S.name = created_name
S.baton_type = I.type
qdel(I)
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 16ef3124bc8..fa0b039df9b 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -198,7 +198,7 @@
if(!cocoon_target)
var/list/choices = list()
for(var/mob/living/L in view(1,src))
- if(L == src | L.anchored)
+ if(L == src || L.anchored)
continue
if(Adjacent(L))
choices += L
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 28546c41c2c..e14419a4919 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -1,33 +1,8 @@
-//handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
-/mob/proc/update_Login_details()
- //Multikey checks and logging
- lastKnownIP = client.address
- computer_id = client.computer_id
- log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]")
- if(config.log_access)
- for(var/mob/M in player_list)
- if(M == src)
- continue
- if( M.key && (M.key != key) )
- var/matches
- if( (M.lastKnownIP == client.address) )
- matches += "IP ([client.address])"
- if( (M.computer_id == client.computer_id) )
- if(matches)
- matches += " and "
- matches += "ID ([client.computer_id])"
- spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
- if(matches)
- if(M.client)
- message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].")
- log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
- else
- message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ")
- log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
-
/mob/Login()
player_list |= src
- update_Login_details()
+ lastKnownIP = client.address
+ computer_id = client.computer_id
+ log_access("Mob Login: [key_name(src)] was assigned to a [type]")
world.update_status()
client.screen = list() //remove hud items just in case
client.images = list()
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index 4732dd88414..cf5d167a16d 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -2,7 +2,6 @@
SStgui.on_logout(src)
unset_machine()
player_list -= src
- log_access("Logout: [key_name(src)]")
if(admin_datums[src.ckey])
if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
var/admins_number = admins.len
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
index 61e9edd8e4e..0879e73008c 100644
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ b/code/modules/ninja/suit/ninjaDrainAct.dm
@@ -131,7 +131,8 @@ They *could* go in their appropriate files, but this is supposed to be modular
for(var/datum/tech/current_data in S.stored_research)
to_chat(H, "Checking \the [current_data.name] database.")
if(do_after(H, S.s_delay, target = src) && G.candrain && src)
- for(var/datum/tech/analyzing_data in files.known_tech)
+ for(var/id in files.known_tech)
+ var/datum/tech/analyzing_data = files.known_tech[id]
if(current_data.id == analyzing_data.id)
if(analyzing_data.level > current_data.level)
to_chat(H, "Database: UPDATED.")
@@ -162,7 +163,8 @@ They *could* go in their appropriate files, but this is supposed to be modular
for(var/datum/tech/current_data in S.stored_research)
to_chat(H, "Checking \the [current_data.name] database.")
if(do_after(H, S.s_delay, target = src) && G.candrain && src)
- for(var/datum/tech/analyzing_data in files.known_tech)
+ for(var/id in files.known_tech)
+ var/datum/tech/analyzing_data = files.known_tech[id]
if(current_data.id == analyzing_data.id)
if(analyzing_data.level > current_data.level)
to_chat(H, "Database: UPDATED.")
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 55dd134ca0a..1aa18f8adeb 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -46,7 +46,9 @@ var/global/list/rad_collectors = list()
toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
"You turn the [src.name] [active? "on":"off"].")
- investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(loaded_tank.air_contents.gases["plasma"][MOLES]/0.29)]%":"It is empty"].","singulo")
+ var/fuel = loaded_tank.air_contents.gases["plasma"]
+ fuel = fuel ? fuel[MOLES] : 0
+ investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].","singulo")
return
else
to_chat(user, "The controls are locked!")
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 7a035916295..c9553aaac87 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -127,7 +127,7 @@
icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
/obj/item/weapon/gun/ballistic/automatic/mini_uzi
- name = "\improper 'Type U3' Uzi"
+ name = "\improper Type U3 Uzi"
desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
icon_state = "mini-uzi"
origin_tech = "combat=4;materials=2;syndicate=4"
@@ -240,7 +240,7 @@
// Bulldog shotgun //
/obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog
- name = "\improper 'Bulldog' Shotgun"
+ name = "\improper Bulldog Shotgun"
desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
icon_state = "bulldog"
item_state = "bulldog"
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 4a4cbf688b1..b66bfc208f2 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -132,6 +132,18 @@ var/const/INJECT = 5 //injection
return id
+/datum/reagents/proc/get_master_reagent()
+ var/list/cached_reagents = reagent_list
+ var/datum/reagent/master
+ var/max_volume = 0
+ for(var/reagent in cached_reagents)
+ var/datum/reagent/R = reagent
+ if(R.volume > max_volume)
+ max_volume = R.volume
+ master = R
+
+ return master
+
/datum/reagents/proc/trans_to(obj/target, amount=1, multiplier=1, preserve_data=1, no_react = 0)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
var/list/cached_reagents = reagent_list
if(!target || !total_volume)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index be24b7b35ce..bc98badc51a 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -14,6 +14,10 @@
var/description = ""
var/taste_description = "metaphorical salt"
var/taste_mult = 1 //how this taste compares to others. Higher values means it is more noticable
+ var/glass_name = "glass of ...what?" // use for specialty drinks.
+ var/glass_desc = "You can't really tell what this is."
+ var/glass_icon_state = null // Otherwise just sets the icon to a normal glass with the mixture of the reagents in the glass.
+ var/shot_glass_icon_state = null
var/datum/reagents/holder = null
var/reagent_state = LIQUID
var/list/data
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 4ed43cb0535..23836e866d2 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -79,6 +79,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
nutriment_factor = 1 * REAGENTS_METABOLISM
boozepwr = 25
taste_description = "piss water"
+ glass_name = "glass of beer"
+ glass_desc = "A freezing pint of beer."
/datum/reagent/consumable/ethanol/beer/green
name = "Green Beer"
@@ -86,6 +88,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is dyed a festive green."
color = "#A8E61D"
taste_description = "green piss water"
+ glass_icon_state = "greenbeerglass"
+ glass_name = "glass of green beer"
+ glass_desc = "A freezing pint of green beer. Festive."
/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/M)
if(M.color != color)
@@ -101,6 +106,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
color = "#664300" // rgb: 102, 67, 0
boozepwr = 45
+ glass_icon_state = "kahluaglass"
+ glass_name = "glass of RR Coffee Liquor"
+ glass_desc = "DAMN, THIS THING LOOKS ROBUST!"
+ shot_glass_icon_state = "shotglasscream"
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
@@ -116,6 +125,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 75
taste_description = "molasses"
+ glass_icon_state = "whiskeyglass"
+ glass_name = "glass of whiskey"
+ glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
+ shot_glass_icon_state = "shotglassbrown"
/datum/reagent/consumable/ethanol/thirteenloko
name = "Thirteen Loko"
@@ -125,6 +138,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
nutriment_factor = 1 * REAGENTS_METABOLISM
boozepwr = 80
taste_description = "jitters and death"
+ glass_icon_state = "thirteen_loko_glass"
+ glass_name = "glass of Thirteen Loko"
+ glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
+
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M)
M.drowsyness = max(0,M.drowsyness-7)
@@ -141,6 +158,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#0064C8" // rgb: 0, 100, 200
boozepwr = 65
taste_description = "grain alcohol"
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of vodka"
+ glass_desc = "The glass contain wodka. Xynta."
+ shot_glass_icon_state = "shotglassclear"
/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/M)
M.radiation = max(M.radiation-2,0)
@@ -154,6 +175,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
nutriment_factor = 2 * REAGENTS_METABOLISM
boozepwr = 15
taste_description = "desperation and lactate"
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of bilk"
+ glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(10))
@@ -168,6 +192,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#666340" // rgb: 102, 99, 64
boozepwr = 10
taste_description = "dryness"
+ glass_icon_state = "threemileislandglass"
+ glass_name = "Three Mile Island Ice Tea"
+ glass_desc = "A glass of this is sure to prevent a meltdown."
/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/M)
M.set_drugginess(50)
@@ -180,6 +207,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 45
taste_description = "an alcoholic christmas tree"
+ glass_icon_state = "ginvodkaglass"
+ glass_name = "glass of gin"
+ glass_desc = "A crystal clear glass of Griffeater gin."
/datum/reagent/consumable/ethanol/rum
name = "Rum"
@@ -188,6 +218,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 60
taste_description = "spiked butterscotch"
+ glass_icon_state = "rumglass"
+ glass_name = "glass of rum"
+ glass_desc = "Now you want to Pray for a pirate suit, don't you?"
+ shot_glass_icon_state = "shotglassbrown"
/datum/reagent/consumable/ethanol/tequila
name = "Tequila"
@@ -196,6 +230,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#FFFF91" // rgb: 255, 255, 145
boozepwr = 70
taste_description = "paint stripper"
+ glass_icon_state = "tequilaglass"
+ glass_name = "glass of tequila"
+ glass_desc = "Now all that's missing is the weird colored shades!"
+ shot_glass_icon_state = "shotglassgold"
/datum/reagent/consumable/ethanol/vermouth
name = "Vermouth"
@@ -204,6 +242,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#91FF91" // rgb: 145, 255, 145
boozepwr = 45
taste_description = "dry alcohol"
+ glass_icon_state = "vermouthglass"
+ glass_name = "glass of vermouth"
+ glass_desc = "You wonder why you're even drinking this straight."
+ shot_glass_icon_state = "shotglassclear"
/datum/reagent/consumable/ethanol/wine
name = "Wine"
@@ -212,6 +254,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#7E4043" // rgb: 126, 64, 67
boozepwr = 35
taste_description = "bitter sweetness"
+ glass_icon_state = "wineglass"
+ glass_name = "glass of wine"
+ glass_desc = "A very classy looking drink."
+ shot_glass_icon_state = "shotglassred"
/datum/reagent/consumable/ethanol/lizardwine
name = "Lizard wine"
@@ -228,6 +274,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#F8EBF1"
boozepwr = 45
taste_description = "classy bitter sweetness"
+ glass_icon_state = "grappa"
+ glass_name = "glass of grappa"
+ glass_desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
/datum/reagent/consumable/ethanol/cognac
name = "Cognac"
@@ -236,6 +285,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#AB3C05" // rgb: 171, 60, 5
boozepwr = 75
taste_description = "angry and irish"
+ glass_icon_state = "cognacglass"
+ glass_name = "glass of cognac"
+ glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
+ shot_glass_icon_state = "shotglassbrown"
/datum/reagent/consumable/ethanol/absinthe
name = "Absinthe"
@@ -244,6 +297,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = rgb(10, 206, 0)
boozepwr = 80 //Very strong even by default
taste_description = "death and licorice"
+ glass_icon_state = "absinthe"
+ glass_name = "glass of absinthe"
+ glass_desc = "It's as strong as it smells."
+ shot_glass_icon_state = "shotglassgreen"
/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/M)
if(prob(10))
@@ -257,6 +314,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 100
taste_description = "pure resignation"
+ glass_icon_state = "glass_brown2"
+ glass_name = "Hooch"
+ glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+
/datum/reagent/consumable/ethanol/ale
name = "Ale"
@@ -265,6 +326,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 65
taste_description = "hearty barley ale"
+ glass_icon_state = "aleglass"
+ glass_name = "glass of ale"
+ glass_desc = "A freezing pint of delicious Ale."
/datum/reagent/consumable/ethanol/goldschlager
name = "Goldschlager"
@@ -273,6 +337,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#FFFF91" // rgb: 255, 255, 145
boozepwr = 25
taste_description = "burning cinnamon"
+ glass_icon_state = "goldschlagerglass"
+ glass_name = "glass of Goldschlager"
+ glass_desc = "100% proof that teen girls will drink anything with gold in it."
+ shot_glass_icon_state = "shotglassgold"
/datum/reagent/consumable/ethanol/patron
name = "Patron"
@@ -281,6 +349,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#585840" // rgb: 88, 88, 64
boozepwr = 60
taste_description = "metallic and expensive"
+ glass_icon_state = "patronglass"
+ glass_name = "glass of patron"
+ glass_desc = "Drinking patron in the bar, with all the subpar ladies."
+ shot_glass_icon_state = "shotglassclear"
/datum/reagent/consumable/ethanol/gintonic
name = "Gin and Tonic"
@@ -289,6 +361,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 25
taste_description = "mild and tart"
+ glass_icon_state = "gintonicglass"
+ glass_name = "Gin and Tonic"
+ glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
/datum/reagent/consumable/ethanol/cuba_libre
name = "Cuba Libre"
@@ -297,6 +372,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#3E1B00" // rgb: 62, 27, 0
boozepwr = 50
taste_description = "cola"
+ glass_icon_state = "cubalibreglass"
+ glass_name = "Cuba Libre"
+ glass_desc = "A classic mix of rum and cola."
/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/M)
if(M.mind && M.mind.special_role in list("Revolutionary", "Head Revolutionary")) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries.
@@ -314,6 +392,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#3E1B00" // rgb: 62, 27, 0
boozepwr = 70
taste_description = "cola"
+ glass_icon_state = "whiskeycolaglass"
+ glass_name = "Whiskey Cola"
+ glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
/datum/reagent/consumable/ethanol/martini
name = "Classic Martini"
@@ -322,6 +403,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 60
taste_description = "dry class"
+ glass_icon_state = "martiniglass"
+ glass_name = "Classic Martini"
+ glass_desc = "Damn, the bartender even stirred it, not shook it."
/datum/reagent/consumable/ethanol/vodkamartini
name = "Vodka Martini"
@@ -330,6 +414,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 65
taste_description = "shaken, not stirred"
+ glass_icon_state = "martiniglass"
+ glass_name = "Vodka martini"
+ glass_desc ="A bastardisation of the classic martini. Still great."
/datum/reagent/consumable/ethanol/white_russian
name = "White Russian"
@@ -338,6 +425,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#A68340" // rgb: 166, 131, 64
boozepwr = 50
taste_description = "bitter cream"
+ glass_icon_state = "whiterussianglass"
+ glass_name = "White Russian"
+ glass_desc = "A very nice looking drink. But that's just, like, your opinion, man."
/datum/reagent/consumable/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -346,6 +436,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#A68310" // rgb: 166, 131, 16
boozepwr = 55
taste_description = "oranges"
+ glass_icon_state = "screwdriverglass"
+ glass_name = "Screwdriver"
+ glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/M)
if(M.mind && M.mind.assigned_role in list("Station Engineer", "Atmospheric Technician", "Chief Engineer")) //Engineers lose radiation poisoning at a massive rate.
@@ -359,6 +452,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#8CFF8C" // rgb: 140, 255, 140
boozepwr = 45
taste_description = "sweet 'n creamy"
+ glass_icon_state = "booger"
+ glass_name = "Booger"
+ glass_desc = "Ewww..."
/datum/reagent/consumable/ethanol/bloody_mary
name = "Bloody Mary"
@@ -367,6 +463,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 55
taste_description = "tomatoes with a hint of lime"
+ glass_icon_state = "bloodymaryglass"
+ glass_name = "Bloody Mary"
+ glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
/datum/reagent/consumable/ethanol/brave_bull
name = "Brave Bull"
@@ -375,6 +474,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 80
taste_description = "alcoholic bravery"
+ glass_icon_state = "bravebullglass"
+ glass_name = "Brave Bull"
+ glass_desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
/datum/reagent/consumable/ethanol/brave_bull/on_mob_life(mob/living/M)
if(M.maxHealth == initial(M.maxHealth)) //Brave Bull makes you sturdier, and thus capable of withstanding a tiny bit more punishment.
@@ -393,6 +495,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#FFE48C" // rgb: 255, 228, 140
boozepwr = 45
taste_description = "oranges"
+ glass_icon_state = "tequilasunriseglass"
+ glass_name = "tequila Sunrise"
+ glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
/datum/reagent/consumable/ethanol/toxins_special
name = "Toxins Special"
@@ -401,6 +506,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 25
taste_description = "spicy toxins"
+ glass_icon_state = "toxinsspecialglass"
+ glass_name = "Toxins Special"
+ glass_desc = "Whoah, this thing is on FIRE!"
+ shot_glass_icon_state = "toxinsspecialglass"
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob)
if (M.bodytemperature < 330)
@@ -415,6 +524,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 90 //THE FIST OF THE LAW IS STRONG AND HARD
metabolization_rate = 0.8
taste_description = "JUSTICE"
+ glass_icon_state = "beepskysmashglass"
+ glass_name = "Beepsky Smash"
+ glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M)
M.Stun(2, 0)
@@ -427,6 +539,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 70
taste_description = "creamy alcohol"
+ glass_icon_state = "irishcreamglass"
+ glass_name = "Irish Cream"
+ glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
/datum/reagent/consumable/ethanol/manly_dorf
name = "The Manly Dorf"
@@ -435,6 +550,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 100 //For the manly only
taste_description = "hair on your chest and your chin"
+ glass_icon_state = "manlydorfglass"
+ glass_name = "The Manly Dorf"
+ glass_desc = "A manly concoction made from Ale and Beer. Intended for true men only."
/datum/reagent/consumable/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -443,6 +561,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 35
taste_description = "a mixture of cola and alcohol"
+ glass_icon_state = "longislandicedteaglass"
+ glass_name = "Long Island Iced Tea"
+ glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+
/datum/reagent/consumable/ethanol/moonshine
name = "Moonshine"
@@ -451,6 +573,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 95
taste_description = "bitterness"
+ glass_icon_state = "glass_clear"
+ glass_name = "Moonshine"
+ glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
/datum/reagent/consumable/ethanol/b52
name = "B-52"
@@ -459,6 +584,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 85
taste_description = "angry and irish"
+ glass_icon_state = "b52glass"
+ glass_name = "B-52"
+ glass_desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
+ shot_glass_icon_state = "b52glass"
/datum/reagent/consumable/ethanol/irishcoffee
name = "Irish Coffee"
@@ -467,6 +596,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 35
taste_description = "giving up on the day"
+ glass_icon_state = "irishcoffeeglass"
+ glass_name = "Irish Coffee"
+ glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
/datum/reagent/consumable/ethanol/margarita
name = "Margarita"
@@ -475,6 +607,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#8CFF8C" // rgb: 140, 255, 140
boozepwr = 35
taste_description = "dry and salty"
+ glass_icon_state = "margaritaglass"
+ glass_name = "Margarita"
+ glass_desc = "On the rocks with salt on the rim. Arriba~!"
/datum/reagent/consumable/ethanol/black_russian
name = "Black Russian"
@@ -483,6 +618,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#360000" // rgb: 54, 0, 0
boozepwr = 70
taste_description = "bitterness"
+ glass_icon_state = "blackrussianglass"
+ glass_name = "Black Russian"
+ glass_desc = "For the lactose-intolerant. Still as classy as a White Russian."
+
/datum/reagent/consumable/ethanol/manhattan
name = "Manhattan"
@@ -491,6 +630,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 30
taste_description = "mild dryness"
+ glass_icon_state = "manhattanglass"
+ glass_name = "Manhattan"
+ glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
+
/datum/reagent/consumable/ethanol/manhattan_proj
name = "Manhattan Project"
@@ -499,6 +642,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 45
taste_description = "death, the destroyer of worlds"
+ glass_icon_state = "proj_manhattanglass"
+ glass_name = "Manhattan Project"
+ glass_desc = "A scientist's drink of choice, for thinking how to blow up the station."
+
/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/M)
M.set_drugginess(30)
@@ -511,6 +658,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 70
taste_description = "soda"
+ glass_icon_state = "whiskeysodaglass2"
+ glass_name = "Whiskey Soda"
+ glass_desc = "Ultimate refreshment."
/datum/reagent/consumable/ethanol/antifreeze
name = "Anti-freeze"
@@ -519,6 +669,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 35
taste_description = "Jack Frost's piss"
+ glass_icon_state = "antifreeze"
+ glass_name = "Anti-freeze"
+ glass_desc = "The ultimate refreshment."
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M)
if (M.bodytemperature < 330)
@@ -532,6 +685,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 45
taste_description = "creamy berries"
+ glass_icon_state = "b&p"
+ glass_name = "Barefoot"
+ glass_desc = "Barefoot and pregnant."
/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/M)
if(ishuman(M)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes.
@@ -548,6 +704,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#FFFFFF" // rgb: 255, 255, 255
boozepwr = 35
taste_description = "refreshing cold"
+ glass_icon_state = "snowwhite"
+ glass_name = "Snow White"
+ glass_desc = "A cold refreshment."
/datum/reagent/consumable/ethanol/demonsblood //Prevents the imbiber from being dragged into a pool of blood by a slaughter demon.
name = "Demon's Blood"
@@ -556,6 +715,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#820000" // rgb: 130, 0, 0
boozepwr = 75
taste_description = "sweet tasting iron"
+ glass_icon_state = "demonsblood"
+ glass_name = "Demons Blood"
+ glass_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
/datum/reagent/consumable/ethanol/devilskiss //If eaten by a slaughter demon, the demon will regret it.
name = "Devil's Kiss"
@@ -564,6 +726,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#A68310" // rgb: 166, 131, 16
boozepwr = 70
taste_description = "bitter iron"
+ glass_icon_state = "devilskiss"
+ glass_name = "Devils Kiss"
+ glass_desc = "Creepy time!"
/datum/reagent/consumable/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -572,6 +737,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#0064C8" // rgb: 0, 100, 200
boozepwr = 70
taste_description = "tart bitterness"
+ glass_icon_state = "vodkatonicglass"
+ glass_name = "Vodka and Tonic"
+ glass_desc = "For when a gin and tonic isn't Russian enough."
+
/datum/reagent/consumable/ethanol/ginfizz
name = "Gin Fizz"
@@ -580,6 +749,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 45
taste_description = "dry, tart lemons"
+ glass_icon_state = "ginfizzglass"
+ glass_name = "Gin Fizz"
+ glass_desc = "Refreshingly lemony, deliciously dry."
+
/datum/reagent/consumable/ethanol/bahama_mama
name = "Bahama Mama"
@@ -588,6 +761,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#FF7F3B" // rgb: 255, 127, 59
boozepwr = 35
taste_description = "lime and orange"
+ glass_icon_state = "bahama_mama"
+ glass_name = "Bahama Mama"
+ glass_desc = "Tropical cocktail."
/datum/reagent/consumable/ethanol/singulo
name = "Singulo"
@@ -596,6 +772,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E6671" // rgb: 46, 102, 113
boozepwr = 35
taste_description = "concentrated matter"
+ glass_icon_state = "singulo"
+ glass_name = "Singulo"
+ glass_desc = "A blue-space beverage."
/datum/reagent/consumable/ethanol/sbiten
name = "Sbiten"
@@ -604,6 +783,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 70
taste_description = "hot and spice"
+ glass_icon_state = "sbitenglass"
+ glass_name = "Sbiten"
+ glass_desc = "A spicy mix of Vodka and Spice. Very hot."
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M)
if (M.bodytemperature < 360)
@@ -617,6 +799,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#C73C00" // rgb: 199, 60, 0
boozepwr = 51 //Red drinks are stronger
taste_description = "sweet and salty alcohol"
+ glass_icon_state = "red_meadglass"
+ glass_name = "Red Mead"
+ glass_desc = "A True Viking's Beverage, though its color is strange."
/datum/reagent/consumable/ethanol/mead
name = "Mead"
@@ -626,6 +811,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
nutriment_factor = 1 * REAGENTS_METABOLISM
boozepwr = 50
taste_description = "sweet, sweet alcohol"
+ glass_icon_state = "meadglass"
+ glass_name = "Mead"
+ glass_desc = "A Viking's Beverage, though a cheap one."
/datum/reagent/consumable/ethanol/iced_beer
name = "Iced Beer"
@@ -634,6 +822,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 15
taste_description = "refreshingly cold"
+ glass_icon_state = "iced_beerglass"
+ glass_name = "Iced Beer"
+ glass_desc = "A beer so frosty, the air around it freezes."
/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M)
if(M.bodytemperature > 270)
@@ -647,6 +838,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 1 //Basically nothing
taste_description = "a poor excuse for alcohol"
+ glass_icon_state = "grogglass"
+ glass_name = "Grog"
+ glass_desc = "A fine and cepa drink for Space."
+
/datum/reagent/consumable/ethanol/aloe
name = "Aloe"
@@ -655,6 +850,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 35
taste_description = "sweet 'n creamy"
+ glass_icon_state = "aloe"
+ glass_name = "Aloe"
+ glass_desc = "Very, very, very good."
/datum/reagent/consumable/ethanol/andalusia
name = "Andalusia"
@@ -663,6 +861,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 40
taste_description = "lemons"
+ glass_icon_state = "andalusia"
+ glass_name = "Andalusia"
+ glass_desc = "A nice, strangely named drink."
/datum/reagent/consumable/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -671,6 +872,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 45
taste_description = "bitter yet free"
+ glass_icon_state = "alliescocktail"
+ glass_name = "Allies cocktail"
+ glass_desc = "A drink made from your allies."
/datum/reagent/consumable/ethanol/acid_spit
name = "Acid Spit"
@@ -679,6 +883,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#365000" // rgb: 54, 80, 0
boozepwr = 80
taste_description = "stomach acid"
+ glass_icon_state = "acidspitglass"
+ glass_name = "Acid Spit"
+ glass_desc = "A drink from Nanotrasen. Made from live aliens."
/datum/reagent/consumable/ethanol/amasec
name = "Amasec"
@@ -687,6 +894,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 35
taste_description = "dark and metallic"
+ glass_icon_state = "amasecglass"
+ glass_name = "Amasec"
+ glass_desc = "Always handy before COMBAT!!!"
/datum/reagent/consumable/ethanol/changelingsting
name = "Changeling Sting"
@@ -695,6 +905,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E6671" // rgb: 46, 102, 113
boozepwr = 95
taste_description = "your brain coming out your nose"
+ glass_icon_state = "changelingsting"
+ glass_name = "Changeling Sting"
+ glass_desc = "A stingy drink."
/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/M)
if(M.mind && M.mind.changeling) //Changeling Sting assists in the recharging of changeling chemicals.
@@ -709,6 +922,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E6671" // rgb: 46, 102, 113
boozepwr = 25
taste_description = "delicious anger"
+ glass_icon_state = "irishcarbomb"
+ glass_name = "Irish Car Bomb"
+ glass_desc = "An Irish car bomb."
/datum/reagent/consumable/ethanol/syndicatebomb
name = "Syndicate Bomb"
@@ -717,6 +933,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E6671" // rgb: 46, 102, 113
boozepwr = 90
taste_description = "purified antagonism"
+ glass_icon_state = "syndicatebomb"
+ glass_name = "Syndicate Bomb"
+ glass_desc = "A syndicate bomb."
/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/M)
if(prob(5))
@@ -730,6 +949,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E6671" // rgb: 46, 102, 113
boozepwr = 35
taste_description = "tartness and bananas"
+ glass_icon_state = "erikasurprise"
+ glass_name = "Erika Surprise"
+ glass_desc = "The surprise is, it's green!"
/datum/reagent/consumable/ethanol/driestmartini
name = "Driest Martini"
@@ -739,6 +961,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E6671" // rgb: 46, 102, 113
boozepwr = 65
taste_description = "a beach"
+ glass_icon_state = "driestmartiniglass"
+ glass_name = "Driest Martini"
+ glass_desc = "Only for the experienced. You think you see sand floating in the glass."
/datum/reagent/consumable/ethanol/bananahonk
name = "Banana Mama"
@@ -748,6 +973,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#FFFF91" // rgb: 255, 255, 140
boozepwr = 60
taste_description = "a bad joke"
+ glass_icon_state = "bananahonkglass"
+ glass_name = "Banana Honk"
+ glass_desc = "A drink from Clown Heaven."
/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/M)
if((ishuman(M) && M.job in list("Clown") ) || ismonkey(M))
@@ -763,6 +991,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 59 //Proof that clowns are better than mimes right here
taste_description = "a pencil eraser"
+ glass_icon_state = "silencerglass"
+ glass_name = "Silencer"
+ glass_desc = "A drink from Mime Heaven."
/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/M)
if(ishuman(M) && M.job in list("Mime"))
@@ -777,6 +1008,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#1EA0FF" // rgb: 102, 67, 0
boozepwr = 50
taste_description = "molasses and a mouthful of pool water"
+ glass_icon_state = "drunkenblumpkin"
+ glass_name = "Drunken Blumpkin"
+ glass_desc = "A drink for the drunks."
/datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour.
name = "Whiskey Sour"
@@ -785,6 +1019,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = rgb(255, 201, 49)
boozepwr = 35
taste_description = "sour lemons"
+ glass_icon_state = "whiskey_sour"
+ glass_name = "Whiskey Sour"
+ glass_desc = "Lemon juice mixed with whiskey and a dash of sugar. Surprisingly satisfying."
/datum/reagent/consumable/ethanol/hcider
name = "Hard Cider"
@@ -794,6 +1031,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
nutriment_factor = 1 * REAGENTS_METABOLISM
boozepwr = 25
taste_description = "apples"
+ glass_icon_state = "whiskeyglass"
+ glass_name = "Hard Cider"
+ glass_desc = "Tastes like autumn."
+ shot_glass_icon_state = "shotglassbrown"
/datum/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber!
@@ -804,6 +1045,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 10
metabolization_rate = 0.1 * REAGENTS_METABOLISM
taste_description = "charged metal" // the same as teslium, honk honk.
+ glass_icon_state = "fetching_fizz"
+ glass_name = "Fetching Fizz"
+ glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
+
/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/M)
for(var/obj/item/weapon/ore/O in orange(3, M))
@@ -819,6 +1064,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 10
metabolization_rate = 0.1 * REAGENTS_METABOLISM
taste_description = "bravado in the face of disaster"
+ glass_icon_state = "hearty_punch"
+ glass_name = "Hearty Punch"
+ glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/M)
if(M.stat == UNCONSCIOUS && M.health <= 0)
@@ -837,6 +1085,10 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = rgb(51, 19, 3) //Sickly brown
boozepwr = 300 //I warned you
taste_description = "a wall of bricks"
+ glass_icon_state = "glass_brown2"
+ glass_name = "Bacchus' Blessing"
+ glass_desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
+
/datum/reagent/consumable/ethanol/atomicbomb
@@ -846,6 +1098,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#666300" // rgb: 102, 99, 0
boozepwr = 0 //custom drunk effect
taste_description = "da bomb"
+ glass_icon_state = "atomicbombglass"
+ glass_name = "Atomic Bomb"
+ glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/M)
M.set_drugginess(50)
@@ -871,6 +1126,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 0 //custom drunk effect
taste_description = "your brains smashed out by a lemon wrapped around a gold brick"
+ glass_icon_state = "gargleblasterglass"
+ glass_name = "Pan-Galactic Gargle Blaster"
+ glass_desc = "Like having your brain smashed out by a slice of lemon wrapped around a large gold brick."
/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/M)
M.dizziness +=6
@@ -896,6 +1154,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#2E2E61" // rgb: 46, 46, 97
boozepwr = 0 //custom drunk effect
taste_description = "a numbing sensation"
+ glass_icon_state = "neurotoxinglass"
+ glass_name = "Neurotoxin"
+ glass_desc = "A drink that is guaranteed to knock you silly."
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/carbon/M)
M.Weaken(3, 1, 0)
@@ -924,6 +1185,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 0 //custom drunk effect
metabolization_rate = 0.2 * REAGENTS_METABOLISM
taste_description = "giving peace a chance"
+ glass_icon_state = "hippiesdelightglass"
+ glass_name = "Hippie's Delight"
+ glass_desc = "A drink enjoyed by people during the 1960's."
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
if (!M.slurring)
@@ -965,3 +1229,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
nutriment_factor = 2 * REAGENTS_METABOLISM
boozepwr = 1
taste_description = "custard and alcohol"
+ glass_icon_state = "glass_yellow"
+ glass_name = "Eggnog"
+ glass_desc = "For enjoying the most wonderful time of the year."
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 2b706f189b8..85f11b8b572 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -10,6 +10,9 @@
description = "Both delicious AND rich in Vitamin C, what more do you need?"
color = "#E78108" // rgb: 231, 129, 8
taste_description = "oranges"
+ glass_icon_state = "glass_orange"
+ glass_name = "glass of orange juice"
+ glass_desc = "Vitamins! Yay!"
/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/M)
if(M.getOxyLoss() && prob(30))
@@ -23,6 +26,9 @@
description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
color = "#731008" // rgb: 115, 16, 8
taste_description = "tomatoes"
+ glass_icon_state = "glass_red"
+ glass_name = "glass of tomato juice"
+ glass_desc = "Are you sure this is tomato juice?"
/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/M)
if(M.getFireLoss() && prob(20))
@@ -36,6 +42,9 @@
description = "The sweet-sour juice of limes."
color = "#365E30" // rgb: 54, 94, 48
taste_description = "unbearable sourness"
+ glass_icon_state = "glass_green"
+ glass_name = "glass of lime juice"
+ glass_desc = "A glass of sweet-sour lime juice."
/datum/reagent/consumable/limejuice/on_mob_life(mob/living/M)
if(M.getToxLoss() && prob(20))
@@ -49,6 +58,9 @@
description = "It is just like a carrot but without crunching."
color = "#973800" // rgb: 151, 56, 0
taste_description = "carrots"
+ glass_icon_state = "carrotjuice"
+ glass_name = "glass of carrot juice"
+ glass_desc = "It's just like a carrot but without crunching."
/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/M)
M.adjust_blurriness(-1)
@@ -68,6 +80,9 @@
description = "A delicious blend of several different kinds of berries."
color = "#863333" // rgb: 134, 51, 51
taste_description = "berries"
+ glass_icon_state = "berryjuice"
+ glass_name = "glass of berry juice"
+ glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
/datum/reagent/consumable/applejuice
name = "Apple Juice"
@@ -82,6 +97,9 @@
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
color = "#863353" // rgb: 134, 51, 83
taste_description = "berries"
+ glass_icon_state = "poisonberryjuice"
+ glass_name = "glass of berry juice"
+ glass_desc = "Berry juice. Or maybe it's poison. Who cares?"
/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/M)
M.adjustToxLoss(1, 0)
@@ -94,6 +112,9 @@
description = "Delicious juice made from watermelon."
color = "#863333" // rgb: 134, 51, 51
taste_description = "juicy watermelon"
+ glass_icon_state = "glass_red"
+ glass_name = "glass of watermelon juice"
+ glass_desc = "A glass of watermelon juice."
/datum/reagent/consumable/lemonjuice
name = "Lemon Juice"
@@ -101,6 +122,9 @@
description = "This juice is VERY sour."
color = "#863333" // rgb: 175, 175, 0
taste_description = "sourness"
+ glass_icon_state = "lemonglass"
+ glass_name = "glass of lemon juice"
+ glass_desc = "Sour..."
/datum/reagent/consumable/banana
name = "Banana Juice"
@@ -108,6 +132,9 @@
description = "The raw essence of a banana. HONK"
color = "#863333" // rgb: 175, 175, 0
taste_description = "banana"
+ glass_icon_state = "banana"
+ glass_name = "glass of banana juice"
+ glass_desc = "The raw essence of a banana. HONK."
/datum/reagent/consumable/banana/on_mob_life(mob/living/M)
if((ishuman(M) && M.job in list("Clown") ) || ismonkey(M))
@@ -120,6 +147,10 @@
id = "nothing"
description = "Absolutely nothing."
taste_description = "nothing"
+ glass_icon_state = "nothing"
+ glass_name = "Nothing"
+ glass_desc = "Absolutely nothing."
+ shot_glass_icon_state = "shotglass"
/datum/reagent/consumable/nothing/on_mob_life(mob/living/M)
if(ishuman(M) && M.job in list("Mime"))
@@ -159,6 +190,9 @@
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
taste_description = "irish sadness"
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of potato juice"
+ glass_desc = "Bleh..."
/datum/reagent/consumable/grapejuice
name = "Grape Juice"
@@ -173,6 +207,9 @@
description = "An opaque white liquid produced by the mammary glands of mammals."
color = "#DFDFDF" // rgb: 223, 223, 223
taste_description = "milk"
+ glass_icon_state = "glass_white"
+ glass_name = "glass of milk"
+ glass_desc = "White and nutritious goodness!"
/datum/reagent/consumable/milk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
@@ -192,6 +229,9 @@
description = "An opaque white liquid made from soybeans."
color = "#DFDFC7" // rgb: 223, 223, 199
taste_description = "soy milk"
+ glass_icon_state = "glass_white"
+ glass_name = "glass of soy milk"
+ glass_desc = "White and nutritious soy goodness!"
/datum/reagent/consumable/soymilk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
@@ -205,6 +245,9 @@
description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
color = "#DFD7AF" // rgb: 223, 215, 175
taste_description = "creamy milk"
+ glass_icon_state = "glass_white"
+ glass_name = "glass of cream"
+ glass_desc = "Ewwww..."
/datum/reagent/consumable/cream/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
@@ -220,6 +263,9 @@
nutriment_factor = 0
overdose_threshold = 80
taste_description = "bitterness"
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of coffee"
+ glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
/datum/reagent/consumable/coffee/overdose_process(mob/living/M)
M.Jitter(5)
@@ -243,6 +289,9 @@
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "tart black tea"
+ glass_icon_state = "teaglass"
+ glass_name = "glass of tea"
+ glass_desc = "Drinking it from here would not seem right."
/datum/reagent/consumable/tea/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-2)
@@ -263,6 +312,9 @@
color = "#FFB766"
nutriment_factor = 2
taste_description = "bitter tea"
+ glass_icon_state = "arnold_palmer"
+ glass_name = "Arnold Palmer"
+ glass_desc = "You feel like taking a few golf swings after a few swigs of this."
/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/M)
if(prob(5))
@@ -277,6 +329,9 @@
color = "#102838" // rgb: 16, 40, 56
nutriment_factor = 0
taste_description = "bitter coldness"
+ glass_icon_state = "icedcoffeeglass"
+ glass_name = "Iced Coffee"
+ glass_desc = "A drink to perk you up and refresh you!"
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
@@ -295,6 +350,9 @@
color = "#104038" // rgb: 16, 64, 56
nutriment_factor = 0
taste_description = "sweet tea"
+ glass_icon_state = "icedteaglass"
+ glass_name = "Iced Tea"
+ glass_desc = "All natural, antioxidant-rich flavour sensation."
/datum/reagent/consumable/icetea/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-2)
@@ -313,6 +371,9 @@
description = "A refreshing beverage."
color = "#100800" // rgb: 16, 8, 0
taste_description = "cola"
+ glass_icon_state = "glass_brown"
+ glass_name = "glass of space Cola"
+ glass_desc = "A glass of refreshing Space Cola."
/datum/reagent/consumable/space_cola/on_mob_life(mob/living/M)
M.drowsyness = max(0,M.drowsyness-5)
@@ -326,6 +387,9 @@
description = "Cola, cola never changes."
color = "#100800" // rgb: 16, 8, 0
taste_description = "the future"
+ glass_icon_state = "nuka_colaglass"
+ glass_name = "Nuka Cola"
+ glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/M)
M.Jitter(20)
@@ -345,6 +409,9 @@
description = "Blows right through you like a space wind."
color = "#102000" // rgb: 16, 32, 0
taste_description = "sweet citrus soda"
+ glass_icon_state = "Space_mountain_wind_glass"
+ glass_name = "glass of Space Mountain Wind"
+ glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/M)
M.drowsyness = max(0,M.drowsyness-7)
@@ -361,6 +428,9 @@
description = "A delicious blend of 42 different flavours."
color = "#102000" // rgb: 16, 32, 0
taste_description = "cherry soda" // FALSE ADVERTISING
+ glass_icon_state = "dr_gibb_glass"
+ glass_name = "glass of Dr. Gibb"
+ glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply."
/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/M)
M.drowsyness = max(0,M.drowsyness-6)
@@ -374,6 +444,10 @@
description = "Tastes like a hull breach in your mouth."
color = "#00FF00" // rgb: 0, 255, 0
taste_description = "cherry soda"
+ glass_icon_state = "space-up_glass"
+ glass_name = "glass of Space-up"
+ glass_desc = "Space-up. It helps you keep your cool."
+
/datum/reagent/consumable/space_up/on_mob_life(mob/living/M)
if (M.bodytemperature > 310)
@@ -386,6 +460,10 @@
id = "lemon_lime"
color = "#8CFF00" // rgb: 135, 255, 0
taste_description = "tangy lime and lemon soda"
+ glass_icon_state = "glass_yellow"
+ glass_name = "glass of Lemon-Lime"
+ glass_desc = "You're pretty certain a real fruit has never actually touched this."
+
/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/M)
if (M.bodytemperature > 310)
@@ -398,6 +476,9 @@
id = "pwr_game"
color = "#9385bf" // rgb: 58, 52, 75
taste_description = "sweet and salty tang"
+ glass_icon_state = "glass_red"
+ glass_name = "glass of Pwr Game"
+ glass_desc = "Goes well with a Vlad's salad."
/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/M)
if (M.bodytemperature > 310)
@@ -410,6 +491,9 @@
id = "shamblers"
color = "#f00060" // rgb: 94, 0, 38
taste_description = "carbonated metallic soda"
+ glass_icon_state = "glass_red"
+ glass_name = "glass of Shambler's Juice"
+ glass_desc = "Mmm mm, shambly."
/datum/reagent/consumable/shamblers/on_mob_life(mob/living/M)
if (M.bodytemperature > 310)
@@ -421,6 +505,9 @@
description = "A can of club soda. Why not make a scotch and soda?"
color = "#619494" // rgb: 97, 148, 148
taste_description = "carbonated water"
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of Soda Water"
+ glass_desc = "Soda water. Why not make a scotch and soda?"
/datum/reagent/consumable/sodawater/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
@@ -435,6 +522,9 @@
description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
color = "#0064C8" // rgb: 0, 100, 200
taste_description = "tart and fresh"
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of Tonic Water"
+ glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
/datum/reagent/consumable/tonic/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
@@ -452,6 +542,9 @@
reagent_state = SOLID
color = "#619494" // rgb: 97, 148, 148
taste_description = "ice"
+ glass_icon_state = "iceglass"
+ glass_name = "glass of ice"
+ glass_desc = "Generally, you're supposed to put something else in there too..."
/datum/reagent/consumable/ice/on_mob_life(mob/living/M)
M.bodytemperature = max( M.bodytemperature - 5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
@@ -463,6 +556,9 @@
description = "A nice and tasty beverage while you are reading your hippie books."
color = "#664300" // rgb: 102, 67, 0
taste_description = "creamy coffee"
+ glass_icon_state = "soy_latte"
+ glass_name = "Soy Latte"
+ glass_desc = "A nice and refreshing beverage while you're reading."
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
@@ -482,6 +578,9 @@
description = "A nice, strong and tasty beverage while you are reading."
color = "#664300" // rgb: 102, 67, 0
taste_description = "bitter cream"
+ glass_icon_state = "cafe_latte"
+ glass_name = "Cafe Latte"
+ glass_desc = "A nice, strong and refreshing beverage while you're reading."
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
@@ -501,6 +600,9 @@
description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly at the cost of hunger."
color = "#FF8CFF" // rgb: 255, 140, 255
taste_description = "homely fruit"
+ glass_icon_state = "doctorsdelightglass"
+ glass_name = "Doctor's Delight"
+ glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M)
M.adjustBruteLoss(-0.5, 0)
@@ -520,6 +622,9 @@
color = "#800000"
nutriment_factor = 4 * REAGENTS_METABOLISM
taste_description = "sweet chocolate"
+ glass_icon_state = "chocolatepudding"
+ glass_name = "Chocolate Pudding"
+ glass_desc = "Tasty."
/datum/reagent/consumable/vanillapudding
name = "Vanilla Pudding"
@@ -528,6 +633,9 @@
color = "#FAFAD2"
nutriment_factor = 4 * REAGENTS_METABOLISM
taste_description = "sweet vanilla"
+ glass_icon_state = "vanillapudding"
+ glass_name = "Vanilla Pudding"
+ glass_desc = "Tasty."
/datum/reagent/consumable/cherryshake
name = "Cherry Shake"
@@ -536,6 +644,9 @@
color = "#FFB6C1"
nutriment_factor = 4 * REAGENTS_METABOLISM
taste_description = "creamy cherry"
+ glass_icon_state = "cherryshake"
+ glass_name = "Cherry Shake"
+ glass_desc = "A cherry flavored milkshake."
/datum/reagent/consumable/bluecherryshake
name = "Blue Cherry Shake"
@@ -544,6 +655,9 @@
color = "#00F1FF"
nutriment_factor = 4 * REAGENTS_METABOLISM
taste_description = "creamy blue cherry"
+ glass_icon_state = "bluecherryshake"
+ glass_name = "Blue Cherry Shake"
+ glass_desc = "An exotic blue milkshake."
/datum/reagent/consumable/pumpkin_latte
name = "Pumpkin Latte"
@@ -552,6 +666,9 @@
color = "#F4A460"
nutriment_factor = 3 * REAGENTS_METABOLISM
taste_description = "creamy pumpkin"
+ glass_icon_state = "pumpkin_latte"
+ glass_name = "Pumpkin Latte"
+ glass_desc = "A mix of coffee and pumpkin juice."
/datum/reagent/consumable/gibbfloats
name = "Gibb Floats"
@@ -560,6 +677,9 @@
color = "#B22222"
nutriment_factor = 3 * REAGENTS_METABOLISM
taste_description = "creamy cherry"
+ glass_icon_state = "gibbfloats"
+ glass_name = "Gibbfloat"
+ glass_desc = "Dr. Gibb with ice cream on top."
/datum/reagent/consumable/pumpkinjuice
name = "Pumpkin Juice"
@@ -581,6 +701,9 @@
description = "A solution."
color = "#C8A5DC"
taste_description = "extreme bitterness"
+ glass_icon_state = "triplecitrus" //needs own sprite mine are trash
+ glass_name = "glass of triple citrus"
+ glass_desc = "A mixture of citrus juices. Tangy, yet smooth."
/datum/reagent/consumable/grape_soda
name = "Grape soda"
@@ -588,6 +711,8 @@
description = "Beloved of children and teetotalers."
color = "#E6CDFF"
taste_description = "grape soda"
+ glass_name = "glass of grape juice"
+ glass_desc = "It's grape (soda)!"
/datum/reagent/consumable/milk/chocolate_milk
name = "Chocolate Milk"
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 59fc0da7664..442772fea84 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -326,6 +326,9 @@
nutriment_factor = 3 * REAGENTS_METABOLISM
color = "#403010" // rgb: 64, 48, 16
taste_description = "creamy chocolate"
+ glass_icon_state = "chocolateglass"
+ glass_name = "glass of chocolate"
+ glass_desc = "Tasty."
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M)
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 898c1afce3f..7739115a64f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -6,6 +6,10 @@
metabolization_rate = 5 //fast rate so it disappears fast.
taste_description = "iron"
taste_mult = 1.3
+ glass_icon_state = "glass_red"
+ glass_name = "glass of tomato juice"
+ glass_desc = "Are you sure this is tomato juice?"
+ shot_glass_icon_state = "shotglassred"
/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, reac_volume)
if(data && data["viruses"])
@@ -81,6 +85,7 @@
color = "#FF9966"
description = "You don't even want to think about what's in here."
taste_description = "gross iron"
+ shot_glass_icon_state = "shotglassred"
/datum/reagent/vaccine
//data must contain virus type
@@ -107,6 +112,10 @@
color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
taste_description = "water"
var/cooling_temperature = 2
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of Water"
+ glass_desc = "The father of all refreshments."
+ shot_glass_icon_state = "shotglassclear"
/*
* Water reaction to turf
@@ -168,6 +177,9 @@
id = "holywater"
description = "Water blessed by some deity."
color = "#E0E8EF" // rgb: 224, 232, 239
+ glass_icon_state = "glass_clear"
+ glass_name = "glass of Holy Water"
+ glass_desc = "A glass of holy water."
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(is_servant_of_ratvar(M))
@@ -858,7 +870,7 @@
to_chat(M, "You feel unstable...")
M.Jitter(2)
current_cycle = 1
- addtimer(CALLBACK(GLOBAL_PROC, .proc/do_teleport, M, get_turf(M), 5, asoundin = 'sound/effects/phasein.ogg'), 30)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/do_teleport, M, get_turf(M), 5, null, null, null, 'sound/effects/phasein.ogg'), 30)
..()
/datum/reagent/aluminium
@@ -883,6 +895,9 @@
description = "Required for welders. Flamable."
color = "#660000" // rgb: 102, 0, 0
taste_description = "gross metal"
+ glass_icon_state = "dr_gibb_glass"
+ glass_name = "glass of welder fuel"
+ glass_desc = "Unless you're an industrial tool, this is probably not safe for consumption."
/datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with welding fuel to make them easy to ignite!
if(!isliving(M))
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index ee296f312d6..528124f84c6 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -304,6 +304,9 @@
color = "#664300" // rgb: 102, 67, 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "piss water"
+ glass_icon_state = "beerglass"
+ glass_name = "glass of beer"
+ glass_desc = "A freezing pint of beer."
/datum/reagent/toxin/beer2/on_mob_life(mob/living/M)
switch(current_cycle)
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index c1c8b305dcc..bf5421190fa 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -340,11 +340,11 @@
if(istype(I, /obj/item/projectile))
return
if(prob(75))
- I.loc = src
- visible_message("\the [I] lands in \the [src].")
+ I.forceMove(src)
+ visible_message("[I] lands in [src].")
update_icon()
else
- visible_message("\the [I] bounces off of \the [src]'s rim!")
+ visible_message("[I] bounces off of [src]'s rim!")
return 0
else
return ..(mover, target, height)
diff --git a/html/changelog.html b/html/changelog.html
index 4895dff63b4..6cdc9a1c5ce 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,28 @@
-->
+
01 April 2017
+
Cyberboss updated:
+
+ - The contents of the shelterpod smart fridge work again
+
+
XDTM updated:
+
+ - Facehuggers no longer rip masks from people protected by helmets.
+
+
+
31 March 2017
+
Cobby updated:
+
+ - Shot glasses are now more ambiguous [EASIER TO MAINTAIN]
+
+
Cyberboss updated:
+
+ - Temperature changes will now properly cause atmospherics simulation to activate
+ - The command report for random xeno eggs will now be delivered along with the rest of the roundstart reports
+ - Drones can no longer be irradiated
+
+
30 March 2017
coiax updated:
@@ -1778,66 +1800,6 @@
- Loads the HADES carbine with the correct bullet.
- The SRM-8 Rocket Pods have been loaded with new explosives designed to do maximum damage to terrain. These explosives are less effective on people, however.
-
-
28 January 2017
-
Joan updated:
-
- - Brass windows no longer start off anchored, but are constructed instantly.
- - You can no longer stack multiple windows of the same direction on a tile.
- - Vitality Matrices now share vitality globally, allowing you to use vitality gained from any Matrix.
- - Geis now mutes human targets if there are less than 6 Servants.
- - Geis no longer produces resist messages below 6 Servants; this isn't a change, as Geis cannot be successfully resisted below 6 Servants.
- - Applying Geis to an already bound target will also mute them, in addition to preventing resistance.
-
-
RemieRichards updated:
-
- - A New weapon for clown mechs, the Oingo Boingo Punch-face! it's a giant boxing glove that extends out on a spring and sends atoms flying (including anchored ones and things that make no sense to move because -clowns-)
-
-
Tofa01 updated:
-
- - Mop will no longer try and clean tile under janitorial cart when wetting the mop.
- - Adds modular computers to Metastation.
- - Fixes no air in Deltastation maintenance kitchen.
- - Adds a modular computer to the CE office on Pubbystation.
-
-
Xhuis updated:
-
- - Energy-based weapons can now light cigarettes.
-
-
coiax updated:
-
- - Communication consoles now share cooldowns on announcements.
- - Cyborgs can now alter the messages of the announcement system.
- - Deadchat is now notified of any deaths on the shuttle or on Centcom. The CTF arena does not generate death messages, due to the high levels of death.
- - The Human-level Intelligence event now occurs slightly more often, and produces a classified message.
-
-
kevinz000 updated:
-
- - Emitters and Tesla Coils now have activation wires!
- - Emitters will shoot out an emitter bolt when pulsed, regardless of it is on.
- - Tesla coils will shoot lightning when pulsed, if it is connected to a cable that has power.
- - Bolas no longer restrain your hands for 10 seconds when you try to remove them and fail.
-
-
-
27 January 2017
-
Joan updated:
-
- - Buckshot now does a maximum of 75 damage, from 90.
- - The unique cyborg scriptures(Linked Vanguard, Judicial Marker) take 3 seconds to invoke, from 4.
- - Invoking Inath-neq and Invoking Nzcrentr now both take 10 seconds to invoke, from 15.
-
-
Lzimann updated:
-
- - Now you can choose what department you want to be as security! (This may not be completly reliable).
-
-
RemieRichards updated:
-
- - Emagging a sleeper now randomises the buttons, the buttons remain the same until randomised again so you can "learn" the new button config if you're a masochist, Inject omnizine but realise far too late that it's all morphine, woops! (Note: Epinephrine can always be injected, regardless of chem levels, this means if something !!FUN!! ends up on the Epinephrine button, it will always be injectable!)
-
-
Sweaterkittens updated:
-
- - There are now updated names and descriptions for the items that your plasma-based crewmembers start with and use frequently.
-