Delete suicide.dm.rej

2017-05-06 11:49:26 -07:00
parent c5f7644452
commit b440ba70b0
1 changed files with 0 additions and 10 deletions
@@ -1,10 +0,0 @@
-diff a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm	(rejected hunks)
-@@ -12,7 +12,7 @@
- 		return
- 	if(confirm == "Yes")
- 		suiciding = 1
-		log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].")
-+		log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].")
- 		var/obj/item/held_item = get_active_held_item()
- 		if(held_item)
- 			var/damagetype = held_item.suicide_act(src)