[MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)

* More Initialize() fixes, requires someone to test with DB * fucking mirror failure
2017-09-22 23:35:22 -05:00
parent 6717720356
commit 2a860d1954
45 changed files with 161 additions and 160 deletions
@@ -40,7 +40,7 @@

 	create_internal_organs()

-	..()
+	. = ..()

 /mob/living/carbon/alien/create_internal_organs()
 	internal_organs += new /obj/item/organ/brain/alien
@@ -8,7 +8,7 @@

 /mob/living/carbon/alien/humanoid/drone/Initialize()
 	AddAbility(new/obj/effect/proc_holder/alien/evolve(null))
-	..()
+	. = ..()


 /mob/living/carbon/alien/humanoid/drone/create_internal_organs()
@@ -13,7 +13,7 @@

 	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
 	AddAbility(new /obj/effect/proc_holder/alien/royal/praetorian/evolve())
-	..()
+	. = ..()

 /mob/living/carbon/alien/humanoid/royal/praetorian/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel/large
@@ -48,4 +48,4 @@
 		return 1
 	else
 		to_chat(user, "<span class='notice'>We already have an alive queen.</span>")
-		return 0
+		return 0
@@ -8,7 +8,7 @@

 /mob/living/carbon/alien/humanoid/sentinel/Initialize()
 	AddAbility(new /obj/effect/proc_holder/alien/sneak)
-	..()
+	. = ..()

 /mob/living/carbon/alien/humanoid/sentinel/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel
@@ -18,4 +18,4 @@


 /mob/living/carbon/alien/humanoid/sentinel/movement_delay()
-	. = ..()
+	. = ..()
@@ -18,12 +18,13 @@
 	var/drooling = 0 //For Neruotoxic spit overlays
 	bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien,
 					 /obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien)
+	devourable = TRUE


 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/humanoid/Initialize()
 	AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
-	..()
+	. = ..()

 /mob/living/carbon/alien/humanoid/movement_delay()
 	. = ..()
@@ -42,7 +43,7 @@
 	<HR>"}
 	for(var/i in 1 to held_items.len)
 		var/obj/item/I = get_item_for_held_index(i)
-		dat += "<BR><B>[get_held_index_name(i)]:</B><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "<font color=grey>Empty</font>"]</a>"
+		dat += "<BR><B>[get_held_index_name(i)]:</B><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "<font color=grey>Empty</font>"]</a>"
 	dat += "<BR><A href='?src=\ref[src];pouches=1'>Empty Pouches</A>"

 	if(handcuffed)
@@ -120,4 +121,4 @@
 /mob/living/carbon/alien/humanoid/check_breath(datum/gas_mixture/breath)
 	if(breath && breath.total_moles() > 0 && !sneaking)
 		playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5)
-	..()
+	..()
@@ -4,7 +4,7 @@
 	icon_state = "larva0"
 	pass_flags = PASSTABLE | PASSMOB
 	mob_size = MOB_SIZE_SMALL
-	density = FALSE
+	density = FALSE

 	maxHealth = 25
 	health = 25
@@ -22,7 +22,7 @@

 	AddAbility(new/obj/effect/proc_holder/alien/hide(null))
 	AddAbility(new/obj/effect/proc_holder/alien/larva_evolve(null))
-	..()
+	. = ..()

 /mob/living/carbon/alien/larva/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny
@@ -65,4 +65,4 @@

 /mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who)
 	to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
-	return
+	return
@@ -60,7 +60,7 @@
 	cap_color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
 	UpdateMushroomCap()
 	health = maxHealth
-	..()
+	. = ..()

 /mob/living/simple_animal/hostile/mushroom/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //Possibility to flee from a fight just to make it more visually interesting
 	if(!retreat_distance && prob(33))