From 0e99339d522dd172e76d8aa350e2029d656aa590 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 29 Nov 2014 20:50:31 -0800 Subject: [PATCH 1/8] Makes the gibber Ultra-Dramatic. Can be toggled on and off via the 'dramatic' variable. --- code/game/machinery/kitchen/gibber.dm | 70 +++++++++++++++++++-------- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index d5510dbbd26..6e3fee68516 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -10,6 +10,7 @@ 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/dramatic = 1 use_power = 1 idle_power_usage = 2 active_power_usage = 500 @@ -134,7 +135,6 @@ visible_message("\red You hear a loud metallic grinding sound.") return use_power(1000) - visible_message("\red You hear a loud squelchy grinding sound.") src.operating = 1 update_icon() var/sourcename = src.occupant.real_name @@ -161,23 +161,55 @@ src.occupant.LAssailant = null else src.occupant.LAssailant = user - - 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) - src.operating = 0 - update_icon() + if(src.dramatic) + visible_message("\red The hatch closes and locks.") + src.occupant.visible_message("\red The hatch closes and locks behind you.") + sleep(20) + visible_message("\red The Gibber states 'Deploying Grinders.'") + src.occupant.visible_message("\blue You hear a faint voice. \red The Gibber states 'Deploying Grinders.'") + src.occupant.visible_message("\red You feel a panel open underneath you.") + sleep(10) + src.occupant.visible_message("\red A number of sharp points press into your back.") + sleep(20) + visible_message("\red The Gibber states 'Engaging Grinders.'") + src.occupant.visible_message("\blue You hear a faint voice. \red The Gibber states 'Engaging Grinders.'") + src.occupant.visible_message("\red The blades start tearing at your flesh! AHHHHH!") + src.occupant.emote("scream") + visible_message("\red You hear a loud squelchy grinding sound.") + sleep(20) + 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) + src.operating = 0 + update_icon() + else + 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) + src.operating = 0 + update_icon() From dd25c9e4a3971da6683d3192251b948181baa2c1 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 29 Nov 2014 22:50:22 -0800 Subject: [PATCH 2/8] Changed a couple lines to be more serious. --- code/game/machinery/kitchen/gibber.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 6e3fee68516..41d146094c4 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -172,8 +172,9 @@ src.occupant.visible_message("\red A number of sharp points press into your back.") sleep(20) visible_message("\red The Gibber states 'Engaging Grinders.'") + visible_message("\red The Gibber starts rumbling!") src.occupant.visible_message("\blue You hear a faint voice. \red The Gibber states 'Engaging Grinders.'") - src.occupant.visible_message("\red The blades start tearing at your flesh! AHHHHH!") + src.occupant.visible_message("\red You feel immense tearing pain in your back.") src.occupant.emote("scream") visible_message("\red You hear a loud squelchy grinding sound.") sleep(20) From 2d67449c6fc8101465169adbf7e8c5a5f31e5b83 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 12:22:59 -0800 Subject: [PATCH 3/8] Allow's slime people to make a squishing sound with *squish --- code/modules/mob/living/carbon/human/emote.dm | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 5f03f064ab7..7dc7db0966b 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -82,6 +82,28 @@ if (!species.name == "Machine") return + if("squish") + if(species.name == "Slime People") + var/M = null + if(param) + for (var/mob/A in view(null, null)) + if (param == A.name) + M = A + break + if(!M) + param = null + + if (param) + message = "[src] squishes at [param]." + else + message = "[src] squishes." + playsound(src.loc, 'sound/effects/squelch1.ogg', 50, 0) + m_type = 1 + else + if(!species.name == "Slime People") + return + + if ("airguitar") if (!src.restrained()) message = "[src] is strumming the air and headbanging like a safari chimp." From d70ca5acb28eebd2cb603394bba97516a0594b15 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 12:54:09 -0800 Subject: [PATCH 4/8] Fix's the handcuffing logs to be Officer > Cuff-ee instead of Cuff-ee > Officer --- code/game/objects/items/weapons/handcuffs.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 3c9dc65f8fe..980fccf3186 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -50,7 +50,7 @@ else feedback_add_details("handcuffs","H") - add_logs(user, C, "handcuffed") + add_logs(C, user, "handcuffed") var/last_chew = 0 /mob/living/carbon/human/RestrainedClickOn(var/atom/A) @@ -112,20 +112,20 @@ var/last_chew = 0 /obj/item/weapon/handcuffs/cyborg dispenser = 1 - + /obj/item/weapon/handcuffs/cyborg/attack(mob/living/carbon/C as mob, mob/user as mob) if(!C.handcuffed) var/turf/p_loc = user.loc var/turf/p_loc_m = C.loc playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) user.visible_message("\red [user] is trying to put handcuffs on [C]!") - + if (ishuman(C)) var/mob/living/carbon/human/H = C if (!H.has_organ_for_slot(slot_handcuffed)) user << "\red \The [H] needs at least two wrists before you can cuff them together!" return - + spawn(30) if(!C) return if(p_loc == user.loc && p_loc_m == C.loc) From f91c1400b6ca78b9bf7e59feda15be74ef216c38 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 16:19:14 -0800 Subject: [PATCH 5/8] Revert "Makes the gibber Ultra-Dramatic." This reverts commit 0e99339d522dd172e76d8aa350e2029d656aa590. Conflicts: code/game/machinery/kitchen/gibber.dm --- code/game/machinery/kitchen/gibber.dm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 41d146094c4..049e06db81d 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -10,7 +10,6 @@ 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/dramatic = 1 use_power = 1 idle_power_usage = 2 active_power_usage = 500 @@ -135,6 +134,7 @@ visible_message("\red You hear a loud metallic grinding sound.") return use_power(1000) + visible_message("\red You hear a loud squelchy grinding sound.") src.operating = 1 update_icon() var/sourcename = src.occupant.real_name @@ -161,6 +161,7 @@ src.occupant.LAssailant = null else src.occupant.LAssailant = user +<<<<<<< HEAD if(src.dramatic) visible_message("\red The hatch closes and locks.") src.occupant.visible_message("\red The hatch closes and locks behind you.") @@ -212,5 +213,25 @@ new /obj/effect/decal/cleanable/blood/gibs(Tx,i) src.operating = 0 update_icon() +======= + + 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) + src.operating = 0 + update_icon() +>>>>>>> parent of 0e99339... Makes the gibber Ultra-Dramatic. Can be toggled on and off via the From 48cfaa7f546c7fcb91dde9476d0d22471abb5cdb Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 16:19:57 -0800 Subject: [PATCH 6/8] Revert "Changed a couple lines to be more serious." This reverts commit dd25c9e4a3971da6683d3192251b948181baa2c1. --- code/game/machinery/kitchen/gibber.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 049e06db81d..edb9405f0ac 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -173,9 +173,8 @@ src.occupant.visible_message("\red A number of sharp points press into your back.") sleep(20) visible_message("\red The Gibber states 'Engaging Grinders.'") - visible_message("\red The Gibber starts rumbling!") src.occupant.visible_message("\blue You hear a faint voice. \red The Gibber states 'Engaging Grinders.'") - src.occupant.visible_message("\red You feel immense tearing pain in your back.") + src.occupant.visible_message("\red The blades start tearing at your flesh! AHHHHH!") src.occupant.emote("scream") visible_message("\red You hear a loud squelchy grinding sound.") sleep(20) From 91e4498792fb8728e2d8edafdbd2a07da4744c56 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 16:20:14 -0800 Subject: [PATCH 7/8] Revert "Allow's slime people to make a squishing sound with *squish" This reverts commit 2d67449c6fc8101465169adbf7e8c5a5f31e5b83. --- code/modules/mob/living/carbon/human/emote.dm | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 7dc7db0966b..5f03f064ab7 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -82,28 +82,6 @@ if (!species.name == "Machine") return - if("squish") - if(species.name == "Slime People") - var/M = null - if(param) - for (var/mob/A in view(null, null)) - if (param == A.name) - M = A - break - if(!M) - param = null - - if (param) - message = "[src] squishes at [param]." - else - message = "[src] squishes." - playsound(src.loc, 'sound/effects/squelch1.ogg', 50, 0) - m_type = 1 - else - if(!species.name == "Slime People") - return - - if ("airguitar") if (!src.restrained()) message = "[src] is strumming the air and headbanging like a safari chimp." From 8ac21a4f1b98bab20e435ec3985e2248a9a79fc1 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 16:25:31 -0800 Subject: [PATCH 8/8] Finishes Revert f91c140 --- code/game/machinery/kitchen/gibber.dm | 53 --------------------------- 1 file changed, 53 deletions(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index edb9405f0ac..d5510dbbd26 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -161,58 +161,6 @@ src.occupant.LAssailant = null else src.occupant.LAssailant = user -<<<<<<< HEAD - if(src.dramatic) - visible_message("\red The hatch closes and locks.") - src.occupant.visible_message("\red The hatch closes and locks behind you.") - sleep(20) - visible_message("\red The Gibber states 'Deploying Grinders.'") - src.occupant.visible_message("\blue You hear a faint voice. \red The Gibber states 'Deploying Grinders.'") - src.occupant.visible_message("\red You feel a panel open underneath you.") - sleep(10) - src.occupant.visible_message("\red A number of sharp points press into your back.") - sleep(20) - visible_message("\red The Gibber states 'Engaging Grinders.'") - src.occupant.visible_message("\blue You hear a faint voice. \red The Gibber states 'Engaging Grinders.'") - src.occupant.visible_message("\red The blades start tearing at your flesh! AHHHHH!") - src.occupant.emote("scream") - visible_message("\red You hear a loud squelchy grinding sound.") - sleep(20) - 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) - src.operating = 0 - update_icon() - else - 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) - src.operating = 0 - update_icon() -======= src.occupant.emote("scream") playsound(src.loc, 'sound/effects/gib.ogg', 50, 1) @@ -231,6 +179,5 @@ new /obj/effect/decal/cleanable/blood/gibs(Tx,i) src.operating = 0 update_icon() ->>>>>>> parent of 0e99339... Makes the gibber Ultra-Dramatic. Can be toggled on and off via the