Double checking my work

2019-09-12 00:46:18 -05:00
parent 5db9b3432f
commit 2bf4d00d29
7 changed files with 7 additions and 43 deletions
@@ -37,6 +37,7 @@
 	gender = NEUTER
 	mob_biotypes = list(MOB_ROBOTIC)
 	speak_emote = list("chirps")
+	speech_span = SPAN_ROBOT
 	bubble_icon = "machine"
 	initial_language_holder = /datum/language_holder/drone
 	mob_size = MOB_SIZE_SMALL
@@ -92,7 +93,7 @@
 		var/obj/item/I = new default_hatmask(src)
 		equip_to_slot_or_del(I, SLOT_HEAD)

-	access_card.item_flags |= TRAIT_NODROP
+	ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)

 	alert_drones(DRONE_NET_CONNECT)

@@ -272,4 +273,4 @@
 	return 1

 /mob/living/simple_animal/drone/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
-	return 0 //So they don't die trying to fix wiring
+	return 0 //So they don't die trying to fix wiring
@@ -84,4 +84,4 @@

 /mob/living/simple_animal/hostile/guardian/dextrous/regenerate_icons()
 	..()
-	update_inv_internal_storage()
+	update_inv_internal_storage()
@@ -178,4 +178,4 @@
 		var/atom/movable/M = target
 		M.clean_blood()
 		visible_message("[src] polishes \the [target].")
-		return TRUE
+		return TRUE
@@ -1177,7 +1177,7 @@
 	M.adjustToxLoss(-3 * REM, 0, TRUE) //Heals TOXINLOVERS
 	M.adjustBrainLoss(2 * REM, 150) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
 	M.adjustCloneLoss(-1 * REM, 0)
-	M.adjustStaminaLoss(-13 * REM, 0)
+	M.adjustStaminaLoss(-30 * REM, 0)
 	M.jitteriness = min(max(0, M.jitteriness + 3), 30)
 	M.druggy = min(max(0, M.druggy + 10), 15) //See above
 	..()
@@ -1407,4 +1407,4 @@
 	M.hallucination = min(max(0, M.hallucination + 5), 60)
 	M.adjustToxLoss(1, 0)
 	..()
-	. = 1
+	. = 1
@@ -678,22 +678,6 @@
 	race = /datum/species/mammal
 	mutationtext = "<span class='danger'>The pain subsides. You feel... fluffier.</span>"

-/datum/reagent/mutationtoxin/aquatic
-	name = "Aquatic Mutation Toxin"
-	id = "aquaticmutationtoxin"
-	description = "A glowing toxin."
-	color = "#5EFF3B" //RGB: 94, 255, 59
-	race = /datum/species/aquatic
-	mutationtext = "<span class='danger'>The pain subsides. You feel... attracted to sea.</span>"
-
-/datum/reagent/mutationtoxin/avian
-	name = "Avian Mutation Toxin"
-	id = "avianmutationtoxin"
-	description = "A glowing toxin."
-	color = "#5EFF3B" //RGB: 94, 255, 59
-	race = /datum/species/avian
-	mutationtext = "<span class='danger'>The pain subsides. You feel... feathery.</span>"
-
 /datum/reagent/mutationtoxin/insect
 	name = "Insect Mutation Toxin"
 	id = "insectmutationtoxin"
@@ -42,19 +42,6 @@
 		mutant_bodyparts |= "mam_tail"
 	H.update_body()

-/datum/species/mammal/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
-		species_traits += DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(FALSE)
-	return ..()
-
-/datum/species/mammal/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
-	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Normal Legs")
-		species_traits -= DIGITIGRADE
-	if(DIGITIGRADE in species_traits)
-		C.Digitigrade_Leg_Swap(TRUE)
-
 /datum/species/mammal/qualifies_for_rank(rank, list/features)
 	return TRUE

@@ -235,11 +235,3 @@
 	required_reagents = list("anaphro" = 5, "acetone" = 1)
 	required_temp = 300
 	mix_message = "The mixture thickens and heats up slighty..."
-
-//Mutation toxin stuff
-/datum/reagent/mutationtoxin/mammal
-	name = "Mammilan Mutation Toxin"
-	id = "mammalmutationtoxin"
-	color = "#5EFF3B" //RGB: 94, 255, 59
-	race = /datum/species/mammal
-	mutationtext = "<span class='danger'>The pain subsides. You feel... like a single furry.</span>"