cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 20:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MDB IGNORE] repaths landmark back to /obj because I apparently am an idiot (#4197)

Browse Source 
* oops

* why

* here you go

* oops
This commit is contained in:
silicons
2022-06-14 14:58:22 -07:00
committed by GitHub
parent f62d7ed648
commit 3085c68890
121 changed files with 1036 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/Generic/map_data.dm
View File

@@ -1,20 +1,20 @@
// These specify how many z levels are in a map. Consoladating them here for map compiling ease - Bloop
// Tether
/atom/movable/landmark/map_data/virgo3b
/obj/landmark/map_data/virgo3b
height = 6
/obj/effect/overmap/visitable/sector/virgo3b // Just a placeholder for when the map isnt loaded
// Triumph
/atom/movable/landmark/map_data/triumph
/obj/landmark/map_data/triumph
height = 4
// Lythios
/atom/movable/landmark/map_data/lythios43c
/obj/landmark/map_data/lythios43c
height = 6
/atom/movable/landmark/map_data/west_plains
/obj/landmark/map_data/west_plains
height = 4
// See beach.dm for more details on this. Placeholder for now to stop compiling issues -Bloop

22
maps/REGEXING_MAP_PORTS.md
View File

@@ -14,22 +14,22 @@ Apply regexes in this order:
// todo: devices/weapons
// Landmarks
`/obj/effect/landmark`-`/atom/movable/landmark`
`/obj/effect/landmark`-`/obj/landmark`
// Specific landmarks
`/atom/movable/landmark\{\n\tname = "Observer-Start"\n\t\}`-`/atom/movable/landmark/observer_spawn`
`/obj/landmark\{\n\tname = "Observer-Start"\n\t\}`-`/obj/landmark/observer_spawn`
// Preliminary job landmarks
`/atom/movable/landmark/start\{\n\tname = "([A-z]+)"\n\t\}`-`/atom/movable/landmark/spawnpoint/job/\L$1`
`/atom/movable/landmark/start\{\n\tname = "([A-z]+) ([A-z]+)"\n\t\}`-`/atom/movable/landmark/spawnpoint/job/\L$1_\L$2`
`/atom/movable/landmark/start\{\n\tname = "([A-z]+) ([A-z]+) ([A-z]+)"\n\t\}`-`/atom/movable/landmark/spawnpoint/job/\L$1_\L$2_\L$3`
`/obj/landmark/start\{\n\tname = "([A-z]+)"\n\t\}`-`/obj/landmark/spawnpoint/job/\L$1`
`/obj/landmark/start\{\n\tname = "([A-z]+) ([A-z]+)"\n\t\}`-`/obj/landmark/spawnpoint/job/\L$1_\L$2`
`/obj/landmark/start\{\n\tname = "([A-z]+) ([A-z]+) ([A-z]+)"\n\t\}`-`/obj/landmark/spawnpoint/job/\L$1_\L$2_\L$3`
/// Specific job landmarks
`/atom/movable/spawnpoint/job/search_and_rescue`-`/atom/movable/spawnpoint/job/field_medic`
`/atom/movable/spawnpoint/job/facility_director`-`/atom/movable/spawnpoint/job/captain`
`/atom/movable/spawnpoint/job/internal_affairs_agent`-`/atom/movable/spawnpoint/job/lawyer`
`/atom/movable/spawnpoint/job/gardener`-`/atom/movable/spawnpoint/job/botanist`
`/obj/landmark/spawnpoint/job/search_and_rescue`-`/obj/landmark/spawnpoint/job/field_medic`
`/obj/landmark/spawnpoint/job/facility_director`-`/obj/landmark/spawnpoint/job/captain`
`/obj/landmark/spawnpoint/job/internal_affairs_agent`-`/obj/landmark/spawnpoint/job/lawyer`
`/obj/landmark/spawnpoint/job/gardener`-`/obj/landmark/spawnpoint/job/botanist`
// TODO: MAKE SURE NO / AFTER COSTUME
`/atom/movable/landmark/costume`-`/atom/movable/landmark/costume/random`
`/atom/movable/landmark/mobcorpse`-`/atom/movable/spawner/corpse`
`/obj/landmark/costume`-`/obj/landmark/costume/random`
`/obj/landmark/mobcorpse`-`/atom/movable/spawner/corpse`
// ATMOSPHERICS
`/obj/machinery/atmospherics/omni`-`/obj/machinery/atmospherics/component/quaternary`

12
maps/citadel_minitest/citadel_minitest-1.dmm
View File

@@ -2859,15 +2859,15 @@
/turf/simulated/floor/tiled,
/area/crew_quarters/cafeteria)
"gx" = (
/atom/movable/landmark/spawnpoint/latejoin/station/elevator,
/obj/landmark/spawnpoint/latejoin/station/elevator,
/turf/simulated/floor/tiled,
/area/bridge)
"gy" = (
/atom/movable/landmark/spawnpoint/latejoin/station/gateway,
/obj/landmark/spawnpoint/latejoin/station/gateway,
/turf/simulated/floor/tiled,
/area/bridge)
"gz" = (
/atom/movable/landmark/observer_spawn,
/obj/landmark/observer_spawn,
/turf/simulated/floor/tiled,
/area/bridge)
"gA" = (
@@ -2875,11 +2875,11 @@
/turf/simulated/floor/tiled,
/area/bridge)
"gB" = (
/atom/movable/landmark/spawnpoint/latejoin/station,
/obj/landmark/spawnpoint/latejoin/station,
/turf/simulated/floor/tiled,
/area/bridge)
"gC" = (
/atom/movable/landmark/spawnpoint/latejoin/station/cryogenics,
/obj/landmark/spawnpoint/latejoin/station/cryogenics,
/turf/simulated/floor/tiled,
/area/bridge)
"gD" = (
@@ -3086,7 +3086,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/ferrydemo)
"hp" = (
/atom/movable/landmark/spawnpoint/latejoin/station,
/obj/landmark/spawnpoint/latejoin/station,
/obj/machinery/embedded_controller/radio/simple_docking_controller{
id_tag = "station_hangar";
layer = 3.1;

6
maps/citadel_minitest/citadel_minitest-sector-2.dmm
View File

@@ -16,7 +16,7 @@
/turf/simulated/mineral/floor/ignore_mapgen,
/area/space)
"af" = (
/atom/movable/landmark{
/obj/landmark{
name = "awaystart"
},
/turf/simulated/mineral/floor/ignore_mapgen,
@@ -255,7 +255,7 @@
/area/awaymission)
"aP" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/atom/movable/landmark/loot_spawn,
/obj/landmark/loot_spawn,
/turf/simulated/floor/tiled/dark,
/area/awaymission)
"aQ" = (
@@ -333,7 +333,7 @@
"be" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/floor_decal/industrial/outline/yellow,
/atom/movable/landmark/costume/random,
/obj/landmark/costume/random,
/turf/simulated/floor/tiled/dark,
/area/awaymission)
"bf" = (

2
maps/nsv_triumph/submaps/_triumph_submaps.dm
View File

@@ -122,7 +122,7 @@
new /datum/random_map/noise/ore/lavaland(null, 1, 1, Z_LEVEL_LAVALAND_EAST, 64, 64)
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_LAVALAND_EAST, world.maxx - 4, world.maxy - 4)
/atom/movable/landmark/map_data/lavaland_east
/obj/landmark/map_data/lavaland_east
height = 1
// Class G Mining Planet Exploration Zone

4
maps/nsv_triumph/submaps/lavaland/_lavaland.dm
View File

@@ -9,11 +9,11 @@
initial_generic_waypoints = list("poid_main")
*/
/atom/movable/landmark/lavaland_entry
/obj/landmark/lavaland_entry
name = "lavaland_entry"
/atom/movable/landmark/lavaland_exit
/obj/landmark/lavaland_exit
name = "lavaland_exit"

6
maps/nsv_triumph/triumph_things.dm
View File

@@ -1,7 +1,7 @@
// Special map objects
/* // Moved to map/generic/map_data.dm
/atom/movable/landmark/map_data/triumph
/obj/landmark/map_data/triumph
height = 4
*/
/*
@@ -66,11 +66,11 @@
// shuttle arrival point landmarks and datum
var/global/list/latejoin_shuttle = list()
/atom/movable/landmark/shuttle
/obj/landmark/shuttle
name = "JoinLateShuttle"
delete_me = 1
/atom/movable/landmark/shuttle/New()
/obj/landmark/shuttle/New()
latejoin_shuttle += loc // Register this turf as shuttle latejoin.
latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks.
return ..()

28
maps/overmap/bearcat/bearcat.dmm
View File

@@ -116,7 +116,7 @@
dir = 2;
on = 1
},
/atom/movable/landmark/spawnpoint/job/captain,
/obj/landmark/spawnpoint/job/captain,
/turf/simulated/floor{
icon_state = "gcircuitoff";
dir = 2
@@ -780,7 +780,7 @@
/obj/structure/window/reinforced{
dir = 1
},
/atom/movable/landmark/spawnpoint/latejoin/station,
/obj/landmark/spawnpoint/latejoin/station,
/turf/simulated/floor{
icon_state = "neutralfull";
dir = 4
@@ -1287,7 +1287,7 @@
icon_state = "twindow"
},
/obj/effect/decal/cleanable/dirt,
/atom/movable/landmark/spawnpoint/job/cargo_technician,
/obj/landmark/spawnpoint/job/cargo_technician,
/turf/simulated/floor{
icon_state = "hydrofloor";
dir = 6
@@ -1594,7 +1594,7 @@
d2 = 2;
icon_state = "1-2"
},
/atom/movable/landmark/observer_spawn,
/obj/landmark/observer_spawn,
/obj/structure/cable{
d1 = 2;
d2 = 8;
@@ -1739,7 +1739,7 @@
icon_state = "twindow"
},
/obj/effect/decal/cleanable/dirt,
/atom/movable/landmark/spawnpoint/job/assistant,
/obj/landmark/spawnpoint/job/assistant,
/turf/simulated/floor{
icon_state = "hydrofloor";
dir = 6
@@ -2069,7 +2069,7 @@
/area/ship/scrap/cargo)
"ds" = (
/obj/effect/decal/cleanable/dirt,
/atom/movable/landmark/spawnpoint/job/cargo_technician,
/obj/landmark/spawnpoint/job/cargo_technician,
/turf/simulated/floor{
icon_state = "bot";
dir = 2
@@ -2130,7 +2130,7 @@
},
/area/ship/scrap/crew/kitchen)
"dA" = (
/atom/movable/landmark/spawnpoint/job/chef,
/obj/landmark/spawnpoint/job/chef,
/obj/structure/stool,
/turf/simulated/floor{
icon_state = "bar";
@@ -2403,7 +2403,7 @@
dir = 2;
level = 2
},
/atom/movable/landmark/spawnpoint/job/quartermaster,
/obj/landmark/spawnpoint/job/quartermaster,
/obj/structure/cable{
d1 = 2;
d2 = 8;
@@ -2497,7 +2497,7 @@
on = 1
},
/obj/structure/stool,
/atom/movable/landmark/spawnpoint/job/medical_doctor,
/obj/landmark/spawnpoint/job/medical_doctor,
/turf/simulated/floor{
icon_state = "white"
},
@@ -3354,7 +3354,7 @@
},
/area/ship/scrap/maintenance/storage)
"fF" = (
/atom/movable/landmark/spawnpoint/job/station_engineer,
/obj/landmark/spawnpoint/job/station_engineer,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/window/westleft{
base_state = "right";
@@ -3399,7 +3399,7 @@
},
/area/ship/scrap/maintenance/storage)
"fH" = (
/atom/movable/landmark/spawnpoint/job/station_engineer,
/obj/landmark/spawnpoint/job/station_engineer,
/obj/machinery/door/window/westleft,
/turf/simulated/floor{
icon_state = "floorgrime";
@@ -3952,7 +3952,7 @@
/area/ship/scrap/maintenance)
"gI" = (
/obj/structure/stool/bed/chair/comfy/brown,
/atom/movable/landmark/spawnpoint/job/chief_engineer,
/obj/landmark/spawnpoint/job/chief_engineer,
/turf/simulated/floor{
icon_state = "floorgrime";
dir = 6
@@ -4041,7 +4041,7 @@
icon_state = "manifold";
level = 2
},
/atom/movable/landmark/spawnpoint/job/atmospheric_technician,
/obj/landmark/spawnpoint/job/atmospheric_technician,
/turf/simulated/floor/plating,
/area/ship/scrap/maintenance/atmos)
"gQ" = (
@@ -4224,7 +4224,7 @@
icon_state = "4-8";
pixel_x = 0
},
/atom/movable/landmark/spawnpoint/job/station_engineer,
/obj/landmark/spawnpoint/job/station_engineer,
/turf/simulated/floor/plating,
/area/ship/scrap/maintenance/power)
"hb" = (

2
maps/rift/submaps/_rift_submaps.dm
View File

@@ -113,7 +113,7 @@
new /datum/random_map/noise/ore/lavaland(null, 1, 1, Z_LEVEL_LAVALAND_EAST, 64, 64)
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_LAVALAND_EAST, world.maxx - 4, world.maxy - 4)
/atom/movable/landmark/map_data/lavaland_east
/obj/landmark/map_data/lavaland_east
height = 1
// Class G Mining Planet Exploration Zone

4
maps/rift/submaps/lavaland/_lavaland.dm
View File

@@ -9,11 +9,11 @@
initial_generic_waypoints = list("poid_main")
*/
/atom/movable/landmark/lavaland_entry
/obj/landmark/lavaland_entry
name = "lavaland_entry"
/atom/movable/landmark/lavaland_exit
/obj/landmark/lavaland_exit
name = "lavaland_exit"

8
maps/submaps/engine_submaps/engine.dm
View File

@@ -54,24 +54,24 @@
display_name = "Nuclear Bomb"
// Landmark for where to load in the engine on permament map
/atom/movable/landmark/engine_loader
/obj/landmark/engine_loader
name = "Engine Loader"
var/clean_turfs // A list of lists, where each list is (x, )
/atom/movable/landmark/engine_loader/Initialize(mapload)
/obj/landmark/engine_loader/Initialize(mapload)
. = ..()
if(SSmapping.engine_loader)
warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]")
return INITIALIZE_HINT_QDEL
SSmapping.engine_loader = src
/atom/movable/landmark/engine_loader/proc/get_turfs_to_clean()
/obj/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))
/atom/movable/landmark/engine_loader/proc/annihilate_bounds()
/obj/landmark/engine_loader/proc/annihilate_bounds()
var/deleted_atoms = 0
admin_notice("<span class='danger'>Annihilating objects in engine loading locatation.</span>", R_DEBUG)
var/list/turfs_to_clean = get_turfs_to_clean()

8
maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm
View File

@@ -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
/atom/movable/landmark/engine_loader
/obj/landmark/engine_loader
name = "Engine Loader"
var/clean_turfs // A list of lists, where each list is (x, )
/atom/movable/landmark/engine_loader/New()
/obj/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 ..()
/atom/movable/landmark/engine_loader/proc/get_turfs_to_clean()
/obj/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))
/atom/movable/landmark/engine_loader/proc/annihilate_bounds()
/obj/landmark/engine_loader/proc/annihilate_bounds()
var/deleted_atoms = 0
admin_notice("<span class='danger'>Annihilating objects in engine loading locatation.</span>", R_DEBUG)
var/list/turfs_to_clean = get_turfs_to_clean()

2
maps/tether/tether_things.dm
View File

@@ -1,6 +1,6 @@
//Special map objects
/* // Moved to map/generic/map_data.dm
/atom/movable/landmark/map_data/virgo3b
/obj/landmark/map_data/virgo3b
height = 6
*/
/*