Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

This commit is contained in:
Artur
2020-07-16 15:56:08 +03:00
19 changed files with 456 additions and 12 deletions
+2 -2
View File
@@ -1,4 +1,6 @@
/mob/living/carbon/BiologicalLife(seconds, times_fired)
//Updates the number of stored chemicals for powers
handle_changeling()
//Reagent processing needs to come before breathing, to prevent edge cases.
handle_organs()
. = ..() // if . is false, we are dead.
@@ -25,8 +27,6 @@
if(stat != DEAD)
handle_liver()
//Updates the number of stored chemicals for powers
handle_changeling()
/mob/living/carbon/PhysicalLife(seconds, times_fired)
if(!(. = ..()))
@@ -30,6 +30,7 @@
verb_yell = "buzzes intensely"
emote_see = list("buzzes.", "makes a loud buzz.", "rolls several times.", "buzzes happily.")
speak_chance = 1
unique_name = TRUE
/mob/living/simple_animal/pet/bumbles/Initialize()
. = ..()
@@ -192,6 +192,15 @@
else
..()
//a cow that produces a random reagent in its udder
/mob/living/simple_animal/cow/random
name = "strange cow"
desc = "Something seems off about the milk this cow is producing."
/mob/living/simple_animal/cow/random/Initialize()
milk_reagent = get_random_reagent_id() //this has a blacklist so don't worry about romerol cows, etc
..()
//Wisdom cow, speaks and bestows great wisdoms
/mob/living/simple_animal/cow/wisdom
name = "wisdom cow"