G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] #5697

PhantomEpicness · 2024-02-11T05:54:17Z

About the pull request

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.

Made a PR so maintainers can take a look at it. Still WIP

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.

lore accurate af, as mentioned in the movie and the tech manual

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

2023-11-20.21-13-12.-.Trim.-.Trim.mp4

Changelog

🆑 TotalEpicness5, Triiodine, monkeyfist
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:

cm13-github · 2024-02-11T05:56:29Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

PhantomEpicness · 2024-02-11T07:05:21Z

need advice on balancing

FrogZeke · 2024-02-11T16:50:58Z

Please correct the name in the PR: Sonic Electronic Ball Breaker
https://avp.fandom.com/wiki/G2_Electroshock_Grenade

Diegoflores31 · 2024-02-11T23:23:02Z

need advice on balancing

Sprite & sound : the explosion effect looks a little goofy , the sound should be less noisy and preferably have less sounds to be in line with a normal grenade . just prime noise and them the boom.

balance :
add FF ( a stun similar of touching a shocked door for marines in range)
reduce the range of EMP effect.
make sure its Hand throwable only ( make it be the size of a M15 if possible so people dont confuse it with a M40).
reduce the
for xenos , make it do a knockup effect on T1s and T2s only.
personally i dont like it taking the spot of Claymores . but i like it as a alternative grenade.

all of this are suggestions i am not a maintaner

PhantomEpicness · 2024-02-12T01:01:39Z

need advice on balancing

Sprite & sound : the explosion effect looks a little goofy , the sound should be less noisy and preferably have less sounds to be in line with a normal grenade . just prime noise and them the boom.

balance : add FF ( a stun similar of touching a shocked door for marines in range) reduce the range of EMP effect. make sure its Hand throwable only ( make it be the size of a M15 if possible so people dont confuse it with a M40). reduce the for xenos , make it do a knockup effect on T1s and T2s only. personally i dont like it taking the spot of Claymores . but i like it as a alternative grenade.

all of this are suggestions i am not a maintaner

I forgot to mention this in the description but the damage it deals is very substantial for marines (but miniscule for xenos less they are ontop of it for some reason). Most damage also goes straight through armor as it deals energy damage. I'll post a video later when I make the thread on discord

In addition synths get stunned + 2x damage (1.2 GV ain't good for electrical anything) and "resets" the fire control systems of sentries by setting its range to 0 for a few seconds.

I will add some more negative effects for marines though, perhaps a flicker stun "every muscle in your body seizes up momentarily" and might adjust the sentry disable time too

Ediblebomb · 2024-02-12T02:27:45Z

Interesting bug with req vendors

ow.mp4

PhantomEpicness · 2024-02-12T17:56:33Z

Interesting bug with req vendors

ow.mp4

real

cm13-github · 2024-02-15T22:50:13Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

PhantomEpicness · 2024-02-15T22:53:36Z

messed up the rebase so hard that I gotta manually fix it.

ignore changes until it's resolved.

cm13-github · 2024-02-15T23:10:14Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

cm13-github · 2024-02-16T03:59:46Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

PhantomEpicness · 2024-02-16T04:00:01Z

ok cleared

sleepynecrons

sprites good

PhantomEpicness · 2024-02-18T00:17:51Z

changes:
uses stamina damage for humans
mild damage buff since you would get like 10 damage from 3 tiles away before
code readability improvements and variable updates.
removed stupid sparks

damage equation:

damage applied = damage - (distance to nade falloff factor)*
falloff factor is 12
damage is 120
so if a marine is 3 tiles away
3 * 12 = 36
120 damage - 36 falloff = 84
which then faces ARMOR_ENERGY reduction and spread across all limbs

todo: damage testing

harryob

failing tests, undraft once you've fixed them

SabreML

A few things, looking good though!

code/game/machinery/vending/vendor_types/requisitions.dm

code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm

code/game/objects/items/explosives/grenades/marines.dm

code/game/objects/items/explosives/mine.dm

code/modules/projectiles/ammo_boxes/grenade_packets.dm

cm13-github · 2024-04-01T09:55:42Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Drulikar

Be sure to install the tools/hooks to resolve the DMI conflict as well (before merging upstream master into your branch locally).

Drulikar · 2024-04-03T02:34:18Z

code/game/objects/items/explosives/grenades/marines.dm

+		playsound(src.loc, 'sound/effects/sebb_explode.ogg', 90, 0, 10)
+	else
+		addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src.loc, 'sound/effects/sebb_beep.ogg', 60, 0, 10), soundtime)


Suggested change

playsound(src.loc, 'sound/effects/sebb_explode.ogg', 90, 0, 10)

else

addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src.loc, 'sound/effects/sebb_beep.ogg', 60, 0, 10), soundtime)

playsound(loc, 'sound/effects/sebb_explode.ogg', 90, 0, 10)

else

addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), loc, 'sound/effects/sebb_beep.ogg', 60, 0, 10), soundtime)

github-actions · 2024-04-11T01:01:37Z

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

