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

G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [Revived Edition] #6667

Merged
merged 3 commits into from
Jul 18, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 9, 2024

About the pull request

For all means and purposes, this is a repr of #5697, approval to repr was given by pr author, all code belongs to the author as well, i only did minor edits.

Adds the G2 electroshock grenade, "Sonic Electric ball breaker" as mentioned in the movies or SEBB for short. It's purpose is to be a tactical option for the marines, as it deals slowdown instead of stun/damage. (unless you stand on top of it)

Only meaningful damage is to marines and especially synths, since a 1.2 Gigavolt charge is probably not healthy for bioelectrics.

Can be used as a mine as well.

Explain why it's good for the game

More marine utility weapons and content, we can probably lower the amount of HEDPs slightly to balance it out aswell.

Testing Photographs and Procedure

Screenshots & Videos
dreamseeker_lkoddiawkL.mp4
dreamseeker_ADTR7k5WYI.mp4

image

Changelog

🆑 TotalEpicness5, Triiodine, monkeyfist, Blundir
add: Adds the G2 electroshock grenade. This grenade does not stun nor deal serious damage to xenos, but it stuns via electric shock. It can create EMP-like effects when faced with electronic devices like sentries, synths, Area Power Controllers, etc. It's damage is reduced by energy armor.
fix: take_overall_armoured_damage now can actually deal burn damage
balance: Marine armor has a small bit of energy armor added back. Heavy armor has slightly more protection than medium/light.
fix: Mines now check for explosive antigrief checks
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge Fix Fix one bug, make ten more Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Jul 9, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 18, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

From #5697 the differences are:

  • Addition of G2 Electroshock grenade packet box support in req vendor (working)
  • Addition of planted.activate_sensors() in /obj/item/explosive/grenade/sebb/afterattack(atom/target, mob/user, proximity) (appears working)
  • removal of some implicit src usage (previously requested change)
  • some whitespace changes

There is no binary difference between sebb.dmi, sebb.ogg, sebb_beep.ogg, nor sebb_explode.dmi. Nor from the internal states in the left, right, or grenade dmis:
image

So as such I will be transferring sprite and balance approval

@Drulikar Drulikar added Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Sprites Approved confirmed no stray pixels labels Jul 18, 2024
@Drulikar Drulikar added this pull request to the merge queue Jul 18, 2024
Merged via the queue into cmss13-devs:master with commit 7bf8ce2 Jul 18, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants