Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841

[MIRROR] Fixes derelict area issues
This commit is contained in:
LetterJay
2018-01-24 21:43:24 -06:00
committed by GitHub
6 changed files with 277 additions and 318 deletions
File diff suppressed because it is too large Load Diff
@@ -546,7 +546,7 @@
},
/area/ruin/space/has_grav/abandonedzoo)
"bq" = (
/obj/item/stack/cable_coil/cut,
/obj/item/stack/cable_coil/cut/red,
/obj/item/stack/tile/plasteel{
pixel_x = 3;
pixel_y = -4
+1 -1
View File
@@ -181,7 +181,7 @@
/turf/open/floor/plating/airless,
/area/tcommsat/chamber)
"aJ" = (
/obj/item/stack/cable_coil/cut{
/obj/item/stack/cable_coil/cut/red{
amount = 1
},
/turf/open/floor/plating/airless,
+8 -16
View File
@@ -24,10 +24,8 @@
/turf/template_noop,
/area/template_noop)
"ae" = (
/obj/item/stack/cable_coil/cut{
amount = 2;
dir = 2;
icon_state = "coil_red2"
/obj/item/stack/cable_coil/cut/red{
amount = 2
},
/obj/structure/lattice/catwalk,
/turf/template_noop,
@@ -427,10 +425,8 @@
/obj/structure/disposalpipe/broken{
dir = 4
},
/obj/item/stack/cable_coil/cut{
amount = 2;
dir = 2;
icon_state = "coil_red2"
/obj/item/stack/cable_coil/cut/red{
amount = 2
},
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
@@ -1022,10 +1018,8 @@
/area/ruin/space/has_grav/onehalf/bridge)
"cK" = (
/obj/structure/lattice,
/obj/item/stack/cable_coil/cut{
amount = 2;
dir = 2;
icon_state = "coil_red2"
/obj/item/stack/cable_coil/cut/red{
amount = 2
},
/turf/template_noop,
/area/ruin/space/has_grav/onehalf/hallway)
@@ -1229,10 +1223,8 @@
/turf/template_noop,
/area/template_noop)
"dl" = (
/obj/item/stack/cable_coil/cut{
amount = 2;
dir = 2;
icon_state = "coil_red2"
/obj/item/stack/cable_coil/cut/red{
amount = 2
},
/turf/template_noop,
/area/template_noop)
+2 -4
View File
@@ -3124,10 +3124,8 @@
id = "Awaylab";
name = "Acid-Proof containment chamber blast door"
},
/obj/item/stack/cable_coil/cut{
amount = 1;
icon_state = "coil_red1";
item_state = "coil_red1"
/obj/item/stack/cable_coil/cut/red{
amount = 1
},
/turf/open/floor/plating{
heat_capacity = 1e+006