shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update suicide.dm

Browse Source
This commit is contained in:
deathride58
2018-06-09 00:47:48 -04:00
committed by GitHub
parent 4ae974644c
commit 8dc3d5f70a
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/suicide.dm
-13
View File
@@ -199,23 +199,10 @@
death(0)
/mob/living/proc/suicide_log()
<<<<<<< HEAD
var/turf/T = get_turf(src)
log_game("[key_name(src)] committed suicide at [get_area(src)][COORD(T)] as [src.type].")
message_admins("[key_name(src)] committed suicide at [get_area(src)] as [src.type].")
/mob/living/carbon/human/suicide_log()
var/turf/T = get_turf(src)
log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) committed suicide at [get_area(src)][COORD(T)].")
message_admins("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].")
=======
log_game("[key_name(src)] committed suicide at [AREACOORD(src)] as [src.type].")
/mob/living/carbon/human/suicide_log()
log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) committed suicide at [AREACOORD(src)].")
>>>>>>> c41d6ac... Standardizes and cleans up some admin messages & logging (#38128)
/mob/living/proc/canSuicide()
if(stat == CONSCIOUS)