Merge branch 'master' into upstream-merge-32249

2017-12-04 23:15:38 +00:00
parent 7e1bd55f7c 858a9bf428
commit 379f73d1e1
112 changed files with 1764 additions and 717 deletions
@@ -34,7 +34,8 @@

 /mob/living/simple_animal/drone/syndrone/Initialize()
 	. = ..()
-	internal_storage.hidden_uplink.telecrystals = 10
+	GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, internal_storage)
+	hidden_uplink.telecrystals = 10

 /mob/living/simple_animal/drone/syndrone/Login()
 	..()
@@ -47,7 +48,8 @@

 /mob/living/simple_animal/drone/syndrone/badass/Initialize()
 	. = ..()
-	internal_storage.hidden_uplink.telecrystals = 30
+	GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, internal_storage)
+	hidden_uplink.telecrystals = 30
 	var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(src)
 	W.implant(src)

@@ -3,14 +3,6 @@
 /////////////
 //Drone speach

-/mob/living/simple_animal/drone/handle_inherent_channels(message, message_mode)
-	if(message_mode == MODE_BINARY)
-		drone_chat(message)
-		return 1
-	else
-		..()
-
-
 /mob/living/simple_animal/drone/get_spans()
 	return ..() | SPAN_ROBOT

@@ -1,18 +1,18 @@
-/mob/living/simple_animal/hostile/creature
-	name = "creature"
-	desc = "A sanity-destroying otherthing."
-	icon_state = "otherthing"
-	icon_living = "otherthing"
-	icon_dead = "otherthing-dead"
-	health = 80
-	maxHealth = 80
-	obj_damage = 100
-	melee_damage_lower = 25
-	melee_damage_upper = 50
-	attacktext = "chomps"
-	attack_sound = 'sound/weapons/bite.ogg'
-	faction = list("creature")
-	speak_emote = list("screams")
-	gold_core_spawnable = HOSTILE_SPAWN
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
+/mob/living/simple_animal/hostile/creature
+	name = "creature"
+	desc = "A sanity-destroying otherthing."
+	icon_state = "otherthing"
+	icon_living = "otherthing"
+	icon_dead = "otherthing-dead"
+	health = 80
+	maxHealth = 80
+	obj_damage = 100
+	melee_damage_lower = 25
+	melee_damage_upper = 50
+	attacktext = "chomps"
+	attack_sound = 'sound/weapons/bite.ogg'
+	faction = list("creature")
+	speak_emote = list("screams")
+	gold_core_spawnable = HOSTILE_SPAWN
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0