Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522

[MIRROR] Adds ~70 more suicides
This commit is contained in:
LetterJay
2018-01-23 10:00:04 -06:00
committed by GitHub
52 changed files with 582 additions and 166 deletions
+9
View File
@@ -689,6 +689,15 @@
grind_results = list("silicon" = 5, "nitrogen" = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs
var/rigged = 0 // true if rigged to explode
var/brightness = 2 //how much light it gives off
/obj/item/light/suicide_act(mob/living/carbon/user)
if (status == LIGHT_BROKEN)
user.visible_message("<span class='suicide'>[user] begins to stab [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return BRUTELOSS
else
user.visible_message("<span class='suicide'>[user] begins to eat \the [src]! It looks like [user.p_theyre()] not very bright!</span>")
shatter()
return BRUTELOSS
/obj/item/light/tube
name = "light tube"