Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583

[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
parent 3a7cc3df75 c924ec765a
commit 4ee17d5167
24 changed files with 1390 additions and 1390 deletions
@@ -104,7 +104,7 @@
 		pda.owner = text("[]", src)
 		pda.name = pda.owner + " (" + pda.ownjob + ")"

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

 	var/datum/action/innate/pai/shell/AS = new /datum/action/innate/pai/shell
 	var/datum/action/innate/pai/chassis/AC = new /datum/action/innate/pai/chassis
@@ -39,7 +39,7 @@
 	#define TILE_EMAG		7

 /mob/living/simple_animal/bot/floorbot/Initialize()
-	..()
+	. = ..()
 	update_icon()
 	var/datum/job/engineer/J = new/datum/job/engineer
 	access_card.access += J.get_access()
@@ -47,7 +47,7 @@
 	var/bloodiness = 0

 /mob/living/simple_animal/bot/mulebot/Initialize()
-	..()
+	. = ..()
 	wires = new /datum/wires/mulebot(src)
 	var/datum/job/cargo_tech/J = new/datum/job/cargo_tech
 	access_card.access = J.get_access()
@@ -32,7 +32,7 @@
 	devourable = TRUE

 /mob/living/simple_animal/pet/cat/Initialize()
-	..()
+	. = ..()
 	verbs += /mob/living/proc/lay_down

 /mob/living/simple_animal/pet/cat/update_canmove()
@@ -92,7 +92,7 @@
 		icon_living = "original"
 		icon_dead = "original_dead"
 	Read_Memory()
-	..()
+	. = ..()

 /mob/living/simple_animal/pet/cat/Runtime/Life()
 	if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP)
@@ -33,7 +33,7 @@
 	flavortext = null

 /mob/living/simple_animal/drone/syndrone/Initialize()
-	..()
+	. = ..()
 	internal_storage.hidden_uplink.telecrystals = 10

 /mob/living/simple_animal/drone/syndrone/Login()
@@ -46,7 +46,7 @@
 	default_storage = /obj/item/device/radio/uplink/nuclear

 /mob/living/simple_animal/drone/syndrone/badass/Initialize()
-	..()
+	. = ..()
 	internal_storage.hidden_uplink.telecrystals = 30
 	var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(src)
 	W.implant(src)
@@ -55,7 +55,7 @@
 	default_hatmask = /obj/item/clothing/head/chameleon/drone

 /mob/living/simple_animal/drone/snowflake/Initialize()
-	..()
+	. = ..()
 	desc += " This drone appears to have a complex holoprojector built on its 'head'."

 /obj/item/drone_shell/syndrone
@@ -27,7 +27,7 @@
 	devourable = TRUE

 /mob/living/simple_animal/mouse/Initialize()
-	..()
+	. = ..()
 	if(!body_color)
 		body_color = pick( list("brown","gray","white") )
 	icon_state = "mouse_[body_color]"
@@ -31,7 +31,7 @@
 		..()

 /mob/living/simple_animal/pet/Initialize()
-	..()
+	. = ..()
 	if(pcollar)
 		pcollar = new(src)
 		regenerate_icons()
@@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	GLOB.parasites += src
 	setthemename(theme)

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

 /mob/living/simple_animal/hostile/guardian/med_hud_set_health()
 	if(!QDELETED(summoner))
@@ -659,7 +659,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	name = "holoparasite injector kit"

 /obj/item/storage/box/syndie_kit/guardian/Initialize()
-	..()
+	. = ..()
 	new /obj/item/guardiancreator/tech/choose/traitor(src)
 	new /obj/item/paper/guides/antag/guardian(src)
 	return
@@ -12,7 +12,7 @@


 /mob/living/simple_animal/hostile/boss/Initialize()
-	..()
+	. = ..()

 	atb = new()
 	atb.point_regen_delay = point_regen_delay
@@ -896,7 +896,7 @@
 	else
 		speak += pick("...alive?", "This isn't parrot heaven!", "I live, I die, I live again!", "The void fades!")

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

 /mob/living/simple_animal/parrot/Poly/Life()
 	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)