Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LZ Name Consistency #5078

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178,885 changes: 89,442 additions & 89,443 deletions maps/map_files/BigRed/BigRed.dmm

Large diffs are not rendered by default.

28 changes: 7 additions & 21 deletions maps/map_files/CORSAT/Corsat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@
"aaF" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
dir = 1;
locked = 0;
name = "CORSAT Armory";
req_access_txt = "101"
},
Expand Down Expand Up @@ -2354,7 +2353,6 @@
/obj/structure/machinery/door/airlock/almayer/maint/colony{
damage_cap = 4000;
dir = 1;
locked = 0;
name = "\improper Emergency Access";
req_access_txt = "100";
req_one_access = null
Expand Down Expand Up @@ -5915,7 +5913,6 @@
"arv" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
damage_cap = 4000;
locked = 0;
name = "\improper Emergency Access";
req_access_txt = "100";
req_one_access = null
Expand Down Expand Up @@ -21864,8 +21861,7 @@
/area/corsat/gamma/engineering)
"bij" = (
/obj/structure/machinery/floodlight{
name = "Floodlight";
unacidable = 0
name = "Floodlight"
},
/turf/open/auto_turf/snow/layer3,
/area/corsat/gamma/biodome)
Expand Down Expand Up @@ -29011,7 +29007,6 @@
/area/corsat/omega/checkpoint)
"bDv" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
locked = 0;
name = "Security Armory";
req_access_txt = "101"
},
Expand Down Expand Up @@ -30469,8 +30464,7 @@
/area/corsat/gamma/airlock/control)
"bJE" = (
/obj/structure/machinery/floodlight{
name = "Floodlight";
unacidable = 0
name = "Floodlight"
},
/turf/open/mars,
/area/corsat/sigma/biodome)
Expand Down Expand Up @@ -34235,8 +34229,7 @@
/area/corsat/sigma/airlock/control)
"bVD" = (
/obj/structure/machinery/floodlight{
name = "Floodlight";
unacidable = 0
name = "Floodlight"
},
/turf/open/floor{
dir = 1;
Expand Down Expand Up @@ -35485,7 +35478,6 @@
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
dir = 1;
name = "Weapons Development";
req_access = null;
req_one_access_txt = "103"
},
/obj/structure/pipes/standard/simple/hidden/green,
Expand Down Expand Up @@ -35812,8 +35804,7 @@
/area/corsat/omega/control)
"caS" = (
/obj/structure/machinery/floodlight{
name = "Floodlight";
unacidable = 0
name = "Floodlight"
},
/turf/open/floor/plating,
/area/corsat/sigma/biodome/testgrounds)
Expand Down Expand Up @@ -37871,8 +37862,7 @@
/area/corsat/omega/hallways)
"dFb" = (
/obj/structure/machinery/floodlight{
name = "Floodlight";
unacidable = 0
name = "Floodlight"
},
/turf/open/auto_turf/snow/layer0,
/area/corsat/gamma/biodome)
Expand Down Expand Up @@ -38222,7 +38212,7 @@
/area/corsat/omega/complex)
"dUj" = (
/obj/docking_port/stationary/marine_dropship/lz2{
name = "Sigma Landing Zone"
name = "LZ2: Sigma Landing Zone"
},
/turf/open/floor/plating,
/area/corsat/sigma/hangar)
Expand Down Expand Up @@ -48479,7 +48469,6 @@
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
dir = 1;
name = "Teleportation Lab";
req_access = null;
req_one_access_txt = "103"
},
/obj/structure/pipes/standard/simple/hidden/green,
Expand Down Expand Up @@ -49113,8 +49102,7 @@
/area/corsat/omega/airlocknorth/id)
"lUY" = (
/obj/structure/machinery/floodlight{
name = "Floodlight";
unacidable = 0
name = "Floodlight"
},
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/auto_turf/snow/layer3,
Expand Down Expand Up @@ -50975,7 +50963,6 @@
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
dir = 1;
name = "Teleportation Chamber";
req_access = null;
req_one_access_txt = "101;103"
},
/turf/open/floor/corsat{
Expand Down Expand Up @@ -61761,7 +61748,6 @@
"vqF" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
damage_cap = 4000;
locked = 0;
name = "\improper Emergency Access";
req_access_txt = "100";
req_one_access = null
Expand Down
32 changes: 9 additions & 23 deletions maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1378,8 +1378,7 @@
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
density = 0;
icon_state = "door_open";
name = "Cell Access";
req_access = null
name = "Cell Access"
},
/turf/open/floor/prison{
dir = 10;
Expand Down Expand Up @@ -1574,8 +1573,7 @@
density = 0;
icon_state = "door_open";
name = "Cell";
opacity = 0;
req_access = null
opacity = 0
},
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -1621,8 +1619,7 @@
dir = 2;
icon_state = "door_open";
name = "Cell";
opacity = 0;
req_access = null
opacity = 0
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/prison{
Expand Down Expand Up @@ -3915,8 +3912,7 @@
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
density = 0;
icon_state = "door_open";
name = "Cell Access";
req_access = null
name = "Cell Access"
},
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -5305,7 +5301,7 @@
/area/prison/hanger/research)
"aoj" = (
/obj/docking_port/stationary/marine_dropship/lz2{
name = "Research Landing Zone"
name = "LZ2: Research Landing Zone"
},
/turf/open/floor/plating,
/area/prison/hanger/research)
Expand Down Expand Up @@ -8229,13 +8225,6 @@
icon_state = "bright_clean"
},
/area/prison/chapel)
"awd" = (
/obj/structure/machinery/door/airlock/almayer/security/colony{
locked = 0;
name = "Research Containment Locker"
},
/turf/open/floor/prison,
/area/prison/research/secret)
"awe" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating,
Expand Down Expand Up @@ -19201,7 +19190,7 @@
/area/prison/hanger/main)
"bcF" = (
/obj/docking_port/stationary/marine_dropship/lz1{
name = "Hangar Landing Zone"
name = "LZ1: Hangar Landing Zone"
},
/turf/open/floor/plating,
/area/prison/hanger/main)
Expand Down Expand Up @@ -28265,8 +28254,7 @@
/area/prison/hallway/east)
"bDU" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{
dir = 2;
req_access = null
dir = 2
},
/turf/open/floor/prison{
dir = 10;
Expand Down Expand Up @@ -31414,9 +31402,7 @@
/turf/open/floor/wood,
/area/prison/residential/south)
"bNt" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
locked = 0
},
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic,
/turf/open/floor/prison{
icon_state = "damaged3"
},
Expand Down Expand Up @@ -87111,7 +87097,7 @@ aeZ
aeZ
aiN
aiN
awd
atK
aiN
aiN
aiN
Expand Down
6 changes: 4 additions & 2 deletions maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6510,7 +6510,7 @@
/area/fiorina/station/disco)
"dYp" = (
/obj/docking_port/stationary/marine_dropship/lz1{
name = "Hangar Landing Zone"
name = "LZ1: Hangar Landing Zone"
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzI)
Expand Down Expand Up @@ -39335,7 +39335,9 @@
/turf/open/floor/plating/prison,
/area/fiorina/station/civres_blue)
"xYg" = (
/obj/docking_port/stationary/marine_dropship/lz2,
/obj/docking_port/stationary/marine_dropship/lz2{
name = "LZ2: Landing Zone"
},
/turf/open/floor/plating/prison,
/area/fiorina/lz/near_lzII)
"xYo" = (
Expand Down
13 changes: 1 addition & 12 deletions maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,6 @@
dir = 4
},
/obj/structure/machinery/door/airlock/almayer/secure/colony{
locked = 0;
name = "Colony Requesitions Storage Pod"
},
/turf/open/floor/plating/icefloor,
Expand Down Expand Up @@ -1333,7 +1332,6 @@
"aeC" = (
/obj/structure/machinery/door/airlock{
id_tag = "st_5";
locked = 0;
name = "Storage Unit";
req_one_access_txt = "100;101;102;103"
},
Expand Down Expand Up @@ -11961,7 +11959,6 @@
"aHB" = (
/obj/structure/machinery/door/airlock/almayer/secure/colony{
id = "st_17";
locked = 0;
name = "Power Storage Unit"
},
/turf/open/floor{
Expand Down Expand Up @@ -12406,7 +12403,6 @@
/obj/structure/machinery/door/airlock/almayer/secure/colony{
dir = 2;
id = "st_18";
locked = 0;
name = "Disposals Storage Unit"
},
/turf/open/floor{
Expand Down Expand Up @@ -13697,7 +13693,6 @@
/obj/structure/machinery/door/airlock/almayer/secure/colony{
dir = 2;
id = "st_19";
locked = 0;
name = "Research Storage Unit"
},
/turf/open/floor{
Expand Down Expand Up @@ -14545,7 +14540,6 @@
"aQm" = (
/obj/structure/machinery/door/airlock/almayer/secure/colony{
id = "research_entrance";
locked = 0;
name = "Omicron Research Dome"
},
/obj/structure/pipes/standard/simple/hidden/green{
Expand Down Expand Up @@ -19677,7 +19671,6 @@
/area/ice_colony/underground/maintenance/north)
"bgR" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
locked = 0;
name = "\improper Underground Maintenance"
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -20402,7 +20395,6 @@
"bjz" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
dir = 1;
locked = 0;
name = "\improper Underground Maintenance";
req_access_txt = "100"
},
Expand Down Expand Up @@ -23731,7 +23723,6 @@
/obj/structure/machinery/door/airlock/almayer/secure/colony{
dir = 2;
id = "engine_electrical_maintenance";
locked = 0;
name = "Underground Power Substation"
},
/turf/open/floor{
Expand Down Expand Up @@ -24970,7 +24961,6 @@
/obj/structure/machinery/door/airlock/almayer/secure/colony{
dir = 2;
id = "engine_electrical_maintenance";
locked = 0;
name = "Underground Power Substation"
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -28109,7 +28099,6 @@
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/almayer/secure/colony{
dir = 2;
locked = 0;
name = "Underground Secure Technical Storage"
},
/turf/open/floor{
Expand Down Expand Up @@ -34904,7 +34893,7 @@
/area/ice_colony/surface/hangar/alpha)
"sto" = (
/obj/docking_port/stationary/marine_dropship/lz1{
name = "Hangar Landing Zone"
name = "LZ1: Hangar Landing Zone"
},
/turf/open/floor/plating,
/area/ice_colony/exterior/surface/landing_pad)
Expand Down
6 changes: 4 additions & 2 deletions maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7354,7 +7354,9 @@
/turf/open/auto_turf/snow/layer2,
/area/shiva/exterior/junkyard)
"boD" = (
/obj/docking_port/stationary/marine_dropship/lz1,
/obj/docking_port/stationary/marine_dropship/lz1{
name = "LZ1: Landing Zone"
},
/turf/open/floor/plating,
/area/shiva/exterior/lz1_valley)
"boS" = (
Expand Down Expand Up @@ -17375,7 +17377,7 @@
/area/shiva/interior/caves/s_lz2)
"mlX" = (
/obj/docking_port/stationary/marine_dropship/lz2{
name = "Research Landing Zone"
name = "LZ2: Research Landing Zone"
},
/turf/open/floor/plating,
/area/shiva/exterior/lz2_fortress)
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/Kutjevo/Kutjevo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4883,7 +4883,7 @@
/area/kutjevo/interior/oob)
"gnj" = (
/obj/docking_port/stationary/marine_dropship/lz1{
name = "Dunes Landing Zone"
name = "LZ1: Dunes Landing Zone"
},
/turf/open/floor/plating/kutjevo,
/area/shuttle/drop1/kutjevo)
Expand Down Expand Up @@ -8316,7 +8316,7 @@
/area/kutjevo/interior/power/comms)
"lkY" = (
/obj/docking_port/stationary/marine_dropship/lz2{
name = "NW Colony Landing Zone"
name = "LZ2: NW Colony Landing Zone"
},
/turf/open/floor/plating/kutjevo,
/area/shuttle/drop2/kutjevo)
Expand Down
Loading
Loading