Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Boxing+ #10008

Merged
merged 24 commits into from
Apr 28, 2022
Merged

Boxing+ #10008

merged 24 commits into from
Apr 28, 2022

Conversation

breadhunt
Copy link
Contributor

@breadhunt breadhunt commented Apr 12, 2022

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:

@tgstation-server tgstation-server added Mechanic Delete me Sound Sound change. labels Apr 12, 2022
@breadhunt
Copy link
Contributor Author

An istype is probably needed because it runtimes without it (since Touch() is also used for floors, doors, etc.), please tell me if there's literally any alternative because I'm peabrain

Copy link
Contributor

@BraveMole BraveMole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lel cm code.

Ping me so I can tell you how to do it properly without snowflake code

@Andrewhedge
Copy link

if we add funny sound as this on power fist, its usage rate will skyrocket. ' YOU GOT PLANTED!!! '

@tgstation-server tgstation-server added the Sprites Changes to .dmi file. label Apr 14, 2022
Copy link
Contributor

@BraveMole BraveMole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Object reference != path.

Your left and right gloves should be object references, so you can QDEL the object when needed.

I suggest adding another var, calling it gloves_path, and doing a :

right_glove = new gloves_path()
left_glove = new gloves_path() when needed

code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Outdated Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
code/modules/clothing/gloves/miscellaneous.dm Show resolved Hide resolved
breadhunt and others added 2 commits April 21, 2022 17:38
Co-authored-by: BraveMole <bsouchu@gmail.com>
@BraveMole BraveMole added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Apr 24, 2022
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
@tgstation-server tgstation-server removed the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Apr 28, 2022
@BraveMole BraveMole merged commit f0f43d0 into tgstation:master Apr 28, 2022
@breadhunt breadhunt deleted the boxing branch May 25, 2022 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mechanic Delete me Sound Sound change. Sprites Changes to .dmi file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants