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

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

Browse Source 
[MIRROR] Fixes derelict area issues
This commit is contained in:
LetterJay
2018-01-24 21:43:24 -06:00
committed by GitHub
parent 0c43d1ef92 e8b15b5c6c
commit c30127d0d5
6 changed files with 277 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+217 -289
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+1 -1
View File
@@ -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
_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+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,
_maps/RandomRuins/SpaceRuins/onehalf.dmm
+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)
_maps/RandomZLevels/moonoutpost19.dmm
+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
code/modules/power/cable.dm
+48 -7
View File
@@ -740,13 +740,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
// Misc.
/////////////////////////////
/obj/item/stack/cable_coil/cut/Initialize(mapload)
. = ..()
amount = rand(1,2)
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
update_icon()
/obj/item/stack/cable_coil/red
item_color = "red"
color = "#ff0000"
@@ -782,5 +775,53 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
item_color = null
color = "#ffffff"
/obj/item/stack/cable_coil/random/five
amount = 5
/obj/item/stack/cable_coil/cut
amount = null
icon_state = "coil2"
/obj/item/stack/cable_coil/cut/Initialize(mapload)
. = ..()
if(!amount)
amount = rand(1,2)
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
update_icon()
/obj/item/stack/cable_coil/cut/red
item_color = "red"
color = "#ff0000"
/obj/item/stack/cable_coil/cut/yellow
item_color = "yellow"
color = "#ffff00"
/obj/item/stack/cable_coil/cut/blue
item_color = "blue"
color = "#1919c8"
/obj/item/stack/cable_coil/cut/green
item_color = "green"
color = "#00aa00"
/obj/item/stack/cable_coil/cut/pink
item_color = "pink"
color = "#ff3ccd"
/obj/item/stack/cable_coil/cut/orange
item_color = "orange"
color = "#ff8000"
/obj/item/stack/cable_coil/cut/cyan
item_color = "cyan"
color = "#00ffff"
/obj/item/stack/cable_coil/cut/white
item_color = "white"
/obj/item/stack/cable_coil/cut/random
item_color = null
color = "#ffffff"