Merge pull request #10317 from Trilbyspaceclone/map_redo
Corrects issues with box map
This commit is contained in:
+6418
-8246
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -3528,7 +3528,6 @@
|
||||
pixel_x = -22
|
||||
},
|
||||
/obj/structure/rack,
|
||||
/obj/item/storage/fancy/donut_box,
|
||||
/obj/item/gun/energy/e_gun/dragnet,
|
||||
/obj/item/gun/energy/e_gun/dragnet,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
@@ -4004,8 +4003,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/rack,
|
||||
/obj/item/gun/energy/pumpaction/blaster,
|
||||
/obj/item/gun/energy/pumpaction/blaster,
|
||||
/obj/item/storage/fancy/donut_box,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/ai_monitored/security/armory)
|
||||
"ahJ" = (
|
||||
@@ -83448,6 +83446,10 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"iCn" = (
|
||||
/obj/machinery/vr_sleeper,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"iLj" = (
|
||||
/obj/structure/table,
|
||||
/turf/open/floor/plating,
|
||||
@@ -83466,6 +83468,16 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/crew_quarters/fitness/recreation)
|
||||
"jhu" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
id_tag = "permahydro";
|
||||
name = "Recreation Module"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"jwW" = (
|
||||
/turf/closed/wall/mineral/plastitanium,
|
||||
/area/crew_quarters/fitness/recreation)
|
||||
@@ -83523,16 +83535,6 @@
|
||||
"krD" = (
|
||||
/turf/closed/wall,
|
||||
/area/science/circuit)
|
||||
"kwg" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
id_tag = "permahydro";
|
||||
name = "Recreation Module"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"kwI" = (
|
||||
/obj/item/wrench,
|
||||
/obj/item/clothing/suit/apron,
|
||||
@@ -83593,10 +83595,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/circuit)
|
||||
"kRT" = (
|
||||
/obj/machinery/vr_sleeper,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"kVo" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
@@ -83616,13 +83614,6 @@
|
||||
/obj/item/integrated_circuit_printer,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/circuit)
|
||||
"lmg" = (
|
||||
/obj/machinery/computer/arcade{
|
||||
icon_state = "arcade";
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"lsv" = (
|
||||
/obj/machinery/power/apc{
|
||||
areastring = "/area/science/circuit";
|
||||
@@ -83671,6 +83662,10 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/fore)
|
||||
"lWL" = (
|
||||
/obj/machinery/smartfridge/organ/preloaded,
|
||||
/turf/closed/wall,
|
||||
/area/medical/surgery)
|
||||
"lWY" = (
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
name = "Telecomms Server Room"
|
||||
@@ -83792,13 +83787,6 @@
|
||||
/obj/item/storage/fancy/candle_box,
|
||||
/turf/open/floor/engine/cult,
|
||||
/area/library)
|
||||
"oba" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"obb" = (
|
||||
/obj/structure/target_stake,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -84067,6 +84055,20 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/crew_quarters/cryopod)
|
||||
"ram" = (
|
||||
/obj/machinery/computer/arcade{
|
||||
icon_state = "arcade";
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"roa" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"rzX" = (
|
||||
/obj/structure/chair/office/light{
|
||||
dir = 1;
|
||||
@@ -84080,6 +84082,17 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"rLV" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/folder,
|
||||
/obj/item/paper/guides/jobs/hydroponics,
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/item/pen,
|
||||
/obj/item/storage/crayons,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"rMS" = (
|
||||
/obj/machinery/status_display/supply,
|
||||
/turf/closed/wall,
|
||||
@@ -84275,15 +84288,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"uHA" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"uJU" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
@@ -84368,10 +84372,6 @@
|
||||
/obj/structure/lattice,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"vPN" = (
|
||||
/obj/machinery/smartfridge/organ/preloaded,
|
||||
/turf/closed/wall,
|
||||
/area/medical/surgery)
|
||||
"wdu" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/lattice,
|
||||
@@ -84444,17 +84444,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/misc_lab)
|
||||
"xcb" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/folder,
|
||||
/obj/item/paper/guides/jobs/hydroponics,
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/item/pen,
|
||||
/obj/item/storage/crayons,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"xeC" = (
|
||||
/obj/machinery/light,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
@@ -84511,6 +84500,15 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/aft)
|
||||
"xIi" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/security/prison)
|
||||
"xVl" = (
|
||||
/turf/closed/wall,
|
||||
/area/hallway/secondary/service)
|
||||
@@ -104241,7 +104239,7 @@ cia
|
||||
cia
|
||||
cpX
|
||||
cia
|
||||
vPN
|
||||
lWL
|
||||
cia
|
||||
ceu
|
||||
dyg
|
||||
@@ -106714,11 +106712,11 @@ aaa
|
||||
aaf
|
||||
aaf
|
||||
aay
|
||||
xcb
|
||||
uHA
|
||||
rLV
|
||||
xIi
|
||||
abC
|
||||
kwg
|
||||
uHA
|
||||
jhu
|
||||
xIi
|
||||
abC
|
||||
abC
|
||||
acr
|
||||
@@ -106972,10 +106970,10 @@ aaf
|
||||
aaa
|
||||
aax
|
||||
abl
|
||||
oba
|
||||
lmg
|
||||
roa
|
||||
ram
|
||||
aax
|
||||
kRT
|
||||
iCn
|
||||
aaR
|
||||
aaR
|
||||
aaI
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user