cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Super Syndicat and Super Cat bug fix (#3136)

Browse Source 
## About The Pull Request
Fixes a bug / balance with Super cats that were brought up to me.

Black lists cats having storage implants being installed.

Makes it so super cats drop all held items when entering a vent.
## Why It's Good For The Game
It's good for the game because it makes it so Super cats are not doing
what I specifically didn't want them doing in the first place.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

</details>

I compiled it and made sure the changes *did* work there is no real
noticeable changes.

## Changelog
🆑
balance: forbids cats having storage implants
fix: Super cats being able to bring things in hand in vents
/🆑
This commit is contained in:
pixelkitty286
2025-02-20 10:32:06 -08:00
committed by GitHub
parent 8b373343f1
commit c5f4fda14f
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_zubbers/code/game/objects/items/implants/implant_storage.dm
+5
View File
@@ -0,0 +1,5 @@
//Prevents super and normal cats from having storage implants. Normal cats don't have hands anyways!
/obj/item/implant/storage/can_be_implanted_in(mob/living/target)
. = ..()
if(iscat(target))
return FALSE
modular_zubbers/code/modules/mob/living/basic/pets/cat/super_cat.dm
+15 -7
View File
@@ -16,13 +16,12 @@
melee_damage_lower = 7
melee_damage_upper = 15
ai_controller = /datum/ai_controller/basic_controller/simple_hostile
faction = list(null) // ...and they will fight 'til there's just one.
faction = list(FACTION_HOSTILE)
/mob/living/basic/pet/cat/super/Initialize(mapload)
. = ..()
add_traits(list(TRAIT_NOGUNS, TRAIT_NO_TWOHANDING, TRAIT_VENTCRAWLER_NUDE), INNATE_TRAIT)
remove_traits(list(TRAIT_VENTCRAWLER_ALWAYS), INNATE_TRAIT)
add_traits(list(TRAIT_NOGUNS, TRAIT_NO_TWOHANDING), INNATE_TRAIT)
AddElement(/datum/element/dextrous)
AddComponent(/datum/component/personal_crafting)
@@ -32,6 +31,9 @@
balloon_alert(src, "Your paws are too soft!")
return FALSE
/mob/living/basic/pet/cat/super/move_into_vent(obj/machinery/atmospherics/components/ventcrawl_target)
. = ..()
drop_all_held_items()
/mob/living/basic/pet/cat/super/tux //Fake runtime
name = "Super Tux Cat"
@@ -80,11 +82,14 @@
/mob/living/basic/pet/cat/cak/super/Initialize(mapload)
. = ..()
add_traits(list(TRAIT_PACIFISM, TRAIT_NO_TWOHANDING, TRAIT_VENTCRAWLER_NUDE), INNATE_TRAIT) //Passive kitty bring kind meows
remove_traits(list(TRAIT_VENTCRAWLER_ALWAYS), INNATE_TRAIT)
add_traits(list(TRAIT_PACIFISM, TRAIT_NO_TWOHANDING), INNATE_TRAIT) //Passive kitty bring kind meows
AddElement(/datum/element/dextrous)
AddComponent(/datum/component/personal_crafting)
/mob/living/basic/pet/cat/cak/move_into_vent(obj/machinery/atmospherics/components/ventcrawl_target)
. = ..()
drop_all_held_items()
// SUPER SYNDICATS!!! GET DAT MRR MRRAW DISK!!!
/mob/living/basic/pet/cat/syndicat/super
name = "Super Syndie Cat"
@@ -95,8 +100,7 @@
/mob/living/basic/pet/cat/syndicat/super/Initialize(mapload)
. = ..()
add_traits(list(TRAIT_NOGUNS, TRAIT_NO_TWOHANDING, TRAIT_VENTCRAWLER_NUDE), INNATE_TRAIT)
remove_traits(list(TRAIT_VENTCRAWLER_ALWAYS), INNATE_TRAIT)
add_traits(list(TRAIT_NOGUNS, TRAIT_NO_TWOHANDING), INNATE_TRAIT)
AddElement(/datum/element/dextrous)
AddComponent(/datum/component/personal_crafting)
// get rid of the microbomb normal syndie cats have
@@ -109,5 +113,9 @@
balloon_alert(src, "Your paws are too weak!")
return FALSE
/mob/living/basic/pet/cat/syndicat/super/move_into_vent(obj/machinery/atmospherics/components/ventcrawl_target)
. = ..()
drop_all_held_items()
#undef SUPER_KITTY_HEALTH
#undef SYNDIE_SUPER_KITTY_HEALTH
tgstation.dme
+1
View File
@@ -8820,6 +8820,7 @@
#include "modular_zubbers\code\game\objects\items\food\halloween_chocolate.dm"
#include "modular_zubbers\code\game\objects\items\food\meatslab.dm"
#include "modular_zubbers\code\game\objects\items\food\misc.dm"
#include "modular_zubbers\code\game\objects\items\implants\implant_storage.dm"
#include "modular_zubbers\code\game\objects\items\robot\items\harm_alarm_new.dm"
#include "modular_zubbers\code\game\objects\items\robot\items\hypo.dm"
#include "modular_zubbers\code\game\objects\items\robot\items\storage.dm"