Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Ports feral cats and feral cat grenades from Hippie #933

Merged
merged 2 commits into from
Dec 3, 2023
+25 −0
Merged

[MIRROR] Ports feral cats and feral cat grenades from Hippie #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e8ab56
[MIRROR] Ports feral cats and feral cat grenades from Hippie [MDB IGN…
SkyratBot Dec 3, 2023
478d7f0
mc resolve
ReezeBL Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/mobfactions.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4692,6 +4692,7 @@
#include "code\modules\mob\living\basic\pets\penguin.dm"
#include "code\modules\mob\living\basic\pets\pet.dm"
#include "code\modules\mob\living\basic\pets\sloth.dm"
#include "code\modules\mob\living\basic\pets\cat\feral.dm"
#include "code\modules\mob\living\basic\pets\dog\_dog.dm"
#include "code\modules\mob\living\basic\pets\dog\corgi.dm"
#include "code\modules\mob\living\basic\pets\dog\dog_subtypes.dm"
Expand Down
Loading