DRAFT: G2 Eletroshock grenade #5028

PhantomEpicness · 2023-11-25T03:18:36Z

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. Uses an effect similar to boiler neuro to have finer control over balance and to prevent stacking. (still wip)

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

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 TotalEpicness5, Triiodine, monkeyfist
add: Adds the G2 electroshock grenade
/:cl:

cm13-github · 2023-11-25T03:20:52Z

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

Zonespace27

Non-balance

Zonespace27 · 2023-11-26T21:40:11Z

code/datums/supply_packs/explosives.dm

@@ -87,6 +87,17 @@
 	containername = "\improper explosive M40 HEDP grenades crate (WARNING)"
 	group = "Explosives"

+/datum/supply_packs/explosives_sebb
+	name = "M40 HEDP blast grenades crate (x6)"


Zonespace27 · 2023-11-26T21:40:18Z

code/datums/supply_packs/explosives.dm

+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate/explosives
+	containername = "\improper explosive M40 HEDP grenades crate (WARNING)"


Zonespace27 · 2023-11-26T21:40:38Z

code/game/machinery/vending/vendor_types/crew/commanding_officer.dm

@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list(
 		list("HEDP Grenade Pack", 15, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR),
 		list("HEFA Grenade Pack", 15, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR),
 		list("WP Grenade Pack", 15, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR),
+		list("G2 Electroshock Grenade Pack",  15, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),


Suggested change

list("G2 Electroshock Grenade Pack", 15, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

list("G2 Electroshock Grenade Pack", 15, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),

Zonespace27 · 2023-11-26T21:40:58Z

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

+	var/range = 5
+	var/damage = 120 // Generic Energy damage from 1.2 GV. Distance scaled
+	var/dam_range_mult = 15 // Range is multiplied by this, then damage is subracted by this


Zonespace27 · 2023-11-26T21:41:14Z

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

+//================================================
+*/
+/obj/item/explosive/grenade/sebb
+	name = "\improper G2 Electroshock grenade"


is electroshock a proper noun?

Zonespace27 · 2023-11-26T21:45:10Z

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

+
+
+/obj/effect/overlay/sebb/New()
+	addtimer(CALLBACK(GLOBAL_PROC,.proc/qdel,src),time_to_live)


There's a QDEL_IN macro

Zonespace27 · 2023-11-26T21:45:15Z

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

+	appearance_flags = RESET_COLOR
+
+
+/obj/effect/overlay/sebb/New()


Initialize()

Zonespace27 · 2023-11-26T21:45:39Z

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

+/obj/item/explosive/mine/sebb
+	name = "\improper G2 Electroshock grenade"
+	icon_state = "grenade_sebb_planted"
+	desc = "A G2 electroshock grenade planted as a landmine"


Suggested change

desc = "A G2 electroshock grenade planted as a landmine"

desc = "A G2 electroshock grenade planted as a landmine."

Zonespace27 · 2023-11-26T21:45:52Z

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

+
+/obj/item/explosive/mine/sebb/prime()
+	set waitfor = 0
+	new /obj/item/explosive/grenade/sebb/primed(src.loc)


not necessarily guaranteed to be a turf

Zonespace27 · 2023-11-26T21:46:08Z

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

+	if(!QDELETED(src))
+		disarm()


what's this check for?

github-actions · 2023-12-04T01:03:59Z

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

TotalEpicness and others added 6 commits November 13, 2022 14:05

inrpgo

60c0548

inprog2

0b01643

inprog2

74aa789

SEBB_functional need review

99826b9

Merge branch 'master' into SEBB

108ae72

needsEffectsnBalancing

daf8a19

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 Nov 25, 2023

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 25, 2023

Zonespace27 requested changes Nov 26, 2023

View reviewed changes

Zonespace27 marked this pull request as draft November 26, 2023 21:46

Zonespace27 added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Nov 26, 2023

github-actions bot added the Stale beg a maintainer to review your PR label Dec 4, 2023

github-actions bot closed this Dec 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DRAFT: G2 Eletroshock grenade #5028

DRAFT: G2 Eletroshock grenade #5028

PhantomEpicness commented Nov 25, 2023 •

edited

Loading

cm13-github commented Nov 25, 2023

Zonespace27 left a comment

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

Zonespace27 Nov 26, 2023

github-actions bot commented Dec 4, 2023

	list("G2 Electroshock Grenade Pack", 15, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),
	list("G2 Electroshock Grenade Pack", 15, /obj/item/storage/box/packet/sebb, null, VENDOR_ITEM_REGULAR),



		/obj/effect/overlay/sebb/New()
		addtimer(CALLBACK(GLOBAL_PROC,.proc/qdel,src),time_to_live)

		appearance_flags = RESET_COLOR


		/obj/effect/overlay/sebb/New()

	desc = "A G2 electroshock grenade planted as a landmine"
	desc = "A G2 electroshock grenade planted as a landmine."

DRAFT: G2 Eletroshock grenade #5028

DRAFT: G2 Eletroshock grenade #5028

Conversation

PhantomEpicness commented Nov 25, 2023 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

cm13-github commented Nov 25, 2023

Zonespace27 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 4, 2023

PhantomEpicness commented Nov 25, 2023 •

edited

Loading