From 00e352cee26735765595d724fee67bc1df51d9ab Mon Sep 17 00:00:00 2001 From: Xhuis Date: Mon, 2 Mar 2015 17:03:42 -0500 Subject: [PATCH 1/2] Restores gibbing for suiciding with C4 --- code/game/objects/items/weapons/explosives.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index e1e8d500734..1d173bb0fce 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -33,11 +33,15 @@ else if(role == "changeling") message_say = "FOR THE HIVE!" else if(role == "cultist") - message_say = "FOR NARSIE!" + message_say = "FOR NAR-SIE!" + else if(role == "revolutionary" || role == "head revolutionary") + message_say = "VIVA LA REVOLUTION!" user.say(message_say) target = user message_admins("[key_name(user, user.client)](?) suicided with [src.name] at ([x],[y],[z] - JMP)",0,1) + sleep(10) explode(get_turf(user)) + user.gib() return . /obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params) From 5e1c69a76ad0aadc4f6671ccc8745bb7c6a66820 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Mon, 9 Mar 2015 16:48:41 -0400 Subject: [PATCH 2/2] Removes unnecessary stuff --- code/game/objects/items/weapons/explosives.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 1d173bb0fce..18c0d9fb0a6 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -22,7 +22,6 @@ ..() /obj/item/weapon/c4/suicide_act(var/mob/user) - . = BRUTELOSS 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) @@ -42,7 +41,6 @@ sleep(10) explode(get_turf(user)) user.gib() - return . /obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) @@ -98,4 +96,4 @@ qdel(src) /obj/item/weapon/c4/attack(mob/M as mob, mob/user as mob, def_zone) - return \ No newline at end of file + return