more save points

2017-12-29 00:07:36 -06:00
parent b759da8c63
commit 8a792d6ef6
40 changed files with 4 additions and 283 deletions
@@ -137,8 +137,6 @@
 				to_chat(src, "<span class='boldwarning'>[priority_absorb_key["self_message"]]</span>")
 		priority_absorb_key["stuns_absorbed"] += amount
 		return TRUE
-<<<<<<< HEAD
-=======

 /////////////////////////////////// DISABILITIES ////////////////////////////////////

@@ -215,4 +213,3 @@
 		status_flags |= DISFIGURED	//makes them unknown
 		update_body()
 	add_disability(DISABILITY_HUSK, source)
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind