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

Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615

Browse Source 
[MIRROR] [MIRROR] Remove suicide act
This commit is contained in:
Nadyr
2021-10-27 21:05:48 -04:00
committed by GitHub
parent a45d6dbbc1 3b898e264d
commit 4f36828e4c
25 changed files with 9 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/projectiles/guns/energy/gunsword_vr.dm
View File

@@ -115,12 +115,5 @@
add_fingerprint(user)
return
/obj/item/weapon/cell/device/weapon/gunsword/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
if(active)
user.visible_message(pick("<span class='danger'>\The [user] is slitting [TU.his] stomach open with \the [src]! It looks like [TU.he] [TU.is] trying to commit seppuku.</span>",\
"<span class='danger'>\The [user] is falling on \the [src]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>"))
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/cell/device/weapon/gunsword/update_icon()
cut_overlays()