diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index a3516cb9d2c..b6349f454b6 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -8,9 +8,12 @@
anchored = 1
var/operating = 0 //Is it on?
var/dirty = 0 // Does it need cleaning?
- var/gibtime = 40 // Time from starting until meat appears
var/mob/living/occupant // Mob who has been put inside
var/locked = 0 //Used to prevent mobs from breaking the feedin anim
+
+ var/gib_throw_dir = WEST // Direction to spit meat and gibs in. Defaults to west.
+ var/gibtime = 40 // Time from starting until meat appears
+
use_power = 1
idle_power_usage = 2
active_power_usage = 500
@@ -19,31 +22,30 @@
/obj/machinery/gibber/autogibber
var/turf/input_plate
- New()
- ..()
- spawn(5)
- for(var/i in 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
- del(input_obj)
- break
+/obj/machinery/gibber/autogibber/New()
+ ..()
+ spawn(5)
+ for(var/i in 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
+ del(input_obj)
+ break
- if(!input_plate)
- diary << "a [src] didn't find an input plate."
- return
+ if(!input_plate)
+ log_misc("a [src] didn't find an input plate.")
+ return
- Bumped(var/atom/A)
- if(!input_plate) return
+/obj/machinery/gibber/autogibber/Bumped(var/atom/A)
+ if(!input_plate) return
- if(ismob(A))
- var/mob/M = A
+ if(ismob(A))
+ var/mob/M = A
- if(M.loc == input_plate
- )
- M.loc = src
- M.gib()
+ if(M.loc == input_plate)
+ M.loc = src
+ M.gib()
/obj/machinery/gibber/New()
@@ -52,14 +54,19 @@
/obj/machinery/gibber/update_icon()
overlays.Cut()
+
if (dirty)
src.overlays += image('icons/obj/kitchen.dmi', "grbloody")
+
if(stat & (NOPOWER|BROKEN))
return
+
if (!occupant)
src.overlays += image('icons/obj/kitchen.dmi', "grjam")
+
else if (operating)
src.overlays += image('icons/obj/kitchen.dmi', "gruse")
+
else
src.overlays += image('icons/obj/kitchen.dmi', "gridle")
@@ -69,43 +76,82 @@
/obj/machinery/gibber/relaymove(mob/user as mob)
if(locked)
return
+
src.go_out()
+
return
/obj/machinery/gibber/attack_hand(mob/user as mob)
if(stat & (NOPOWER|BROKEN))
return
+
if(operating)
- user << "\red It's locked and running"
+ user << "The gibber is locked and running, wait for it to finish."
return
+
if(locked)
- user << "\red Wait for [occupant.name] to finish being loaded!"
+ user << "Wait for [occupant.name] to finish being loaded!"
return
+
else
src.startgibbing(user)
/obj/machinery/gibber/attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params)
- if(src.occupant)
- user << "\red The gibber is full, empty it first!"
- return
- if (!( istype(G, /obj/item/weapon/grab)) || !(istype(G.affecting, /mob/living/carbon/human)))
- user << "\red This item is not suitable for the gibber!"
- return
- if(G.affecting.abiotic(1))
- user << "\red Subject may not have abiotic items on."
+ if(!istype(G))
+ return ..()
+
+ if(G.state < 2)
+ user << "You need a better grip to do that!"
return
- user.visible_message("\red [user] starts to put [G.affecting] into the gibber!")
+ move_into_gibber(user,G.affecting)
+
+ del(G)
+
+/obj/machinery/gibber/MouseDrop_T(mob/target, mob/user)
+ if(usr.stat || (!ishuman(user)) || user.restrained() || user.weakened || user.stunned || user.paralysis || user.resting)
+ return
+
+ if(!istype(target,/mob/living))
+ return
+
+ var/mob/living/targetl = target
+
+ if(targetl.buckled)
+ return
+
+ move_into_gibber(user,target)
+
+/obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim)
+ if(src.occupant)
+ user << "The gibber is full, empty it first!"
+ return
+
+ if(operating)
+ user << "The gibber is locked and running, wait for it to finish."
+ return
+
+ if(!(istype(victim, /mob/living/carbon/human)))
+ user << "This is not suitable for the gibber!"
+ return
+
+ if(victim.abiotic(1))
+ user << "Subject may not have abiotic items on."
+ return
+
+ user.visible_message("\red [user] starts to put [victim] into the gibber!")
src.add_fingerprint(user)
- if(do_after(user, 30) && G && G.affecting && !occupant)
- user.visible_message("\red [user] stuffs [G.affecting] into the gibber!")
- var/mob/M = G.affecting
- if(M.client)
- M.client.perspective = EYE_PERSPECTIVE
- M.client.eye = src
- M.loc = src
- src.occupant = M
- del(G)
+ if(do_after(user, 30) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
+
+ user.visible_message("\red [user] stuffs [victim] into the gibber!")
+
+ if(victim.client)
+ victim.client.perspective = EYE_PERSPECTIVE
+ victim.client.eye = src
+
+ victim.loc = src
+ src.occupant = victim
+
update_icon()
feedinTopanim()
@@ -116,29 +162,39 @@
if (usr.stat != 0)
return
+
src.go_out()
add_fingerprint(usr)
+
return
/obj/machinery/gibber/proc/go_out()
- if (!src.occupant)
+ if (operating || !src.occupant) //no going out if operating, just in case they manage to trigger go_out before being dead
return
+
if (locked)
return
+
for(var/obj/O in src)
O.loc = src.loc
+
if (src.occupant.client)
src.occupant.client.eye = src.occupant.client.mob
src.occupant.client.perspective = MOB_PERSPECTIVE
+
src.occupant.loc = src.loc
src.occupant = null
+
update_icon()
+
return
/obj/machinery/gibber/proc/feedinTopanim()
if(!src.occupant)
return
+ src.layer = MOB_LAYER + 0.1
+
src.locked = 1
var/image/gibberoverlay = new
@@ -151,57 +207,71 @@
feedee.icon = getFlatIcon(occupant, 2)
feedee.pixel_y = 25
feedee.pixel_x = 2
+
overlays += feedee
overlays += gibberoverlay
var/i //our counter
- for(i=0,i<30,i++)
+ for(i=0,i<30,i++) //32 tenths of a second (3.2seconds), counting from 0 to 31
overlays -= gibberoverlay
overlays -= feedee
+
feedee.pixel_y--
+
if(feedee.pixel_y == 16)
feedee.icon += icon('icons/obj/kitchen.dmi', "footicon")
continue
+
if(feedee.pixel_y == -5)
overlays -= feedee
overlays -= gibberoverlay
src.locked = 0
break
+
overlays += feedee
overlays += gibberoverlay
+
sleep(1)
+ src.layer = 3
/obj/machinery/gibber/proc/startgibbing(mob/user as mob)
if(src.operating)
return
+
if(!src.occupant)
- visible_message("\red You hear a loud metallic grinding sound.")
+ visible_message("You hear a loud metallic grinding sound.")
return
+
use_power(1000)
- visible_message("\red You hear a loud squelchy grinding sound.")
+ visible_message("You hear a loud squelchy grinding sound.")
+
src.operating = 1
update_icon()
- var/sourcename = src.occupant.real_name
- var/sourcejob = src.occupant.job
- var/sourcenutriment = src.occupant.nutrition / 15
- var/sourcetotalreagents = src.occupant.reagents.total_volume
- var/totalslabs = 3
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/allmeat[totalslabs]
- for (var/i=1 to totalslabs)
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new
- newmeat.name = sourcename + newmeat.name
- newmeat.subjectname = sourcename
- newmeat.subjectjob = sourcejob
- newmeat.reagents.add_reagent ("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first
- src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
- allmeat[i] = newmeat
+ var/slab_name = occupant.name
+ var/slab_count = 3
+ var/slab_type = /obj/item/weapon/reagent_containers/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
+ var/slab_nutrition = src.occupant.nutrition / 15
+
+ slab_nutrition /= slab_count
+
+ for(var/i=1 to slab_count)
+ var/obj/item/weapon/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)
+
+ if(src.occupant.reagents)
+ src.occupant.reagents.trans_to(new_meat, round(occupant.reagents.total_volume/slab_count,1))
+
+ new /obj/effect/decal/cleanable/blood/gibs(src)
src.occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [user]/[user.ckey]" //One shall not simply gib a mob unnoticed!
user.attack_log += "\[[time_stamp()]\] Gibbed [src.occupant]/[src.occupant.ckey]"
+
if(src.occupant.ckey)
msg_admin_attack("[user.name] ([user.ckey]) gibbed [src.occupant] ([src.occupant.ckey]) (JMP)")
+
if(!iscarbon(user))
src.occupant.LAssailant = null
else
@@ -209,19 +279,25 @@
src.occupant.emote("scream")
playsound(src.loc, 'sound/effects/gib.ogg', 50, 1)
+
src.occupant.death(1)
src.occupant.ghostize()
+
del(src.occupant)
+
spawn(src.gibtime)
+
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
operating = 0
- for (var/i=1 to totalslabs)
- var/obj/item/meatslab = allmeat[i]
- var/turf/Tx = locate(src.x - i, src.y, src.z)
- meatslab.loc = src.loc
- meatslab.throw_at(Tx,i,3,src)
- if (!Tx.density)
- new /obj/effect/decal/cleanable/blood/gibs(Tx,i)
+
+ 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.
+
+ 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)
+
src.operating = 0
update_icon()