-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[THE HALF-MODULAR PRINCE] Snalance (Snail Balance) and Snissues (Snai…
…l Issues) Adjustment (#25439) * initial d * holy shit i forgot * i got so much cheese in my pocket, they thought I was a fucking calzone * opp was sneak-dissing on the 'gram, turned his city into pompeii * Just fixing some diffs (line breaks should match tg) * Fixes these edit comments --------- Co-authored-by: Giz <[email protected]>
- Loading branch information
2 people
authored and
FFMirrorBot
committed
Dec 20, 2023
1 parent
db8b7c9
commit 9d5740a
Showing
8 changed files
with
206 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /obj/item/organ/internal/heart/snail | ||
| name = "twin gastropod hearts" | ||
| desc = "A primary heart normally nestled inside a gastropod's shell, and another in the owner's actual chest; necessary to maintain ample bloodflow through essentially two torsos." | ||
| icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' | ||
| icon_state = "heart-snail-on" | ||
| base_icon_state = "heart-snail" | ||
| maxHealth = 2 * STANDARD_ORGAN_THRESHOLD // There's two of them. Also, due to the special interaction below, it's best we make sure these aren't easily lost. | ||
| now_fixed = span_info("Your hearts begin to beat again.") //For the sake of verisimilitude. | ||
|
|
||
| COOLDOWN_DECLARE(shell_effect_cd) | ||
|
|
||
| /obj/item/organ/internal/heart/snail/on_insert(mob/living/carbon/organ_owner, special) | ||
| . = ..() | ||
| if(!ishuman(organ_owner)) | ||
| return | ||
|
|
||
| if(!issnail(organ_owner)) //This is cleaner than checking for the shell, because there's not really going to be any non-horribly-bugged situation in which a snail will be lacking a shell. | ||
| return | ||
|
|
||
| var/mob/living/carbon/human/human_owner = organ_owner | ||
|
|
||
| RegisterSignal(human_owner, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(modify_damage)) | ||
| RegisterSignal(human_owner, COMSIG_MOB_AFTER_APPLY_DAMAGE, PROC_REF(do_block_effect)) | ||
|
|
||
| /obj/item/organ/internal/heart/snail/on_remove(mob/living/carbon/organ_owner, special) | ||
| . = ..() | ||
| if(!ishuman(organ_owner) || QDELETED(organ_owner)) | ||
| return | ||
|
|
||
| var/mob/living/carbon/human/human_owner = organ_owner | ||
|
|
||
| UnregisterSignal(human_owner, list(COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, COMSIG_MOB_AFTER_APPLY_DAMAGE)) | ||
|
|
||
| /** | ||
| * Signal proc for [COMSIG_MOB_APPLY_DAMAGE_MODIFIERS] | ||
| * | ||
| * Adds a 0.5 modifier to attacks from the back, code borrowed (wholesale) from the roach heart. | ||
| */ | ||
| /obj/item/organ/internal/heart/snail/proc/modify_damage(mob/living/carbon/human/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) | ||
| SIGNAL_HANDLER | ||
|
|
||
| if(!is_blocking(source, damage_amount, damagetype, attack_direction)) | ||
| return | ||
|
|
||
| damage_mods += 0.5 | ||
|
|
||
| /** | ||
| * Signal proc for [COMSIG_MOB_AFTER_APPLY_DAMAGE] | ||
| * | ||
| * Does a special effect if we blocked damage with our shell. | ||
| */ | ||
| /obj/item/organ/internal/heart/snail/proc/do_block_effect(mob/living/carbon/human/source, damage_dealt, damagetype, def_zone, blocked, wound_bonus, bare_wound_bonus, sharpness, attack_direction, obj/item/attacking_item) | ||
| SIGNAL_HANDLER | ||
|
|
||
| if(!is_blocking(source, damage_dealt, damagetype, attack_direction)) | ||
| return | ||
|
|
||
| if(COOLDOWN_FINISHED(src, shell_effect_cd)) | ||
| source.visible_message(span_warning("[source]'s shell weathers the blow, absorbing most of the shock!")) | ||
| playsound(source, 'sound/weapons/parry.ogg', 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) | ||
|
|
||
| COOLDOWN_START(src, shell_effect_cd, 5 SECONDS) // Cooldown resets EVERY time we get hit | ||
|
|
||
| /// Checks if the passed mob is in a valid state to be blocking damage with the snail shell | ||
| /obj/item/organ/internal/heart/snail/proc/is_blocking(mob/living/carbon/human/blocker, damage_amount, damagetype, attack_direction) | ||
| if(damage_amount < 5 || damagetype != BRUTE || !attack_direction) | ||
| return | ||
| if(!ishuman(blocker) || blocker.stat >= UNCONSCIOUS) | ||
| return FALSE | ||
| // No tactical spinning | ||
| if(HAS_TRAIT(blocker, TRAIT_SPINNING)) | ||
| return FALSE | ||
| if(blocker.body_position == LYING_DOWN || (blocker.dir & attack_direction)) | ||
| return TRUE | ||
| return FALSE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| /obj/item/organ/internal/liver/snail | ||
| name = "gastropod liver" | ||
| icon_state = "liver-x" | ||
| icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' | ||
| icon_state = "liver-snail" | ||
| desc = "Due to snailfolk evolving in typically poisonous environments such as bogs, their liver has a higher tolerance for poisons compared to most." | ||
| maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD | ||
| toxTolerance = 5 //can shrug off up to 5u of toxins |
Oops, something went wrong.