Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948

[MIRROR] Adds a weretiger.
This commit is contained in:
Nadyr
2021-07-08 00:15:00 -04:00
committed by GitHub
6 changed files with 56 additions and 1 deletions

View File

@@ -22,6 +22,13 @@
containername = "EXTREMELY Dangerous Predator crate"
access = access_xenobiology
contraband = 1
/datum/supply_pack/sci/weretiger
name = "Exotic Weretiger crate"
cost = 55
containertype = /obj/structure/largecrate/animal/weretiger
containername = "Weretiger crate"
access = access_xenobiology
/*
/datum/supply_pack/sci/otie
name = "VARMAcorp adoptable reject (Dangerous!)"

View File

@@ -55,6 +55,7 @@
/mob/living/simple_mob/vore/aggressive/rat/tame,
/mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit
/mob/living/simple_mob/vore/rabbit,
/mob/living/simple_mob/vore/weretiger;0.5,
// /mob/living/simple_mob/otie;0.5
))
return ..()
@@ -140,3 +141,8 @@
name = "Jerboa Crate"
desc = "Lots, and lots of squeaking."
starts_with = list(/mob/living/simple_mob/animal/passive/mouse/jerboa)
/obj/structure/largecrate/animal/weretiger
name = "Weretiger Crate"
desc = "You can hear a lot of annoyed scratches, clearly someone doesn't enjoy being locked up."
starts_with = list(/mob/living/simple_mob/vore/weretiger)

View File

@@ -53,6 +53,7 @@
"Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost,
"Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless,
"Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless,
"Weretiger" = /mob/living/simple_mob/vore/weretiger,
"Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add.
)

View File

@@ -0,0 +1,40 @@
/mob/living/simple_mob/vore/weretiger
name = "weretiger"
desc = "A big scary, albino were-tiger! At least they seem decently mannered..."
tt_desc = "Tigris Thropus Album"
icon_state = "bigcat"
icon_living = "bigcat"
icon_dead = "bigcat_dead"
icon_rest = null
icon = 'icons/mob/bigcat.dmi'
faction = "panther"
maxHealth = 150
health = 150
response_help = "pats"
response_disarm = "gently pushes aside"
response_harm = "hits"
harm_intent_damage = 15
melee_damage_lower = 10
melee_damage_upper = 20
attacktext = list("mauled")
say_list_type = /datum/say_list/weretiger
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
// Nomnomn
/mob/living/simple_mob/vore/weretiger
vore_active = 1
vore_bump_chance = 10
vore_bump_emote = "sneaks up on"
vore_pounce_chance = 50
vore_default_mode = DM_HOLD
vore_icons = SA_ICON_LIVING
/datum/say_list/weretiger
speak = list("Gruff.","ROAR!","Growl.")
emote_hear = list("growls!","grunts.")
emote_see = list("pads around noisily.","scratches the floor thoroughly.")

BIN
icons/mob/bigcat.dmi Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

View File

@@ -3280,6 +3280,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub_larva.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\solarmoth_ch.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\weretiger.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\xeno_vore.dm"