diff --git a/_maps/away_missions/140x140/carpfarm.dmm b/_maps/away_missions/140x140/carpfarm.dmm index 1fbe94f0d0c..ac1713173b9 100644 --- a/_maps/away_missions/140x140/carpfarm.dmm +++ b/_maps/away_missions/140x140/carpfarm.dmm @@ -10,7 +10,7 @@ /turf/space, /area/space) "af" = ( -/obj/effect/landmark/gateway_scatter, +/atom/movable/landmark/gateway_scatter, /turf/simulated/mineral/floor/ignore_mapgen, /area/space) "ah" = ( @@ -255,7 +255,7 @@ /area/awaymission/carpfarm/base) "aT" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/dark, /area/awaymission/carpfarm/base) "aU" = ( @@ -333,7 +333,7 @@ "bi" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/landmark/costume, +/atom/movable/landmark/costume, /turf/simulated/floor/tiled/dark, /area/awaymission/carpfarm/base) "bj" = ( diff --git a/_maps/away_missions/140x140/snowfield.dmm b/_maps/away_missions/140x140/snowfield.dmm index a788d49b64e..140601f18ab 100644 --- a/_maps/away_missions/140x140/snowfield.dmm +++ b/_maps/away_missions/140x140/snowfield.dmm @@ -24,7 +24,7 @@ }, /area/awaymission/snowfield) "af" = ( -/obj/effect/landmark/gateway_scatter, +/atom/movable/landmark/gateway_scatter, /turf/simulated/floor/outdoors/snow{ temperature = 243.15 }, diff --git a/_maps/away_missions/140x140/zoo.dmm b/_maps/away_missions/140x140/zoo.dmm index 1aed462f4be..99297d69c03 100644 --- a/_maps/away_missions/140x140/zoo.dmm +++ b/_maps/away_missions/140x140/zoo.dmm @@ -299,7 +299,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/landmark/loot_spawn{ +/atom/movable/landmark/loot_spawn{ live_cargo = 0 }, /turf/simulated/floor/plating, @@ -384,7 +384,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/effect/landmark/loot_spawn{ +/atom/movable/landmark/loot_spawn{ live_cargo = 0 }, /turf/simulated/floor/plating, @@ -396,7 +396,7 @@ /area/awaymission/zoo/pirateship) "bl" = ( /obj/effect/floor_decal/industrial/warning, -/obj/effect/landmark/loot_spawn{ +/atom/movable/landmark/loot_spawn{ live_cargo = 0 }, /turf/simulated/floor/plating, @@ -3861,7 +3861,7 @@ /area/awaymission/zoo) "km" = ( /obj/structure/table/rack, -/obj/effect/landmark/costume, +/atom/movable/landmark/costume, /turf/simulated/floor/holofloor/carpet, /area/awaymission/zoo) "kn" = ( @@ -4173,7 +4173,7 @@ /turf/simulated/floor/wood, /area/awaymission/zoo) "ln" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/wood, /area/awaymission/zoo) "lo" = ( @@ -4269,7 +4269,7 @@ /obj/structure/toilet{ dir = 8 }, -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/tiled/white, /area/awaymission/zoo) "lC" = ( @@ -5748,7 +5748,7 @@ }, /area/awaymission/zoo) "pv" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/holofloor/beach/sand{ icon_state = "dgrass4" }, @@ -7117,7 +7117,7 @@ }, /area/awaymission/zoo) "sG" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/tiled/neutral, /area/awaymission/zoo) "sH" = ( @@ -7142,7 +7142,7 @@ /turf/simulated/floor/holofloor/grass, /area/awaymission/zoo) "sK" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/outdoors/beach, /area/awaymission/zoo) "sL" = ( @@ -7781,7 +7781,7 @@ /turf/simulated/floor/holofloor/desert, /area/awaymission/zoo) "um" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /mob/living/simple_mob/animal/space/goose{ faction = "zoo" }, @@ -8156,7 +8156,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo) "vi" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/holofloor/desert, /area/awaymission/zoo) "vj" = ( @@ -8272,7 +8272,7 @@ /turf/simulated/floor/plating, /area/awaymission/zoo) "vw" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/plating, /area/awaymission/zoo) "vx" = ( @@ -8298,7 +8298,7 @@ /turf/simulated/floor/outdoors/beach, /area/awaymission/zoo) "vA" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/grass, /area/awaymission/zoo) "vB" = ( @@ -8515,7 +8515,7 @@ /area/awaymission/zoo) "wg" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/plating, /area/awaymission/zoo) "wh" = ( @@ -8656,7 +8656,7 @@ /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "wC" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/tiled/red, /area/awaymission/zoo) "wD" = ( @@ -8670,7 +8670,7 @@ /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "wF" = ( -/obj/effect/landmark/away, +/atom/movable/landmark/away, /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "wG" = ( @@ -8750,7 +8750,7 @@ /area/awaymission/zoo) "wT" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /obj/structure/symbol/da{ pixel_x = -32 }, @@ -8876,7 +8876,7 @@ /turf/simulated/floor/tiled/dark, /area/awaymission/zoo) "xj" = ( -/obj/effect/landmark/loot_spawn{ +/atom/movable/landmark/loot_spawn{ live_cargo = 0 }, /turf/simulated/floor/tiled/dark, diff --git a/_maps/away_missions/archive/Academy.dmm b/_maps/away_missions/archive/Academy.dmm index e7caab0994e..03d2547e799 100644 --- a/_maps/away_missions/archive/Academy.dmm +++ b/_maps/away_missions/archive/Academy.dmm @@ -526,7 +526,7 @@ /turf/simulated/floor/plating, /area/awaymission/academy/headmaster) "bQ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/plating, @@ -920,7 +920,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /obj/item/weldingtool, @@ -1495,7 +1495,7 @@ /turf/simulated/floor/plating, /area/awaymission/academy/classrooms) "fW" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/plating, @@ -2325,7 +2325,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/tiled/old_tile/gray, @@ -2569,7 +2569,7 @@ }, /area/awaymission/academy/academyaft) "jf" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/tiled/old_tile/gray, diff --git a/_maps/away_missions/archive/blackmarketpackers.dmm b/_maps/away_missions/archive/blackmarketpackers.dmm index b99f8d2efe3..8e8326a9607 100644 --- a/_maps/away_missions/archive/blackmarketpackers.dmm +++ b/_maps/away_missions/archive/blackmarketpackers.dmm @@ -868,7 +868,7 @@ /turf/simulated/floor/tiled/dark, /area/awaymission/BMPship1) "dE" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /obj/effect/decal/cleanable/blood/splatter, @@ -2115,13 +2115,13 @@ /turf/simulated/floor/airless, /area/awaymission) "hZ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/airless, /area/awaymission) "ia" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/plating, diff --git a/_maps/away_missions/archive/challenge.dmm b/_maps/away_missions/archive/challenge.dmm index ec5557abcd3..12f6da7be7c 100644 --- a/_maps/away_missions/archive/challenge.dmm +++ b/_maps/away_missions/archive/challenge.dmm @@ -32,7 +32,7 @@ /turf/simulated/floor/airless, /area/awaymission/challenge/start) "al" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/airless, @@ -590,7 +590,7 @@ "cf" = ( /obj/machinery/door/airlock/centcom{ name = "Airlock"; - + }, /turf/simulated/floor/airless, /area/awaymission/challenge/end) @@ -678,7 +678,7 @@ "cx" = ( /obj/machinery/door/airlock/centcom{ name = "Security"; - + }, /turf/simulated/floor/wood, /area/awaymission/challenge/end) @@ -703,7 +703,7 @@ "cB" = ( /obj/machinery/door/airlock/centcom{ name = "Administrator"; - + }, /turf/simulated/floor/wood, /area/awaymission/challenge/end) @@ -1002,7 +1002,7 @@ "dm" = ( /obj/machinery/door/airlock/centcom{ name = "Gateway Access"; - + }, /turf/simulated/floor/airless, /area/awaymission/challenge/end) diff --git a/_maps/away_missions/archive/example.dmm b/_maps/away_missions/archive/example.dmm index de6ceb843c6..582fde502a4 100644 --- a/_maps/away_missions/archive/example.dmm +++ b/_maps/away_missions/archive/example.dmm @@ -388,7 +388,7 @@ /turf/simulated/floor/wood, /area/awaymission/example) "bv" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/space, @@ -436,7 +436,7 @@ "bG" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms"; - + }, /turf/simulated/floor/tiled/white, /area/awaymission/example) @@ -612,13 +612,13 @@ /turf/simulated/floor, /area/awaymission/example) "cq" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, /area/awaymission/example) "cr" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /obj/item/assembly/mousetrap/armed, @@ -629,7 +629,7 @@ /turf/simulated/floor, /area/awaymission/example) "ct" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /obj/machinery/light_construct/small{ @@ -638,7 +638,7 @@ /turf/simulated/floor, /area/awaymission/example) "cu" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /obj/item/mop, diff --git a/_maps/away_missions/archive/jungle.dmm b/_maps/away_missions/archive/jungle.dmm index 98f944c2fa9..896619132a9 100644 --- a/_maps/away_missions/archive/jungle.dmm +++ b/_maps/away_missions/archive/jungle.dmm @@ -26,7 +26,7 @@ }, /area/jungle/temple_six) "ag" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/white, /area/jungle/temple_six) "ah" = ( @@ -53,14 +53,14 @@ }, /area/jungle/temple_two) "an" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/temple_two) "ao" = ( /turf/simulated/floor/tiled/white, /area/jungle/temple_two) "ap" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/white, /area/jungle/temple_two) "aq" = ( @@ -84,11 +84,11 @@ }, /area/jungle/temple_four) "aw" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/temple_four) "ax" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/white, /area/jungle/temple_four) "ay" = ( @@ -100,7 +100,7 @@ }, /area/jungle/temple_six) "aC" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/temple_six) "aE" = ( @@ -269,7 +269,7 @@ }, /area/jungle/temple_one) "bv" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/white, /area/jungle/temple_one) "bw" = ( @@ -291,7 +291,7 @@ }, /area/jungle/temple_three) "bB" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/temple_one) "bC" = ( @@ -300,14 +300,14 @@ }, /area/jungle/temple_three) "bD" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/temple_three) "bF" = ( /turf/simulated/floor/tiled/white, /area/jungle/temple_three) "bG" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/white, /area/jungle/temple_three) "bJ" = ( @@ -336,7 +336,7 @@ }, /area/jungle/temple_five) "bO" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/simulated/floor/tiled/white, /area/jungle/temple_five) "bP" = ( @@ -388,7 +388,7 @@ }, /area/jungle/temple_three) "cb" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/temple_five) "cd" = ( @@ -657,7 +657,7 @@ /turf/simulated/floor/outdoors/dirt, /area/jungle/crash_ship_source) "dy" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/outdoors/dirt, /area/jungle/crash_ship_source) "dA" = ( @@ -698,7 +698,7 @@ /turf/simulated/shuttle/wall, /area/jungle/crash_ship_source) "dH" = ( -/obj/effect/landmark/loot_spawn/low, +/atom/movable/landmark/loot_spawn/low, /turf/simulated/floor/tiled/white, /area/jungle/crash_ship_source) "dI" = ( diff --git a/_maps/away_missions/archive/labyrinth.dmm b/_maps/away_missions/archive/labyrinth.dmm index 41bef49df24..035686f853d 100644 --- a/_maps/away_missions/archive/labyrinth.dmm +++ b/_maps/away_missions/archive/labyrinth.dmm @@ -62,7 +62,7 @@ }, /area/awaymission/labyrinth/temple/north_east) "ak" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" @@ -75,14 +75,14 @@ }, /area/awaymission/labyrinth/temple/north_west) "an" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" }, /area/awaymission/labyrinth/temple/north_west) "ao" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" @@ -108,14 +108,14 @@ }, /area/awaymission/labyrinth/temple/north_east) "av" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" }, /area/awaymission/labyrinth/temple/north_west) "ax" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood, /turf/unsimulated/floor{ dir = 8; @@ -123,7 +123,7 @@ }, /area/awaymission/labyrinth/temple/north_east) "ay" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood{ icon_state = "gibmid3" }, @@ -133,7 +133,7 @@ }, /area/awaymission/labyrinth/temple/north_east) "az" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood{ icon_state = "mfloor5" }, @@ -161,7 +161,7 @@ }, /area/awaymission/labyrinth/temple/center) "aD" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood{ icon_state = "mgibbl4" }, @@ -194,7 +194,7 @@ }, /area/awaymission/labyrinth/temple/west) "aJ" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood{ icon_state = "mgibbl3" }, @@ -217,28 +217,28 @@ }, /area/awaymission/labyrinth/temple/west) "aO" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" }, /area/awaymission/labyrinth/temple/west) "aQ" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" }, /area/awaymission/labyrinth/temple/east) "aT" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" }, /area/awaymission/labyrinth/temple/center) "aU" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" @@ -263,7 +263,7 @@ }, /area/awaymission/labyrinth/temple/south_east) "aZ" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" @@ -288,14 +288,14 @@ }, /area/awaymission/labyrinth/temple/south) "bd" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" }, /area/awaymission/labyrinth/temple/south_east) "be" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" @@ -320,7 +320,7 @@ }, /area/awaymission/labyrinth/temple/south_west) "bk" = ( -/obj/effect/landmark/loot_spawn, +/atom/movable/landmark/loot_spawn, /turf/unsimulated/floor{ dir = 8; icon_state = "asteroidfloor" @@ -1504,7 +1504,7 @@ }, /area/awaymission/labyrinth/cave) "dU" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood{ icon_state = "mfloor5" }, @@ -1559,7 +1559,7 @@ }, /area/awaymission/labyrinth/boss) "ea" = ( -/obj/effect/landmark/corpse/scientist, +/atom/movable/landmark/corpse/scientist, /obj/effect/decal/cleanable/blood{ icon_state = "mgibbl1" }, diff --git a/_maps/away_missions/archive/spacebattle.dmm b/_maps/away_missions/archive/spacebattle.dmm index f828bb65928..7393a18cc4f 100644 --- a/_maps/away_missions/archive/spacebattle.dmm +++ b/_maps/away_missions/archive/spacebattle.dmm @@ -45,7 +45,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/syndicate2) "ap" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -105,7 +105,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/syndicate3) "aF" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -185,7 +185,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/syndicate1) "be" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -400,7 +400,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "cs" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Rosen Miller"; name = "Rosen Miller" }, @@ -502,7 +502,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "cQ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -517,7 +517,7 @@ }, /area/awaymission/spacebattle/cruiser) "cU" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Bill Sanchez"; name = "Bill Sanchez" }, @@ -581,7 +581,7 @@ }, /area/awaymission/spacebattle/cruiser) "di" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "John Locke"; name = "John Locke" }, @@ -605,7 +605,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "do" = ( -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Daniel Kalla"; name = "Daniel Kalla" }, @@ -619,7 +619,7 @@ }, /area/awaymission/spacebattle/cruiser) "dz" = ( -/obj/effect/landmark/corpse/chef{ +/atom/movable/landmark/corpse/chef{ mobname = "Nathaniel Waters"; name = "Nathaniel Waters" }, @@ -704,7 +704,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "ea" = ( -/obj/effect/landmark/corpse/engineer/rig{ +/atom/movable/landmark/corpse/engineer/rig{ corpseidjob = "Gunner"; mobname = "Andrew Thorn"; name = "Andrew Thorn" @@ -728,7 +728,7 @@ }, /area/awaymission/spacebattle/cruiser) "ed" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Clay Dawson"; name = "Clay Dawson" }, @@ -836,7 +836,7 @@ /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "eB" = ( -/obj/effect/landmark/corpse/bridgeofficer{ +/atom/movable/landmark/corpse/bridgeofficer{ mobname = "Davis Hume"; name = "Davis Hume" }, @@ -864,7 +864,7 @@ /mob/living/simple_mob/humanoid/merc/melee/sword/space, /area/awaymission/spacebattle/cruiser) "eK" = ( -/obj/effect/landmark/corpse/engineer/rig{ +/atom/movable/landmark/corpse/engineer/rig{ corpseidjob = "Gunner"; mobname = "Peter West"; name = "Peter West" @@ -929,13 +929,13 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "fa" = ( -/obj/effect/landmark/corpse/syndicatesoldier, +/atom/movable/landmark/corpse/syndicatesoldier, /obj/item/melee/energy/sword, /obj/effect/decal/cleanable/blood, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "fb" = ( -/obj/effect/landmark/corpse/bridgeofficer{ +/atom/movable/landmark/corpse/bridgeofficer{ mobname = "Kurt Kliest"; name = "Kurt Kliest" }, @@ -953,7 +953,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "fe" = ( -/obj/effect/landmark/corpse/engineer/rig{ +/atom/movable/landmark/corpse/engineer/rig{ corpseidjob = "Gunner"; mobname = "Eric Abnett"; name = "Eric Abnett" @@ -995,7 +995,7 @@ /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "ft" = ( -/obj/effect/landmark/corpse/syndicatesoldier, +/atom/movable/landmark/corpse/syndicatesoldier, /obj/item/gun/projectile/automatic/c20r, /obj/item/ammo_casing/a10mm, /obj/item/ammo_casing/a10mm, @@ -1003,7 +1003,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "fv" = ( -/obj/effect/landmark/corpse/bridgeofficer{ +/atom/movable/landmark/corpse/bridgeofficer{ mobname = "Walter Strider"; name = "Walter Strider" }, @@ -1017,7 +1017,7 @@ /obj/item/ammo_casing/a357, /obj/item/ammo_casing/a357, /obj/item/gun/projectile/revolver/mateba, -/obj/effect/landmark/corpse/commander{ +/atom/movable/landmark/corpse/commander{ mobname = "Aaron Bowden"; name = "Aaron Bowden" }, @@ -1053,7 +1053,7 @@ /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "gh" = ( -/obj/effect/landmark/corpse/bridgeofficer{ +/atom/movable/landmark/corpse/bridgeofficer{ mobname = "Robert Faver"; name = "Robert Faver" }, @@ -1146,7 +1146,7 @@ }, /area/awaymission/spacebattle/cruiser) "gK" = ( -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Adam Smith"; name = "Adam Smith" }, @@ -1183,7 +1183,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "gT" = ( -/obj/effect/landmark/corpse/engineer/rig{ +/atom/movable/landmark/corpse/engineer/rig{ corpseidjob = "Gunner"; name = "Jeremy Tailor" }, @@ -1211,7 +1211,7 @@ /turf/simulated/floor/plating, /area/awaymission/spacebattle/cruiser) "ha" = ( -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Allan Yoshimaru"; name = "Allan Yoshimaru" }, @@ -1252,7 +1252,7 @@ /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "hm" = ( -/obj/effect/landmark/corpse/engineer/rig{ +/atom/movable/landmark/corpse/engineer/rig{ corpseidjob = "Gunner"; mobname = "Dan Hedricks"; name = "Dan Hedricks" @@ -1402,7 +1402,7 @@ /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "hP" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ corpseidjob = "Gunner"; mobname = "William Gannon"; name = "William Gannon" @@ -1435,7 +1435,7 @@ }, /area/awaymission/spacebattle/cruiser) "hV" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Javier Wismer"; name = "Javier Wismer" }, @@ -1498,7 +1498,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "im" = ( -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Herbert West"; name = "Herbert West" }, @@ -1506,7 +1506,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "in" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Carth Robinson"; name = "Carth Robinson" }, @@ -1529,7 +1529,7 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "iw" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Cyrion"; name = "Cyrion" }, @@ -1538,12 +1538,12 @@ /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "iy" = ( -/obj/effect/landmark/corpse/syndicatesoldier, +/atom/movable/landmark/corpse/syndicatesoldier, /obj/item/gun/projectile/automatic/c20r, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "iA" = ( -/obj/effect/landmark/corpse/engineer{ +/atom/movable/landmark/corpse/engineer{ mobname = "Mercutio"; name = "Mercutio" }, @@ -1555,7 +1555,7 @@ /turf/space, /area) "iC" = ( -/obj/effect/landmark/corpse/syndicatesoldier, +/atom/movable/landmark/corpse/syndicatesoldier, /turf/space, /area) "iD" = ( @@ -1577,7 +1577,7 @@ }, /area) "iH" = ( -/obj/effect/landmark/corpse/syndicatesoldier, +/atom/movable/landmark/corpse/syndicatesoldier, /turf/simulated/floor/airless{ dir = 10 }, diff --git a/_maps/away_missions/archive/stationCollision.dmm b/_maps/away_missions/archive/stationCollision.dmm index 3aa1409ce8c..0ac3a9c847d 100644 --- a/_maps/away_missions/archive/stationCollision.dmm +++ b/_maps/away_missions/archive/stationCollision.dmm @@ -2951,7 +2951,7 @@ }, /area/awaymission/gateroom) "kT" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/airless, @@ -2962,7 +2962,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/airless, @@ -2996,7 +2996,7 @@ /turf/simulated/floor/airless, /area/awaymission/gateroom) "lf" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -3007,7 +3007,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, diff --git a/_maps/away_missions/archive/wildwest.dmm b/_maps/away_missions/archive/wildwest.dmm index 9b9eb4255f3..47335e29c6c 100644 --- a/_maps/away_missions/archive/wildwest.dmm +++ b/_maps/away_missions/archive/wildwest.dmm @@ -149,7 +149,7 @@ /turf/simulated/floor/cult, /area/awaymission/wwvault) "aK" = ( -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor/cult, /area/awaymission/wwvault) "aL" = ( @@ -177,7 +177,7 @@ /turf/simulated/floor/plating, /area/awaymission/wwmines) "aU" = ( -/obj/effect/landmark/corpse/syndicatecommando, +/atom/movable/landmark/corpse/syndicatecommando, /turf/simulated/floor/cult, /area/awaymission/wwvault) "aV" = ( @@ -207,7 +207,7 @@ /turf/simulated/floor/plating, /area/awaymission/wwrefine) "bi" = ( -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /obj/effect/mine/dnascramble, /turf/simulated/floor/plating, /area/awaymission/wwmines) @@ -231,7 +231,7 @@ /turf/simulated/floor/plating, /area/awaymission/wwrefine) "bq" = ( -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor/plating, /area/awaymission/wwrefine) "br" = ( @@ -424,7 +424,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "cd" = ( -/obj/effect/landmark/corpse/chef{ +/atom/movable/landmark/corpse/chef{ mobname = "Chef" }, /turf/simulated/floor{ @@ -550,7 +550,7 @@ /turf/simulated/floor, /area/awaymission/wwgov) "cH" = ( -/obj/effect/landmark/corpse/chef{ +/atom/movable/landmark/corpse/chef{ mobname = "Chef" }, /turf/simulated/floor, @@ -560,7 +560,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "cM" = ( -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor/wood, /area/awaymission/wwgov) "cN" = ( @@ -637,7 +637,7 @@ /turf/simulated/floor, /area/awaymission/wwgov) "dh" = ( -/obj/effect/landmark/corpse/syndicatecommando{ +/atom/movable/landmark/corpse/syndicatecommando{ mobname = "Syndicate Commando" }, /turf/simulated/floor/carpet, @@ -700,7 +700,7 @@ /turf/simulated/floor/plating, /area/awaymission/wwmines) "dy" = ( -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor/wood, /area/awaymission/wwmines) "dB" = ( @@ -963,7 +963,7 @@ /area/awaymission/wwmines) "eL" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor/carpet, /area/awaymission/wwmines) "eM" = ( @@ -1045,7 +1045,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "fh" = ( -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Doctor Mugabee" }, /turf/simulated/floor/plating, @@ -1080,7 +1080,7 @@ /turf/simulated/mineral{ icon_state = "sandstone0"; mineral = "sandstone"; - + }, /area/awaymission/wwmines) "fo" = ( @@ -1195,7 +1195,7 @@ /area/awaymission/wwmines) "fR" = ( /obj/effect/mine/dnascramble, -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor/wood, /area/awaymission/wwmines) "fS" = ( @@ -1265,7 +1265,7 @@ /turf/simulated/floor, /area) "ge" = ( -/obj/effect/landmark/corpse/miner/rig, +/atom/movable/landmark/corpse/miner/rig, /turf/simulated/floor, /area/awaymission/wwrefine) "gf" = ( @@ -1335,7 +1335,7 @@ /turf/simulated/floor/plating, /area/awaymission/wwmines) "gy" = ( -/obj/effect/landmark/corpse/syndicatecommando{ +/atom/movable/landmark/corpse/syndicatecommando{ mobname = "Syndicate Commando" }, /turf/simulated/floor/grass, @@ -1448,7 +1448,7 @@ }, /area/awaymission/wwrefine) "gV" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/plating, diff --git a/_maps/away_missions/archive/zresearchlabs.dmm b/_maps/away_missions/archive/zresearchlabs.dmm index eee86e64b40..2a8b73c7cc8 100644 --- a/_maps/away_missions/archive/zresearchlabs.dmm +++ b/_maps/away_missions/archive/zresearchlabs.dmm @@ -1773,7 +1773,7 @@ }, /area/awaymission/labs/researchdivision) "fx" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor{ @@ -1890,7 +1890,7 @@ }, /area/awaymission/labs/researchdivision) "fL" = ( -/obj/effect/landmark/corpse/scientist{ +/atom/movable/landmark/corpse/scientist{ mobname = "Steve Smith"; name = "Steve Smith" }, @@ -1925,7 +1925,7 @@ }, /area/awaymission/labs/militarydivision) "fP" = ( -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Amando Cruz"; name = "Amando Cruz" }, @@ -2323,7 +2323,7 @@ /area/awaymission/labs/researchdivision) "gL" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/scientist{ +/atom/movable/landmark/corpse/scientist{ mobname = "James MacDonald"; name = "James MacDonald" }, @@ -2571,7 +2571,7 @@ }, /area/awaymission/labs/researchdivision) "hs" = ( -/obj/effect/landmark/corpse/scientist{ +/atom/movable/landmark/corpse/scientist{ mobname = "Mikhail Ruznov"; name = "Mikhail Ruznov" }, @@ -3221,7 +3221,7 @@ }, /area/awaymission/labs/command) "iW" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -3562,7 +3562,7 @@ }, /area/awaymission/labs/researchdivision) "jK" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/plating, @@ -4781,7 +4781,7 @@ /turf/simulated/floor, /area/awaymission/labs/civilian) "mz" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor/plating, @@ -4873,7 +4873,7 @@ /turf/simulated/floor, /area/awaymission/labs/cargo) "mL" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor, @@ -6153,7 +6153,7 @@ /turf/simulated/floor/outdoors/dirt, /area/awaymission/labs/cave) "qd" = ( -/obj/effect/landmark/corpse/chef{ +/atom/movable/landmark/corpse/chef{ mobname = "Harold Brown"; name = "Harold Brown" }, @@ -6788,7 +6788,7 @@ }, /area/awaymission/labs/civilian) "rU" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "awaystart" }, /turf/simulated/floor{ @@ -7118,7 +7118,7 @@ /area/awaymission/labs/medical) "ta" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/doctor{ +/atom/movable/landmark/corpse/doctor{ mobname = "Elias Smith"; name = "Elias Smith" }, diff --git a/_maps/map_files/tether/tether-01-surface1.dmm b/_maps/map_files/tether/tether-01-surface1.dmm index 7a7e7eeb217..ddc769be5cd 100644 --- a/_maps/map_files/tether/tether-01-surface1.dmm +++ b/_maps/map_files/tether/tether-01-surface1.dmm @@ -582,7 +582,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/paramed) "aaY" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Paramedic" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -754,7 +754,7 @@ /area/tether/surfacebase/surface_one_hall) "abi" = ( /obj/machinery/hologram/holopad, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Paramedic" }, /obj/structure/cable/green{ @@ -1072,7 +1072,7 @@ /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/medical/mentalhealth) "abV" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Psychiatrist" }, /obj/structure/bed/chair/office/dark{ @@ -1231,7 +1231,7 @@ /area/maintenance/lower/mining_eva) "ach" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Paramedic" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -1530,7 +1530,7 @@ "acJ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled, @@ -5074,7 +5074,7 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled/white, @@ -6216,7 +6216,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled, @@ -7363,7 +7363,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/steel_dirty, @@ -7393,7 +7393,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) "amw" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7509,14 +7509,14 @@ /turf/simulated/floor/tiled, /area/storage/primary) "amG" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Assistant" }, /turf/simulated/floor/tiled, /area/storage/primary) "amH" = ( /obj/item/stool, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Assistant" }, /turf/simulated/floor/tiled, @@ -9535,7 +9535,7 @@ dir = 8; pixel_x = 24 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled, @@ -12336,7 +12336,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/effect/floor_decal/borderfloorwhite{ @@ -13544,7 +13544,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/solars) "awV" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/effect/floor_decal/borderfloorwhite/corner{ @@ -13885,7 +13885,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/structure/cable/green{ @@ -14858,7 +14858,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "ayK" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/white, @@ -15257,7 +15257,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "azo" = ( @@ -15267,7 +15267,7 @@ /obj/machinery/status_display{ pixel_y = 30 }, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "azp" = ( @@ -17011,7 +17011,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aCi" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, /turf/simulated/floor/plating, @@ -18277,7 +18277,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "aEE" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, /turf/simulated/floor/plating, @@ -18825,7 +18825,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Bartender" }, /turf/simulated/floor/tiled, @@ -19424,7 +19424,7 @@ /area/tether/surfacebase/cargostore/office) "aGs" = ( /obj/structure/bed/chair/sofa/brown/corner, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /obj/effect/floor_decal/borderfloor{ @@ -20126,7 +20126,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargostore) "aHA" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled, @@ -21951,7 +21951,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aKI" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /obj/structure/bed/chair/office/dark{ @@ -22083,7 +22083,7 @@ /area/engineering/atmos) "aKV" = ( /obj/item/stool, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/tiled, @@ -23581,7 +23581,7 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "aNI" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/tiled, @@ -30530,7 +30530,7 @@ dir = 4; pixel_x = -23 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled, @@ -30672,7 +30672,7 @@ /turf/simulated/floor/tiled, /area/rnd/external) "bcV" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "droppod_landing" }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -31380,7 +31380,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "bTt" = ( @@ -31416,7 +31416,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31932,7 +31932,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) "dJZ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/structure/cable/green{ @@ -32840,7 +32840,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled, @@ -33738,10 +33738,10 @@ /turf/simulated/floor/tiled/techfloor/grid/virgo3b, /area/tether/surfacebase/tunnel) "jbU" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/techfloor, @@ -35327,7 +35327,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/dark, @@ -35357,7 +35357,7 @@ name = "asset retention console"; pixel_y = -30 }, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -36595,7 +36595,7 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "qhk" = ( @@ -37059,7 +37059,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -37250,7 +37250,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) "rIU" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Mime" }, /turf/simulated/floor/carpet/bcarpet, @@ -37889,7 +37889,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/tram, +/atom/movable/landmark/tram, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -39356,7 +39356,7 @@ /area/tether/surfacebase/outside/outside1) "xRP" = ( /obj/effect/floor_decal/rust, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Clown" }, /obj/structure/cable/green{ @@ -39532,7 +39532,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled, diff --git a/_maps/map_files/tether/tether-02-surface2.dmm b/_maps/map_files/tether/tether-02-surface2.dmm index e6b2fd70ef3..80d5366eeb6 100644 --- a/_maps/map_files/tether/tether-02-surface2.dmm +++ b/_maps/map_files/tether/tether-02-surface2.dmm @@ -268,7 +268,7 @@ dir = 4 }, /obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -1491,7 +1491,7 @@ pixel_x = -26; pixel_y = -10 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chief Medical Officer" }, /turf/simulated/floor/carpet, @@ -4470,7 +4470,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/techmaint, @@ -4700,7 +4700,7 @@ /obj/effect/floor_decal/corner/red/bordercorner, /obj/structure/table/bench/steel, /obj/machinery/hologram/holopad, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/dark, @@ -4713,7 +4713,7 @@ dir = 8 }, /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/dark, @@ -5242,7 +5242,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/dark, @@ -5258,7 +5258,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/dark, @@ -5664,7 +5664,7 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "aiH" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/structure/cable/green{ @@ -5892,7 +5892,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "aiX" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5930,7 +5930,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Detective" }, /turf/simulated/floor/carpet, @@ -5970,7 +5970,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Detective" }, /turf/simulated/floor/carpet, @@ -6061,7 +6061,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/dark, @@ -6083,7 +6083,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/dark, @@ -7180,7 +7180,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -7484,7 +7484,7 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "aly" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -8317,7 +8317,7 @@ /area/tether/surfacebase/medical/uppersouthstairwell) "amK" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/structure/bed/chair{ @@ -8865,7 +8865,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -9289,7 +9289,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Warden" }, /obj/structure/cable/green{ @@ -10909,7 +10909,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/north) "aqW" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11883,7 +11883,7 @@ }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Warden" }, /obj/structure/curtain/open/bed, @@ -12132,7 +12132,7 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13910,7 +13910,7 @@ /area/tether/surfacebase/surface_two_hall) "awe" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/plating, @@ -14184,7 +14184,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, /turf/simulated/floor/tiled/techfloor, @@ -16988,7 +16988,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/hologram/holopad, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/dark, @@ -18860,7 +18860,7 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "aHa" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Command Secretary" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19008,7 +19008,7 @@ /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) "aHu" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Command Secretary" }, /obj/structure/bed/chair/comfy/black{ @@ -20085,7 +20085,7 @@ pixel_x = -30; pixel_y = -18 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Research Director" }, /obj/machinery/button/remote/blast_door{ @@ -22465,7 +22465,7 @@ /area/engineering/lower/breakroom) "aOF" = ( /obj/structure/bed/chair, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/carpet, @@ -23260,7 +23260,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/carpet, @@ -23447,7 +23447,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /turf/simulated/floor/wood, @@ -23460,7 +23460,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/wood, @@ -23777,7 +23777,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/wood, @@ -23786,7 +23786,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /turf/simulated/floor/wood, @@ -24076,7 +24076,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/wood, @@ -24555,7 +24555,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Xenobiologist" }, /turf/simulated/floor/wood, @@ -24621,7 +24621,7 @@ /turf/simulated/floor/tiled, /area/engineering/lower/atmos_lockers) "aSK" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/tiled, @@ -26527,7 +26527,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /turf/simulated/floor/tiled, @@ -26585,7 +26585,7 @@ /obj/effect/floor_decal/corner_techfloor_grid/full{ dir = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, /turf/simulated/floor/tiled/techfloor, @@ -26990,7 +26990,7 @@ /area/janitor) "aXj" = ( /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /turf/simulated/floor/tiled, @@ -27228,7 +27228,7 @@ dir = 4 }, /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /turf/simulated/floor/tiled, @@ -27654,7 +27654,7 @@ /turf/simulated/floor/plating, /area/engineering/drone_fabrication) "aYK" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/open, @@ -28015,7 +28015,7 @@ /area/engineering/atmos/monitoring) "aZN" = ( /obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /obj/structure/disposalpipe/segment{ @@ -28285,7 +28285,7 @@ /obj/machinery/computer/cryopod/robot{ pixel_y = -32 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/plating, @@ -32780,7 +32780,7 @@ /area/maintenance/lower/atmos) "blx" = ( /obj/structure/catwalk, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, /turf/simulated/floor/plating, @@ -34523,7 +34523,7 @@ /area/rnd/outpost/xenobiology/outpost_slimepens) "rJc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/structure/bed/chair{ @@ -34768,7 +34768,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -34890,7 +34890,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, diff --git a/_maps/map_files/tether/tether-03-surface3.dmm b/_maps/map_files/tether/tether-03-surface3.dmm index 0b09ecc0bc5..c02033af832 100644 --- a/_maps/map_files/tether/tether-03-surface3.dmm +++ b/_maps/map_files/tether/tether-03-surface3.dmm @@ -813,7 +813,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/wood, @@ -1028,7 +1028,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "abF" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/structure/cable/green{ @@ -2138,7 +2138,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Internal Affairs Agent" }, /turf/simulated/floor/tiled/dark, @@ -3108,7 +3108,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled, @@ -3688,7 +3688,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "afw" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/effect/floor_decal/borderfloor/corner{ @@ -3731,7 +3731,7 @@ "afz" = ( /obj/structure/bed/chair/office/light, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -4643,7 +4643,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "agU" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/effect/floor_decal/borderfloor{ @@ -5023,7 +5023,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled, @@ -5458,7 +5458,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aie" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -5876,7 +5876,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /obj/effect/floor_decal/corner/red{ @@ -8729,7 +8729,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "aog" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled, @@ -11120,7 +11120,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chef" }, /turf/simulated/floor/tiled/white, @@ -11535,7 +11535,7 @@ /area/hydroponics) "atp" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled/techfloor, @@ -11664,7 +11664,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled/techfloor, @@ -12281,7 +12281,7 @@ /area/hydroponics) "auP" = ( /obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Xenobotanist" }, /turf/simulated/floor/tiled, @@ -12844,7 +12844,7 @@ dir = 4 }, /obj/machinery/hologram/holopad, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled, @@ -14488,7 +14488,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Librarian" }, /turf/simulated/floor/carpet, @@ -14798,7 +14798,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Librarian" }, /obj/machinery/power/apc{ @@ -18285,7 +18285,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Librarian" }, /turf/simulated/floor/carpet, @@ -18630,7 +18630,7 @@ pixel_y = 10 }, /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Entertainer" }, /turf/simulated/floor/lino, @@ -20096,7 +20096,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /turf/simulated/floor/tiled/steel_grid, @@ -21427,7 +21427,7 @@ /area/hydroponics) "aLc" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chef" }, /turf/simulated/floor/tiled/white, @@ -23301,7 +23301,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Facility Director" }, /obj/machinery/button/remote/blast_door{ @@ -23463,7 +23463,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Xenobiologist" }, /obj/machinery/button/remote/blast_door{ @@ -23481,7 +23481,7 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aPz" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Xenobiologist" }, /obj/structure/bed/chair/office/dark{ @@ -23994,7 +23994,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Xenobiologist" }, /turf/simulated/floor/wood, @@ -24762,7 +24762,7 @@ /area/tether/surfacebase/medical/admin) "aSo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -24841,7 +24841,7 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "aSu" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "droppod_landing" }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -24939,7 +24939,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -25076,7 +25076,7 @@ /area/tether/surfacebase/security/upperhall) "aST" = ( /obj/machinery/hologram/holopad, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -26213,7 +26213,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aVc" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Paramedic" }, /turf/simulated/floor/tiled/white, @@ -26271,7 +26271,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chemist" }, /obj/machinery/button/remote/blast_door{ @@ -26771,7 +26771,7 @@ /turf/simulated/floor/plating, /area/shuttle/tourbus/general) "aWd" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -28165,7 +28165,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/structure/cable/green{ @@ -28437,13 +28437,13 @@ /area/maintenance/commandmaint) "aYW" = ( /obj/structure/bed/chair/comfy/brown, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Head of Personnel" }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "aYX" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled/dark, @@ -30806,7 +30806,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bcY" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Entertainer" }, /obj/structure/bed/chair/wood{ @@ -31115,7 +31115,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Botanist" }, /turf/simulated/floor/tiled, @@ -31467,7 +31467,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chef" }, /turf/simulated/floor/tiled/white, @@ -31546,7 +31546,7 @@ /area/hallway/lower/third_south) "beC" = ( /obj/structure/table/bench/standard, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Botanist" }, /turf/simulated/floor/tiled, @@ -31713,7 +31713,7 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "beS" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Entertainer" }, /obj/structure/bed/chair/wood, @@ -31819,7 +31819,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/shuttle_pad) "bfi" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/techfloor, @@ -32190,7 +32190,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bgd" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Observer-Start" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -32387,7 +32387,7 @@ /obj/structure/bed/chair/wood{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Entertainer" }, /turf/simulated/floor/wood, @@ -32843,7 +32843,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/structure/cable/orange{ @@ -32974,7 +32974,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/plating, @@ -34058,7 +34058,7 @@ /area/rnd/robotics) "bku" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /turf/simulated/floor/tiled/steel_grid, @@ -34310,7 +34310,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /turf/simulated/floor/tiled/steel_grid, @@ -34616,7 +34616,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -34647,7 +34647,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -34948,7 +34948,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -34981,7 +34981,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -35303,7 +35303,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chemist" }, /obj/structure/cable/green{ @@ -36202,7 +36202,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /obj/machinery/button/windowtint/multitint{ @@ -37764,7 +37764,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/carpet/blue, @@ -38172,7 +38172,7 @@ /area/shuttle/tourbus/general) "iQr" = ( /obj/machinery/hologram/holopad, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled, @@ -40514,7 +40514,7 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) "oWD" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateGateway" }, /obj/effect/floor_decal/techfloor/orange, @@ -40841,7 +40841,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/carpet/blue, @@ -41311,7 +41311,7 @@ pixel_y = -33; req_access = list(2) }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Head of Security" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -41463,7 +41463,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -41747,7 +41747,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chef" }, /turf/simulated/floor/tiled/white, @@ -42363,7 +42363,7 @@ pixel_x = -25; pixel_y = 7 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Internal Affairs Agent" }, /turf/simulated/floor/tiled/dark, @@ -43585,7 +43585,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "wKZ" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/structure/bed/chair/office/light, @@ -43886,7 +43886,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xog" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chemist" }, /obj/structure/cable/green{ @@ -44144,7 +44144,7 @@ pixel_x = 24 }, /obj/structure/bed/chair/comfy/beige, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Bartender" }, /turf/simulated/floor/wood, diff --git a/_maps/map_files/tether/tether-05-station1.dmm b/_maps/map_files/tether/tether-05-station1.dmm index a40a60dc60d..844881a8413 100644 --- a/_maps/map_files/tether/tether-05-station1.dmm +++ b/_maps/map_files/tether/tether-05-station1.dmm @@ -3,7 +3,7 @@ /turf/space, /area/space) "aab" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "carpspawn" }, /turf/space, @@ -443,7 +443,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "aaO" = ( -/obj/effect/landmark/engine_loader{ +/atom/movable/landmark/engine_loader{ clean_turfs = list(list(20,93,30,118),list(31,94,35,96),list(29,97,43,118),list(44,113,46,118)) }, /turf/space, @@ -2041,7 +2041,7 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCyborg" }, /turf/simulated/floor/tiled/techfloor, @@ -3403,7 +3403,7 @@ dir = 1; pixel_y = -24 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCyborg" }, /turf/simulated/floor/tiled/techfloor, @@ -3594,7 +3594,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/tiled, @@ -4756,7 +4756,7 @@ /area/tether/exploration/crew) "ajg" = ( /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/tiled, @@ -5727,7 +5727,7 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/hallway) "alS" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Assistant" }, /turf/simulated/floor/tiled, @@ -5865,7 +5865,7 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "ame" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/tiled, @@ -5896,7 +5896,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/plating, @@ -6310,7 +6310,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/tiled, @@ -6733,7 +6733,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/wood, @@ -7158,7 +7158,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -7257,7 +7257,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -8242,7 +8242,7 @@ /area/engineering/hallway) "aqG" = ( /obj/structure/bed/chair/comfy/beige, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/carpet, @@ -8882,7 +8882,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/carpet, @@ -8905,7 +8905,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/carpet, @@ -9092,7 +9092,7 @@ /obj/machinery/alarm{ pixel_y = 22 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/effect/floor_decal/techfloor{ @@ -9298,7 +9298,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "ate" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor, @@ -9432,7 +9432,7 @@ /turf/simulated/floor, /area/constructionsite) "atx" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/effect/floor_decal/techfloor{ @@ -9441,7 +9441,7 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "aty" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/effect/floor_decal/techfloor{ @@ -9567,7 +9567,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/carpet, @@ -9576,7 +9576,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/carpet, @@ -10329,7 +10329,7 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "ave" = ( -/obj/effect/landmark/start, +/atom/movable/landmark/start, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -10586,7 +10586,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/carpet, @@ -10612,7 +10612,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/carpet, @@ -10672,7 +10672,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary) "avV" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Assistant" }, /obj/structure/cable/green{ @@ -10761,7 +10761,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "awe" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /obj/machinery/alarm{ @@ -11455,7 +11455,7 @@ /turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) "ayn" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor, @@ -12123,7 +12123,7 @@ dir = 4; pixel_x = 11 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/white, @@ -12613,7 +12613,7 @@ dir = 8; pixel_x = 24 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled, @@ -13583,7 +13583,7 @@ dir = 4; pixel_x = 28 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/white, @@ -15266,7 +15266,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chief Engineer" }, /obj/machinery/button/windowtint{ @@ -15297,7 +15297,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "aSo" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/effect/floor_decal/techfloor{ @@ -15338,7 +15338,7 @@ /area/constructionsite) "aSB" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/tiled, @@ -15979,7 +15979,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/tiled, @@ -17620,7 +17620,7 @@ /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) "bZS" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor, @@ -18974,7 +18974,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCyborg" }, /obj/machinery/computer/cryopod/robot{ @@ -19517,7 +19517,7 @@ dir = 1 }, /obj/structure/table/bench/standard, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/tiled, @@ -19745,7 +19745,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/wood, @@ -19759,7 +19759,7 @@ /turf/simulated/floor/tiled/white, /area/tether/exploration/showers) "gqB" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor, @@ -20074,7 +20074,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/wood, @@ -22204,7 +22204,7 @@ /area/maintenance/station/eng_lower) "mXw" = ( /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Field Medic" }, /turf/simulated/floor/tiled, @@ -22391,14 +22391,14 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/wood, /area/tether/exploration/crew) "nsZ" = ( /obj/machinery/hologram/holopad, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cyborg" }, /turf/simulated/floor/tiled/techfloor, @@ -22759,7 +22759,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/landmark/free_ai_shell, +/atom/movable/landmark/free_ai_shell, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "oqY" = ( @@ -22812,7 +22812,7 @@ /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "owJ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "lightsout" }, /turf/simulated/floor/wood, @@ -23300,7 +23300,7 @@ /area/ai_upload_foyer) "pAf" = ( /obj/structure/table/bench/standard, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Field Medic" }, /turf/simulated/floor/tiled, @@ -23606,7 +23606,7 @@ /area/engineering/hallway) "qsZ" = ( /obj/machinery/hologram/holopad, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/techfloor, @@ -23703,7 +23703,7 @@ pixel_y = -32 }, /obj/machinery/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Field Medic" }, /turf/simulated/floor/wood, @@ -23720,7 +23720,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cyborg" }, /turf/simulated/floor/tiled/techfloor, @@ -25402,7 +25402,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/wood, @@ -27232,7 +27232,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Field Medic" }, /turf/simulated/floor/wood, diff --git a/_maps/map_files/tether/tether-06-station2.dmm b/_maps/map_files/tether/tether-06-station2.dmm index 9198a163068..8553ba2bda8 100644 --- a/_maps/map_files/tether/tether-06-station2.dmm +++ b/_maps/map_files/tether/tether-06-station2.dmm @@ -1722,7 +1722,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/starboard) "ajt" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -5056,7 +5056,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/simulated/floor/tiled/dark, @@ -6712,7 +6712,7 @@ /area/tether/station/burial) "avU" = ( /obj/structure/bed/chair/wood, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chaplain" }, /turf/simulated/floor/carpet/bcarpet, @@ -7075,7 +7075,7 @@ /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) "axL" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "maint_pred" }, /turf/simulated/floor, @@ -7201,7 +7201,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "ayn" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pathfinder" }, /obj/structure/bed/chair/office/dark{ @@ -7677,7 +7677,7 @@ /turf/simulated/floor/carpet/oracarpet, /area/chapel/main) "aAI" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chaplain" }, /turf/simulated/floor/tiled/dark, @@ -8588,7 +8588,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "aFS" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tripai" }, /obj/machinery/camera/network/command{ @@ -9686,7 +9686,7 @@ /area/tether/station/burial) "aJF" = ( /obj/machinery/light/small, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chaplain" }, /obj/structure/bed/chair{ @@ -9720,7 +9720,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "aJI" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Shaft Miner" }, /obj/item/stool/padded, @@ -12157,7 +12157,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_upper) "aSJ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tripai" }, /obj/machinery/camera/network/command{ @@ -12852,7 +12852,7 @@ /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) "aVd" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "AI" }, /obj/machinery/requests_console{ @@ -13470,7 +13470,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Shaft Miner" }, /turf/simulated/floor/tiled, @@ -18623,7 +18623,7 @@ "iSs" = ( /obj/structure/disposalpipe/segment, /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/tiled/monotile, @@ -20931,7 +20931,7 @@ /turf/simulated/floor/tiled/techfloor, /area/quartermaster/belterdock) "nlg" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "morphspawn" }, /turf/space, @@ -21022,7 +21022,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Quartermaster" }, /obj/structure/disposalpipe/segment{ @@ -22792,7 +22792,7 @@ /area/shuttle/excursion/cargo) "qlt" = ( /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/tiled/monotile, @@ -24123,7 +24123,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "sEN" = ( -/obj/effect/landmark/map_data/virgo3b, +/atom/movable/landmark/map_data/virgo3b, /turf/space, /area/space) "sEX" = ( @@ -24280,7 +24280,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/tiled, @@ -25260,7 +25260,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -26395,7 +26395,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "wQz" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Shaft Miner" }, /obj/item/stool/padded, @@ -26725,7 +26725,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -27159,7 +27159,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/spacedorm1) "yfO" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /turf/simulated/floor/wood, diff --git a/_maps/map_files/tether/tether-09-solars.dmm b/_maps/map_files/tether/tether-09-solars.dmm index c4c503d9ddf..acf9ad24a92 100644 --- a/_maps/map_files/tether/tether-09-solars.dmm +++ b/_maps/map_files/tether/tether-09-solars.dmm @@ -394,7 +394,7 @@ /turf/simulated/floor/virgo3b, /area/tether/outpost/solars_shed) "aP" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "bluespacerift" }, /turf/simulated/floor/outdoors/dirt/virgo3b, diff --git a/_maps/map_files/tether/tether_misc.dmm b/_maps/map_files/tether/tether_misc.dmm index cbd4a2e90be..d17384544ae 100644 --- a/_maps/map_files/tether/tether_misc.dmm +++ b/_maps/map_files/tether/tether_misc.dmm @@ -289,7 +289,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) "aP" = ( -/obj/effect/landmark/costume, +/atom/movable/landmark/costume, /obj/structure/table/rack/holorack, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) @@ -382,7 +382,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "bj" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Holocarp Spawn" }, /turf/simulated/floor/holofloor/reinforced, @@ -1347,7 +1347,7 @@ /turf/simulated/shuttle/floor/alien, /area/unknown/dorm5) "ec" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Holocarp Spawn Random" }, /turf/simulated/floor/holofloor/space, @@ -1928,7 +1928,7 @@ }, /area/holodeck/holodorm/source_beach) "gm" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Wolfgirl Spawn" }, /turf/simulated/floor/holofloor/snow, @@ -2039,7 +2039,7 @@ /area/shuttle/escape) "hg" = ( /obj/structure/flora/ausbushes/ywflowers, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Catgirl Spawn" }, /turf/simulated/floor/holofloor/grass, @@ -3794,7 +3794,7 @@ /area/centcom/simulated/medical) "FH" = ( /obj/structure/bed/chair, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "endgame_exit" }, /obj/item/toy/plushie/mouse{ @@ -5126,13 +5126,13 @@ /area/unknown/dorm3) "TF" = ( /obj/structure/bed/chair, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "endgame_exit" }, /turf/unsimulated/beach/sand, /area/beach) "TG" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "endgame_exit" }, /turf/unsimulated/beach/sand, diff --git a/_maps/map_files/triumph/triumph-01-deck1.dmm b/_maps/map_files/triumph/triumph-01-deck1.dmm index 9e1599fcc0f..e44d59c0a2c 100644 --- a/_maps/map_files/triumph/triumph-01-deck1.dmm +++ b/_maps/map_files/triumph/triumph-01-deck1.dmm @@ -1162,7 +1162,7 @@ dir = 4 }, /obj/machinery/light/small, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -2859,7 +2859,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -4676,7 +4676,7 @@ dir = 1 }, /obj/structure/table/bench/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/tiled/techmaint, @@ -5114,7 +5114,7 @@ /turf/simulated/wall, /area/engineering/atmos/storage) "rv" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /obj/item/radio/intercom{ @@ -7977,7 +7977,7 @@ dir = 5 }, /obj/structure/lattice, -/obj/effect/landmark/engine_loader, +/atom/movable/landmark/engine_loader, /turf/space, /area/space) "BC" = ( @@ -8210,7 +8210,7 @@ pixel_y = 32 }, /obj/structure/table/bench/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /turf/simulated/floor/tiled/techmaint, @@ -8454,7 +8454,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "Dt" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "carpspawn" }, /turf/space, @@ -9261,7 +9261,7 @@ /area/engineering/hallway/lower) "FF" = ( /obj/machinery/camera/network/engineering, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/tiled/steel_dirty, @@ -10330,7 +10330,7 @@ dir = 5 }, /obj/structure/table/bench/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /obj/item/storage/toolbox/lunchbox/nt, @@ -12197,7 +12197,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "Ps" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Atmospheric Technician" }, /turf/simulated/floor/tiled/steel_dirty, @@ -14086,7 +14086,7 @@ /area/maintenance/engi_engine) "VA" = ( /obj/structure/table/bench/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Station Engineer" }, /obj/effect/floor_decal/techfloor/orange{ @@ -14104,7 +14104,7 @@ /obj/structure/bed/chair/comfy/beige{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chief Engineer" }, /turf/simulated/floor/carpet/blucarpet, diff --git a/_maps/map_files/triumph/triumph-02-deck2.dmm b/_maps/map_files/triumph/triumph-02-deck2.dmm index 4519fe07e59..223b6d93971 100644 --- a/_maps/map_files/triumph/triumph-02-deck2.dmm +++ b/_maps/map_files/triumph/triumph-02-deck2.dmm @@ -451,7 +451,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Gardener" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -777,7 +777,7 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "cs" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "carpspawn" }, /turf/space, @@ -1187,7 +1187,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /obj/structure/disposalpipe/segment, @@ -1394,7 +1394,7 @@ /turf/simulated/floor/wood, /area/vacant/vacant_shop) "ep" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/machinery/light{ @@ -1820,7 +1820,7 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "fq" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /turf/simulated/floor/tiled/dark, @@ -2786,7 +2786,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled, @@ -3499,7 +3499,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "jL" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/structure/extinguisher_cabinet{ @@ -5154,7 +5154,7 @@ /area/maintenance/dormitory) "oe" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Bartender" }, /turf/simulated/floor/wood, @@ -5648,7 +5648,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/tiled, @@ -5909,7 +5909,7 @@ /area/crew_quarters/bar) "qq" = ( /obj/structure/window/basic, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Observer-Start" }, /obj/effect/floor_decal/spline/fancy/wood, @@ -6550,7 +6550,7 @@ /area/maintenance/dormitory) "sn" = ( /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Bartender" }, /turf/simulated/floor/tiled/dark, @@ -6766,7 +6766,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Shaft Miner" }, /turf/simulated/floor/tiled, @@ -7780,7 +7780,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Bartender" }, /obj/item/stool/padded, @@ -9208,7 +9208,7 @@ /area/crew_quarters/lounge/kitchen_freezer) "zF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10629,7 +10629,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "DZ" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Gardener" }, /obj/structure/cable/green{ @@ -10945,7 +10945,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Janitor" }, /turf/simulated/floor/tiled/dark, @@ -12880,7 +12880,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/belter) "KB" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/machinery/computer/ship/navigation/telescreen{ @@ -13280,7 +13280,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/fitness) "LL" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Quartermaster" }, /turf/simulated/floor/carpet/sblucarpet, @@ -13932,7 +13932,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/coffee_shop) "NR" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled, @@ -14677,7 +14677,7 @@ "Qa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/tiled, @@ -14886,7 +14886,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_6) "QK" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /obj/machinery/firealarm{ @@ -15269,7 +15269,7 @@ /area/maintenance/substation/civilian) "RQ" = ( /obj/structure/table/bench/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Shaft Miner" }, /turf/simulated/floor/tiled, @@ -15309,7 +15309,7 @@ /turf/simulated/floor/plating, /area/vacant/vacant_office) "RV" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chef" }, /turf/simulated/floor/tiled, @@ -16160,7 +16160,7 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/Dorm_1) "Ug" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Cargo Technician" }, /turf/simulated/floor/tiled, @@ -17260,13 +17260,13 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "WZ" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateCryo" }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "Xa" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chef" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17292,7 +17292,7 @@ dir = 1 }, /obj/machinery/light/small, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, diff --git a/_maps/map_files/triumph/triumph-03-deck3.dmm b/_maps/map_files/triumph/triumph-03-deck3.dmm index 896c70ded70..f9097fb6f20 100644 --- a/_maps/map_files/triumph/triumph-03-deck3.dmm +++ b/_maps/map_files/triumph/triumph-03-deck3.dmm @@ -506,7 +506,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -2166,7 +2166,7 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, @@ -2834,7 +2834,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/cmo) "crI" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateGateway" }, /obj/effect/floor_decal/techfloor/orange{ @@ -3991,7 +3991,7 @@ /area/hallway/primary/port) "dnK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateGateway" }, /obj/effect/floor_decal/techfloor/orange{ @@ -5190,7 +5190,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "emp" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled, @@ -5849,7 +5849,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled/techfloor, @@ -7173,7 +7173,7 @@ /area/rnd/xenobiology) "fSC" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Psychiatrist" }, /turf/simulated/floor/carpet/sblucarpet, @@ -7954,7 +7954,7 @@ /area/hallway/primary/port) "gzr" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /turf/simulated/floor/tiled/old_cargo/purple, @@ -8388,7 +8388,7 @@ /area/rnd/anomaly_lab) "gRE" = ( /obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chief Medical Officer" }, /turf/simulated/floor/tiled/dark, @@ -9069,7 +9069,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateGateway" }, /obj/effect/floor_decal/techfloor/orange{ @@ -10947,7 +10947,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Psychiatrist" }, /turf/simulated/floor/carpet/sblucarpet, @@ -11531,7 +11531,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/carpet/purcarpet, @@ -15035,7 +15035,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /obj/machinery/hologram/holopad, @@ -16664,7 +16664,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/medbreak) "nGr" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Roboticist" }, /obj/structure/bed/chair/office/dark{ @@ -16944,7 +16944,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled, @@ -17181,7 +17181,7 @@ /obj/effect/floor_decal/industrial/danger{ dir = 9 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled, @@ -22989,7 +22989,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -23537,7 +23537,7 @@ pixel_y = -16 }, /obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Research Director" }, /obj/structure/cable/green{ @@ -24398,7 +24398,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Paramedic" }, /turf/simulated/floor/tiled/white, @@ -24554,7 +24554,7 @@ /turf/simulated/floor/tiled, /area/rnd/research_foyer_auxiliary) "tkF" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/tiled, @@ -25499,7 +25499,7 @@ /area/medical/chemistry) "tRC" = ( /obj/machinery/light/small, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /obj/random/trash, @@ -26173,7 +26173,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/carpet/purcarpet, @@ -26905,7 +26905,7 @@ /area/medical/psych_ward) "uYd" = ( /obj/structure/table/bench/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Paramedic" }, /turf/simulated/floor/tiled, @@ -27039,7 +27039,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "JoinLateGateway" }, /obj/effect/floor_decal/techfloor/orange{ @@ -27212,7 +27212,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "vhq" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "carpspawn" }, /turf/space, @@ -27888,7 +27888,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Scientist" }, /turf/simulated/floor/carpet/purcarpet, @@ -28542,7 +28542,7 @@ name = "north bump"; pixel_y = 28 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Medical Doctor" }, /turf/simulated/floor/tiled/white, diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm index 3c132074288..08c506a76f5 100644 --- a/_maps/map_files/triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/triumph/triumph-04-deck4.dmm @@ -565,7 +565,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "awx" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Detective" }, /obj/structure/bed/chair/office/dark{ @@ -900,7 +900,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "aIn" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /obj/structure/cable/green{ @@ -1033,7 +1033,7 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/aft) "aNI" = ( @@ -1265,7 +1265,7 @@ /obj/effect/floor_decal/techfloor/orange{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled/dark, @@ -1465,7 +1465,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "bhx" = ( @@ -1918,7 +1918,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "bwd" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "carpspawn" }, /turf/space, @@ -2631,7 +2631,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -2679,7 +2679,7 @@ /area/security/riot_control) "bWp" = ( /obj/effect/floor_decal/techfloor, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/aft) @@ -4659,7 +4659,7 @@ pixel_y = 16 }, /obj/structure/curtain/open/shower/security, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -5369,7 +5369,7 @@ /area/shuttle/courser/cockpit) "dTy" = ( /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Explorer" }, /turf/simulated/floor/tiled, @@ -6274,7 +6274,7 @@ /turf/simulated/shuttle/floor/voidcraft, /area/bridge) "ezD" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /obj/structure/cable/green{ @@ -6966,7 +6966,7 @@ /turf/simulated/floor, /area/security/brig) "ePg" = ( -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/aft) "ePz" = ( @@ -7421,7 +7421,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/effect/landmark/free_ai_shell, +/atom/movable/landmark/free_ai_shell, /turf/simulated/floor/bluegrid, /area/ai_upload) "fdt" = ( @@ -7586,7 +7586,7 @@ /area/crew_quarters/heads/hop) "fhd" = ( /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /turf/simulated/floor/tiled, @@ -7650,13 +7650,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/monotile, /area/security/security_lockerroom) "fkU" = ( -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /obj/machinery/computer/cryopod{ name = "asset retention console"; pixel_y = -30 @@ -8340,7 +8340,7 @@ pixel_y = -37 }, /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Search and Rescue" }, /turf/simulated/floor/tiled, @@ -8618,7 +8618,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chaplain" }, /turf/simulated/floor/tiled/dark, @@ -8662,7 +8662,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "fYj" = ( @@ -10002,7 +10002,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Warden" }, /turf/simulated/floor/tiled/dark, @@ -10742,7 +10742,7 @@ /turf/simulated/floor/tiled/monotile, /area/security/prison) "hxc" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Librarian" }, /obj/structure/bed/chair/comfy/brown{ @@ -12789,7 +12789,7 @@ /area/library) "iKO" = ( /obj/machinery/computer/timeclock/premade/south, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/aft) @@ -13080,7 +13080,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Facility Director" }, /obj/item/storage/secure/safe{ @@ -13499,7 +13499,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "jkn" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Head of Security" }, /obj/machinery/button/remote/airlock{ @@ -14334,7 +14334,7 @@ /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) "jRE" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Clown" }, /obj/structure/cable/green, @@ -15478,7 +15478,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "xeno_spawn"; pixel_x = -1 }, @@ -15667,7 +15667,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) "kSl" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/plating, @@ -16352,7 +16352,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/library) "lpL" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Internal Affairs Agent" }, /obj/structure/bed/chair/office/dark{ @@ -16520,7 +16520,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 4 }, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "ltW" = ( @@ -16928,7 +16928,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled, @@ -18304,7 +18304,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/tram) "mDX" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Librarian" }, /obj/machinery/newscaster{ @@ -19076,7 +19076,7 @@ /area/security/security_lockerroom) "nhT" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Detective" }, /turf/simulated/floor/carpet, @@ -19273,7 +19273,7 @@ /area/hallway/secondary/docking_hallway) "noJ" = ( /obj/machinery/gateway/centerstation, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled/dark, @@ -20060,7 +20060,7 @@ /turf/simulated/floor/tiled, /area/security/brig) "nRQ" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Mime" }, /turf/simulated/floor/carpet/bcarpet, @@ -21695,7 +21695,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "oVF" = ( -/obj/effect/landmark/map_data/triumph, +/atom/movable/landmark/map_data/triumph, /turf/space, /area/space) "oVI" = ( @@ -21942,7 +21942,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "pcU" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pathfinder" }, /obj/structure/bed/chair/office/dark{ @@ -23286,7 +23286,7 @@ /area/exploration/explorer_prep) "pXl" = ( /obj/effect/floor_decal/techfloor, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /obj/effect/floor_decal/corner/red/border, /obj/structure/sign/warning/evac{ pixel_x = -32 @@ -23933,7 +23933,7 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "qor" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Internal Affairs Agent" }, /obj/structure/bed/chair/office/dark{ @@ -25673,7 +25673,7 @@ /turf/simulated/floor/tiled, /area/security/eva) "rqT" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "AI" }, /obj/machinery/requests_console{ @@ -26638,7 +26638,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/security/breakroom) "saf" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tripai" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -28062,7 +28062,7 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 27 }, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /obj/structure/sign/warning/evac{ pixel_x = -32 }, @@ -28205,7 +28205,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, -/obj/effect/landmark/shuttle, +/atom/movable/landmark/shuttle, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "sXA" = ( @@ -29229,7 +29229,7 @@ "tLZ" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /turf/simulated/floor/tiled/monotile, @@ -30363,7 +30363,7 @@ /area/maintenance/central) "uBQ" = ( /obj/structure/bed/chair, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Chaplain" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -30572,7 +30572,7 @@ /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "uMX" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tripai" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -30589,7 +30589,7 @@ /turf/simulated/floor/tiled/dark, /area/security/hanger) "uNi" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /obj/structure/cable/green{ @@ -33306,7 +33306,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Security Officer" }, /obj/effect/floor_decal/steeldecal/steel_decals_central5, @@ -34819,7 +34819,7 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "xsE" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Pilot" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -34896,7 +34896,7 @@ /area/exploration/explorer_prep) "xvG" = ( /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Search and Rescue" }, /turf/simulated/floor/tiled, @@ -35653,7 +35653,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/sauna) "xVy" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled, diff --git a/_maps/map_files/triumph/triumph-05-flagship.dmm b/_maps/map_files/triumph/triumph-05-flagship.dmm index da85bae3a8a..a1cb9a94082 100644 --- a/_maps/map_files/triumph/triumph-05-flagship.dmm +++ b/_maps/map_files/triumph/triumph-05-flagship.dmm @@ -1204,7 +1204,7 @@ }, /area/centcom/specops) "bT" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Response Team" }, /turf/unsimulated/floor/steel{ @@ -2918,7 +2918,7 @@ /area/tdome/tdomeobserve) "fc" = ( /obj/structure/bed/chair, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdomeobserve" }, /turf/unsimulated/floor{ @@ -3587,7 +3587,7 @@ }, /area/tdome/tdome1) "gm" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /turf/unsimulated/floor{ @@ -3606,7 +3606,7 @@ }, /area/tdome/tdome1) "go" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /turf/unsimulated/floor{ @@ -3741,7 +3741,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /turf/unsimulated/floor{ @@ -3753,7 +3753,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /turf/unsimulated/floor{ @@ -3932,7 +3932,7 @@ /turf/unsimulated/floor/steel, /area/centcom/evac) "hc" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /obj/machinery/camera/network/thunder{ @@ -3953,7 +3953,7 @@ }, /area/tdome) "he" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /obj/machinery/camera/network/thunder{ @@ -16174,7 +16174,7 @@ /turf/unsimulated/wall/planetary/virgo3b, /area/centcom/bathroom) "DB" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Commando" }, /turf/unsimulated/floor{ diff --git a/_maps/map_files/triumph/triumph_misc.dmm b/_maps/map_files/triumph/triumph_misc.dmm index 4896b143447..5c0fcf640af 100644 --- a/_maps/map_files/triumph/triumph_misc.dmm +++ b/_maps/map_files/triumph/triumph_misc.dmm @@ -79,7 +79,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) "aP" = ( -/obj/effect/landmark/costume, +/atom/movable/landmark/costume, /obj/structure/table/rack/holorack, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) @@ -169,7 +169,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "bj" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Holocarp Spawn" }, /turf/simulated/floor/holofloor/reinforced, @@ -1010,7 +1010,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) "ec" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Holocarp Spawn Random" }, /turf/simulated/floor/holofloor/space, @@ -1602,7 +1602,7 @@ }, /area/holodeck/holodorm/source_beach) "gm" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Wolfgirl Spawn" }, /turf/simulated/floor/holofloor/snow, @@ -1675,7 +1675,7 @@ /area/holodeck/source_chess) "hx" = ( /obj/structure/flora/ausbushes/ywflowers, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Catgirl Spawn" }, /turf/simulated/floor/holofloor/grass, diff --git a/_maps/map_levels/140x140/lavaland_east.dmm b/_maps/map_levels/140x140/lavaland_east.dmm index 7e759cca460..5d0978e149a 100644 --- a/_maps/map_levels/140x140/lavaland_east.dmm +++ b/_maps/map_levels/140x140/lavaland_east.dmm @@ -276,7 +276,7 @@ /turf/simulated/floor/tiled/lavaland, /area/lavaland/east/colony) "fD" = ( -/obj/effect/landmark/map_data/lavaland_east, +/atom/movable/landmark/map_data/lavaland_east, /turf/simulated/mineral/triumph/lavaland, /area/lavaland/east/explored) "fL" = ( diff --git a/_maps/map_levels/140x140/talon/talon1.dmm b/_maps/map_levels/140x140/talon/talon1.dmm index f2c602f0e78..66037346879 100644 --- a/_maps/map_levels/140x140/talon/talon1.dmm +++ b/_maps/map_levels/140x140/talon/talon1.dmm @@ -466,7 +466,7 @@ /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "ed" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Doctor" }, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -1078,7 +1078,7 @@ /obj/structure/bed/chair/bay/comfy/brown{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Pilot" }, /turf/simulated/floor/tiled/eris/dark/cyancorner, @@ -1692,7 +1692,7 @@ /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "oH" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Engineer" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2156,7 +2156,7 @@ /obj/structure/bed/chair/bay/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Guard" }, /turf/simulated/floor/tiled/eris/steel, @@ -4988,7 +4988,7 @@ /area/talon/maintenance/deckone_starboard) "MV" = ( /obj/structure/bed/chair/office/light, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Doctor" }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, @@ -5500,7 +5500,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Engineer" }, /turf/simulated/floor/tiled/eris/dark/brown_perforated, @@ -5532,7 +5532,7 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_port_aft_wing) "Sb" = ( -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Captain" }, /turf/simulated/floor/tiled/eris/white/golden, @@ -6238,7 +6238,7 @@ /obj/structure/bed/chair/bay/comfy/red{ dir = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Pilot" }, /turf/simulated/floor/tiled/eris/dark/cyancorner, @@ -6512,7 +6512,7 @@ /area/talon/deckone/bridge_hallway) "ZZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Engineer" }, /obj/machinery/atmospherics/binary/pump{ diff --git a/_maps/map_levels/140x140/talon/talon2.dmm b/_maps/map_levels/140x140/talon/talon2.dmm index 8548083ad3d..2306379ea98 100644 --- a/_maps/map_levels/140x140/talon/talon2.dmm +++ b/_maps/map_levels/140x140/talon/talon2.dmm @@ -311,7 +311,7 @@ "fb" = ( /obj/structure/bed/double/padded, /obj/item/bedsheet/hopdouble, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Captain" }, /turf/simulated/floor/carpet/sblucarpet, @@ -1130,7 +1130,7 @@ dir = 8; pixel_x = -24 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Guard" }, /turf/simulated/floor/carpet, @@ -1345,7 +1345,7 @@ /area/talon/decktwo/lifeboat) "oL" = ( /obj/item/stool/padded, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Captain" }, /turf/simulated/floor/tiled/eris/cafe, @@ -1411,7 +1411,7 @@ dir = 4; pixel_x = 26 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Engineer" }, /turf/simulated/floor/carpet, @@ -1513,7 +1513,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/decktwo_starboard) "qd" = ( -/obj/effect/landmark/map_data/talon, +/atom/movable/landmark/map_data/talon, /turf/space, /area/space) "qr" = ( @@ -2384,7 +2384,7 @@ /obj/structure/bed/chair/bay/chair{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Captain" }, /obj/structure/cable/green{ @@ -2933,7 +2933,7 @@ /turf/simulated/open, /area/talon/maintenance/decktwo_aft) "FV" = ( -/obj/effect/landmark/talon, +/atom/movable/landmark/talon, /obj/machinery/computer/cryopod{ pixel_x = 32 }, @@ -3004,7 +3004,7 @@ dir = 8; pixel_x = -24 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Pilot" }, /turf/simulated/floor/carpet, @@ -3187,7 +3187,7 @@ dir = 4; pixel_x = 26 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Talon Doctor" }, /turf/simulated/floor/carpet, @@ -4163,7 +4163,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/decktwo/central_hallway) "TD" = ( -/obj/effect/landmark/talon, +/atom/movable/landmark/talon, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/talon/decktwo/central_hallway) "TI" = ( diff --git a/_maps/map_levels/140x140/tradeport.dmm b/_maps/map_levels/140x140/tradeport.dmm index ee5b9f32f24..a6ff11bae00 100644 --- a/_maps/map_levels/140x140/tradeport.dmm +++ b/_maps/map_levels/140x140/tradeport.dmm @@ -948,7 +948,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/wood, @@ -1137,7 +1137,7 @@ pixel_y = -26; specialfunctions = 4 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/carpet/blue, @@ -2072,7 +2072,7 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/shuttle/floor/white, @@ -2328,7 +2328,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/carpet, @@ -4626,7 +4626,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/tiled/neutral, @@ -5841,7 +5841,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Trader" }, /turf/simulated/floor/carpet/bcarpet, @@ -6934,7 +6934,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Trader" }, /turf/simulated/floor/carpet/bcarpet, @@ -7020,7 +7020,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Trader" }, /turf/simulated/floor/carpet/bcarpet, @@ -9732,7 +9732,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /obj/effect/floor_decal/spline/fancy/wood, @@ -10598,7 +10598,7 @@ /area/tradeport/pads) "MS" = ( /obj/structure/bed/chair, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/wood, @@ -11658,7 +11658,7 @@ /area/tradeport) "QJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/shuttle/floor/white, @@ -11929,7 +11929,7 @@ pixel_x = -26 }, /obj/item/toy/plushie/squid/blue, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -11979,7 +11979,7 @@ /obj/machinery/newscaster{ pixel_x = -27 }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/wood, @@ -12529,7 +12529,7 @@ /turf/simulated/floor/carpet/blue, /area/tradeport/commons) "TV" = ( -/obj/effect/landmark/trade, +/atom/movable/landmark/trade, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/commons) "TW" = ( @@ -12985,7 +12985,7 @@ /turf/simulated/floor/plating, /area/tradeport/facility) "VR" = ( -/obj/effect/landmark/trade, +/atom/movable/landmark/trade, /obj/machinery/computer/cryopod/robot{ pixel_y = -30 }, @@ -13028,7 +13028,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cyndi) "VV" = ( -/obj/effect/landmark/trade, +/atom/movable/landmark/trade, /obj/machinery/computer/cryopod{ pixel_y = -32 }, @@ -14035,7 +14035,7 @@ pixel_y = 22; req_one_access = list(160) }, -/obj/effect/landmark/start{ +/atom/movable/landmark/start{ name = "Trader" }, /turf/simulated/floor/wood, diff --git a/_maps/submaps/level_specific/class_h/desertsaloon.dmm b/_maps/submaps/level_specific/class_h/desertsaloon.dmm index 21eb2d90921..69197309b15 100644 --- a/_maps/submaps/level_specific/class_h/desertsaloon.dmm +++ b/_maps/submaps/level_specific/class_h/desertsaloon.dmm @@ -25,7 +25,7 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/mobcorpse/syndicatesoldier, +/atom/movable/landmark/mobcorpse/syndicatesoldier, /obj/machinery/light/small{ dir = 1 }, @@ -226,7 +226,7 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, -/obj/effect/landmark/mobcorpse/clown, +/atom/movable/landmark/mobcorpse/clown, /obj/effect/decal/cleanable/blood, /turf/simulated/floor/carpet/blucarpet, /area/class_h/POIs/saloon) diff --git a/_maps/submaps/level_specific/class_h/highnoonH.dmm b/_maps/submaps/level_specific/class_h/highnoonH.dmm index 13f8124842d..cac59587635 100644 --- a/_maps/submaps/level_specific/class_h/highnoonH.dmm +++ b/_maps/submaps/level_specific/class_h/highnoonH.dmm @@ -21,7 +21,7 @@ /area/class_h/POIs/WW_Town) "dI" = ( /obj/structure/bed/padded, -/obj/effect/landmark/corpse/syndicatesoldier, +/atom/movable/landmark/corpse/syndicatesoldier, /turf/simulated/floor/wood/classh, /area/class_h/POIs/WW_Town) "dR" = ( diff --git a/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm b/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm index 2978a38486b..6c64f578fd4 100644 --- a/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm +++ b/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm @@ -893,7 +893,7 @@ /area/shuttle/mackerel_lc_wreck) "Zp" = ( /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpse/vintage/pilot, +/atom/movable/landmark/corpse/vintage/pilot, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/mackerel_lc_wreck) "ZJ" = ( diff --git a/_maps/templates/admin/dhael_centcom.dmm b/_maps/templates/admin/dhael_centcom.dmm index fb12d47ee40..6049016d4c0 100644 --- a/_maps/templates/admin/dhael_centcom.dmm +++ b/_maps/templates/admin/dhael_centcom.dmm @@ -2459,7 +2459,7 @@ /area/tdome/tdomeobserve) "fc" = ( /obj/structure/bed/chair, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdomeobserve" }, /turf/unsimulated/floor{ @@ -3088,7 +3088,7 @@ }, /area/tdome/tdome1) "gm" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /turf/unsimulated/floor{ @@ -3107,7 +3107,7 @@ }, /area/tdome/tdome1) "go" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /turf/unsimulated/floor{ @@ -3198,7 +3198,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /turf/unsimulated/floor{ @@ -3210,7 +3210,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /turf/unsimulated/floor{ @@ -3367,7 +3367,7 @@ /turf/unsimulated/floor/steel, /area/centcom/evac) "hc" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /obj/machinery/camera/network/thunder{ @@ -3388,7 +3388,7 @@ }, /area/tdome) "he" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /obj/machinery/camera/network/thunder{ diff --git a/_maps/templates/admin/ert.dmm b/_maps/templates/admin/ert.dmm index 96366573891..c8c1fedfea2 100644 --- a/_maps/templates/admin/ert.dmm +++ b/_maps/templates/admin/ert.dmm @@ -1430,7 +1430,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Commando" }, /turf/simulated/floor/tiled/techfloor, @@ -1439,7 +1439,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Commando" }, /turf/simulated/floor/tiled/techfloor, @@ -2024,11 +2024,11 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pf" = ( -/obj/effect/landmark/map_data/ert_ship, +/atom/movable/landmark/map_data/ert_ship, /turf/space, /area/space) "pg" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Commando" }, /turf/simulated/floor/tiled/techfloor, @@ -5858,7 +5858,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Commando" }, /turf/simulated/floor/tiled/techmaint, @@ -6848,7 +6848,7 @@ dir = 1 }, /obj/effect/catwalk_plated, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Commando" }, /turf/simulated/floor/plating, diff --git a/_maps/templates/admin/kk_mercship.dmm b/_maps/templates/admin/kk_mercship.dmm index 005b4b78a88..c9ce551062d 100644 --- a/_maps/templates/admin/kk_mercship.dmm +++ b/_maps/templates/admin/kk_mercship.dmm @@ -290,7 +290,7 @@ /area/ship/manta/hallways_star) "bl" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -756,7 +756,7 @@ /area/ship/manta/hallways_aft) "dc" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -934,7 +934,7 @@ /area/ship/manta/hallways_port) "ej" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -2530,7 +2530,7 @@ /area/ship/manta/engine) "lW" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -3259,7 +3259,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "pf" = ( -/obj/effect/landmark/map_data/manta_ship, +/atom/movable/landmark/map_data/manta_ship, /turf/space, /area/space) "pn" = ( @@ -6201,7 +6201,7 @@ /area/ship/manta/hallways_port) "De" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -9245,7 +9245,7 @@ /area/ship/manta/hallways_aft) "SW" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -9257,7 +9257,7 @@ /area/ship/manta/barracks/bed_1) "SX" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -9418,7 +9418,7 @@ /area/ship/manta/dock_star) "TB" = ( /obj/structure/bed/pod, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/hos, @@ -10675,7 +10675,7 @@ /area/ship/manta/recreation) "ZH" = ( /obj/structure/table/steel_reinforced, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Uplink" }, /turf/simulated/floor/tiled/techfloor, diff --git a/_maps/templates/admin/mercbase.dmm b/_maps/templates/admin/mercbase.dmm index b2de78f75e5..1ac309b2ce1 100644 --- a/_maps/templates/admin/mercbase.dmm +++ b/_maps/templates/admin/mercbase.dmm @@ -12,7 +12,7 @@ icon_state = "frame"; pixel_y = 32 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /turf/unsimulated/floor{ @@ -456,7 +456,7 @@ /area/antag/antag_base) "aN" = ( /obj/structure/bed/padded, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/red, @@ -613,7 +613,7 @@ icon_state = "frame"; pixel_x = 32 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Spawn" }, /obj/item/bedsheet/red, @@ -972,7 +972,7 @@ }, /area/antag/antag_base) "bB" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "Syndicate-Uplink" }, /turf/unsimulated/floor{ diff --git a/_maps/templates/admin/thunderdome.dmm b/_maps/templates/admin/thunderdome.dmm index 551a7f017bd..d33d9496e11 100644 --- a/_maps/templates/admin/thunderdome.dmm +++ b/_maps/templates/admin/thunderdome.dmm @@ -7,7 +7,7 @@ /area/tdome/tdomeadmin) "c" = ( /obj/structure/bed/chair, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdomeobserve" }, /turf/unsimulated/floor{ @@ -15,7 +15,7 @@ }, /area/tdome/tdomeobserve) "d" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdomeobserve" }, /turf/unsimulated/floor{ @@ -94,7 +94,7 @@ }, /area/tdome/tdome1) "m" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /turf/unsimulated/floor{ @@ -113,7 +113,7 @@ }, /area/tdome/tdome1) "o" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /turf/unsimulated/floor{ @@ -138,7 +138,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /turf/unsimulated/floor{ @@ -150,7 +150,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /turf/unsimulated/floor{ @@ -159,7 +159,7 @@ }, /area/tdome/tdome1) "s" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /obj/machinery/camera/network/thunder{ @@ -180,7 +180,7 @@ }, /area/tdome) "u" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /obj/machinery/camera/network/thunder{ @@ -192,7 +192,7 @@ }, /area/tdome/tdome1) "v" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome2" }, /obj/machinery/recharger{ @@ -212,7 +212,7 @@ }, /area/tdome) "x" = ( -/obj/effect/landmark{ +/atom/movable/landmark{ name = "tdome1" }, /obj/machinery/recharger{ diff --git a/code/__DEFINES/dcs/signals/signals_tram.dm b/code/__DEFINES/dcs/signals/signals_tram.dm index fb0fbe4c15c..e239f52596d 100644 --- a/code/__DEFINES/dcs/signals/signals_tram.dm +++ b/code/__DEFINES/dcs/signals/signals_tram.dm @@ -7,5 +7,5 @@ /// Sent from /obj/structure/industrial_lift/tram when its travelling status updates. (travelling) ////#define COMSIG_TRAM_SET_TRAVELLING "tram_set_travelling" -/// Sent from /obj/structure/industrial_lift/tram when it begins to travel. (obj/effect/landmark/tram/from_where, obj/effect/landmark/tram/to_where) +/// Sent from /obj/structure/industrial_lift/tram when it begins to travel. (atom/movable/landmark/tram/from_where, atom/movable/landmark/tram/to_where) ////#define COMSIG_TRAM_TRAVEL "tram_travel" diff --git a/code/controllers/subsystem/job/job_controller.dm b/code/controllers/subsystem/job/job_controller.dm index d4d50277d71..b1e22aaa886 100644 --- a/code/controllers/subsystem/job/job_controller.dm +++ b/code/controllers/subsystem/job/job_controller.dm @@ -343,7 +343,7 @@ var/global/datum/controller/occupations/job_master if(!joined_late) var/obj/S = null var/list/possible_spawns = list() - for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list) + for(var/atom/movable/landmark/start/sloc in GLOB.landmarks_list) if(sloc.name != rank) continue if(locate(/mob/living) in sloc.loc) continue possible_spawns.Add(sloc) @@ -351,7 +351,7 @@ var/global/datum/controller/occupations/job_master S = pick(possible_spawns) if(!S) S = locate("start*[rank]") // use old stype - if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)) + if(istype(S, /atom/movable/landmark/start) && istype(S.loc, /turf)) H.forceMove(S.loc) else var/list/spawn_props = LateSpawn(H.client, rank) diff --git a/code/controllers/subsystem/mapping/_mapping.dm b/code/controllers/subsystem/mapping/_mapping.dm index c7f894ee267..feb00bfd592 100644 --- a/code/controllers/subsystem/mapping/_mapping.dm +++ b/code/controllers/subsystem/mapping/_mapping.dm @@ -309,7 +309,7 @@ SUBSYSTEM_DEF(mapping) /datum/controller/subsystem/mapping var/list/map_templates = list() var/dmm_suite/maploader = null - var/obj/effect/landmark/engine_loader/engine_loader + var/atom/movable/landmark/engine_loader/engine_loader var/list/shelter_templates = list() /datum/controller/subsystem/mapping/Recover() diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index e2ed778815b..fd8ebc95333 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -241,7 +241,7 @@ SUBSYSTEM_DEF(ticker) spawn(0)//Forking here so we dont have to wait for this to finish mode.post_setup() //Cleanup some stuff - for(var/obj/effect/landmark/start/S in GLOB.landmarks_list) + for(var/atom/movable/landmark/start/S in GLOB.landmarks_list) //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") qdel(S) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 1669541872b..6718dfb19cd 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -15,7 +15,7 @@ /obj/effect/portal, /obj/effect/abstract, /obj/effect/hotspot, - /obj/effect/landmark, + /atom/movable/landmark, /obj/effect/temp_visual, /obj/effect/light_emitter/tendril, /obj/effect/collapse, diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm index 9c97096cad1..8dbb0e92a35 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -58,7 +58,7 @@ /datum/antagonist/proc/create_nuke(var/atom/paper_spawn_loc, var/datum/mind/code_owner) // Decide on a code. - var/obj/effect/landmark/nuke_spawn = locate(nuke_spawn_loc ? nuke_spawn_loc : "landmark*Nuclear-Bomb") + var/atom/movable/landmark/nuke_spawn = locate(nuke_spawn_loc ? nuke_spawn_loc : "landmark*Nuclear-Bomb") var/code if(nuke_spawn) diff --git a/code/game/antagonist/antagonist_place.dm b/code/game/antagonist/antagonist_place.dm index 33a99a3e558..c79cd484823 100644 --- a/code/game/antagonist/antagonist_place.dm +++ b/code/game/antagonist/antagonist_place.dm @@ -1,7 +1,7 @@ /datum/antagonist/proc/get_starting_locations() if(landmark_id) starting_locations = list() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/atom/movable/landmark/L in GLOB.landmarks_list) if(L.name == landmark_id) starting_locations |= get_turf(L) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 91e1b39abeb..abec329fd4a 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -103,7 +103,7 @@ var/hadevent = 0 log_world("ERROR: Could not initate grey-tide. Unable find prison or brig area.") /proc/carp_migration() // -- Darem - for(var/obj/effect/landmark/C in GLOB.landmarks_list) + for(var/atom/movable/landmark/C in GLOB.landmarks_list) if(C.name == "carpspawn") new /mob/living/simple_mob/animal/space/carp(C.loc) //sleep(100) @@ -119,7 +119,7 @@ var/hadevent = 0 for(var/i=1,i<=lightsoutAmount,i++) var/list/possibleEpicentres = list() - for(var/obj/effect/landmark/newEpicentre in GLOB.landmarks_list) + for(var/atom/movable/landmark/newEpicentre in GLOB.landmarks_list) if(newEpicentre.name == "lightsout" && !(newEpicentre in epicentreList)) possibleEpicentres += newEpicentre if(possibleEpicentres.len) @@ -130,7 +130,7 @@ var/hadevent = 0 if(!epicentreList.len) return - for(var/obj/effect/landmark/epicentre in epicentreList) + for(var/atom/movable/landmark/epicentre in epicentreList) for(var/obj/machinery/power/apc/apc in range(epicentre,lightsoutRange)) apc.overload_lighting() diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 7337df5c522..0f32c714221 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -159,10 +159,10 @@ var/specops_shuttle_timeleft = 0 sleep(10) var/spawn_marauder[] = new() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/atom/movable/landmark/L in GLOB.landmarks_list) if(L.name == "Marauder Entry") spawn_marauder.Add(L) - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/atom/movable/landmark/L in GLOB.landmarks_list) if(L.name == "Marauder Exit") var/obj/effect/portal/P = new(L.loc) P.invisibility = 101//So it is not seen by anyone. diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 111839e048b..e1bb42db6c6 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -85,10 +85,10 @@ var/syndicate_elite_shuttle_timeleft = 0 sleep(10) var/spawn_marauder[] = new() - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/atom/movable/landmark/L in GLOB.landmarks_list) if(L.name == "Marauder Entry") spawn_marauder.Add(L) - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/atom/movable/landmark/L in GLOB.landmarks_list) if(L.name == "Marauder Exit") var/obj/effect/portal/P = new(L.loc) P.invisibility = 101//So it is not seen by anyone. diff --git a/code/game/machinery/teleporter/old_teleporter.dm b/code/game/machinery/teleporter/old_teleporter.dm index afd5cc22d8f..7dc5708dc25 100644 --- a/code/game/machinery/teleporter/old_teleporter.dm +++ b/code/game/machinery/teleporter/old_teleporter.dm @@ -51,7 +51,7 @@ var/obj/L = null - for(var/obj/effect/landmark/sloc in GLOB.landmarks_list) + for(var/atom/movable/landmark/sloc in GLOB.landmarks_list) if(sloc.name != C.data) continue if(locate(/mob/living) in sloc.loc) continue L = sloc @@ -60,7 +60,7 @@ if(!L) L = locate("landmark*[C.data]") // use old stype - if(istype(L, /obj/effect/landmark/) && istype(L.loc, /turf)) + if(istype(L, /atom/movable/landmark/) && istype(L.loc, /turf)) to_chat(usr, "You insert the coordinates into the machine.") to_chat(usr, "A message flashes across the screen, reminding the user that the nuclear authentication disk is not transportable via insecure means.") user.drop_item() diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 275beb72b79..81f82d4ce87 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -227,14 +227,14 @@ // Get the desired spawn location to put the body var/S = null var/list/vr_landmarks = list() - for(var/obj/effect/landmark/virtual_reality/sloc in GLOB.landmarks_list) + for(var/atom/movable/landmark/virtual_reality/sloc in GLOB.landmarks_list) vr_landmarks += sloc.name S = input(occupant, "Please select a location to spawn your avatar at:", "Spawn location") as null|anything in vr_landmarks if(!S) return 0 - for(var/obj/effect/landmark/virtual_reality/i in GLOB.landmarks_list) + for(var/atom/movable/landmark/virtual_reality/i in GLOB.landmarks_list) if(i.name == S) S = i break diff --git a/code/game/machinery/vr_console.dm b/code/game/machinery/vr_console.dm index ee76546f3eb..760aa4fd06d 100644 --- a/code/game/machinery/vr_console.dm +++ b/code/game/machinery/vr_console.dm @@ -196,14 +196,14 @@ // Get the desired spawn location to put the body var/S = null var/list/vr_landmarks = list() - for(var/obj/effect/landmark/virtual_reality/sloc in GLOB.landmarks_list) + for(var/atom/movable/landmark/virtual_reality/sloc in GLOB.landmarks_list) vr_landmarks += sloc.name S = input(occupant, "Please select a location to spawn your avatar at:", "Spawn location") as null|anything in vr_landmarks if(!S) return 0 - for(var/obj/effect/landmark/virtual_reality/i in GLOB.landmarks_list) + for(var/atom/movable/landmark/virtual_reality/i in GLOB.landmarks_list) if(i.name == S) S = i break diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index d8e648c940f..d80319198fe 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -1,14 +1,13 @@ -/obj/effect/landmark +/atom/movable/landmark name = "landmark" icon = 'icons/mob/screen1.dmi' icon_state = "x2" anchored = 1.0 - unacidable = 1 simulated = 0 invisibility = 100 var/delete_me = 0 -/obj/effect/landmark/New() +/atom/movable/landmark/New() ..() tag = text("landmark*[]", name) invisibility = 101 @@ -87,98 +86,98 @@ GLOB.landmarks_list += src return 1 -/obj/effect/landmark/proc/delete() +/atom/movable/landmark/proc/delete() delete_me = 1 -/obj/effect/landmark/Initialize() +/atom/movable/landmark/Initialize() . = ..() if(delete_me) return INITIALIZE_HINT_QDEL -/obj/effect/landmark/Destroy(var/force = FALSE) +/atom/movable/landmark/Destroy(var/force = FALSE) if(delete_me || force) GLOB.landmarks_list -= src return ..() return QDEL_HINT_LETMELIVE -/obj/effect/landmark/start +/atom/movable/landmark/start name = "start" icon = 'icons/mob/screen1.dmi' icon_state = "x" anchored = 1.0 -/obj/effect/landmark/start/New() +/atom/movable/landmark/start/New() ..() tag = "start*[name]" invisibility = 101 return 1 -/obj/effect/landmark/virtual_reality +/atom/movable/landmark/virtual_reality name = "virtual_reality" icon = 'icons/mob/screen1.dmi' icon_state = "x" anchored = 1.0 -/obj/effect/landmark/virtual_reality/New() +/atom/movable/landmark/virtual_reality/New() ..() tag = "virtual_reality*[name]" invisibility = 101 return 1 //Costume spawner landmarks -/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears +/atom/movable/landmark/costume/New() //costume spawner, selects a random subclass and disappears - var/list/options = typesof(/obj/effect/landmark/costume) + var/list/options = typesof(/atom/movable/landmark/costume) var/PICK= options[rand(1,options.len)] new PICK(src.loc) delete_me = 1 //SUBCLASSES. Spawn a bunch of items and disappear likewise -/obj/effect/landmark/costume/chicken/New() +/atom/movable/landmark/costume/chicken/New() new /obj/item/clothing/suit/chickensuit(src.loc) new /obj/item/clothing/head/chicken(src.loc) new /obj/item/reagent_containers/food/snacks/egg(src.loc) delete_me = 1 -/obj/effect/landmark/costume/gladiator/New() +/atom/movable/landmark/costume/gladiator/New() new /obj/item/clothing/under/gladiator(src.loc) new /obj/item/clothing/head/helmet/gladiator(src.loc) qdel(src) -/obj/effect/landmark/costume/madscientist/New() +/atom/movable/landmark/costume/madscientist/New() new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc) new /obj/item/clothing/glasses/gglasses(src.loc) delete_me = 1 -/obj/effect/landmark/costume/elpresidente/New() +/atom/movable/landmark/costume/elpresidente/New() new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc) new /obj/item/clothing/shoes/boots/jackboots(src.loc) delete_me = 1 -/obj/effect/landmark/costume/nyangirl/New() +/atom/movable/landmark/costume/nyangirl/New() new /obj/item/clothing/under/schoolgirl(src.loc) new /obj/item/clothing/head/kitty(src.loc) delete_me = 1 -/obj/effect/landmark/costume/maid/New() +/atom/movable/landmark/costume/maid/New() new /obj/item/clothing/under/skirt(src.loc) var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears ) new CHOICE(src.loc) new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc) delete_me = 1 -/obj/effect/landmark/costume/butler/New() +/atom/movable/landmark/costume/butler/New() new /obj/item/clothing/accessory/wcoat(src.loc) new /obj/item/clothing/under/suit_jacket(src.loc) new /obj/item/clothing/head/that(src.loc) delete_me = 1 -/obj/effect/landmark/costume/scratch/New() +/atom/movable/landmark/costume/scratch/New() new /obj/item/clothing/gloves/white(src.loc) new /obj/item/clothing/shoes/white(src.loc) new /obj/item/clothing/under/scratch(src.loc) @@ -186,12 +185,12 @@ new /obj/item/clothing/head/cueball(src.loc) delete_me = 1 -/obj/effect/landmark/costume/highlander/New() +/atom/movable/landmark/costume/highlander/New() new /obj/item/clothing/under/kilt(src.loc) new /obj/item/clothing/head/beret(src.loc) delete_me = 1 -/obj/effect/landmark/costume/prig/New() +/atom/movable/landmark/costume/prig/New() new /obj/item/clothing/accessory/wcoat(src.loc) new /obj/item/clothing/glasses/monocle(src.loc) var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that) @@ -202,24 +201,24 @@ new /obj/item/clothing/mask/fakemoustache(src.loc) delete_me = 1 -/obj/effect/landmark/costume/plaguedoctor/New() +/atom/movable/landmark/costume/plaguedoctor/New() new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc) new /obj/item/clothing/head/plaguedoctorhat(src.loc) delete_me = 1 -/obj/effect/landmark/costume/nightowl/New() +/atom/movable/landmark/costume/nightowl/New() new /obj/item/clothing/under/owl(src.loc) new /obj/item/clothing/mask/gas/owl_mask(src.loc) delete_me = 1 -/obj/effect/landmark/costume/waiter/New() +/atom/movable/landmark/costume/waiter/New() new /obj/item/clothing/under/waiter(src.loc) var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears) new CHOICE(src.loc) new /obj/item/clothing/suit/storage/apron(src.loc) delete_me = 1 -/obj/effect/landmark/costume/pirate/New() +/atom/movable/landmark/costume/pirate/New() new /obj/item/clothing/under/pirate(src.loc) new /obj/item/clothing/suit/pirate(src.loc) var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana ) @@ -227,44 +226,44 @@ new /obj/item/clothing/glasses/eyepatch(src.loc) delete_me = 1 -/obj/effect/landmark/costume/commie/New() +/atom/movable/landmark/costume/commie/New() new /obj/item/clothing/under/soviet(src.loc) new /obj/item/clothing/head/ushanka(src.loc) delete_me = 1 -/obj/effect/landmark/costume/imperium_monk/New() +/atom/movable/landmark/costume/imperium_monk/New() new /obj/item/clothing/suit/imperium_monk(src.loc) if (prob(25)) new /obj/item/clothing/mask/gas/cyborg(src.loc) delete_me = 1 -/obj/effect/landmark/costume/holiday_priest/New() +/atom/movable/landmark/costume/holiday_priest/New() new /obj/item/clothing/suit/holidaypriest(src.loc) qdel(src) -/obj/effect/landmark/costume/marisawizard/fake/New() +/atom/movable/landmark/costume/marisawizard/fake/New() new /obj/item/clothing/head/wizard/marisa/fake(src.loc) new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc) delete_me = 1 -/obj/effect/landmark/costume/cutewitch/New() +/atom/movable/landmark/costume/cutewitch/New() new /obj/item/clothing/under/sundress(src.loc) new /obj/item/clothing/head/witchwig(src.loc) new /obj/item/staff/broom(src.loc) delete_me = 1 -/obj/effect/landmark/costume/fakewizard/New() +/atom/movable/landmark/costume/fakewizard/New() new /obj/item/clothing/suit/wizrobe/fake(src.loc) new /obj/item/clothing/head/wizard/fake(src.loc) new /obj/item/staff/(src.loc) delete_me = 1 -/obj/effect/landmark/costume/sexyclown/New() +/atom/movable/landmark/costume/sexyclown/New() new /obj/item/clothing/mask/gas/sexyclown(src.loc) new /obj/item/clothing/under/sexyclown(src.loc) delete_me = 1 -/obj/effect/landmark/costume/sexymime/New() +/atom/movable/landmark/costume/sexymime/New() new /obj/item/clothing/mask/gas/sexymime(src.loc) new /obj/item/clothing/under/sexymime(src.loc) delete_me = 1 diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 83a2b16c8b3..651d313ce4e 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -165,12 +165,12 @@ /* Teleporter that sends objects stepping on it to a specific landmark. */ /obj/effect/step_trigger/teleporter/landmark - var/obj/effect/landmark/the_landmark = null + var/atom/movable/landmark/the_landmark = null var/landmark_id = null /obj/effect/step_trigger/teleporter/landmark/Initialize(mapload) . = ..() - for(var/obj/effect/landmark/teleport_mark/mark in tele_landmarks) + for(var/atom/movable/landmark/teleport_mark/mark in tele_landmarks) if(mark.landmark_id == landmark_id) the_landmark = mark return @@ -182,14 +182,14 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is looping through world. -/obj/effect/landmark/teleport_mark +/atom/movable/landmark/teleport_mark var/landmark_id = null -/obj/effect/landmark/teleport_mark/Initialize(mapload) +/atom/movable/landmark/teleport_mark/Initialize(mapload) . = ..() tele_landmarks += src -/obj/effect/landmark/teleport_mark/Destroy() +/atom/movable/landmark/teleport_mark/Destroy() tele_landmarks -= src return ..() diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 0323d16f31a..9063ff84261 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -64,7 +64,7 @@ to_chat(usr, "The box contained nothing!") return */ - var/loot = pick(/obj/effect/landmark/costume, + var/loot = pick(/atom/movable/landmark/costume, /obj/item/clothing/glasses/thermal, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat/advanced, diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 5e79cbee132..56ba4fcbee4 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -471,12 +471,12 @@ desc = "A healthy, fat pumpkin. It looks as if it was freshly plucked from its vines and shows no signs of decay." icon_state = "decor-pumpkin" -/obj/effect/landmark/carved_pumpkin_spawn +/atom/movable/landmark/carved_pumpkin_spawn name = "jack o'lantern spawn" icon = 'icons/obj/flora/pumpkins.dmi' icon_state = "spawner-jackolantern" -/obj/effect/landmark/carved_pumpkin_spawn/New() +/atom/movable/landmark/carved_pumpkin_spawn/New() var/new_pumpkin = pick( prob(70);/obj/structure/flora/pumpkin, prob(60);/obj/structure/flora/pumpkin/carved, diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index e03e02fc226..912a2d0e17d 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -2,7 +2,7 @@ /turf/proc/empty(turf_type=/turf/space, baseturf_type, list/ignore_typecache, flags) // Remove all atoms except observers, landmarks, docking ports - var/static/list/ignored_atoms = typecacheof(list(/mob/observer, /obj/effect/landmark, /atom/movable/lighting_object)) // typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object)) + var/static/list/ignored_atoms = typecacheof(list(/mob/observer, /atom/movable/landmark, /atom/movable/lighting_object)) // typecacheof(list(/mob/dead, /atom/movable/landmark, /obj/docking_port, /atom/movable/lighting_object)) var/list/allowed_contents = typecache_filter_list_reverse(GetAllContentsIgnoring(ignore_typecache), ignored_atoms) allowed_contents -= src for(var/i in 1 to allowed_contents.len) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 96ab6623dba..802fd198980 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -4,7 +4,7 @@ //To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now). -/obj/effect/landmark/corpse +/atom/movable/landmark/corpse name = "Unknown" var/mobname = "Unknown" //Unused now but it'd fuck up maps to remove it now var/corpseuniform = null //Set this to an object path to have the slot filled with said object on the corpse. @@ -26,12 +26,12 @@ var/species = SPECIES_HUMAN delete_me = TRUE -/obj/effect/landmark/corpse/Initialize(mapload) +/atom/movable/landmark/corpse/Initialize(mapload) . = ..() createCorpse() return INITIALIZE_HINT_QDEL -/obj/effect/landmark/corpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. +/atom/movable/landmark/corpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. set waitfor = FALSE var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) M.set_species(species) @@ -89,7 +89,7 @@ -/obj/effect/landmark/corpse/syndicatesoldier +/atom/movable/landmark/corpse/syndicatesoldier name = "Mercenary" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/armor/vest @@ -105,7 +105,7 @@ -/obj/effect/landmark/corpse/syndicatecommando +/atom/movable/landmark/corpse/syndicatecommando name = "Syndicate Commando" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/space/void/merc @@ -124,7 +124,7 @@ ///////////Civilians////////////////////// -/obj/effect/landmark/corpse/chef +/atom/movable/landmark/corpse/chef name = "Chef" corpseuniform = /obj/item/clothing/under/rank/chef corpsesuit = /obj/item/clothing/suit/chef/classic @@ -137,7 +137,7 @@ corpseidaccess = "Chef" -/obj/effect/landmark/corpse/doctor +/atom/movable/landmark/corpse/doctor name = "Doctor" corpseradio = /obj/item/radio/headset/headset_med corpseuniform = /obj/item/clothing/under/rank/medical @@ -149,7 +149,7 @@ corpseidjob = "Medical Doctor" corpseidaccess = "Medical Doctor" -/obj/effect/landmark/corpse/engineer +/atom/movable/landmark/corpse/engineer name = "Engineer" corpseradio = /obj/item/radio/headset/headset_eng corpseuniform = /obj/item/clothing/under/rank/engineer @@ -162,12 +162,12 @@ corpseidjob = "Station Engineer" corpseidaccess = "Station Engineer" -/obj/effect/landmark/corpse/engineer/rig +/atom/movable/landmark/corpse/engineer/rig corpsesuit = /obj/item/clothing/suit/space/void/engineering corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/engineering -/obj/effect/landmark/corpse/clown +/atom/movable/landmark/corpse/clown name = "Clown" corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes @@ -179,7 +179,7 @@ corpseidjob = "Clown" corpseidaccess = "Clown" -/obj/effect/landmark/corpse/scientist +/atom/movable/landmark/corpse/scientist name = "Scientist" corpseradio = /obj/item/radio/headset/headset_sci corpseuniform = /obj/item/clothing/under/rank/scientist @@ -190,7 +190,7 @@ corpseidjob = "Scientist" corpseidaccess = "Scientist" -/obj/effect/landmark/corpse/miner +/atom/movable/landmark/corpse/miner corpseradio = /obj/item/radio/headset/headset_cargo corpseuniform = /obj/item/clothing/under/rank/miner corpsegloves = /obj/item/clothing/gloves/black @@ -200,7 +200,7 @@ corpseidjob = "Shaft Miner" corpseidaccess = "Shaft Miner" -/obj/effect/landmark/corpse/miner/rig +/atom/movable/landmark/corpse/miner/rig corpsesuit = /obj/item/clothing/suit/space/void/mining corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/helmet/space/void/mining @@ -208,7 +208,7 @@ /////////////////Officers////////////////////// -/obj/effect/landmark/corpse/bridgeofficer +/atom/movable/landmark/corpse/bridgeofficer name = "Bridge Officer" corpseradio = /obj/item/radio/headset/heads/hop corpseuniform = /obj/item/clothing/under/rank/centcom_officer @@ -219,7 +219,7 @@ corpseidjob = "Bridge Officer" corpseidaccess = "Captain" -/obj/effect/landmark/corpse/commander +/atom/movable/landmark/corpse/commander name = "Commander" corpseuniform = /obj/item/clothing/under/rank/centcom_captain corpsesuit = /obj/item/clothing/suit/armor/bulletproof @@ -234,7 +234,7 @@ corpseidjob = "Commander" corpseidaccess = "Captain" -/obj/effect/landmark/corpse/vintage/pilot +/atom/movable/landmark/corpse/vintage/pilot name = "Unknown Pilot" corpsesuit = /obj/item/clothing/suit/space/void/refurb/pilot corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/pilot diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 73085bc9587..47c4739c40d 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -129,7 +129,7 @@ M.setDir(SOUTH) return else - var/obj/effect/landmark/dest = pick(awaydestinations) + var/atom/movable/landmark/dest = pick(awaydestinations) if(dest) M.forceMove(dest.loc) M.setDir(SOUTH) diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 2893b7a3b1e..a7ecd8a97f1 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -1,5 +1,5 @@ // Legacy version. Need to investigate what the hell lootdrop in loot.dm does later. -Ace -/obj/effect/landmark/loot_spawn +/atom/movable/landmark/loot_spawn name = "loot spawner" icon_state = "grabbed1" var/live_cargo = 1 // So you can turn off aliens. @@ -7,12 +7,12 @@ var/spawned_faction = "hostile" // Spawned mobs can have their faction changed. -/obj/effect/landmark/loot_spawn/low +/atom/movable/landmark/loot_spawn/low name = "low prob loot spawner" icon_state = "grabbed" low_probability = 1 -/obj/effect/landmark/loot_spawn/New() +/atom/movable/landmark/loot_spawn/New() switch(pick( \ low_probability * 1000;"nothing", \ diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index ba7391217ff..7ebc070ac82 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -48,7 +48,7 @@ proc/createRandomZlevel() template.load_new_z() log_world("away mission loaded: [map]") /* VOREStation Removal - We do this in the special landmark init instead. - for(var/obj/effect/landmark/L in GLOB.landmarks_list) + for(var/atom/movable/landmark/L in GLOB.landmarks_list) if (L.name != "awaystart") continue awaydestinations.Add(L) @@ -60,15 +60,15 @@ proc/createRandomZlevel() return //VOREStation Add - This landmark type so it's not so ghetto. -/obj/effect/landmark/gateway_scatter +/atom/movable/landmark/gateway_scatter name = "uncalibrated gateway destination" -/obj/effect/landmark/gateway_scatter/Initialize(mapload) +/atom/movable/landmark/gateway_scatter/Initialize(mapload) . = ..() awaydestinations += src -/obj/effect/landmark/event_scatter +/atom/movable/landmark/event_scatter name = "uncalibrated gateway destination" -/obj/effect/landmark/event_scatter/Initialize(mapload) +/atom/movable/landmark/event_scatter/Initialize(mapload) . = ..() eventdestinations += src //VOREStation Add End diff --git a/code/modules/events/apc_damage.dm b/code/modules/events/apc_damage.dm index 2dd10d87fef..7ac789aec1b 100644 --- a/code/modules/events/apc_damage.dm +++ b/code/modules/events/apc_damage.dm @@ -23,7 +23,7 @@ var/list/possibleEpicentres = list() var/list/apcs = list() - for(var/obj/effect/landmark/newEpicentre in GLOB.landmarks_list) + for(var/atom/movable/landmark/newEpicentre in GLOB.landmarks_list) if(newEpicentre.name == "lightsout") possibleEpicentres += newEpicentre diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index fa1b08150fb..9f26ba78de4 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -5,7 +5,7 @@ /datum/event/rogue_drone/start() //spawn them at the same place as carp var/list/possible_spawns = list() - for(var/obj/effect/landmark/C in GLOB.landmarks_list) + for(var/atom/movable/landmark/C in GLOB.landmarks_list) if(C.name == "carpspawn") possible_spawns.Add(C) diff --git a/code/modules/gamemaster/actions/carp_migration.dm b/code/modules/gamemaster/actions/carp_migration.dm index dde4f002ac6..4957c6f9324 100644 --- a/code/modules/gamemaster/actions/carp_migration.dm +++ b/code/modules/gamemaster/actions/carp_migration.dm @@ -34,7 +34,7 @@ var/group_size_min = 3 var/group_size_max = 5 - for(var/obj/effect/landmark/C in GLOB.landmarks_list) + for(var/atom/movable/landmark/C in GLOB.landmarks_list) if(C.name == "carpspawn") spawn_locations.Add(C.loc) diff --git a/code/modules/gamemaster/actions/electrical_storm.dm b/code/modules/gamemaster/actions/electrical_storm.dm index 5bed4aadaab..e1b2e0f7970 100644 --- a/code/modules/gamemaster/actions/electrical_storm.dm +++ b/code/modules/gamemaster/actions/electrical_storm.dm @@ -14,7 +14,7 @@ for(var/i=1, i <= lightsoutAmount, i++) var/list/possibleEpicentres = list() - for(var/obj/effect/landmark/newEpicentre in GLOB.landmarks_list) + for(var/atom/movable/landmark/newEpicentre in GLOB.landmarks_list) if(newEpicentre.name == "lightsout" && !(newEpicentre in epicentreList)) possibleEpicentres += newEpicentre if(possibleEpicentres.len) @@ -25,7 +25,7 @@ if(!epicentreList.len) return - for(var/obj/effect/landmark/epicentre in epicentreList) + for(var/atom/movable/landmark/epicentre in epicentreList) for(var/obj/machinery/power/apc/apc in range(epicentre,lightsoutRange)) apc.overload_lighting() diff --git a/code/modules/gamemaster/actions/rogue_drones.dm b/code/modules/gamemaster/actions/rogue_drones.dm index 4a8c64c098e..d5379c351d9 100644 --- a/code/modules/gamemaster/actions/rogue_drones.dm +++ b/code/modules/gamemaster/actions/rogue_drones.dm @@ -9,7 +9,7 @@ ..() //spawn them at the same place as carp var/list/possible_spawns = list() - for(var/obj/effect/landmark/C in GLOB.landmarks_list) + for(var/atom/movable/landmark/C in GLOB.landmarks_list) if(C.name == "carpspawn") possible_spawns.Add(C) diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 0105af1596b..c39fc32fb94 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -331,7 +331,7 @@ linkedholodeck.sound_env = A.sound_env spawn(30) - for(var/obj/effect/landmark/L in linkedholodeck) + for(var/atom/movable/landmark/L in linkedholodeck) if(L.name=="Atmospheric Test Start") spawn(20) var/turf/T = get_turf(L) diff --git a/code/modules/looking_glass/lg_area.dm b/code/modules/looking_glass/lg_area.dm index 6b35ffd577a..10e1bc0e563 100644 --- a/code/modules/looking_glass/lg_area.dm +++ b/code/modules/looking_glass/lg_area.dm @@ -1,7 +1,7 @@ /area/looking_glass name = "make a subtype" - var/obj/effect/landmark/looking_glass/our_landmark + var/atom/movable/landmark/looking_glass/our_landmark var/list/our_turfs = list() var/list/our_optional_turfs = list() diff --git a/code/modules/looking_glass/lg_imageholder.dm b/code/modules/looking_glass/lg_imageholder.dm index 44637c14085..9e82a0d1520 100644 --- a/code/modules/looking_glass/lg_imageholder.dm +++ b/code/modules/looking_glass/lg_imageholder.dm @@ -1,6 +1,6 @@ #define LG_IMAGE_SIZE 736 -/obj/effect/landmark/looking_glass +/atom/movable/landmark/looking_glass var/image/holding var/list/viewers @@ -9,31 +9,31 @@ mouse_opacity = 0 -/obj/effect/landmark/looking_glass/Initialize() +/atom/movable/landmark/looking_glass/Initialize() . = ..() viewers = list() -/obj/effect/landmark/looking_glass/proc/gain_viewer(var/client/C) +/atom/movable/landmark/looking_glass/proc/gain_viewer(var/client/C) if(C in viewers) stack_trace("Looking Glass [x],[y],[z] tried to add a duplicate viewer.") viewers |= C if(holding) show_to(C) -/obj/effect/landmark/looking_glass/proc/lose_viewer(var/client/C) +/atom/movable/landmark/looking_glass/proc/lose_viewer(var/client/C) if(!(C in viewers)) stack_trace("Looking Glass [x],[y],[z] tried to remove a viewer it didn't have") viewers -= C if(holding) unshow_to(C) -/obj/effect/landmark/looking_glass/proc/show_to(var/client/C) +/atom/movable/landmark/looking_glass/proc/show_to(var/client/C) C.images |= holding -/obj/effect/landmark/looking_glass/proc/unshow_to(var/client/C) +/atom/movable/landmark/looking_glass/proc/unshow_to(var/client/C) C.images -= holding -/obj/effect/landmark/looking_glass/proc/take_image(var/image/newimage) +/atom/movable/landmark/looking_glass/proc/take_image(var/image/newimage) if(!istype(newimage)) return @@ -52,7 +52,7 @@ for(var/client in viewers) show_to(client) -/obj/effect/landmark/looking_glass/proc/drop_image() +/atom/movable/landmark/looking_glass/proc/drop_image() if(!holding) return diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index f0dfeeb0c8a..67ed2e00ae4 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -43,7 +43,7 @@ for(var/turf/T in get_affected_turfs(central_turf, 1)) T.flags_1 |= NO_RUINS - new /obj/effect/landmark/ruin(central_turf, src) + new /atom/movable/landmark/ruin(central_turf, src) return central_turf /datum/map_template/ruin/proc/place_on_isolated_level(z) @@ -56,7 +56,7 @@ for(var/turf/T in get_affected_turfs(placement)) T.flags_1 |= NO_RUINS var/turf/center = locate(placement.x + round(width/2),placement.y + round(height/2),placement.z) - new /obj/effect/landmark/ruin(center, src) + new /atom/movable/landmark/ruin(center, src) return center /proc/seedRuins(list/z_levels = null, budget = 0, whitelist = list(/area/space), list/potentialRuins) diff --git a/code/modules/maps/admin/ert.dm b/code/modules/maps/admin/ert.dm index 602c1fe318f..0b92ebaea5f 100644 --- a/code/modules/maps/admin/ert.dm +++ b/code/modules/maps/admin/ert.dm @@ -114,7 +114,7 @@ initial_generic_waypoints = list("ert_ship_near_fore", "ert_ship_near_aft", "ert_ship_near_port", "ert_ship_near_star", "ert_ship_port", "ert_ship_star", "ert_ship_base_dock", "omship_spawn_ert_lander") // initial_restricted_waypoints = list("NRV Von Braun's Bay" = list("omship_spawn_ert_lander")) -/obj/effect/landmark/map_data/ert_ship +/atom/movable/landmark/map_data/ert_ship height = 1 /obj/effect/shuttle_landmark/premade/ert_ship_port diff --git a/code/modules/maps/admin/mercship.dm b/code/modules/maps/admin/mercship.dm index d1d4ac36c8f..55ee09ede17 100644 --- a/code/modules/maps/admin/mercship.dm +++ b/code/modules/maps/admin/mercship.dm @@ -133,7 +133,7 @@ initial_generic_waypoints = list("manta_ship_near_fore", "manta_ship_near_aft", "manta_ship_near_port", "manta_ship_near_star", "manta_ship_port", "manta_ship_star", "manta_ship_base_dock", "omship_spawn_manta_lander") // initial_restricted_waypoints = list("Mercenary Cruiser's Bay" = list("omship_spawn_manta_lander")) -/obj/effect/landmark/map_data/manta_ship +/atom/movable/landmark/map_data/manta_ship height = 1 /obj/effect/shuttle_landmark/premade/manta_ship_port diff --git a/code/modules/maps/away_missions/140x140/snowfield.dm b/code/modules/maps/away_missions/140x140/snowfield.dm index 5e11d78682e..9c9ee9e2c43 100644 --- a/code/modules/maps/away_missions/140x140/snowfield.dm +++ b/code/modules/maps/away_missions/140x140/snowfield.dm @@ -111,7 +111,7 @@ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. The controls are locked." icon_state = "smes" -/obj/effect/landmark/away +/atom/movable/landmark/away name = "awaystart" /obj/effect/floor_decal/derelict/d1 diff --git a/code/modules/maps/away_missions/archive/labyrinth.dm b/code/modules/maps/away_missions/archive/labyrinth.dm index 47567c21537..f1f6d8645d6 100644 --- a/code/modules/maps/away_missions/archive/labyrinth.dm +++ b/code/modules/maps/away_missions/archive/labyrinth.dm @@ -185,7 +185,7 @@ do_after_cooldown() return -/obj/effect/landmark/corpse/tunnelclown +/atom/movable/landmark/corpse/tunnelclown name = "dead tunnel clown" corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes @@ -194,7 +194,7 @@ corpsemask = /obj/item/clothing/mask/gas/clown_hat corpsepocket1 = /obj/item/bikehorn -/obj/effect/landmark/corpse/tunnelclown/sentinel +/atom/movable/landmark/corpse/tunnelclown/sentinel name = "dead clown sentinel" corpsesuit = /obj/item/clothing/suit/cultrobes corpsehelmet = /obj/item/clothing/head/culthood @@ -217,7 +217,7 @@ // emote_hear = list("honks") // speak_chance = 1 a_intent = "harm" - var/corpse = /obj/effect/landmark/mobcorpse/tunnelclown + var/corpse = /atom/movable/landmark/mobcorpse/tunnelclown var/weapon1 = /obj/item/twohanded/fireaxe stop_when_pulled = 0 maxHealth = 100 @@ -250,7 +250,7 @@ icon_state = "sentinelclown" icon_living = "sentinelclown" icon_dead = "clown_dead" - corpse = /obj/effect/landmark/mobcorpse/tunnelclown/sentinel + corpse = /atom/movable/landmark/mobcorpse/tunnelclown/sentinel weapon1 = /obj/item/material/twohanded/spear maxHealth = 150 health = 150 diff --git a/code/modules/maps/away_missions/archive/stationCollision.dm b/code/modules/maps/away_missions/archive/stationCollision.dm index ee9bbf33e3a..81b82df30f2 100644 --- a/code/modules/maps/away_missions/archive/stationCollision.dm +++ b/code/modules/maps/away_missions/archive/stationCollision.dm @@ -43,11 +43,11 @@ /* * Landmarks - Instead of spawning a new object type, I'll spawn the bible using a landmark! */ -/obj/effect/landmark/sc_bible_spawner +/atom/movable/landmark/sc_bible_spawner name = "Safecode hint spawner" delete_me = TRUE -/obj/effect/landmark/sc_bible_spawner/Initialize() +/atom/movable/landmark/sc_bible_spawner/Initialize() . = ..() var/obj/item/storage/bible/B = new /obj/item/storage/bible/booze(src.loc) B.name = "The Holy book of the Geometer" diff --git a/code/modules/maps/misc_maps/trade/trade_station.dm b/code/modules/maps/misc_maps/trade/trade_station.dm index b003a1a18b6..22da0876edc 100644 --- a/code/modules/maps/misc_maps/trade/trade_station.dm +++ b/code/modules/maps/misc_maps/trade/trade_station.dm @@ -42,11 +42,11 @@ /////////////////////////// //// Spawning and despawning var/global/list/latejoin_trade = list() -/obj/effect/landmark/trade +/atom/movable/landmark/trade name = "JoinLateTrade" delete_me = 1 -/obj/effect/landmark/trade/New() +/atom/movable/landmark/trade/New() latejoin_trade += loc // Register this turf as trade latejoin. ..() @@ -73,7 +73,7 @@ var/global/list/latejoin_trade = list() announce_channel = "Trade" on_store_name = "Beruang Trading Corp Storage" -/obj/effect/landmark/map_data/trade +/atom/movable/landmark/map_data/trade height = 2 // Their shuttle diff --git a/code/modules/maps/talon/talon.dm b/code/modules/maps/talon/talon.dm index d6fb5351c86..d15cefe8367 100644 --- a/code/modules/maps/talon/talon.dm +++ b/code/modules/maps/talon/talon.dm @@ -3,11 +3,11 @@ /// Most of this can be left uncommented out except for ship datums (those get upset if they cant find their landmarks) -Bloop var/global/list/latejoin_talon = list() -/obj/effect/landmark/talon +/atom/movable/landmark/talon name = "JoinLateTalon" delete_me = 1 -/obj/effect/landmark/talon/New() +/atom/movable/landmark/talon/New() latejoin_talon += loc // Register this turf as tram latejoin. ..() @@ -34,7 +34,7 @@ var/global/list/latejoin_talon = list() announce_channel = "Talon" on_store_name = "ITV Talon Robotic Storage" -/obj/effect/landmark/map_data/talon +/atom/movable/landmark/map_data/talon height = 2 /////////////////////////// diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index b8b14e3fa5b..27a6705182a 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -1,7 +1,7 @@ var/global/list/empty_playable_ai_cores = list() /hook/roundstart/proc/spawn_empty_ai() - for(var/obj/effect/landmark/start/S in GLOB.landmarks_list) + for(var/atom/movable/landmark/start/S in GLOB.landmarks_list) if(S.name != "AI") continue if(locate(/mob/living) in S.loc) diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index 51a1af5f225..e5e399aed8e 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -125,13 +125,13 @@ GLOBAL_LIST_EMPTY(available_ai_shells) // Place this on your map to mark where a free AI shell will be. // This can be turned off in the config (and is off by default). // Note that mapping in more than one of these will result in multiple shells. -/obj/effect/landmark/free_ai_shell +/atom/movable/landmark/free_ai_shell name = "free ai shell spawner" icon = 'icons/mob/screen1.dmi' icon_state = "x3" delete_me = TRUE -/obj/effect/landmark/free_ai_shell/Initialize(mapload) +/atom/movable/landmark/free_ai_shell/Initialize(mapload) if(config_legacy.allow_ai_shells && config_legacy.give_free_ai_shell) new /mob/living/silicon/robot/ai_shell(get_turf(src)) return ..() diff --git a/code/modules/mob/living/simple_mob/corpse.dm b/code/modules/mob/living/simple_mob/corpse.dm index 66b5e1bcd2f..e6f7a764415 100644 --- a/code/modules/mob/living/simple_mob/corpse.dm +++ b/code/modules/mob/living/simple_mob/corpse.dm @@ -7,7 +7,7 @@ //To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now). -/obj/effect/landmark/mobcorpse +/atom/movable/landmark/mobcorpse name = "Unknown" var/mobname = "Unknown" //Unused now but it'd fuck up maps to remove it now var/corpseuniform = null //Set this to an object path to have the slot filled with said object on the corpse. @@ -27,13 +27,13 @@ var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access. var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID -/obj/effect/landmark/mobcorpse/Initialize(mapload) +/atom/movable/landmark/mobcorpse/Initialize(mapload) . = ..() createCorpse() delete_me = TRUE return INITIALIZE_HINT_QDEL -/obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. +/atom/movable/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) M.real_name = src.name M.set_stat(DEAD) //Kills the new mob @@ -84,7 +84,7 @@ //List of different corpse types -/obj/effect/landmark/mobcorpse/syndicatesoldier +/atom/movable/landmark/mobcorpse/syndicatesoldier name = "Mercenary" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/armor/vest @@ -98,7 +98,7 @@ corpseidjob = "Operative" corpseidaccess = "Syndicate" -/obj/effect/landmark/mobcorpse/solarpeacekeeper +/atom/movable/landmark/mobcorpse/solarpeacekeeper name = "Mercenary" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/armor/pcarrier/blue/sol @@ -112,7 +112,7 @@ corpseidjob = "Peacekeeper" corpseidaccess = "Syndicate" -/obj/effect/landmark/mobcorpse/syndicatecommando +/atom/movable/landmark/mobcorpse/syndicatecommando name = "Syndicate Commando" corpseuniform = /obj/item/clothing/under/syndicate corpsesuit = /obj/item/clothing/suit/space/void/merc @@ -129,7 +129,7 @@ -/obj/effect/landmark/mobcorpse/clown +/atom/movable/landmark/mobcorpse/clown name = "Clown" corpseuniform = /obj/item/clothing/under/rank/clown corpseshoes = /obj/item/clothing/shoes/clown_shoes @@ -141,7 +141,7 @@ corpseidjob = "Clown" corpseidaccess = "Clown" -/obj/effect/landmark/mobcorpse/clown/clownop +/atom/movable/landmark/mobcorpse/clown/clownop name = "Clown Commando" corpseuniform = /obj/item/clothing/under/rank/clown corpsesuit = /obj/item/clothing/suit/armor/pcarrier/clownop @@ -154,7 +154,7 @@ corpseidjob = "Commando" corpseidaccess = "Syndicate" -/obj/effect/landmark/mobcorpse/clown/clownop/space +/atom/movable/landmark/mobcorpse/clown/clownop/space name = "Clown Commando" corpseuniform = /obj/item/clothing/under/rank/clown corpsesuit = /obj/item/clothing/suit/space/void/clownop @@ -167,7 +167,7 @@ corpseidjob = "Commando" corpseidaccess = "Syndicate" -/obj/effect/landmark/mobcorpse/clown/clownop/space/alt +/atom/movable/landmark/mobcorpse/clown/clownop/space/alt name = "Clown Commando" corpseuniform = /obj/item/clothing/under/rank/clown corpsesuit = /obj/item/clothing/suit/space/void/clownop @@ -180,24 +180,24 @@ corpseidjob = "Commando" corpseidaccess = "Syndicate" -/obj/effect/landmark/mobcorpse/russian +/atom/movable/landmark/mobcorpse/russian name = "Russian" corpseuniform = /obj/item/clothing/under/soviet corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpsehelmet = /obj/item/clothing/head/bearpelt -/obj/effect/landmark/mobcorpse/russian/ranged +/atom/movable/landmark/mobcorpse/russian/ranged corpsehelmet = /obj/item/clothing/head/ushanka //Diorama Corpses -/obj/effect/landmark/mobcorpse/shogun +/atom/movable/landmark/mobcorpse/shogun name = "Shogun's Bodyguard" corpseuniform = /obj/item/clothing/under/color/black corpsesuit = /obj/item/clothing/suit/kamishimo corpseshoes = /obj/item/clothing/shoes/sandal corpsehelmet = /obj/item/clothing/head/rice -/obj/effect/landmark/mobcorpse/safari +/atom/movable/landmark/mobcorpse/safari name = "Colonial Adventurer" corpseuniform = /obj/item/clothing/under/safari corpseshoes = /obj/item/clothing/shoes/boots/workboots @@ -207,16 +207,16 @@ // Vox Bodies ////////////////////////// -/obj/effect/landmark/mobcorpse/vox +/atom/movable/landmark/mobcorpse/vox name = "vox" corpseid = 0 -/obj/effect/landmark/mobcorpse/vox/Initialize() +/atom/movable/landmark/mobcorpse/vox/Initialize() . = ..() createvoxCorpse() return INITIALIZE_HINT_QDEL -/obj/effect/landmark/mobcorpse/vox/proc/createvoxCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. +/atom/movable/landmark/mobcorpse/vox/proc/createvoxCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/vox/M = new /mob/living/carbon/human/vox (src.loc) M.real_name = src.name M.set_stat(DEAD) //Kills the new mob @@ -267,7 +267,7 @@ //Types of Vox corpses: -/obj/effect/landmark/mobcorpse/vox/pirate +/atom/movable/landmark/mobcorpse/vox/pirate name = "vox pirate" corpseuniform = /obj/item/clothing/under/color/black corpsesuit = /obj/item/clothing/suit/armor/vox_scrap @@ -276,7 +276,7 @@ corpsemask = /obj/item/clothing/mask/breath corpseid = 0 -/obj/effect/landmark/mobcorpse/vox/boarder_m +/atom/movable/landmark/mobcorpse/vox/boarder_m name = "vox melee boarder" corpseuniform = /obj/item/clothing/under/vox/vox_casual corpsesuit = /obj/item/clothing/suit/armor/vox_scrap @@ -285,7 +285,7 @@ corpsemask = /obj/item/clothing/mask/breath corpseid = 0 -/obj/effect/landmark/mobcorpse/vox/boarder_r +/atom/movable/landmark/mobcorpse/vox/boarder_r name = "vox ranged boarder" corpseuniform = /obj/item/clothing/under/rank/bartender corpsesuit = /obj/item/clothing/suit/armor/bulletproof @@ -293,7 +293,7 @@ corpsemask = /obj/item/clothing/mask/breath corpseid = 0 -/obj/effect/landmark/mobcorpse/vox/boarder_t +/atom/movable/landmark/mobcorpse/vox/boarder_t name = "vox salvage technician" corpseuniform = /obj/item/clothing/under/rank/bartender corpsesuit = /obj/item/clothing/suit/armor/bulletproof @@ -301,7 +301,7 @@ corpsemask = /obj/item/clothing/mask/breath corpseid = 0 -/obj/effect/landmark/mobcorpse/vox/suppressor +/atom/movable/landmark/mobcorpse/vox/suppressor name = "vox suppressor" corpseuniform = /obj/item/clothing/under/color/red corpsesuit = /obj/item/clothing/suit/storage/toggle/fr_jacket @@ -310,7 +310,7 @@ corpsemask = /obj/item/clothing/mask/gas/half corpseid = 0 -/obj/effect/landmark/mobcorpse/vox/captain +/atom/movable/landmark/mobcorpse/vox/captain name = "vox captain" corpseuniform = /obj/item/clothing/under/color/black corpsesuit = /obj/item/clothing/suit/space/vox/carapace @@ -320,7 +320,7 @@ corpsehelmet = /obj/item/clothing/head/helmet/riot corpseid = 0 -/obj/effect/landmark/mobcorpse/syndicatecommando +/atom/movable/landmark/mobcorpse/syndicatecommando name = "Mercenary Commando" ////////////////////////// @@ -328,25 +328,25 @@ ////////////////////////// //I'm sorry for how huge this list is. I didn't really consider the ramifications of creating a diverse crew of pirates. -/obj/effect/landmark/mobcorpse/pirate +/atom/movable/landmark/mobcorpse/pirate name = "Pirate" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/tan -/obj/effect/landmark/mobcorpse/pirate/melee +/atom/movable/landmark/mobcorpse/pirate/melee corpsesuit = /obj/item/clothing/suit/unathi/mantle corpseshoes = /obj/item/clothing/shoes/boots/workboots corpseglasses = /obj/item/clothing/glasses/eyepatch corpsebelt = /obj/item/storage/belt/security/tactical corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/melee_machete +/atom/movable/landmark/mobcorpse/pirate/melee_machete name = "Pirate Brush Cutter" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpseshoes = /obj/item/clothing/shoes/boots/workboots corpsemask = /obj/item/clothing/mask/balaclava corpseback = /obj/item/storage/backpack/dufflebag/syndie -/obj/effect/landmark/mobcorpse/pirate/melee_machete_armor +/atom/movable/landmark/mobcorpse/pirate/melee_machete_armor name = "Armored Brush Cutter" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/green corpsesuit = /obj/item/clothing/suit/storage/vest/tactical @@ -354,21 +354,21 @@ corpsehelmet = /obj/item/clothing/head/welding corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/melee_energy_armor +/atom/movable/landmark/mobcorpse/pirate/melee_energy_armor name = "Armored Duelist" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/tan corpsesuit = /obj/item/clothing/suit/armor/pcarrier/navy corpseshoes = /obj/item/clothing/accessory/armor/legguards/riot corpsemask = /obj/item/clothing/mask/gas/jackal -/obj/effect/landmark/mobcorpse/pirate/melee_shield +/atom/movable/landmark/mobcorpse/pirate/melee_shield name = "Pirate Buckler" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/green corpseshoes = /obj/item/clothing/shoes/boots/workboots corpsehelmet = /obj/item/clothing/head/tajaran/scarf corpseback = /obj/item/storage/backpack/dufflebag/syndie -/obj/effect/landmark/mobcorpse/pirate/melee_shield_machete_armor +/atom/movable/landmark/mobcorpse/pirate/melee_shield_machete_armor name = "Armored Sword and Boarder" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/green corpsesuit = /obj/item/clothing/suit/armor/pcarrier/navy @@ -377,7 +377,7 @@ corpsebelt = /obj/item/storage/belt/security/tactical corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/ranged +/atom/movable/landmark/mobcorpse/pirate/ranged name = "Pirate Pistolier" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpseshoes = /obj/item/clothing/shoes/boots/workboots @@ -385,14 +385,14 @@ corpsebelt = /obj/item/storage/belt/security/tactical corpseback = /obj/item/storage/backpack/dufflebag/syndie -/obj/effect/landmark/mobcorpse/pirate/ranged_armor +/atom/movable/landmark/mobcorpse/pirate/ranged_armor name = "Armored Pistolier" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpsesuit = /obj/item/clothing/suit/storage/vest/tactical corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpsebelt = /obj/item/storage/belt/security/tactical -/obj/effect/landmark/mobcorpse/pirate/ranged_laser +/atom/movable/landmark/mobcorpse/pirate/ranged_laser name = "Pirate Handcannon" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpseshoes = /obj/item/clothing/shoes/boots/workboots @@ -400,14 +400,14 @@ corpsebelt = /obj/item/storage/belt/security/tactical corpseback = /obj/item/storage/backpack/dufflebag/syndie -/obj/effect/landmark/mobcorpse/pirate/ranged_laser_armor +/atom/movable/landmark/mobcorpse/pirate/ranged_laser_armor name = "Armored Handcannon" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpsesuit = /obj/item/clothing/suit/storage/vest/tactical corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpsebelt = /obj/item/storage/belt/security/tactical -/obj/effect/landmark/mobcorpse/pirate/ranged_blunderbuss +/atom/movable/landmark/mobcorpse/pirate/ranged_blunderbuss name = "Pirate Blunderbuster" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpseshoes = /obj/item/clothing/shoes/boots/workboots @@ -415,7 +415,7 @@ corpsebelt = /obj/item/storage/belt/security/tactical/bandolier corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/ranged_blunderbuss_armor +/atom/movable/landmark/mobcorpse/pirate/ranged_blunderbuss_armor name = "Armored Blunderbuster" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/tan corpsesuit = /obj/item/clothing/suit/storage/vest/tactical @@ -424,19 +424,19 @@ corpsebelt = /obj/item/storage/belt/security/tactical/bandolier corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/mate +/atom/movable/landmark/mobcorpse/pirate/mate name = "First Mate" corpseuniform = /obj/item/clothing/under/worn_fatigues corpsesuit = /obj/item/clothing/suit/armor/riot/alt corpseshoes = /obj/item/clothing/accessory/armor/legguards/riot corpsemask = /obj/item/clothing/mask/gas/commando -/obj/effect/landmark/mobcorpse/pirate/mate/rifle +/atom/movable/landmark/mobcorpse/pirate/mate/rifle name = "Mate Marksman" corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpsemask = null -/obj/effect/landmark/mobcorpse/pirate/bosun +/atom/movable/landmark/mobcorpse/pirate/bosun name = "Bosun" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/green corpsesuit = /obj/item/clothing/suit/armor/tactical/pirate @@ -444,7 +444,7 @@ corpseglasses = /obj/item/clothing/glasses/eyepatch corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/captain +/atom/movable/landmark/mobcorpse/pirate/captain name = "Pirate Captain" corpseuniform = /obj/item/clothing/under/worn_fatigues corpsesuit = /obj/item/clothing/suit/armor/tactical/pirate @@ -453,7 +453,7 @@ corpsehelmet = /obj/item/clothing/head/helmet/pirate //Akula -/obj/effect/landmark/mobcorpse/akula/proc/createakulaCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. +/atom/movable/landmark/mobcorpse/akula/proc/createakulaCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/akula/M = new /mob/living/carbon/human/akula (src.loc) M.real_name = src.name M.set_stat(DEAD) //Kills the new mob @@ -502,27 +502,27 @@ W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) -/obj/effect/landmark/mobcorpse/pirate/melee_armor +/atom/movable/landmark/mobcorpse/pirate/melee_armor name = "Armored Pirate" corpseuniform = /obj/item/clothing/under/oricon/utility/marine corpsesuit = /obj/item/clothing/suit/storage/vest/tactical corpseshoes = /obj/item/clothing/accessory/armor/legguards/riot corpsehelmet = /obj/item/clothing/head/helmet/cyberpunk -/obj/effect/landmark/mobcorpse/pirate/melee_energy +/atom/movable/landmark/mobcorpse/pirate/melee_energy name = "Pirate Duelist" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/tan corpsesuit = /obj/item/clothing/suit/unathi/mantle corpseshoes = /obj/item/clothing/accessory/armor/legguards/riot corpsehelmet = /obj/item/clothing/head/welding -/obj/effect/landmark/mobcorpse/pirate/mate/shotgun +/atom/movable/landmark/mobcorpse/pirate/mate/shotgun name = "Mate Blunderbuster" corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpsemask = /obj/item/clothing/mask/gas/jackal //Vulpkanin -/obj/effect/landmark/mobcorpse/vulpkanin/proc/createvuplkaninCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. +/atom/movable/landmark/mobcorpse/vulpkanin/proc/createvuplkaninCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/vulpkanin/M = new /mob/living/carbon/human/vulpkanin (src.loc) M.real_name = src.name M.set_stat(DEAD) //Kills the new mob @@ -571,12 +571,12 @@ W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) -/obj/effect/landmark/mobcorpse/pirate/melee_shield_machete +/atom/movable/landmark/mobcorpse/pirate/melee_shield_machete name = "Sword and Boarder" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/tan corpseshoes = /obj/item/clothing/shoes/boots/workboots -/obj/effect/landmark/mobcorpse/pirate/melee_shield_armor +/atom/movable/landmark/mobcorpse/pirate/melee_shield_armor name = "Armored Buckler" corpseuniform = /obj/item/clothing/under/oricon/utility/marine/green corpsesuit = /obj/item/clothing/suit/armor/pcarrier/navy @@ -585,20 +585,20 @@ corpsebelt = /obj/item/storage/belt/security/tactical corpseback = /obj/item/storage/backpack/rebel -/obj/effect/landmark/mobcorpse/pirate/mate/pistol +/atom/movable/landmark/mobcorpse/pirate/mate/pistol name = "Mate Pistolier" corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpsehelmet = /obj/item/clothing/head/helmet/cyberpunk /* -/obj/effect/landmark/mobcorpse/pirate +/atom/movable/landmark/mobcorpse/pirate name = "Pirate" corpseuniform = /obj/item/clothing/under/pirate corpseshoes = /obj/item/clothing/shoes/boots/jackboots corpseglasses = /obj/item/clothing/glasses/eyepatch corpsehelmet = /obj/item/clothing/head/bandana -/obj/effect/landmark/mobcorpse/pirate/ranged +/atom/movable/landmark/mobcorpse/pirate/ranged name = "Pirate Gunner" corpsesuit = /obj/item/clothing/suit/pirate corpsehelmet = /obj/item/clothing/head/pirate diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm index a4d47ad3389..bc2c27b23b0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm @@ -101,7 +101,7 @@ attacktext = list("slashed", "stabbed") armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 100, rad = 100) // Same armor values as the vest they drop, plus simple mob immunities - corpse = /obj/effect/landmark/mobcorpse/clown/clownop + corpse = /atom/movable/landmark/mobcorpse/clown/clownop loot_list = list(/obj/item/melee/clownop = 100) // Might as well give it the knife ai_holder_type = /datum/ai_holder/simple_mob/merc @@ -232,7 +232,7 @@ max_n2 = 0 minbodytemp = 0 - corpse = /obj/effect/landmark/mobcorpse/clown/clownop/space + corpse = /atom/movable/landmark/mobcorpse/clown/clownop/space loot_list = list(/obj/item/melee/clownstaff = 100) /mob/living/simple_mob/humanoid/clown/commando/melee/space/Process_Spacemove(var/check_drift = 0) @@ -241,7 +241,7 @@ /mob/living/simple_mob/humanoid/clown/commando/melee/space/alt icon_state = "clownop_space_alt_melee" icon_living = "clownop_space_alt_melee" - corpse = /obj/effect/landmark/mobcorpse/clown/clownop/space/alt + corpse = /atom/movable/landmark/mobcorpse/clown/clownop/space/alt // Ranged Space Clown /mob/living/simple_mob/humanoid/clown/commando/ranged/space @@ -265,7 +265,7 @@ max_n2 = 0 minbodytemp = 0 - corpse = /obj/effect/landmark/mobcorpse/clown/clownop/space + corpse = /atom/movable/landmark/mobcorpse/clown/clownop/space loot_list = list(/obj/item/gun/projectile/automatic/clown_rifle = 100, /obj/item/ammo_magazine/mcompressedbio/large/banana = 30, /obj/item/ammo_magazine/mcompressedbio/large/banana = 30 @@ -280,4 +280,4 @@ /mob/living/simple_mob/humanoid/clown/commando/ranged/space/alt icon_state = "clownop_space_alt_ranged" icon_living = "clownop_space_alt_ranged" - corpse = /obj/effect/landmark/mobcorpse/clown/clownop/space/alt + corpse = /atom/movable/landmark/mobcorpse/clown/clownop/space/alt diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index 691cd1cc056..735775c90ef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -71,7 +71,7 @@ attacktext = list("slashed", "stabbed") armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 100) // Same armor values as the vest they drop, plus simple mob immunities - corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier + corpse = /atom/movable/landmark/mobcorpse/syndicatesoldier loot_list = list(/obj/item/material/knife/tacknife = 100) // Might as well give it the knife ai_holder_type = /datum/ai_holder/simple_mob/merc @@ -228,7 +228,7 @@ icon_living = "blueforranged_smg" catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human/peacekeeper) - corpse = /obj/effect/landmark/mobcorpse/solarpeacekeeper + corpse = /atom/movable/landmark/mobcorpse/solarpeacekeeper loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100) base_attack_cooldown = 5 // Two attacks a second or so. @@ -348,7 +348,7 @@ max_n2 = 0 minbodytemp = 0 - corpse = /obj/effect/landmark/mobcorpse/syndicatecommando + corpse = /atom/movable/landmark/mobcorpse/syndicatecommando /mob/living/simple_mob/humanoid/merc/melee/sword/space/Process_Spacemove(var/check_drift = 0) return @@ -374,7 +374,7 @@ max_n2 = 0 minbodytemp = 0 - corpse = /obj/effect/landmark/mobcorpse/syndicatecommando + corpse = /atom/movable/landmark/mobcorpse/syndicatecommando base_attack_cooldown = 5 // Two attacks a second or so. reload_max = 20 @@ -617,7 +617,7 @@ max_n2 = 0 minbodytemp = 0 - corpse = /obj/effect/landmark/mobcorpse/vox/pirate + corpse = /atom/movable/landmark/mobcorpse/vox/pirate loot_list = list(/obj/item/gun/projectile/shotgun/pump/rifle/vox_hunting = 100, /obj/item/ammo_magazine/clip/c762 = 30, /obj/item/ammo_magazine/clip/c762 = 30 @@ -660,7 +660,7 @@ attack_edge = 1 ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive - corpse = /obj/effect/landmark/mobcorpse/vox/boarder_m + corpse = /atom/movable/landmark/mobcorpse/vox/boarder_m loot_list = list(/obj/item/melee/energy/sword = 100) // They're good with the swords? I dunno. I like the idea they can deflect. @@ -703,7 +703,7 @@ projectilesound = 'sound/weapons/Gunshot_shotgun.ogg' ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive - corpse = /obj/effect/landmark/mobcorpse/vox/boarder_r + corpse = /atom/movable/landmark/mobcorpse/vox/boarder_r loot_list = list(/obj/item/gun/projectile/shotgun/pump/combat = 100, /obj/item/ammo_magazine/m12gdrum = 30, /obj/item/ammo_magazine/m12gdrum = 30 @@ -734,7 +734,7 @@ projectilesound = 'sound/weapons/Laser.ogg' ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting - corpse = /obj/effect/landmark/mobcorpse/vox/boarder_t + corpse = /atom/movable/landmark/mobcorpse/vox/boarder_t loot_list = list(/obj/item/gun/energy/ionrifle) needs_reload = TRUE @@ -766,7 +766,7 @@ projectilesound = 'sound/effects/basscannon.ogg' ai_holder_type = /datum/ai_holder/simple_mob/destructive - corpse = /obj/effect/landmark/mobcorpse/vox/suppressor + corpse = /atom/movable/landmark/mobcorpse/vox/suppressor loot_list = list(/obj/item/gun/energy/sonic = 100) base_attack_cooldown = 5 // Two attacks a second or so. @@ -798,7 +798,7 @@ projectilesound = 'sound/weapons/eLuger.ogg' ai_holder_type = /datum/ai_holder/simple_mob/destructive - corpse = /obj/effect/landmark/mobcorpse/vox/captain + corpse = /atom/movable/landmark/mobcorpse/vox/captain loot_list = list(/obj/item/gun/energy/darkmatter = 100) needs_reload = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm index 5e7de138183..4e2f0235e34 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm @@ -44,7 +44,7 @@ loot_list = list(/obj/item/material/knife/tacknife = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee + corpse = /atom/movable/landmark/mobcorpse/pirate/melee ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/pirate @@ -60,7 +60,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/clothing/accessory/armor/armorplate/stab = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_armor /////////////////////////////// // Machete Priate @@ -88,7 +88,7 @@ loot_list = list(/obj/item/material/knife/machete = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_machete + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_machete //Armored Variant @@ -101,7 +101,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/machete = 100, /obj/item/clothing/accessory/armor/armorplate/stab = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_machete_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_machete_armor /////////////////////////////// // E-Sword Priate @@ -124,7 +124,7 @@ loot_list = list(/obj/item/melee/energy/sword/pirate = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_energy + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_energy //Armored Variant /mob/living/simple_mob/humanoid/pirate/las/armored @@ -136,7 +136,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/melee/energy/sword/pirate = 100, /obj/item/clothing/accessory/armor/armorplate/stab = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_energy_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_energy_armor /////////////////////////////// @@ -148,7 +148,7 @@ icon_state = "piratemelee-shield" icon_living = "piratemelee-shield" - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_shield + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_shield //This Should Allow all childs of the shield priate to block /mob/living/simple_mob/humanoid/pirate/shield/attackby(var/obj/item/O as obj, var/mob/user as mob) @@ -184,7 +184,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/shield/riot/tower = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_shield_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_shield_armor /////////////////////////////// // Shield Machete Pirate @@ -210,7 +210,7 @@ loot_list = list(/obj/item/material/knife/machete = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_shield_machete + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_shield_machete // Armored Variant /mob/living/simple_mob/humanoid/pirate/shield/machete/armored @@ -222,7 +222,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/machete = 100, /obj/item/shield/riot/tower = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/melee_shield_machete_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/melee_shield_machete_armor /////////////////////////////// // Pirate Pistolier @@ -246,7 +246,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged + corpse = /atom/movable/landmark/mobcorpse/pirate/ranged //Armored Variant @@ -259,7 +259,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/projectile/pirate = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/ranged_armor /////////////////////////////// // Pirate Blunderbuster @@ -283,7 +283,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged_blunderbuss + corpse = /atom/movable/landmark/mobcorpse/pirate/ranged_blunderbuss //Armored Variant /mob/living/simple_mob/humanoid/pirate/ranged/shotgun/armored @@ -295,7 +295,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged_blunderbuss_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/ranged_blunderbuss_armor /////////////////////////////// // Pirate Ziplas @@ -319,7 +319,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged_laser + corpse = /atom/movable/landmark/mobcorpse/pirate/ranged_laser //Armored Variant /mob/living/simple_mob/humanoid/pirate/ranged/handcannon/armored @@ -331,7 +331,7 @@ armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/energy/zip = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged_laser_armor + corpse = /atom/movable/landmark/mobcorpse/pirate/ranged_laser_armor /////////////////////////////// // First Mate @@ -354,7 +354,7 @@ loot_list = list(/obj/item/melee/energy/sword/pirate = 100, /obj/item/clothing/suit/armor/riot/alt = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/mate + corpse = /atom/movable/landmark/mobcorpse/pirate/mate /////////////////////////////// // Mate Pistolier @@ -384,7 +384,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged - corpse = /obj/effect/landmark/mobcorpse/pirate/mate/pistol + corpse = /atom/movable/landmark/mobcorpse/pirate/mate/pistol /mob/living/simple_mob/humanoid/pirate/mate/ranged/bosun /// Special Mech Pilot Pirate name = "Bosun" @@ -395,7 +395,7 @@ loot_list = list(/obj/item/gun/energy/retro = 100, /obj/item/clothing/suit/armor/riot/alt = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/bosun + corpse = /atom/movable/landmark/mobcorpse/pirate/bosun /////////////////////////////// // Mate Sweeper @@ -423,7 +423,7 @@ loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/armor/riot/alt = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/mate/shotgun + corpse = /atom/movable/landmark/mobcorpse/pirate/mate/shotgun /////////////////////////////// // Mate Marksman @@ -451,7 +451,7 @@ loot_list = list(/obj/item/gun/projectile/shotgun/pump/rifle = 100, /obj/item/clothing/suit/armor/riot/alt = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/mate/rifle + corpse = /atom/movable/landmark/mobcorpse/pirate/mate/rifle /////////////////////////////// // Pirate Captain @@ -471,7 +471,7 @@ projectilesound = 'sound/weapons/weaponsounds_laserstrong.ogg' base_attack_cooldown = 5 - corpse = /obj/effect/landmark/mobcorpse/pirate/captain + corpse = /atom/movable/landmark/mobcorpse/pirate/captain loot_list = list(/obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100) //Belt of pistols @@ -761,7 +761,7 @@ projectilesound = 'sound/weapons/weaponsounds_laserstrong.ogg' base_attack_cooldown = 5 - //corpse = /obj/effect/landmark/mobcorpse/pirate/ranged + //corpse = /atom/movable/landmark/mobcorpse/pirate/ranged loot_list = list(/obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100) //Belt of pistols diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm index 607ddf4e0a6..3e6e2dda5e8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm @@ -49,7 +49,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/possessed //Set to Null on silenced. -// corpse = /obj/effect/landmark/mobcorpse/possessed +// corpse = /atom/movable/landmark/mobcorpse/possessed // Will eventually leave a full corpse with an activated RIG on it. But not yet. //Miasma Cloud "Item" diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm index 640d7001d2f..fb467233dd0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm @@ -34,7 +34,7 @@ loot_list = list(/obj/item/material/knife = 100) - corpse = /obj/effect/landmark/mobcorpse/russian + corpse = /atom/movable/landmark/mobcorpse/russian /mob/living/simple_mob/humanoid/russian/ranged icon_state = "russianranged" @@ -46,4 +46,4 @@ loot_list = list(/obj/item/gun/projectile/revolver/mateba = 100) - corpse = /obj/effect/landmark/mobcorpse/russian/ranged + corpse = /atom/movable/landmark/mobcorpse/russian/ranged diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 879578d2c28..eeb3d2bee6e 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -103,21 +103,21 @@ if(move) var/obj/loc_landmark - for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list) + for(var/atom/movable/landmark/start/sloc in GLOB.landmarks_list) if (sloc.name != "AI") continue if ((locate(/mob/living) in sloc.loc) || (locate(/obj/structure/AIcore) in sloc.loc)) continue loc_landmark = sloc if (!loc_landmark) - for(var/obj/effect/landmark/tripai in GLOB.landmarks_list) + for(var/atom/movable/landmark/tripai in GLOB.landmarks_list) if (tripai.name == "tripai") if((locate(/mob/living) in tripai.loc) || (locate(/obj/structure/AIcore) in tripai.loc)) continue loc_landmark = tripai if (!loc_landmark) to_chat(O, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.") - for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list) + for(var/atom/movable/landmark/start/sloc in GLOB.landmarks_list) if (sloc.name == "AI") loc_landmark = sloc diff --git a/code/modules/multiz/_stubs.dm b/code/modules/multiz/_stubs.dm index 20f045db39e..e047959f0b1 100644 --- a/code/modules/multiz/_stubs.dm +++ b/code/modules/multiz/_stubs.dm @@ -1,4 +1,4 @@ -/obj/effect/landmark/map_data +/atom/movable/landmark/map_data name = "Unknown" desc = "An unknown location." invisibility = 101 diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm index 8c3daa9c0a4..17b53391c35 100644 --- a/code/modules/multiz/basic.dm +++ b/code/modules/multiz/basic.dm @@ -2,13 +2,13 @@ var/list/z_levels = list()// Each bit re... haha just kidding this is a list of bools now // If the height is more than 1, we mark all contained levels as connected. -/obj/effect/landmark/map_data/New() +/atom/movable/landmark/map_data/New() for(var/i = (z - height + 1) to (z-1)) if (z_levels.len Annihilating objects in engine loading locatation.", R_DEBUG) var/list/turfs_to_clean = get_turfs_to_clean() diff --git a/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm b/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm index b19db0a403a..765d6786581 100644 --- a/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm +++ b/maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm @@ -38,24 +38,24 @@ display_name = list("Edison's Bane", "Lady Tesla", "Lightning Ball", "Overpowered Phone Charger", "Exploder of Machines") // Landmark for where to load in the engine on permament map -/obj/effect/landmark/engine_loader +/atom/movable/landmark/engine_loader name = "Engine Loader" var/clean_turfs // A list of lists, where each list is (x, ) -/obj/effect/landmark/engine_loader/New() +/atom/movable/landmark/engine_loader/New() if(SSmapping.engine_loader) warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]") delete_me = TRUE SSmapping.engine_loader = src return ..() -/obj/effect/landmark/engine_loader/proc/get_turfs_to_clean() +/atom/movable/landmark/engine_loader/proc/get_turfs_to_clean() . = list() if(clean_turfs) for(var/list/coords in clean_turfs) . += block(locate(coords[1], coords[2], src.z), locate(coords[3], coords[4], src.z)) -/obj/effect/landmark/engine_loader/proc/annihilate_bounds() +/atom/movable/landmark/engine_loader/proc/annihilate_bounds() var/deleted_atoms = 0 admin_notice("Annihilating objects in engine loading locatation.", R_DEBUG) var/list/turfs_to_clean = get_turfs_to_clean() diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index b2ece4b9896..895e00fe30f 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -1,6 +1,6 @@ //Special map objects /* // Moved to map/generic/map_data.dm -/obj/effect/landmark/map_data/virgo3b +/atom/movable/landmark/map_data/virgo3b height = 6 */ /* @@ -177,11 +177,11 @@ // Tram arrival point landmarks and datum var/global/list/latejoin_tram = list() -/obj/effect/landmark/tram +/atom/movable/landmark/tram name = "JoinLateTram" delete_me = 1 -/obj/effect/landmark/tram/New() +/atom/movable/landmark/tram/New() latejoin_tram += loc // Register this turf as tram latejoin. latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks. ..()