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
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"