From 49096003031b7438e8e7152747eee17fc732fd15 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sun, 23 Aug 2015 15:02:34 -0400 Subject: [PATCH 1/5] Adds/tweaks several suicide messages. --- .../game/objects/items/devices/instruments.dm | 4 ++++ .../items/devices/radio/electropack.dm | 4 ++++ code/game/objects/items/weapons/RCD.dm | 4 ++++ .../game/objects/items/weapons/clown_items.dm | 9 ++++++++ code/game/objects/items/weapons/explosives.dm | 2 ++ .../items/weapons/grenades/syndieminibomb.dm | 23 ++++++++++++++++++- .../objects/items/weapons/storage/boxes.dm | 4 ++++ .../objects/items/weapons/storage/toolbox.dm | 6 ++++- code/game/objects/items/weapons/tools.dm | 6 ++++- code/game/objects/items/weapons/twohanded.dm | 4 ++++ code/modules/hydroponics/seeds.dm | 4 ++++ code/modules/paperwork/paper.dm | 3 +++ 12 files changed, 70 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index e45b7253355..c2b90c743c1 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -16,6 +16,10 @@ song = null ..() +/obj/item/device/instrument/suicide_act(mob/user) + user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) + /obj/item/device/instrument/initialize() song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded ..() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index ce51646f6aa..0b9d1d5c36b 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -13,6 +13,10 @@ var/frequency = 1449 var/shock_cooldown = 0 +/obj/item/device/electropack/suicide_act(mob/user) + user.visible_message("[user] hooks \himself to the electropack and spams the trigger! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) + /obj/item/device/electropack/initialize() if(radio_controller) radio_controller.add_object(src, frequency, RADIO_CHAT) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index b5ffd7faa7a..475c67e9e53 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -64,6 +64,10 @@ RCD var/deconwindowdelay = 50 var/deconairlockdelay = 50 +/obj/item/weapon/rcd/suicide_act(mob/user) + user.visible_message("[user] sets the RCD to 'Wall' and points it down his throat! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) + /obj/item/weapon/rcd/verb/change_airlock_access() set name = "Change Airlock Access" set category = "Object" diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 2412edfe9cd..55a306c69f0 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -35,6 +35,11 @@ icon_state = "soapsyndie" cleanspeed = 10 //much faster than mop so it is useful for traitors who want to clean crime scenes +/obj/item/weapon/soap/suicide_act(mob/user) + user.visible_message("[user] crams the bar of soap down \his throat! It looks like \he's trying to commit suicide..") + . = TOXLOSS + qdel(src) + /obj/item/weapon/soap/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM @@ -86,6 +91,10 @@ var/honksound = 'sound/items/bikehorn.ogg' var/cooldowntime = 20 +/obj/item/weapon/bikehorn/suicide_act(mob/user) + user.visible_message("[user] solemnly points the horn at \his temple! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) + /obj/item/weapon/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) if(!spam_flag) playsound(loc, honksound, 50, 1, -1) //plays instead of tap.ogg! diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 6572831cd53..15374418e96 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -35,6 +35,8 @@ message_say = "FOR NAR-SIE!" else if(role == "revolutionary" || role == "head revolutionary") message_say = "VIVA LA REVOLUTION!" + else if(user.mind.gang_datum) + message_say = "[uppertext(user.mind.gang_datum.name)] GANG RULES!" user.say(message_say) target = user message_admins("[key_name_admin(user)](?) (FLW) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm index cc26f378c46..3985f2edb75 100644 --- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm +++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm @@ -9,4 +9,25 @@ /obj/item/weapon/grenade/syndieminibomb/prime() update_mob() explosion(src.loc,1,2,4,flame_range = 2) - qdel(src) \ No newline at end of file + qdel(src) + +/obj/item/weapon/grenade/syndieminibomb/suicide_act(mob/user) + user.visible_message("[user] activates the [src.name] and holds it above \his head! It looks like \he's going out with a bang!") + var/message_say = "FOR NO RAISIN!" + if(user.mind) + if(user.mind.special_role) + var/role = lowertext(user.mind.special_role) + if(role == "traitor" || role == "syndicate") + message_say = "FOR THE SYNDICATE!" + else if(role == "changeling") + message_say = "FOR THE HIVE!" + else if(role == "cultist") + message_say = "FOR NAR-SIE!" + else if(role == "revolutionary" || role == "head revolutionary") + message_say = "VIVA LA REVOLUTION!" + else if(user.mind.gang_datum) + message_say = "[uppertext(user.mind.gang_datum.name)] GANG RULES!" + user.say(message_say) + prime() + message_admins("[key_name_admin(user)](?) (FLW) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) + message_admins("[key_name(user)] suicided with [src.name] at ([x],[y],[z])") \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 8d817f95c4f..5351e399e2c 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -650,6 +650,10 @@ icon_state = "hugbox" foldable = null +/obj/item/weapon/storage/box/hug/suicide_act(mob/user) + user.visible_message("[user] clamps the box of hugs on \his jugular! Guess it wasn't such a hugbox after all..") + return (BRUTELOSS) + /obj/item/weapon/storage/box/hug/attack_self(mob/user) ..() user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 4d3e413f51d..d20fc00612a 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -99,4 +99,8 @@ new /obj/item/weapon/crowbar(src) new /obj/item/stack/cable_coil(src,30,color) new /obj/item/weapon/wirecutters(src) - new /obj/item/device/multitool(src) \ No newline at end of file + new /obj/item/device/multitool(src) + +/obj/item/weapon/storage/toolbox/suicide_act(mob/user) + user.visible_message("[user] robusts \himself with the toolbox! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) \ No newline at end of file diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 9f54eeaace4..ea1270f501a 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -193,7 +193,11 @@ /obj/item/weapon/weldingtool/examine(mob/user) ..() - user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." + user << "It contains [get_fuel()] unit\s of fuel sout of [max_fuel]." + +/obj/item/weapon/weldingtool/suicide_act(mob/user) + user.visible_message("[user] welds \his every orifice closed! It looks like \he's trying to commit suicide..") + return (FIRELOSS) /obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 779df4e79c1..fe8010e74f5 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -161,6 +161,10 @@ icon_state = "fireaxe[wielded]" return +/obj/item/weapon/twohanded/fireaxe/suicide_act(mob/user) + user.visible_message("[user] axes \himself from head to toe! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) + /obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(A && wielded && (istype(A,/obj/structure/window) || istype(A,/obj/structure/grille))) //destroys windows and grilles in one hit diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 7334590239e..7bc50beadb9 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -1339,6 +1339,10 @@ if(parent) mutations = parent.mutations +/obj/item/seeds/kudzuseed/suicide_act(mob/user) + user.visible_message("[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) + /obj/item/seeds/kudzuseed/harvest() var/list/prod = ..() for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 411f5de8522..79f49cde1c2 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -82,6 +82,9 @@ name = "paper[(n_name ? text("- '[n_name]'") : null)]" add_fingerprint(usr) +/obj/item/weapon/paper/suicide_act(mob/user) + user.visible_message("[user] gives \himself a thousand tiny paper cuts! It looks like \he's trying to commit suicide..") + return (BRUTELOSS) /obj/item/weapon/paper/attack_self(mob/user) user.examinate(src) From 4fe28339c5688b4e74b378c03972ab8bed9de4e2 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Wed, 26 Aug 2015 18:37:14 -0400 Subject: [PATCH 2/5] Makes requested changes. --- code/game/objects/items/devices/radio/electropack.dm | 2 +- code/game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/items/weapons/explosives.dm | 2 +- .../game/objects/items/weapons/grenades/syndieminibomb.dm | 2 +- code/modules/hydroponics/seeds.dm | 8 ++++++-- code/modules/paperwork/paper.dm | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 0b9d1d5c36b..94b0e536fd2 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -15,7 +15,7 @@ /obj/item/device/electropack/suicide_act(mob/user) user.visible_message("[user] hooks \himself to the electropack and spams the trigger! It looks like \he's trying to commit suicide..") - return (BRUTELOSS) + return (FIRELOSS) /obj/item/device/electropack/initialize() if(radio_controller) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 55a306c69f0..30eda7e45fb 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -38,7 +38,7 @@ /obj/item/weapon/soap/suicide_act(mob/user) user.visible_message("[user] crams the bar of soap down \his throat! It looks like \he's trying to commit suicide..") . = TOXLOSS - qdel(src) + src.loc = user /obj/item/weapon/soap/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 15374418e96..70b76b5a81e 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -36,7 +36,7 @@ else if(role == "revolutionary" || role == "head revolutionary") message_say = "VIVA LA REVOLUTION!" else if(user.mind.gang_datum) - message_say = "[uppertext(user.mind.gang_datum.name)] GANG RULES!" + message_say = "[uppertext(user.mind.gang_datum.name)] RULES!" user.say(message_say) target = user message_admins("[key_name_admin(user)](?) (FLW) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm index 3985f2edb75..6e5d408e23e 100644 --- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm +++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm @@ -26,7 +26,7 @@ else if(role == "revolutionary" || role == "head revolutionary") message_say = "VIVA LA REVOLUTION!" else if(user.mind.gang_datum) - message_say = "[uppertext(user.mind.gang_datum.name)] GANG RULES!" + message_say = "[uppertext(user.mind.gang_datum.name)] RULES!" user.say(message_say) prime() message_admins("[key_name_admin(user)](?) (FLW) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 7bc50beadb9..06f917a668b 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -1341,6 +1341,7 @@ /obj/item/seeds/kudzuseed/suicide_act(mob/user) user.visible_message("[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..") + plant(user) return (BRUTELOSS) /obj/item/seeds/kudzuseed/harvest() @@ -1348,16 +1349,19 @@ for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) K.mutations = mutations -/obj/item/seeds/kudzuseed/attack_self(mob/user) +/obj/item/seeds/kudzuseed/proc/plant(mob/user) if(istype(user.loc,/turf/space)) return var/turf/T = get_turf(src) - user << "You plant the kudzu. You monster." message_admins("Kudzu planted by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - (JMP))",0,1) investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu") new /obj/effect/spacevine_controller(user.loc, mutations, potency, production) qdel(src) +/obj/item/seeds/kudzuseed/attack_self(mob/user) + plant(user) + user << "You plant the kudzu. You monster." + /obj/item/seeds/kudzuseed/get_analyzer_text() var/list/mut_text = list() var/text_string = "" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 79f49cde1c2..2218bda0a71 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -83,7 +83,7 @@ add_fingerprint(usr) /obj/item/weapon/paper/suicide_act(mob/user) - user.visible_message("[user] gives \himself a thousand tiny paper cuts! It looks like \he's trying to commit suicide..") + user.visible_message("[user] scratches a grid on their wrist with the paper! It looks like \he's trying to commit sudoku..") return (BRUTELOSS) /obj/item/weapon/paper/attack_self(mob/user) From ca34015b8556c9da0c55d72fb7433115f9e9d51f Mon Sep 17 00:00:00 2001 From: bgobandit Date: Wed, 2 Sep 2015 23:07:40 -0400 Subject: [PATCH 3/5] Removes minibomb suicide message. Fixes wand suicide message. --- .../items/weapons/grenades/syndieminibomb.dm | 23 +------------------ code/modules/projectiles/guns/magic.dm | 2 +- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm index 6e5d408e23e..cc26f378c46 100644 --- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm +++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm @@ -9,25 +9,4 @@ /obj/item/weapon/grenade/syndieminibomb/prime() update_mob() explosion(src.loc,1,2,4,flame_range = 2) - qdel(src) - -/obj/item/weapon/grenade/syndieminibomb/suicide_act(mob/user) - user.visible_message("[user] activates the [src.name] and holds it above \his head! It looks like \he's going out with a bang!") - var/message_say = "FOR NO RAISIN!" - if(user.mind) - if(user.mind.special_role) - var/role = lowertext(user.mind.special_role) - if(role == "traitor" || role == "syndicate") - message_say = "FOR THE SYNDICATE!" - else if(role == "changeling") - message_say = "FOR THE HIVE!" - else if(role == "cultist") - message_say = "FOR NAR-SIE!" - else if(role == "revolutionary" || role == "head revolutionary") - message_say = "VIVA LA REVOLUTION!" - else if(user.mind.gang_datum) - message_say = "[uppertext(user.mind.gang_datum.name)] RULES!" - user.say(message_say) - prime() - message_admins("[key_name_admin(user)](?) (FLW) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) - message_admins("[key_name(user)] suicided with [src.name] at ([x],[y],[z])") \ No newline at end of file + qdel(src) \ No newline at end of file diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 645d078002e..1b2ae853be5 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -74,6 +74,6 @@ return /obj/item/weapon/gun/magic/suicide_act(mob/user) - user.visible_message("[user] is casting a spell on themself with the [src.name]! It looks like \he's trying to commit suicide.") + user.visible_message("[user] is twisting the [src.name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.") playsound(loc, fire_sound, 50, 1, -1) return (FIRELOSS) \ No newline at end of file From 1748a8c261ba0e583c8ef871a63a4b7ef85e4764 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 3 Sep 2015 14:34:53 -0400 Subject: [PATCH 4/5] ADDS EXTRA HONK --- code/game/objects/items/weapons/clown_items.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 30eda7e45fb..e7415d55fd1 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -93,6 +93,7 @@ /obj/item/weapon/bikehorn/suicide_act(mob/user) user.visible_message("[user] solemnly points the horn at \his temple! It looks like \he's trying to commit suicide..") + playsound(src.loc, honksound, 50, 1) return (BRUTELOSS) /obj/item/weapon/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user) From 362157a5d56bfd0c28453ade2f14b40c31164436 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Fri, 4 Sep 2015 22:21:51 -0400 Subject: [PATCH 5/5] t y p o h o n k --- code/game/objects/items/weapons/tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index ea1270f501a..c7a857f059b 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -193,7 +193,7 @@ /obj/item/weapon/weldingtool/examine(mob/user) ..() - user << "It contains [get_fuel()] unit\s of fuel sout of [max_fuel]." + user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." /obj/item/weapon/weldingtool/suicide_act(mob/user) user.visible_message("[user] welds \his every orifice closed! It looks like \he's trying to commit suicide..")