From 6ec7f5c3e077b9acddd15b5cd1caf6a499822627 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 18 May 2017 05:16:36 -0500 Subject: [PATCH] [MIRROR] Ports gibbers to Initialize (#870) * Ports gibbers to Initialize * Update gibber.dm * Delete gibber.dm.rej --- .../kitchen_machinery/gibber.dm | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 43cf70bbe2..81e3692376 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -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