Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00
parent 4f4fe98240 a6a4deb94c
commit 04d071deda
252 changed files with 6549 additions and 5230 deletions
@@ -10,15 +10,15 @@ Doesn't work on other aliens/AI.*/
 	name = "Alien Power"
 	panel = "Alien"
 	var/plasma_cost = 0
-	var/check_turf = 0
-	var/has_action = 1
-	var/datum/action/spell_action/alien/action = null
-	var/action_icon = 'icons/mob/actions/actions_xeno.dmi'
-	var/action_icon_state = "spell_default"
-	var/action_background_icon_state = "bg_alien"
+	var/check_turf = FALSE
+	has_action = TRUE
+	datum/action/spell_action/alien/action
+	action_icon = 'icons/mob/actions/actions_xeno.dmi'
+	action_icon_state = "spell_default"
+	action_background_icon_state = "bg_alien"

-/obj/effect/proc_holder/alien/New()
-	..()
+/obj/effect/proc_holder/alien/Initialize()
+	. = ..()
 	action = new(src)

 /obj/effect/proc_holder/alien/Click()
@@ -30,15 +30,20 @@ Doesn't work on other aliens/AI.*/
 			user.adjustPlasma(-plasma_cost)
 	return 1

-/obj/effect/proc_holder/alien/proc/on_gain(mob/living/carbon/user)
+/obj/effect/proc_holder/alien/on_gain(mob/living/carbon/user)
 	return

-/obj/effect/proc_holder/alien/proc/on_lose(mob/living/carbon/user)
+/obj/effect/proc_holder/alien/on_lose(mob/living/carbon/user)
 	return

-/obj/effect/proc_holder/alien/proc/fire(mob/living/carbon/user)
+/obj/effect/proc_holder/alien/fire(mob/living/carbon/user)
 	return 1

+/obj/effect/proc_holder/alien/get_panel_text()
+	. = ..()
+	if(plasma_cost > 0)
+		return "[plasma_cost]"
+
 /obj/effect/proc_holder/alien/proc/cost_check(check_turf=0,mob/living/carbon/user,silent = 0)
 	if(user.stat)
 		if(!silent)
@@ -168,7 +173,6 @@ Doesn't work on other aliens/AI.*/
 	if(user.getPlasma() > A.plasma_cost && A.corrode(O))
 		user.adjustPlasma(-A.plasma_cost)

-
 /obj/effect/proc_holder/alien/neurotoxin
 	name = "Spit Neurotoxin"
 	desc = "Spits neurotoxin at someone, paralyzing them for a short time."
@@ -179,7 +183,7 @@ Doesn't work on other aliens/AI.*/
 	var/message
 	if(active)
 		message = "<span class='notice'>You empty your neurotoxin gland.</span>"
-		remove_ranged_ability(user,message)
+		remove_ranged_ability(message)
 	else
 		message = "<span class='notice'>You prepare your neurotoxin gland. <B>Left-click to fire at a target!</B></span>"
 		add_ranged_ability(user, message, TRUE)
@@ -193,7 +197,7 @@ Doesn't work on other aliens/AI.*/
 		return
 	var/p_cost = 50
 	if(!iscarbon(ranged_ability_user) || ranged_ability_user.lying || ranged_ability_user.stat)
-		remove_ranged_ability(ranged_ability_user)
+		remove_ranged_ability()
 		return

 	var/mob/living/carbon/user = ranged_ability_user
@@ -219,8 +223,7 @@ Doesn't work on other aliens/AI.*/
 	return TRUE

 /obj/effect/proc_holder/alien/neurotoxin/on_lose(mob/living/carbon/user)
-	if(user.ranged_ability == src)
-		user.ranged_ability = null
+	remove_ranged_ability()

 /obj/effect/proc_holder/alien/neurotoxin/add_ranged_ability(mob/living/user, msg)
 	..()
@@ -328,7 +331,3 @@ Doesn't work on other aliens/AI.*/
 		return 1

 	return 0
-
-
-/proc/cmp_abilities_cost(obj/effect/proc_holder/alien/a, obj/effect/proc_holder/alien/b)
-	return b.plasma_cost - a.plasma_cost
@@ -34,6 +34,7 @@

 	if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ?
 		to_chat(user, "<span class='danger'>You cannot evolve when you are cuffed.</span>")
+		return

 	if(L.amount_grown >= L.max_grown)	//TODO ~Carn
 		to_chat(L, "<span class='name'>You are growing into a beautiful alien! It is time to choose a caste.</span>")
@@ -425,23 +425,6 @@
 			var/turf/target = get_turf(loc)
 			I.throw_at(target,I.throw_range,I.throw_speed,src)

