[MISSED MIRROR] Fixes COMSIG_LIVING_EARLY_UNARMED_ATTACK arguments (#80783)
#1476
Conversation
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
…(#80783) (#344) Fixes `COMSIG_LIVING_EARLY_UNARMED_ATTACK` arguments (#80783) ## About The Pull Request Fixes #80566 Fixes the wrong arguments being passed to `COMSIG_LIVING_EARLY_UNARMED_ATTACK`. It now properly receives the proximity flag. Changes clicking with handcuffs to no longer always assume no proximity. Replaces some checks for hands blocked to some checks for `can_unarmed_attack` (which, currently, JUST checks for hands blocked, but this is good for future reasons, just in case) ## Changelog :cl: Melbert fix: Strong arm implant users can shove more correctly. /:cl: Co-authored-by: MrMelbert <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Jan 6, 2024
Iajret
pushed a commit
that referenced
this pull request
Mar 16, 2024
…haste buff) (#1476) * Ice cream now gives a chilling food effect (plus small food haste buff) (#81719) ## About The Pull Request We have a `crafted_food_buff` in the code meant for specific food buffs (and perhaps one day, debuffs) that has gone unused ever since it was created during the 'Foodening' PR. Anyway, yeah, this PR takes the fire step to implement it with ice cream and other frozen treats. Frozen treats (all food found in the `food/frozen.dm` file) have it by default. Other ice cream holders such as waffles cones (and now regular waffles too!) can aquire it when filled with ice cream. Using the ice cream vat also adds the 'Chef Made' trait now, which is required for food effects to happen. Also very slight food effect refactor. There's no need to have five different alert screen objects when only have to switch icon states. This PR also adds an action speed modifier to the generic 'haste' food effect. I'm confident the original creator would have done that too, but action speed modifiers aren't as well-known. ## Why It's Good For The Game People tend to make one feature, call it a day and then move on to the next. Food effects are nice, however they're barely implemented, and I don't like food being all the same-ish in the end. ## Changelog :cl: add: Ice cream and frozen treats now have a chilling effect. add: You can add a scoop of ice cream on waffles. balance: added an action speed modifier to the generic food haste effect (you do things, and not just run, an itsy bitsy faster) /:cl: * Ice cream now gives a chilling food effect (plus small food haste buff) --------- Co-authored-by: Ghom <[email protected]>
ReezeBL
pushed a commit
that referenced
this pull request
Mar 17, 2024
…haste buff) (#1476) (#2437) * Ice cream now gives a chilling food effect (plus small food haste buff) (#81719) ## About The Pull Request We have a `crafted_food_buff` in the code meant for specific food buffs (and perhaps one day, debuffs) that has gone unused ever since it was created during the 'Foodening' PR. Anyway, yeah, this PR takes the fire step to implement it with ice cream and other frozen treats. Frozen treats (all food found in the `food/frozen.dm` file) have it by default. Other ice cream holders such as waffles cones (and now regular waffles too!) can aquire it when filled with ice cream. Using the ice cream vat also adds the 'Chef Made' trait now, which is required for food effects to happen. Also very slight food effect refactor. There's no need to have five different alert screen objects when only have to switch icon states. This PR also adds an action speed modifier to the generic 'haste' food effect. I'm confident the original creator would have done that too, but action speed modifiers aren't as well-known. ## Why It's Good For The Game People tend to make one feature, call it a day and then move on to the next. Food effects are nice, however they're barely implemented, and I don't like food being all the same-ish in the end. ## Changelog :cl: add: Ice cream and frozen treats now have a chilling effect. add: You can add a scoop of ice cream on waffles. balance: added an action speed modifier to the generic food haste effect (you do things, and not just run, an itsy bitsy faster) /:cl: * Ice cream now gives a chilling food effect (plus small food haste buff) --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: Ghom <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Fixes #80566
Fixes the wrong arguments being passed to
COMSIG_LIVING_EARLY_UNARMED_ATTACK.It now properly receives the proximity flag.
Changes clicking with handcuffs to no longer always assume no proximity.
Replaces some checks for hands blocked to some checks for
can_unarmed_attack(which, currently, JUST checks for hands blocked, but this is good for future reasons, just in case)Changelog
🆑 Melbert
fix: Strong arm implant users can shove more correctly. /:cl: