Skip to content

Commit

Permalink
Ports feral cats and feral cat grenades from Hippie (tgstation#80031)
Browse files Browse the repository at this point in the history
## About The Pull Request
Feral Cats are just a hostile variant of cats that will fuck you up if
they see you. They are added solely for the sake of feral cat grenades -
a new, interesting, and fuzzy way to get out of a jam or just wreak
havoc around you. Each one costs 5 TC and spawns 5 really pissed off
cats to chase down assistants in the hallway.

They don't currently ignore traitors or the person who threw them - I
haven't worked out how to do that with our faction system (Hippie gave
them the syndicate faction but traitors don't get that on our codebase).
If anyone wants to contribute or help me suss that out it'll be cool,
otherwise just don't be around if there's nobody else for them to maul.

## Why It's Good For The Game
They're funny.

## Changelog
:cl: Vekter
add: Added a new hostile variant of cats, "feral cats".
add: Added a new traitor item, "feral cat grenades". For 5 TC, you too
can throw a grenade at someone and make five cats maul them to death.
/:cl:
  • Loading branch information
TheVekter authored and Higgin committed Dec 12, 2023
1 parent e6485bd commit 886d015
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/mobfactions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#define FACTION_CLOWN "clowns"
/// Headslugs
#define FACTION_CREATURE "creature"
/// Cats
#define FACTION_CAT "cat"
/// Faithless and shadowpeople
#define FACTION_FAITHLESS "faithless"
/// Gnomes
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/grenades/spawnergrenade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,9 @@
inhand_icon_state = null
spawner_type = /mob/living/basic/clown/mutant
deliveryamt = 5

/obj/item/grenade/spawnergrenade/cat
name = "Catnade"
desc = "You can hear faint meowing and the sounds of claws on metal coming from within."
spawner_type = /mob/living/basic/pet/cat/feral
deliveryamt = 5
9 changes: 9 additions & 0 deletions code/modules/mob/living/basic/pets/cat/feral.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/mob/living/basic/pet/cat/feral
name = "feral cat"
desc = "Kitty!! Wait, no no DON'T BITE-"
health = 30
maxHealth = 30
melee_damage_lower = 15
melee_damage_upper = 7
ai_controller = /datum/ai_controller/basic_controller/simple_hostile
faction = list(FACTION_CAT, ROLE_SYNDICATE)
7 changes: 7 additions & 0 deletions code/modules/uplink/uplink_items/dangerous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,10 @@
cost = 13
surplus = 50
purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //nukies get their own version

/datum/uplink_item/dangerous/cat
name = "Feral cat grenade"
desc = "This grenade is filled with 5 feral cats in stasis. Upon activation, the feral cats are awoken and unleashed unto unlucky bystanders. WARNING: The cats are not trained to discern friend from foe!"
cost = 5
item = /obj/item/grenade/spawnergrenade/cat
surplus = 30
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4597,6 +4597,7 @@
#include "code\modules\mob\living\basic\pets\cat\bread_cat_ai.dm"
#include "code\modules\mob\living\basic\pets\cat\cat.dm"
#include "code\modules\mob\living\basic\pets\cat\cat_ai.dm"
#include "code\modules\mob\living\basic\pets\cat\feral.dm"
#include "code\modules\mob\living\basic\pets\cat\keeki.dm"
#include "code\modules\mob\living\basic\pets\cat\kitten_ai.dm"
#include "code\modules\mob\living\basic\pets\cat\runtime.dm"
Expand Down

0 comments on commit 886d015

Please sign in to comment.