shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[All stations] Cleaned up var-editted areas

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-21 22:29:41 -05:00
parent 5fd5e32628
commit db4b764aea
11 changed files with 14761 additions and 21524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Cerestation/cerestation.dmm
+2746 -5810
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Cerestation/cerestation.dmm.rej
+5763
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Deltastation/DeltaStation2.dmm
+2551 -6582
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+2019 -5418
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/OmegaStation.dmm
+348 -1044
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+779 -2335
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/TgStation/tgstation.2.1.3.dmm
+103 -309
View File
@@ -11515,9 +11515,7 @@
"azq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"azr" = (
/obj/structure/grille/broken,
/turf/open/floor/plating,
@@ -11635,9 +11633,7 @@
/area/ai_monitored/storage/eva)
"azF" = (
/turf/closed/wall,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"azG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -12038,15 +12034,11 @@
icon_state = "0-8"
},
/turf/open/floor/plating,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAy" = (
/obj/machinery/power/smes{
charge = 0
@@ -12166,9 +12158,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAL" = (
/obj/machinery/power/apc{
dir = 2;
@@ -12220,14 +12210,10 @@
"aAP" = (
/obj/machinery/hydroponics/soil,
/turf/open/floor/grass,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAQ" = (
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAR" = (
/obj/structure/cable{
d1 = 1;
@@ -12247,23 +12233,17 @@
pixel_y = 30
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAT" = (
/obj/machinery/seed_extractor,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAU" = (
/obj/structure/sink{
pixel_y = 30
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aAV" = (
/obj/structure/cable{
d1 = 1;
@@ -12422,9 +12402,7 @@
dir = 5
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aBn" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -12501,9 +12479,7 @@
"aBv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aBw" = (
/obj/item/seeds/apple,
/obj/item/seeds/banana,
@@ -12519,9 +12495,7 @@
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aBx" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -12584,9 +12558,7 @@
on = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aBH" = (
/obj/machinery/light{
icon_state = "tube1";
@@ -12625,9 +12597,7 @@
"aBM" = (
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aBN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
@@ -13179,9 +13149,7 @@
scrub_Toxins = 0
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aDb" = (
/obj/structure/table,
/obj/item/weapon/wirecutters,
@@ -13237,9 +13205,7 @@
"aDg" = (
/obj/machinery/biogenerator,
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aDh" = (
/obj/machinery/vending/assist,
/turf/open/floor/plasteel,
@@ -13953,9 +13919,7 @@
/turf/open/floor/plasteel/green/side{
dir = 4
},
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aEG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/red/side{
@@ -13997,9 +13961,7 @@
req_access_txt = "0"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aEM" = (
/turf/open/floor/circuit,
/area/ai_monitored/nuke_storage)
@@ -14469,9 +14431,7 @@
/turf/open/floor/plasteel/green/side{
dir = 4
},
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aFO" = (
/obj/machinery/camera{
c_tag = "Garden";
@@ -14484,17 +14444,13 @@
pixel_x = 24
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aFP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aFQ" = (
/obj/structure/table,
/obj/item/stack/cable_coil{
@@ -15339,9 +15295,7 @@
/turf/open/floor/plasteel/green/side{
dir = 5
},
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aHA" = (
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/weapon/reagent_containers/spray/pestspray{
@@ -15360,9 +15314,7 @@
/turf/open/floor/plasteel/green/side{
dir = 9
},
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aHB" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 1;
@@ -15965,9 +15917,7 @@
/turf/open/floor/plasteel/green/side{
dir = 4
},
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aIT" = (
/obj/item/weapon/storage/bag/plants/portaseeder,
/obj/structure/table/glass,
@@ -15985,9 +15935,7 @@
/turf/open/floor/plasteel/green/side{
dir = 8
},
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aIU" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=8";
@@ -16575,16 +16523,12 @@
name = "Garden"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aKn" = (
/obj/structure/grille,
/obj/structure/window/fulltile,
/turf/open/floor/plating,
/area/hallway/secondary/construction{
name = "\improper Garden"
})
/area/hydroponics/garden)
"aKo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/side{
@@ -23638,9 +23582,7 @@
d2 = 4
},
/turf/open/floor/plating,
/area/security/vacantoffice{
name = "Vacant Office A"
})
/area/security/vacantoffice/a)
"bbJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -55717,14 +55659,10 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/meter,
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"ctZ" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cua" = (
/turf/closed/wall,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -55779,9 +55717,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"cuf" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cug" = (
/obj/machinery/ai_status_display{
pixel_y = -32
@@ -55798,15 +55734,11 @@
/obj/item/weapon/crowbar/red,
/obj/item/clothing/head/welding,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cui" = (
/obj/machinery/atmospherics/components/unary/tank/air,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuj" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/aisat_interior)
@@ -55831,9 +55763,7 @@
"cum" = (
/obj/machinery/recharge_station,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cun" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 2;
@@ -55843,9 +55773,7 @@
/turf/open/floor/plating{
icon_plating = "warnplate"
},
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuo" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/firealarm{
@@ -55856,9 +55784,7 @@
dir = 2
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cup" = (
/obj/structure/showcase{
density = 0;
@@ -55878,9 +55804,7 @@
/turf/open/floor/plating{
icon_plating = "warnplate"
},
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuq" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 0;
@@ -55891,9 +55815,7 @@
/turf/open/floor/plating{
icon_plating = "warnplate"
},
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cur" = (
/obj/structure/showcase{
density = 0;
@@ -55959,17 +55881,13 @@
/turf/open/floor/plating{
icon_plating = "warnplate"
},
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuw" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating{
icon_plating = "warnplate"
},
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cux" = (
/obj/structure/table,
/obj/item/stack/sheet/metal{
@@ -55991,18 +55909,14 @@
dir = 1
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuy" = (
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/aisat_interior)
"cuz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuA" = (
/obj/machinery/light/small{
dir = 8
@@ -56025,9 +55939,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuB" = (
/obj/machinery/light/small{
dir = 4
@@ -56046,16 +55958,12 @@
/turf/open/floor/plasteel/darkblue/corner{
dir = 4
},
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuC" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuD" = (
/obj/machinery/light/small{
dir = 8
@@ -56136,9 +56044,7 @@
/turf/open/floor/plasteel/darkblue/corner{
dir = 1
},
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuI" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8;
@@ -56146,18 +56052,14 @@
scrub_Toxins = 0
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuK" = (
/obj/machinery/light/small{
dir = 4
@@ -56186,9 +56088,7 @@
dir = 8
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuL" = (
/obj/structure/cable{
d1 = 4;
@@ -56200,9 +56100,7 @@
dir = 5
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuM" = (
/obj/machinery/power/apc{
dir = 8;
@@ -56219,9 +56117,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuN" = (
/obj/structure/cable{
d1 = 4;
@@ -56233,9 +56129,7 @@
dir = 1
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuO" = (
/obj/structure/cable{
d1 = 4;
@@ -56248,9 +56142,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuP" = (
/obj/structure/cable{
d1 = 4;
@@ -56327,9 +56219,7 @@
dir = 10
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuU" = (
/obj/structure/cable{
d1 = 4;
@@ -56355,9 +56245,7 @@
pixel_y = 0
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuW" = (
/obj/structure/cable{
d1 = 4;
@@ -56374,9 +56262,7 @@
icon_state = "2-8"
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuX" = (
/obj/machinery/power/apc{
dir = 4;
@@ -56393,9 +56279,7 @@
dir = 8
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cuY" = (
/obj/machinery/porta_turret/ai{
dir = 4
@@ -56403,9 +56287,7 @@
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cuZ" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
@@ -56413,9 +56295,7 @@
},
/mob/living/simple_animal/bot/floorbot,
/turf/open/floor/plasteel/darkblue/corner,
/area/ai_monitored/turret_protected/AIsatextAS{
name = "AI Satellite Atmospherics"
})
/area/ai_monitored/turret_protected/aisat/atmos)
"cva" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai)
@@ -56492,9 +56372,7 @@
/turf/open/floor/plasteel/darkblue/corner{
dir = 8
},
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cvh" = (
/obj/machinery/porta_turret/ai{
dir = 4
@@ -56502,9 +56380,7 @@
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cvi" = (
/obj/structure/cable{
d1 = 1;
@@ -56512,19 +56388,13 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFP{
name = "AI Satellite Service"
})
/area/ai_monitored/turret_protected/aisat/service)
"cvj" = (
/turf/closed/wall,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvk" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvl" = (
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/ai)
@@ -56535,15 +56405,11 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvo" = (
/obj/structure/cable{
d1 = 1;
@@ -56557,9 +56423,7 @@
req_one_access_txt = "65"
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvp" = (
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
@@ -56574,9 +56438,7 @@
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvr" = (
/obj/machinery/porta_turret/ai{
dir = 4
@@ -56586,30 +56448,22 @@
"cvs" = (
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvt" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvu" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvv" = (
/turf/closed/wall,
/area/ai_monitored/turret_protected/ai)
"cvw" = (
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvx" = (
/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
@@ -56644,9 +56498,7 @@
/obj/structure/window/reinforced/fulltile,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvz" = (
/obj/structure/cable{
d1 = 1;
@@ -56655,9 +56507,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvA" = (
/obj/effect/landmark/tripai,
/obj/item/device/radio/intercom{
@@ -56692,9 +56542,7 @@
/obj/item/weapon/crowbar/red,
/obj/item/weapon/wrench,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvC" = (
/obj/structure/cable{
d1 = 1;
@@ -56702,21 +56550,15 @@
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvD" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvE" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvF" = (
/obj/structure/lattice,
/obj/machinery/camera{
@@ -56739,9 +56581,7 @@
dir = 8
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvH" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
@@ -56749,9 +56589,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvI" = (
/obj/structure/cable{
d1 = 1;
@@ -56766,9 +56604,7 @@
scrub_Toxins = 0
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvJ" = (
/obj/machinery/porta_turret/ai{
dir = 4;
@@ -56779,9 +56615,7 @@
dir = 4
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvK" = (
/obj/structure/lattice,
/obj/machinery/camera{
@@ -56801,9 +56635,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvM" = (
/obj/machinery/camera/motion{
c_tag = "MiniSat Core Hallway";
@@ -56815,9 +56647,7 @@
pixel_x = -24
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvN" = (
/obj/structure/sign/securearea{
pixel_x = -32;
@@ -56829,9 +56659,7 @@
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56847,17 +56675,13 @@
dir = 4
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvR" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
@@ -56865,17 +56689,13 @@
dir = 10
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvT" = (
/obj/structure/cable{
d1 = 1;
@@ -56885,9 +56705,7 @@
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvU" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "MiniSat Maintenance";
@@ -56900,9 +56718,7 @@
pixel_y = 0
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvV" = (
/obj/structure/cable{
d1 = 2;
@@ -56910,9 +56726,7 @@
icon_state = "2-4"
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvW" = (
/obj/structure/cable{
d1 = 1;
@@ -56920,22 +56734,16 @@
icon_state = "1-8"
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvX" = (
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvY" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cvZ" = (
/obj/machinery/airalarm{
dir = 4;
@@ -56943,9 +56751,7 @@
pixel_y = 0
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cwa" = (
/obj/structure/cable,
/obj/machinery/power/apc{
@@ -56955,9 +56761,7 @@
pixel_y = 0
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cwb" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
@@ -56965,9 +56769,7 @@
dir = 5
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cwc" = (
/obj/structure/cable{
d1 = 1;
@@ -56980,9 +56782,7 @@
on = 1
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cwd" = (
/obj/structure/cable{
d1 = 1;
@@ -56999,9 +56799,7 @@
pixel_y = -29
},
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cwe" = (
/obj/structure/sign/securearea,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -57114,9 +56912,7 @@
"cwq" = (
/obj/structure/grille,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cwr" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
@@ -59395,9 +59191,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/black,
/area/ai_monitored/turret_protected/AIsatextFS{
name = "AI Satellite Hallway"
})
/area/ai_monitored/turret_protected/aisat/hallway)
"cBT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
+12
View File
@@ -0,0 +1,12 @@
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
@@ -20207,9 +20151,7 @@
/area/shuttle/syndicate)
"aTq" = (
/turf/closed/wall,
-/area/security/vacantoffice{
- name = "Vacant Office A"
- })
+/area/security/vacantoffice/a)
"aTr" = (
/obj/machinery/door/firedoor,
/obj/machinery/status_display{
code/game/area/Space_Station_13_areas.dm
+433 -23
View File
@@ -117,6 +117,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/maintenance/atmos_control
name = "Atmospherics Maintenance"
icon_state = "fpmaint"
/area/maintenance/department/chapel
name = "Chapel Maintenance"
icon_state = "fpmaint"
/area/maintenance/department/chapel/monastery
name = "Monastery Maintenance"
icon_state = "fpmaint"
/area/maintenance/department/security
name = "Security Maintenance"
icon_state = "fpmaint"
/area/maintenance/department/security/brig
name = "Brig Maintenance"
icon_state = "fpmaint"
/area/maintenance/fpmaint
name = "EVA Maintenance"
@@ -161,6 +177,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/maintenance/maintcentral
name = "Bridge Maintenance"
icon_state = "maintcentral"
/area/maintenance/maintcentral/central
name = "Central Maintenance"
icon_state = "maintcentral"
/area/maintenance/fore
name = "Fore Maintenance"
@@ -169,6 +189,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/maintenance/starboard
name = "Starboard Maintenance"
icon_state = "smaint"
/area/maintenance/starboard/central
name = "Central Starboard Maintenance"
icon_state = "smaint"
/area/maintenance/starboard/aft_starboard_maintenance
name = "Aft Starboard Maintenance"
@@ -181,18 +205,98 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/maintenance/port
name = "Locker Room Maintenance"
icon_state = "pmaint"
/area/maintenance/port/central
name = "Central Port Maintenance"
icon_state = "pmaint"
/area/maintenance/aft
name = "Engineering Maintenance"
icon_state = "amaint"
/area/maintenance/aft/xeno_maint
name = "Xenobiology Maintenance"
icon_state = "xenomaint"
/area/maintenance/aft/Aft_Maintenance
name = "Aft Maintenance"
icon_state = "amaint"
/area/maintenance/asteroid/aft/science
name = "Aft Maintenance"
icon_state = "amaint"
/area/maintenance/asteroid/aft/arrivals
name = "Aft Maintenance"
icon_state = "amaint"
/area/maintenance/asteroid/central
name = "Central Asteroid Maintenance"
icon_state = "maintcentral"
/area/maintenance/asteroid/disposal/east
name = "Eastern External Waste Belt"
icon_state = "disposal"
/area/maintenance/asteroid/disposal/north
name = "Northern External Waste Belt"
icon_state = "disposal"
/area/maintenance/asteroid/disposal/southeast
name = "South-Eastern Disposal"
icon_state = "disposal"
/area/maintenance/asteroid/disposal/southwest
name = "South-Western Disposal"
icon_state = "disposal"
/area/maintenance/asteroid/fore/cargo_west
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/cargo_south
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_west
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_north
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_east
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/fore/com_south
name = "Fore Asteroid Maintenance"
icon_state = "fmaint"
/area/maintenance/asteroid/port/neast
name = "Port Asteroid Maintenance"
icon_state = "pmaint"
/area/maintenance/asteroid/port/east
name = "Port Asteroid Maintenance"
icon_state = "pmaint"
/area/maintenance/asteroid/port/west
name = "Port Asteroid Maintenance"
icon_state = "pmaint"
/area/maintenance/asteroid/starboard
name = "Starboard Asteroid Maintenance"
icon_state = "smaint"
/area/maintenance/storage
name = "Atmospherics"
icon_state = "green"
/area/maintenance/storage/tcom_storage
name = "Telecoms Storage"
icon_state = "green"
/area/maintenance/incinerator
name = "Incinerator"
@@ -216,7 +320,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/hallway/primary/starboard
name = "Starboard Primary Hallway"
icon_state = "hallS"
/area/hallway/primary/starboard/aft
name = "Starboard Quarter Primary Hallway"
icon_state = "hallS"
/area/hallway/primary/starboard/fore
name = "Starboard Bow Primary Hallway"
icon_state = "hallS"
/area/hallway/primary/aft
name = "Aft Primary Hallway"
icon_state = "hallA"
@@ -232,7 +344,51 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/hallway/secondary/exit
name = "Escape Shuttle Hallway"
icon_state = "escape"
/area/hallway/secondary/exit/departure_lounge
name = "Departure Lounge"
icon_state = "escape"
/area/hallway/secondary/bridges/cargo_ai
name = "Cargo-AI-Command Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/com_engi
name = "Command-Engineering Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/com_serv
name = "Command-Service Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/dock_med
name = "Docking-Medical Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/engi_med
name = "Engineering-Medical Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/med_cargo
name = "Medical-Cargo Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/sci_dock
name = "Science-Docking Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/serv_engi
name = "Service-Engineering Bridge"
icon_state = "yellow"
/area/hallway/secondary/bridges/serv_sci
name = "Service-Science Bridge"
icon_state = "yellow"
/area/hallway/secondary/command
name = "Command Hallway"
icon_state = "bridge"
/area/hallway/secondary/construction
name = "Construction Area"
icon_state = "construction"
@@ -240,6 +396,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/hallway/secondary/entry
name = "Arrival Shuttle Hallway"
icon_state = "entry"
/area/hallway/secondary/service
name = "Service Hallway"
icon_state = "Sleep"
//Command
@@ -253,6 +413,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "meeting"
music = null
/area/bridge/meeting_room/council
name = "Council Chamber"
icon_state = "meeting"
music = null
/area/bridge/showroom/corporate
name = "Corporate Showroom"
icon_state = "showroom"
music = null
/area/crew_quarters/captain
name = "Captain's Office"
icon_state = "captain"
@@ -260,6 +430,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/captain/captains_quarters
name = "Captain's Quarters"
icon_state = "captain"
/area/crew_quarters/chief
name = "Chief Engineer's Office"
icon_state = "head_quarters"
/area/crew_quarters/chief/private
name = "Chief Engineer's Private Quarters"
icon_state = "head_quarters"
/area/crew_quarters/courtroom
name = "Courtroom"
@@ -272,9 +450,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/hor
name = "Research Director's Office"
icon_state = "head_quarters"
/area/crew_quarters/chief
name = "Chief Engineer's Office"
/area/crew_quarters/hor/private
name = "Research Director's Private Quarters"
icon_state = "head_quarters"
/area/mint
@@ -295,10 +473,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Dormitories"
icon_state = "Sleep"
safe = 1
/area/crew_quarters/rehab_dome
name = "Rehabilitation Dome"
icon_state = "Sleep"
/area/crew_quarters/toilet
name = "Dormitory Toilets"
icon_state = "toilet"
/area/crew_quarters/toilet/auxiliary
name = "Auxiliary Restrooms"
icon_state = "toilet"
/area/crew_quarters/toilet/restrooms
name = "Restrooms"
icon_state = "toilet"
/area/crew_quarters/sleep
name = "Dormitories"
@@ -323,6 +513,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/locker
name = "Locker Room"
icon_state = "locker"
/area/crew_quarters/lounge
name = "Lounge"
icon_state = "yellow"
/area/crew_quarters/locker/locker_toilet
name = "Locker Toilets"
@@ -331,14 +525,26 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/fitness
name = "Fitness Room"
icon_state = "fitness"
/area/crew_quarters/fitness/recreation
name = "Recreation Area"
icon_state = "fitness"
/area/crew_quarters/cafeteria
name = "Cafeteria"
icon_state = "cafeteria"
/area/crew_quarters/cafeteria/lunchroom
name = "Lunchroom"
icon_state = "cafeteria"
/area/crew_quarters/kitchen
name = "Kitchen"
icon_state = "kitchen"
/area/crew_quarters/kitchen/backroom
name = "Kitchen Coldroom"
icon_state = "kitchen"
/area/crew_quarters/bar
name = "Bar"
@@ -359,11 +565,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/theatre
name = "Theatre"
icon_state = "Theatre"
/area/crew_quarters/theatre/abandoned
name = "Abandoned Theatre"
icon_state = "Theatre"
/area/library
name = "Library"
icon_state = "library"
flags = NONE
/area/library/lounge
name = "Library Lounge"
icon_state = "library"
/area/library/abandoned_library
name = "Abandoned Library"
@@ -377,6 +591,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/chapel/main
name = "Chapel"
/area/chapel/main/monastery
name = "Monastery"
/area/chapel/office
name = "Chapel Office"
@@ -399,6 +616,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Engineering"
icon_state = "engine"
/area/engine/atmospherics_engine
name = "Atmospherics Engine"
icon_state = "blue"
/area/engine/break_room
name = "Engineering Foyer"
icon_state = "engine"
@@ -407,13 +628,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Chief Engineer's office"
icon_state = "engine_control"
/area/engine/gravity_generator
name = "Gravity Generator Room"
icon_state = "blue"
/area/engine/secure_construction
name = "Secure Construction Area"
icon_state = "engine"
/area/engine/storage
name = "Engineering Storage"
icon_state = "engine"
/area/engine/gravity_generator
name = "Gravity Generator Room"
icon_state = "blue"
/area/engine/transit_tube
name = "Transit Tube"
icon_state = "engine"
//Solars
@@ -424,30 +654,110 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
blob_allowed = FALSE
flags = NONE
/area/solar/asteroid/aft
name = "Aft Asteroid Solar"
icon_state = "panelsA"
/area/solar/asteroid/command
name = "Command Asteroid Solar"
icon_state = "panelsA"
/area/solar/asteroid/fore
name = "Fore Asteroid Solar"
icon_state = "panelsA"
/area/solar/auxport
name = "Fore Port Solar Array"
icon_state = "panelsA"
name = "Fore Port Solar Array"
icon_state = "panelsA"
/area/solar/auxstarboard
name = "Fore Starboard Solar Array"
icon_state = "panelsA"
name = "Fore Starboard Solar Array"
icon_state = "panelsA"
/area/solar/fore
name = "Fore Solar Array"
icon_state = "yellow"
name = "Fore Solar Array"
icon_state = "yellow"
/area/solar/aft
name = "Aft Solar Array"
icon_state = "aft"
name = "Aft Solar Array"
icon_state = "yellow"
/area/solar/starboard
name = "Aft Starboard Solar Array"
icon_state = "panelsS"
name = "Aft Starboard Solar Array"
icon_state = "panelsS"
/area/solar/starboard/starboard
name = "Starboard Solar Array"
icon_state = "panelsS"
/area/solar/starboard/aft
name = "Starboard Quarter Solar Array"
icon_state = "panelsS"
/area/solar/starboard/fore
name = "Starboard Bow Solar Array"
icon_state = "panelsS"
/area/solar/port
name = "Aft Port Solar Array"
icon_state = "panelsP"
name = "Aft Port Solar Array"
icon_state = "panelsP"
/area/solar/port/port
name = "Port Solar Array"
icon_state = "panelsP"
/area/solar/port/aft
name = "Port Quarter Solar Array"
icon_state = "panelsP"
/area/solar/port/fore
name = "Port Bow Solar Array"
icon_state = "panelsP"
/area/maintenance/solars
name = "Solar Maintenance"
icon_state = "yellow"
/area/maintenance/solars/port
name = "Port Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/asteroid/aft
name = "Aft Asteroid Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/asteroid/command
name = "Command Asteroid Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/asteroid/fore
name = "Fore Asteroid Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/port/aft
name = "Starboard Quarter Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/port/fore
name = "Starboard Bow Solar Maintenance"
icon_state = "SolarcontrolP"
/area/maintenance/solars/starboard
name = "Starboard Solar Maintenance"
icon_state = "SolarcontrolS"
/area/maintenance/solars/starboard/aft
name = "Starboard Quarter Solar Maintenance"
icon_state = "SolarcontrolS"
/area/maintenance/solars/starboard/fore
name = "Starboard Bow Solar Maintenance"
icon_state = "SolarcontrolS"
/area/maintenance/auxsolarport
name = "Fore Port Solar Maintenance"
icon_state = "SolarcontrolA"
@@ -490,6 +800,26 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Teleporter Room"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/cargo
name = "Cargo Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/docking
name = "Docking Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/research
name = "Research Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/teleporter/quantum/security
name = "Security Quantum Pad"
icon_state = "teleporter"
music = "signal"
/area/gateway
name = "Gateway"
@@ -528,6 +858,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Medbay"
icon_state = "medbay3"
music = 'sound/ambience/signal.ogg'
/area/medical/medbay3/aft
name = "Medbay Aft"
icon_state = "medbay3"
music = 'sound/ambience/signal.ogg'
/area/medical/abandoned_medbay
name = "Abandoned Medbay"
@@ -537,10 +872,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/medical/patients_rooms
name = "Patients' Rooms"
icon_state = "patients"
/area/medical/patients_rooms/room_a
name = "Patient Room A"
icon_state = "patients"
/area/medical/patients_rooms/room_b
name = "Patient Room B"
icon_state = "patients"
/area/medical/cmo
name = "Chief Medical Officer's office"
icon_state = "CMO"
/area/medical/cmo/private
name = "Chief Medical Officer's Private Quarters"
icon_state = "CMO"
/area/medical/robotics
name = "Robotics"
@@ -613,6 +960,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/processing
name = "Labor Shuttle Dock"
icon_state = "sec_prison"
/area/security/processing/cremation
name = "Security Crematorium"
icon_state = "sec_prison"
/area/security/warden
name = "Brig Control"
@@ -625,6 +976,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/hos
name = "Head of Security's Office"
icon_state = "sec_hos"
/area/security/hos/private
name = "Head of Security's Private Quarters"
icon_state = "sec_hos"
/area/security/detectives_office
name = "Detective's Office"
@@ -644,7 +999,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Transfer Centre"
icon_state = "armory"
/area/security/nuke_storage
name = "Vault"
icon_state = "nuke_storage"
@@ -676,10 +1030,26 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/checkpoint/science
name = "Security Post - Science"
icon_state = "checkpoint1"
/area/security/checkpoint/science/research
name = "Security Post - Research Division"
icon_state = "checkpoint1"
/area/security/checkpoint/customs
name = "Customs"
icon_state = "bridge"
/area/security/vacantoffice
name = "Vacant Office"
icon_state = "security"
/area/security/vacantoffice/a
name = "Vacant Office A"
icon_state = "security"
/area/security/vacantoffice/b
name = "Vacant Office B"
icon_state = "security"
/area/security/vacantoffice2
name = "Vacant Office B"
@@ -713,9 +1083,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Quartermaster's Office"
icon_state = "quart"
/area/quartermaster/qm/private
name = "Quartermaster's Private Quarters"
icon_state = "quart"
/area/quartermaster/miningdock
name = "Mining Dock"
icon_state = "mining"
/area/quartermaster/miningdock/abandoned
name = "Abandoned Mining Dock"
icon_state = "mining"
/area/quartermaster/miningoffice
name = "Mining Office"
@@ -738,9 +1116,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Hydroponics"
icon_state = "hydro"
/area/hydroponics/Abandoned_Garden
/area/hydroponics/garden/abandoned
name = "Abandoned Garden"
icon_state = "hydro"
/area/hydroponics/garden/monastery
name = "Monastery Garden"
icon_state = "hydro"
/area/hydroponics/garden
name = "Garden"
icon_state = "hydro"
//Toxins
@@ -772,7 +1158,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/toxins/misc_lab
name = "Testing Lab"
icon_state = "toxmisc"
/area/toxins/misc_lab/range
name = "Research Testing Range"
icon_state = "toxmisc"
/area/toxins/server
name = "Research Division Server Room"
icon_state = "server"
@@ -842,6 +1232,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/mining_construction
name = "Auxillary Base Construction"
icon_state = "yellow"
/area/mining_construction/closet
name = "Auxiliary Closet Construction"
icon_state = "yellow"
/area/construction/supplyshuttle
name = "Supply Shuttle"
@@ -911,6 +1305,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/ai_monitored/turret_protected/aisat
name = "AI Satellite"
icon_state = "ai"
/area/ai_monitored/turret_protected/aisat/atmos
name = "AI Satellite Atmos"
icon_state = "ai"
/area/ai_monitored/turret_protected/aisat/atmos
name = "AI Satellite Atmos"
icon_state = "ai"
/area/ai_monitored/turret_protected/aisat/service
name = "AI Satellite Service"
icon_state = "ai"
/area/ai_monitored/turret_protected/aisat/hallway
name = "AI Satellite Hallway"
icon_state = "ai"
/area/aisat
name = "AI Satellite Exterior"
code/game/area/areas/mining.dm
+3 -3
View File
@@ -57,13 +57,13 @@
name = "Mining Station Communications"
/area/mine/cafeteria
name = "Mining station Cafeteria"
name = "Mining Station Cafeteria"
/area/mine/hydroponics
name = "Mining station Hydroponics"
name = "Mining Station Hydroponics"
/area/mine/sleeper
name = "Mining station Emergency Sleeper"
name = "Mining Station Emergency Sleeper"
/area/mine/north_outpost
name = "North Mining Outpost"
code/game/area/areas/misc.dm
+4
View File
@@ -115,6 +115,10 @@
/area/prison/solitary
name = "Solitary Confinement"
icon_state = "brig"
/area/prison/execution_room
name = "Prisoner Education Chamber"
icon_state = "armory"
/area/prison/cell_block/A
name = "Prison Cell Block A"