rej cleanup

2017-05-17 03:50:34 -05:00
parent 3516852582
commit f978e3d56e
20 changed files with 0 additions and 531 deletions
@@ -1,9 +0,0 @@
-diff a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm	(rejected hunks)
-@@ -5,6 +5,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
- /mob/dead/Initialize()
- 	if(initialized)
- 		stack_trace("Warning: [src]([type]) initialized multiple times!")
-+	initialized = TRUE
- 	tag = "mob_[next_mob_id++]"
- 	GLOB.mob_list += src
- 
@@ -1,33 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
-@@ -173,14 +173,18 @@
- 	if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype)
- 		C.dna.blood_type = exotic_bloodtype
- 
-+	if(old_species.mutanthands)
-+		for(var/obj/item/I in C.held_items)
-+			if(istype(I, old_species.mutanthands))
-+				qdel(I)
-+
- 	if(mutanthands)
- 		// Drop items in hands
- 		// If you're lucky enough to have a NODROP item, then it stays.
- 		for(var/V in C.held_items)
- 			var/obj/item/I = V
- 			if(istype(I))
-				if(C.dropItemToGround(I))
-					C.put_in_hands(new mutanthands())
-+				C.dropItemToGround(I)
- 			else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
- 				C.put_in_hands(new mutanthands())
- 
-@@ -189,10 +193,6 @@
- 		C.dna.blood_type = random_blood_type()
- 	if(DIGITIGRADE in species_traits)
- 		C.Digitigrade_Leg_Swap(TRUE)
-	if(mutanthands)
-		for(var/obj/item/I in C.held_items)
-			if(istype(I, mutanthands))
-				qdel(I)
- 
- /datum/species/proc/handle_hair(mob/living/carbon/human/H, forced_colour)
- 	H.remove_overlay(HAIR_LAYER)
@@ -1,40 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm	(rejected hunks)
-@@ -41,14 +41,11 @@
- 	for(var/spell in construct_spells)
- 		AddSpell(new spell(null))
- 
-<<<<<<< HEAD
- /mob/living/simple_animal/hostile/construct/Destroy()
- 	for(var/X in actions)
- 		var/datum/action/A = X
- 		qdel(A)
- 	..()
-=======
->>>>>>> a7603e4aba50d410795d5207e6d5e929b2401cb9
- 
- /mob/living/simple_animal/hostile/construct/Login()
- 	..()
-@@ -288,8 +285,6 @@
- 	environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP
- 
- 
-
-<<<<<<< HEAD
- ///////////////////////Master-Tracker///////////////////////
- 
- /datum/action/innate/seek_master
-@@ -320,7 +315,7 @@
- 		the_construct.seeking = TRUE
- 		to_chat(the_construct, "<span class='cultitalic'>You are now tracking your master.</span>")
- 
-=======
-+
- /////////////////////////////ui stuff/////////////////////////////
- 
- /mob/living/simple_animal/hostile/construct/update_health_hud()
-@@ -337,4 +332,4 @@
- 			hud_used.healths.icon_state = "[icon_state]_health5"
- 		else
- 			hud_used.healths.icon_state = "[icon_state]_health6"
->>>>>>> a7603e4aba50d410795d5207e6d5e929b2401cb9
-+