cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11615 from VOREStation/upstream-merge-8311

Browse Source 
[MIRROR] Remove suicide act
This commit is contained in:
Aronai Sieyes
2021-10-27 20:48:15 -04:00
committed by Chompstation Bot
parent 299511d80d
commit 0f2f5cb482
25 changed files with 9 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/instruments/items.dm
View File

@@ -29,11 +29,6 @@
/obj/item/instrument/proc/should_stop_playing(mob/user)
return user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user))) // sorry, no more TK playing.
/obj/item/instrument/suicide_act(mob/user)
var/datum/gender/T = gender_datums[user.get_visible_gender()]
user.visible_message("<span class='suicide'>[user] begins to play 'Gloomy Sunday'! It looks like [T.hes] trying to commit suicide!</span>")
return (BRUTELOSS)
/obj/item/instrument/attack_self(mob/user)
if(!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")