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

Merge pull request #1280 from Citadel-Station-13/upstream-merge-27768

Browse Source 
[MIRROR] Cable coils New -> Initialize
This commit is contained in:
LetterJay
2017-05-29 15:01:24 -05:00
committed by GitHub
parent fd99ecba30 84c9682114
commit 4f214e3f55
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+7 -6
View File
@@ -527,7 +527,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>") user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return(OXYLOSS) return(OXYLOSS)
/obj/item/stack/cable_coil/New(loc, new_amount = null, var/param_color = null) /obj/item/stack/cable_coil/Initialize(mapload, new_amount = null, param_color = null)
. = ..() . = ..()
if(new_amount) // MAXCOIL by default if(new_amount) // MAXCOIL by default
amount = new_amount amount = new_amount
@@ -779,9 +779,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cut /obj/item/stack/cable_coil/cut
item_state = "coil_red2" item_state = "coil_red2"
/obj/item/stack/cable_coil/cut/New(loc) /obj/item/stack/cable_coil/cut/Initialize(mapload)
..() . =..()
src.amount = rand(1,2) amount = rand(1,2)
pixel_x = rand(-2,2) pixel_x = rand(-2,2)
pixel_y = rand(-2,2) pixel_y = rand(-2,2)
update_icon() update_icon()
@@ -819,10 +819,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
item_color = "white" item_color = "white"
icon_state = "coil_white" icon_state = "coil_white"
/obj/item/stack/cable_coil/random/New() /obj/item/stack/cable_coil/random/Initialize(mapload)
. = ..()
item_color = pick("red","orange","yellow","green","cyan","blue","pink","white") item_color = pick("red","orange","yellow","green","cyan","blue","pink","white")
icon_state = "coil_[item_color]" icon_state = "coil_[item_color]"
..()
/obj/item/stack/cable_coil/random/five /obj/item/stack/cable_coil/random/five
amount = 5 amount = 5