woo

code/modules/mob/living/simple_animal/constructs.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm	(rejected hunks)
-@@ -35,7 +35,6 @@
- 
- /mob/living/simple_animal/hostile/construct/Initialize()
- 	. = ..()
--	updateglow()
- 	update_health_hud()
- 	for(var/spell in construct_spells)
- 		AddSpell(new spell(null))

code/modules/mob/logout.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm	(rejected hunks)
-@@ -3,7 +3,7 @@
- 	unset_machine()
- 	GLOB.player_list -= src
- 	if(GLOB.admin_datums[src.ckey])
--		if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
-+		if (SSticker && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
- 			var/admins_number = GLOB.admins.len
- 			if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
- 				var/cheesy_message = pick( list(  \