Merge pull request #2292 from Citadel-Station-13/upstream-merge-29724

[MIRROR] More Initialize() garbage
This commit is contained in:
LetterJay
2017-08-07 07:26:53 -05:00
committed by GitHub
7 changed files with 20 additions and 20 deletions
@@ -7,7 +7,7 @@
var/assembly_type
/obj/effect/spawner/newbomb/Initialize()
..()
. = ..()
var/obj/item/device/transfer_valve/V = new(src.loc)
var/obj/item/weapon/tank/internals/plasma/full/PT = new(V)
var/obj/item/weapon/tank/internals/oxygen/OT = new(V)
@@ -9,7 +9,7 @@
var/state = 0
/obj/item/stack/tile/light/Initialize(mapload, new_amount, merge = TRUE)
..()
. = ..()
if(prob(5))
state = 3 //broken
else if(prob(5))
@@ -27,4 +27,4 @@
if(amount <= 0)
qdel(src)
else
return ..()
return ..()