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

Can't kinetic crusher mark a space dragon anymore (#2591)

Browse Source 
## About The Pull Request
Makes dragons unable to be marked by a kinetic crusher.

## Why It's Good For The Game
Kinetic crushers get kinda whack amounts of damage with mark because
they're balanced for megafauna health.

## Proof Of Testing

https://github.com/user-attachments/assets/9f62107b-f9c7-41d4-99e0-82bf8e35c17c


## Changelog

🆑
balance: Can't kinetic crusher mark space dragons anymore
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
This commit is contained in:
Arturlang
2024-12-01 09:31:43 +00:00
committed by GitHub
co-authored by Waterpig
parent 3376f5bbbb
commit fdd0ae9db0
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~~bubber_defines/traits/declarations.dm
+4
View File
@@ -29,3 +29,7 @@
#define TRAIT_PET_SKILLCHIP "mkii_ultra"
#define TRAIT_SIGN_LANGUAGE_BLOCKED "sign_language_blocked"
// makes the mob immune to crusher marks even if they are within the required mob size
#define TRAIT_CRUSHER_MARK_IMMUNE "crusher_mark_immune"
code/_globalvars/traits/_traits.dm
+2 -1
View File
@@ -561,7 +561,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SPEECH_BOOSTER" = TRAIT_SPEECH_BOOSTER,
"TRAIT_MINING_PARRYING" = TRAIT_MINING_PARRYING,
"TRAIT_ILLUSORY_EFFECT" = TRAIT_ILLUSORY_EFFECT,
"TRAIT_SIGN_LANGUAGE_BLOCKED" = TRAIT_SIGN_LANGUAGE_BLOCKED
"TRAIT_SIGN_LANGUAGE_BLOCKED" = TRAIT_SIGN_LANGUAGE_BLOCKED,
"TRAIT_CRUSHER_MARK_IMMUNE" = TRAIT_CRUSHER_MARK_IMMUNE, // BUBBER EDIT ADDITION
),
/obj/item = list(
"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,
code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
+1 -1
View File
@@ -69,7 +69,7 @@
/mob/living/basic/space_dragon/Initialize(mapload)
. = ..()
add_traits(list(TRAIT_SPACEWALK, TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_NO_FLOATING_ANIM, TRAIT_HEALS_FROM_CARP_RIFTS), INNATE_TRAIT)
add_traits(list(TRAIT_SPACEWALK, TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_NO_FLOATING_ANIM, TRAIT_HEALS_FROM_CARP_RIFTS, TRAIT_CRUSHER_MARK_IMMUNE), INNATE_TRAIT) // BUBBER EDIT - ADDED TRAIT_CRUSHER_MARK_IMMUNE
AddElement(/datum/element/simple_flying)
AddElement(/datum/element/content_barfer)
AddElement(/datum/element/wall_tearer, tear_time = 4 SECONDS, reinforced_multiplier = 3, do_after_key = DOAFTER_SOURCE_SPACE_DRAGON_INTERACTION)
modular_skyrat/master_files/code/datums/status_effects/debuffs/debuffs.dm
+1 -1
View File
@@ -11,7 +11,7 @@
return ..()
/datum/status_effect/crusher_mark/on_apply()
if(owner.mob_size >= MOB_SIZE_LARGE)
if(owner.mob_size >= MOB_SIZE_LARGE && !HAS_TRAIT(owner, TRAIT_CRUSHER_MARK_IMMUNE))
marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
marked_underlay.pixel_x = -owner.pixel_x
marked_underlay.pixel_y = -owner.pixel_y