From f7642d18096e2f9336d98957c76a1a56e158f15d Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Thu, 29 Nov 2018 11:55:01 +0100 Subject: [PATCH 1/2] Fixed gibber --- code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index bd80823addd..63d980d267c 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -75,8 +75,7 @@ to_chat(user, "Wait for [occupant.name] to finish being loaded!") return - else - startgibbing(user) + startgibbing(user) /obj/machinery/gibber/attackby(obj/item/P, mob/user, params) if(istype(P, /obj/item/grab)) @@ -279,11 +278,10 @@ occupant.death(1) occupant.ghostize() - qdel(occupant) + QDEL_NULL(occupant) spawn(gibtime) playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1) - operating = 0 if(stealthmode) for(var/atom/movable/AM in contents) From 45c892d6b436d2dfefb9af1b332f0b81c121977d Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Thu, 29 Nov 2018 12:13:44 +0100 Subject: [PATCH 2/2] Fixed spacing in the file while I was at it --- .../kitchen_machinery/gibber.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 63d980d267c..c5bcd22a885 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -112,7 +112,7 @@ move_into_gibber(user,target) -/obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim) +/obj/machinery/gibber/proc/move_into_gibber(mob/user, mob/living/victim) if(occupant) to_chat(user, "The [src] is full, empty it first!") return @@ -214,7 +214,7 @@ qdel(holder2) //get rid of holder object locked = 0 //unlock -/obj/machinery/gibber/proc/startgibbing(var/mob/user, var/UserOverride=0) +/obj/machinery/gibber/proc/startgibbing(mob/user, UserOverride=0) if(!istype(user) && !UserOverride) log_debug("Some shit just went down with the gibber at X[x], Y[y], Z[z] with an invalid user. (JMP)") return @@ -248,11 +248,11 @@ for(var/i=1 to slab_count) var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src) new_meat.name = "[slab_name] [new_meat.name]" - new_meat.reagents.add_reagent("nutriment",slab_nutrition) + new_meat.reagents.add_reagent("nutriment", slab_nutrition) if(occupant.reagents) - occupant.reagents.trans_to(new_meat, round(occupant.reagents.total_volume/slab_count,1)) + occupant.reagents.trans_to(new_meat, round(occupant.reagents.total_volume/slab_count, 1)) if(ishuman(occupant)) var/mob/living/carbon/human/H = occupant @@ -290,12 +290,12 @@ else for(var/obj/item/thing in contents) //Meat is spawned inside the gibber and thrown out afterwards. thing.loc = get_turf(thing) // Drop it onto the turf for throwing. - thing.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) // Being pelted with bits of meat and bone would hurt. + thing.throw_at(get_edge_target_turf(src, gib_throw_dir), rand(1, 5), 15) // Being pelted with bits of meat and bone would hurt. sleep(1) for(var/obj/effect/gibs in contents) //throw out the gibs too gibs.loc = get_turf(gibs) //drop onto turf for throwing - gibs.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) + gibs.throw_at(get_edge_target_turf(src, gib_throw_dir), rand(1, 5), 15) sleep(1) pixel_x = initial(pixel_x) //return to it's spot after shaking @@ -356,7 +356,7 @@ break victim_targets.Cut() -/obj/machinery/gibber/autogibber/proc/force_move_into_gibber(var/mob/living/carbon/human/victim) +/obj/machinery/gibber/autogibber/proc/force_move_into_gibber(mob/living/carbon/human/victim) if(!istype(victim)) return 0 visible_message("\The [victim.name] gets sucked into \the [src]!") @@ -383,7 +383,7 @@ qdel(O) //they are already dead by now H.unEquip(O) O.loc = loc - O.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) + O.throw_at(get_edge_target_turf(src, gib_throw_dir), rand(1, 5), 15) sleep(1) for(var/obj/item/clothing/C in H) @@ -391,7 +391,7 @@ qdel(C) H.unEquip(C) C.loc = loc - C.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) + C.throw_at(get_edge_target_turf(src, gib_throw_dir), rand(1, 5), 15) sleep(1) visible_message("\The [src] spits out \the [H.name]'s possessions!") @@ -403,7 +403,7 @@ qdel(O) else if(istype(O)) O.loc = loc - O.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15) + O.throw_at(get_edge_target_turf(src, gib_throw_dir), rand(1, 5), 15) spats++ sleep(1) if(spats)