cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01: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-28 00:49:05 +00: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
code/modules/paperwork/pen.dm
-5
View File
@@ -303,11 +303,6 @@
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
/obj/item/weapon/pen/crayon/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
to_chat(viewers(user),"<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>")
return (BRUTELOSS|OXYLOSS)
/obj/item/weapon/pen/crayon/New()
name = "[colourName] crayon"