Skip to content

Commit

Permalink
If it meows, it hates getting sprayed with water
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## About The Pull Request

does as the title says, if it can meow and doesnt have pepperspray protection it hates getting sprayed with water
<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->

## Why It's Good For The Game

anti-(meow x 10) measure
<!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. -->

:cl:
add: If it meows, it hates getting sprayed with water.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
  • Loading branch information
SirNightKnight committed Jan 26, 2025
1 parent 64e2cbd commit 21ad8ba
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
7 changes: 7 additions & 0 deletions code/datums/mood_events/generic_negative_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,13 @@
mood_change = -1
timeout = 30 SECONDS

//MONKESTATION EDIT START
/datum/mood_event/watersprayed/cat
description = "HSSSSSSS!"
mood_change = -10
timeout = 5 SECONDS
//MONKESTATION EDIT STOP

/datum/mood_event/gamer_withdrawal
description = "I wish I was gaming right now..."
mood_change = -5
Expand Down
20 changes: 20 additions & 0 deletions code/modules/reagents/chemistry/reagents/other_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,26 @@
exposed_mob.incapacitate(1) // startles the felinid, canceling any do_after
exposed_mob.add_mood_event("watersprayed", /datum/mood_event/watersprayed)

//MONKESTATION EDIT START
if(!is_cat_enough(exposed_mob, include_all_anime = TRUE))
return

var/mob/living/victim = exposed_mob
if((methods & (TOUCH|VAPOR)) && !victim.is_pepper_proof())
if(prob(50))
victim.emote("scream")
else
victim.emote("hiss")
victim.set_eye_blur_if_lower(5 SECONDS)
victim.set_confusion_if_lower(5 SECONDS)
victim.Knockdown(3 SECONDS)
victim.add_movespeed_modifier(/datum/movespeed_modifier/reagent/pepperspray)
addtimer(CALLBACK(victim, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS)
if(iscarbon(victim))
victim.add_mood_event("watersprayed", /datum/mood_event/watersprayed/cat)
victim.update_damage_hud()
//MONKESTATION EDIT STOP


#undef WATER_TO_WET_STACKS_FACTOR_TOUCH
#undef WATER_TO_WET_STACKS_FACTOR_VAPOR
Expand Down

0 comments on commit 21ad8ba

Please sign in to comment.