Merge pull request #11151 from Fox-McCloud/suicide-refactor

Suicide Refactor
This commit is contained in:
variableundefined
2019-03-29 20:49:18 +08:00
committed by GitHub
43 changed files with 138 additions and 95 deletions
@@ -42,7 +42,7 @@
/obj/item/storage/bag/trash/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] puts the [name] over [user.p_their()] head and starts chomping at the insides! Disgusting!</span>")
playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
return (TOXLOSS)
return TOXLOSS
/obj/item/storage/bag/trash/update_icon()
if(contents.len == 0)
@@ -9,9 +9,10 @@
var/mob/affecting = null
var/deity_name = "Christ"
suicide_act(mob/user)
to_chat(viewers(user), "<span class='warning'><b>[user] stares into [src.name] and attempts to trascend understanding of the universe!</b></span>")
return (user.dust())
/obj/item/storage/bible/suicide_act(mob/user)
to_chat(viewers(user), "<span class='warning'><b>[user] stares into [src.name] and attempts to transcend understanding of the universe!</b></span>")
user.dust()
return OBLITERATION
/obj/item/storage/bible/booze