fix roundstart/rej cleanup

2017-05-17 05:08:51 -05:00
parent 932f323e39
commit 1948b007d1
11 changed files with 14 additions and 147 deletions
@@ -1,15 +0,0 @@
-diff a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm	(rejected hunks)
-@@ -117,10 +117,12 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
- 
- 	animate(src, pixel_y = 2, time = 10, loop = -1)
- 
-	grant_all_languages()
- 	GLOB.dead_mob_list += src
-+
- 	..()
- 
-+	grant_all_languages()
-+
- /mob/dead/observer/narsie_act()
- 	var/old_color = color
- 	color = "#960000"
@@ -1,12 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm	(rejected hunks)
-@@ -58,8 +58,9 @@
- 	if(!(NOBLOOD in dna.species.species_traits))
- 		internal_organs += new /obj/item/organ/heart
- 
-	internal_organs += new dna.species.mutanteyes()
-+	internal_organs += new dna.species.mutanteyes
- 	internal_organs += new dna.species.mutantears
-+	internal_organs += new dna.species.mutanttongue
- 	internal_organs += new /obj/item/organ/brain
- 	..()
- 
@@ -1,18 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
-@@ -66,15 +66,10 @@
- 	//Flight and floating
- 	var/override_float = 0
- 
-
-	//Eyes
- 	var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
-
-	//Ears
- 	var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
-
-	//Hands
- 	var/obj/item/mutanthands = null
-+	var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue
- 
- ///////////
- // PROCS //
@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm	(rejected hunks)
-@@ -6,7 +6,7 @@
- 	default_color = "00FF00"
- 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
- 	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs")
-	mutant_organs = list(/obj/item/organ/tongue/lizard)
-+	mutanttongue = /obj/item/organ/tongue/lizard
- 	coldmod = 1.5
- 	heatmod = 0.67
- 	default_features = list("mcolor" = "0F0", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")