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

[MIRROR] Ports gibbers to Initialize (#870)

Browse Source 
* Ports gibbers to Initialize

* Update gibber.dm

* Delete gibber.dm.rej
This commit is contained in:
CitadelStationBot
2017-05-18 05:16:36 -05:00
committed by Poojawa
parent 3930c75351
commit 6ec7f5c3e0
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+15 -16
View File
@@ -19,20 +19,19 @@
/obj/machinery/gibber/autogibber
var/turf/input_plate
/obj/machinery/gibber/autogibber/New()
..()
spawn(5)
for(var/i in GLOB.cardinal)
var/obj/machinery/mineral/input/input_obj = locate( /obj/machinery/mineral/input, get_step(src.loc, i) )
if(input_obj)
if(isturf(input_obj.loc))
input_plate = input_obj.loc
qdel(input_obj)
break
/obj/machinery/gibber/autogibber/Initialize()
. = ..()
for(var/i in GLOB.cardinal)
var/obj/machinery/mineral/input/input_obj = locate() in get_step(loc, i)
if(input_obj)
if(isturf(input_obj.loc))
input_plate = input_obj.loc
qdel(input_obj)
break
if(!input_plate)
GLOB.world_game_log << "a [src] didn't find an input plate."
return
if(!input_plate)
CRASH("Didn't find an input plate.")
return
/obj/machinery/gibber/autogibber/Bumped(atom/A)
if(!input_plate) return
@@ -45,10 +44,10 @@
M.gib()
/obj/machinery/gibber/New()
..()
/obj/machinery/gibber/Initialize()
. = ..()
add_overlay("grjam")
var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/gibber(null)
var/obj/item/weapon/circuitboard/machine/gibber/B = new
B.apply_default_parts(src)
/obj/item/weapon/circuitboard/machine/gibber