Merge pull request #11341 from bgobandit/suicideisnotajoke

Adds/tweaks several suicide messages.
This commit is contained in:
Razharas
2015-09-06 06:42:00 +03:00
12 changed files with 55 additions and 4 deletions
+10 -2
View File
@@ -1339,21 +1339,29 @@
if(parent)
mutations = parent.mutations
/obj/item/seeds/kudzuseed/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] swallows the pack of kudzu seeds! It looks like \he's trying to commit suicide..</span>")
plant(user)
return (BRUTELOSS)
/obj/item/seeds/kudzuseed/harvest()
var/list/prod = ..()
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 << "<span class='notice'>You plant the kudzu. You monster.</span>"
message_admins("Kudzu planted by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) at ([T.x],[T.y],[T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>(JMP)</a>)",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 << "<span class='notice'>You plant the kudzu. You monster.</span>"
/obj/item/seeds/kudzuseed/get_analyzer_text()
var/list/mut_text = list()
var/text_string = ""
+3
View File
@@ -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("<span class='suicide'>[user] scratches a grid on their wrist with the paper! It looks like \he's trying to commit sudoku..</span>")
return (BRUTELOSS)
/obj/item/weapon/paper/attack_self(mob/user)
user.examinate(src)
+1 -1
View File
@@ -74,6 +74,6 @@
return
/obj/item/weapon/gun/magic/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is casting a spell on themself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is twisting the [src.name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.</span>")
playsound(loc, fire_sound, 50, 1, -1)
return (FIRELOSS)