[MIRROR] Boxing+ #273
Merged
[MIRROR] Boxing+ #273
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
* theft * I like punching my own team * Simplemobs have a stamina of 0, so ups required stamina to 10 * adds ishuman(), i can banish this if needed * Adds heldgloves & boxing glove subtype for them * oops * oops 2 * oops 3 * spriteadd #1, steals tg punching bag which should be okay to do * corporate issues fix * review compliance, 1line changes * touching up remove_gloves, not sure if I need to add QDEL_NULL to destroy() as well? * final review compliance: adds rightglove/rightglove_path as suggested in review (I think), adds NODROP toggle on create_gloves * adds clear-up QDEL_NULL on parent glove destroy * i accidentally added a fucking-around map, removes it * autodoc + nodrop compliance * disable/enable bitfield * fix: both hands receive gloves again, OR only checks until it finds a true condition * adds KO * OOPS * actually adds sprites for different coloured boxing gloves * early returns * Apply suggestions from code review Co-authored-by: BraveMole <bsouchu@ gmail.com> * Update code/modules/clothing/gloves/miscellaneous.dm Co-authored-by: TiviPlus <57223640+TiviPlus@ users.noreply.github.com> Co-authored-by: BraveMole <bsouchu@ gmail.com> Co-authored-by: TiviPlus <57223640+TiviPlus@ users.noreply.github.com>
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.
Original PR: tgstation/TerraGov-Marine-Corps#10008
About The Pull Request
Absolutely steals CM's KO audio file and copies their boxing idea.
Punching people with boxing gloves now deals 10 stam damage. Under 0 stamina (5 hits), a KO sound plays and they're knocked out for about 10 seconds.
Numbers can be changed however but this probably won't affect balance too badly. Probably
Also adds handgloves. Wear them, alt-click them while worn, you'll get stuff in your hands. Could be used for some cool shit
Don't merge, still todo icons, KOs, banging the gloves together
Why It's Good For The Game
We already have boxing areas in some maps and they're pretty fun even without this.
More fluff is always nice and fleshes out the game more
Also I want to punch the fucking FC in the face let me at him let me at him I WANT HIS FUCKING THROAT!!!
There is a risk of this being used in actual combat, but a) a machete is 3x as effective, b) a gun is 10x as effective, c) that would only be applicable in HvH, d) if 2+ people with guns get boxed away, massive skill issue and e) it'd be fucking funny so I don't think it's too much of a problem. If it's too strong at picking off people with low stam (i.e they just finished running) required stamina loss to KO can be reduced to, like, twice as much needed or something
Changelog
🆑
soundadd: Steals CM's boxing KO sound. Thanks CM!
add: Boxing gloves now deal stamina damage. Hit someone enough and that will KO them. Still deals brute damage like normal punches, so be careful.
/:cl: