cleanup

code/game/turfs/simulated/chasm.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm	(rejected hunks)
-@@ -91,7 +91,7 @@
- 		return FALSE
- 	if(istype(AM, /obj/effect/portal))
- 		//Portals aren't affected by gravity. Probably.
--		return 0
-+		return FALSE
- 	if(istype(AM, /obj/structure/stone_tile))
- 		return FALSE
- 	//Flies right over the chasm

code/modules/mob/living/damage_procs.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm	(rejected hunks)
-@@ -58,7 +58,7 @@
- 			return getStaminaLoss()
- 
- 
--/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = 0, stamina = 0)
-+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0)
- 	if(blocked >= 100)
- 		return 0
- 	if(brute)