Consistency for station pets. (#52717)

* Station pets!

* Makes Lia and Sgt Araneus actual subtypes.

* Fixes some vars.

* Turns on AI for Cayenne and Lia, makes Lia neutral faction.

* Gives Lamarr a description.

* Pettable status and emotes for HoS and syndicate pet..

* Tom the mouse consistency.

* Comment correction.
This commit is contained in:
uomo
2020-08-10 17:46:03 -03:00
committed by GitHub
parent 92b80692d5
commit 52a090af65
12 changed files with 109 additions and 79 deletions
@@ -32,6 +32,7 @@
/obj/item/clothing/mask/facehugger/lamarr
name = "Lamarr"
desc = "The Research Director's pet, a domesticated and debeaked xenomorph facehugger. Friendly, but may still try to couple with your head."
sterile = 1
/obj/item/clothing/mask/facehugger/dead
@@ -128,6 +128,10 @@
collar_type = "pug"
held_state = "pug"
/mob/living/simple_animal/pet/dog/pug/mcgriff
name = "McGriff"
desc = "This dog can tell someting smells around here, and that something is CRIME!"
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi
name = "Exotic Corgi"
desc = "As cute as it is colorful!"
@@ -54,3 +54,7 @@
unsuitable_atmos_damage = 0
minbodytemp = TCMB
maxbodytemp = T0C + 40
/mob/living/simple_animal/hostile/lizard/wags_his_tail
name = "Wags-His-Tail"
desc = "The janitorial department's trusty pet lizard."
@@ -163,6 +163,8 @@
response_harm_continuous = "splats"
response_harm_simple = "splat"
gold_core_spawnable = NO_SPAWN
pet_bonus = TRUE
pet_bonus_emote = "squeaks happily!"
/obj/item/reagent_containers/food/snacks/deadmouse
name = "dead mouse"
@@ -222,15 +222,30 @@
/mob/living/simple_animal/hostile/carp/cayenne
name = "Cayenne"
real_name = "Cayenne"
desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
gender = FEMALE
speak_emote = list("squeaks")
gold_core_spawnable = NO_SPAWN
faction = list(ROLE_SYNDICATE)
AIStatus = AI_OFF
rarechance = 10
food_type = list()
tame_chance = 0
bonus_tame_chance = 0
pet_bonus = TRUE
pet_bonus_emote = "bloops happily!"
/mob/living/simple_animal/hostile/carp/cayenne/lia
name = "Lia"
real_name = "Lia"
desc = "A failed experiment of Nanotrasen to create weaponised carp technology. This less than intimidating carp now serves as the Head of Security's pet."
faction = list("neutral")
health = 200
icon_dead = "magicarp_dead"
icon_gib = "magicarp_gib"
icon_living = "magicarp"
icon_state = "magicarp"
maxHealth = 200
random_color = FALSE
#undef REGENERATION_DELAY
@@ -33,8 +33,6 @@
var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus
var/min_oxy = 0
var/max_tox = 0
//Space bats need no air to fly in.
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
@@ -42,3 +40,28 @@
/mob/living/simple_animal/hostile/retaliate/bat/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
/mob/living/simple_animal/hostile/retaliate/bat/sgt_araneus //Despite being a bat for... reasons, this is now a spider, and is one of the HoS' pets.
name = "Sergeant Araneus"
real_name = "Sergeant Araneus"
desc = "A fierce companion of the Head of Security, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine."
emote_hear = list("chitters")
faction = list("spiders")
harm_intent_damage = 3
health = 200
icon_dead = "guard_dead"
icon_gib = "guard_dead"
icon_living = "guard"
icon_state = "guard"
maxHealth = 250
max_co2 = 5
max_tox = 2
melee_damage_lower = 15
melee_damage_upper = 20
min_oxy = 5
movement_type = GROUND
response_help_continuous = "pets"
response_help_simple = "pet"
turns_per_move = 10
pet_bonus = TRUE
pet_bonus_emote = "chitters proudly!"