-/mob/living/carbon/proc/AddAbility(obj/effect/proc_holder/alien/A)
-	abilities.Add(A)
-	A.on_gain(src)
-	if(A.has_action)
-		A.action.Grant(src)
-	sortInsert(abilities, /proc/cmp_abilities_cost, 0)
-
-/mob/living/carbon/proc/RemoveAbility(obj/effect/proc_holder/alien/A)
-	abilities.Remove(A)
-	A.on_lose(src)
-	if(A.action)
-		A.action.Remove(src)
-
-/mob/living/carbon/proc/add_abilities_to_panel()
-	for(var/obj/effect/proc_holder/alien/A in abilities)
-		statpanel("[A.panel]",A.plasma_cost > 0?"([A.plasma_cost])":"",A)
-
 /mob/living/carbon/Stat()
 	..()
 	if(statpanel("Status"))
@@ -35,7 +35,6 @@
 	has_limbs = 1
 	var/obj/item/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab

-	var/list/obj/effect/proc_holder/alien/abilities = list()
 	var/gib_type = /obj/effect/decal/cleanable/blood/gibs

 	var/rotate_on_lying = 1
@@ -311,7 +311,7 @@
 				if(istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(CIH, /obj/item/organ/cyberimp/eyes/hud/medical))
 					var/cyberimp_detect
 					for(var/obj/item/organ/cyberimp/CI in internal_organs)
-						if(CI.status == ORGAN_ROBOTIC)
+						if(CI.status == ORGAN_ROBOTIC && !CI.syndicate_implant)
 							cyberimp_detect += "[name] is modified with a [CI.name].<br>"
 					if(cyberimp_detect)
 						msg += "Detected cybernetic modifications:<br>"
@@ -586,6 +586,57 @@
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)

+/datum/species/golem/clockwork
+	name = "Clockwork Golem"
+	id = "clockwork golem"
+	say_mod = "clicks"
+	limbs_id = "clockgolem"
+	info_text = "<span class='bold alloy'>As a </span><span class='bold brass'>clockwork golem</span><span class='bold alloy'>, you are faster than \
+	other types of golem (being a machine), and are immune to electric shocks.</span>"
+	species_traits = list(NO_UNDERWEAR, NOTRANSSTING, NOBREATH, NOZOMBIE, VIRUSIMMUNE, RADIMMUNE, NOBLOOD, RESISTCOLD, RESISTPRESSURE)
+	armor = 40 //Reinforced, but also slim to allow for fast movement
+	attack_verb = "smash"
+	attack_sound = 'sound/magic/clockwork/anima_fragment_attack.ogg'
+	sexes = FALSE
+	speedmod = 0
+	siemens_coeff = 0
+	damage_overlay_type = "synth"
+	prefix = "Clockwork"
+	var/has_corpse
+
+/datum/species/golem/clockwork/on_species_gain(mob/living/carbon/human/H)
+	. = ..()
+	H.faction |= "ratvar"
+
+/datum/species/golem/clockwork/on_species_loss(mob/living/carbon/human/H)
+	if(!is_servant_of_ratvar(H))
+		H.faction -= "ratvar"
+	. = ..()
+
+/datum/species/golem/clockwork/get_spans()
+	return SPAN_ROBOT //beep
+
+/datum/species/golem/clockwork/spec_death(gibbed, mob/living/carbon/human/H)
+	gibbed = !has_corpse ? FALSE : gibbed
+	. = ..()
+	if(!has_corpse)
+		var/turf/T = get_turf(H)
+		H.visible_message("<span class='warning'>[H]'s exoskeleton shatters, collapsing into a heap of scrap!</span>")
+		playsound(H, 'sound/magic/clockwork/anima_fragment_death.ogg', 50, TRUE)
+		for(var/i in 1 to rand(3, 5))
+			new/obj/item/clockwork/alloy_shards/small(T)
+		new/obj/item/clockwork/alloy_shards/clockgolem_remains(T)
+		qdel(H)
+
+/datum/species/golem/clockwork/no_scrap //These golems are created through the herald's beacon and leave normal corpses on death.
+	id = "clockwork golem servant"
+	armor = 15 //Balance reasons make this armor weak
+	no_equip = list()
+	nojumpsuit = FALSE
+	has_corpse = TRUE
+	blacklisted = TRUE
+	dangerous_existence = TRUE
+  
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"
@@ -412,8 +412,9 @@
 			liver_failure()
 		else
 			liver.failing = FALSE
-
-	if(((!(NOLIVER in dna.species.species_traits)) && (!liver)))
+	else
+		if((dna && dna.species && (NOLIVER in dna.species.species_traits)))
+			return
 		liver_failure()

 /mob/living/carbon/proc/undergoing_liver_failure()