…d Edition] (#6667)  # 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. - [lore accurate af](https://avp.fandom.com/wiki/G2_Electroshock_Grenade), as mentioned in the movie and the tech manual # Testing Photographs and Procedure   <details> <summary>Screenshots & Videos</summary> https://github.com/cmss13-devs/cmss13/assets/100090741/eed7440f-e828-4545-b3e1-9c89e618985e https://github.com/cmss13-devs/cmss13/assets/100090741/bbfcf1af-94f4-41ae-8f43-726fee7a37b7 ![image](https://github.com/cmss13-devs/cmss13/assets/100090741/5b18710d-2812-447e-b0f9-ca9e222d5349) </details> # Changelog   :cl: 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 bot added Sprites Remove the soul from the game. Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Feb 11, 2024

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 11, 2024

PhantomEpicness force-pushed the SEBB branch from 3afa1e2 to b40ff31 Compare February 15, 2024 22:50

cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 15, 2024

PhantomEpicness force-pushed the SEBB branch from b40ff31 to 74aa789 Compare February 15, 2024 23:10

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 15, 2024

PhantomEpicness force-pushed the SEBB branch from 74aa789 to 5395085 Compare February 16, 2024 03:59

cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 16, 2024

sleepynecrons approved these changes Feb 17, 2024

View reviewed changes

sleepynecrons added the Sprites Approved confirmed no stray pixels label Feb 17, 2024

harryob requested changes Feb 22, 2024

View reviewed changes

harryob marked this pull request as draft February 22, 2024 16:17

PhantomEpicness marked this pull request as ready for review February 28, 2024 23:16

SabreML requested changes Feb 29, 2024

View reviewed changes

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Mar 1, 2024

Update marines.dm

4c26ecb

cm13-github added a commit that referenced this pull request Mar 27, 2024

TGS Test Merge (#5697)

3fe6a10

Deahaka mentioned this pull request Mar 27, 2024

Empulse effects update TauCetiStation/TauCetiClassic#13001

Merged

PhantomEpicness added 2 commits March 27, 2024 15:48

minorbuff

8ac3518

too ahrd to use without mass ff, underslug launmch test?

5756d58

Drewzeedo5 mentioned this pull request Mar 28, 2024

ASRS is unable to be hacked by an MT #6033

Closed

3 tasks

cm13-github added a commit that referenced this pull request Mar 28, 2024

TGS Test Merge (#5697)

487bb7f

cm13-github added a commit that referenced this pull request Mar 29, 2024

TGS Test Merge (#5697)

f787e68

This comment was marked as outdated.

Sign in to view

cm13-github added a commit that referenced this pull request Mar 30, 2024

TGS Test Merge (#5697)

34c2539

cm13-github added a commit that referenced this pull request Mar 30, 2024

TGS Test Merge (#5697)

37c9f94

cm13-github added a commit that referenced this pull request Mar 30, 2024

TGS Test Merge (#5697)

4d8ffe1

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

aeca482

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

0498926

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

e933701

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

6886552

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

f04e92d

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

b68d1ee

cm13-github added a commit that referenced this pull request Mar 31, 2024

TGS Test Merge (#5697)

b4f0853

cm13-github added a commit that referenced this pull request Apr 1, 2024

TGS Test Merge (#5697)

b3a27cb

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 1, 2024

Drulikar requested changes Apr 3, 2024

View reviewed changes

Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Apr 3, 2024

Drulikar marked this pull request as draft April 3, 2024 02:47

github-actions bot added the Stale beg a maintainer to review your PR label Apr 11, 2024

github-actions bot closed this Apr 19, 2024

Blundir mentioned this pull request Jul 9, 2024

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] #5697

G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] #5697

PhantomEpicness commented Feb 11, 2024 •

edited

Loading

cm13-github commented Feb 11, 2024

PhantomEpicness commented Feb 11, 2024

FrogZeke commented Feb 11, 2024

Diegoflores31 commented Feb 11, 2024

PhantomEpicness commented Feb 12, 2024

Ediblebomb commented Feb 12, 2024

PhantomEpicness commented Feb 12, 2024

cm13-github commented Feb 15, 2024

PhantomEpicness commented Feb 15, 2024 •

edited

Loading

cm13-github commented Feb 15, 2024

cm13-github commented Feb 16, 2024

PhantomEpicness commented Feb 16, 2024

sleepynecrons left a comment

PhantomEpicness commented Feb 18, 2024

harryob left a comment

SabreML left a comment

This comment was marked as outdated.

cm13-github commented Apr 1, 2024

Drulikar left a comment

Drulikar Apr 3, 2024

github-actions bot commented Apr 11, 2024

G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] #5697

G2 Electroshock Grenade "Sonic Electric Ball Breakers (SEBB)" [No Shitcode Edition] #5697

Conversation

PhantomEpicness commented Feb 11, 2024 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

cm13-github commented Feb 11, 2024

PhantomEpicness commented Feb 11, 2024

FrogZeke commented Feb 11, 2024

Diegoflores31 commented Feb 11, 2024

PhantomEpicness commented Feb 12, 2024

Ediblebomb commented Feb 12, 2024

PhantomEpicness commented Feb 12, 2024

cm13-github commented Feb 15, 2024

PhantomEpicness commented Feb 15, 2024 • edited Loading

cm13-github commented Feb 15, 2024

cm13-github commented Feb 16, 2024

PhantomEpicness commented Feb 16, 2024

sleepynecrons left a comment

Choose a reason for hiding this comment

PhantomEpicness commented Feb 18, 2024

harryob left a comment

Choose a reason for hiding this comment

SabreML left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

cm13-github commented Apr 1, 2024

Drulikar left a comment

Choose a reason for hiding this comment

Drulikar Apr 3, 2024

Choose a reason for hiding this comment

github-actions bot commented Apr 11, 2024

PhantomEpicness commented Feb 11, 2024 •

edited

Loading

PhantomEpicness commented Feb 15, 2024 •

edited

Loading