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

[TM Ready] Chemical Weapons (CN20) in the FS Menu #510

Open
wants to merge 20 commits into
base: master
Choose a base branch
from

Conversation

GriffinMan4455
Copy link
Contributor

@GriffinMan4455 GriffinMan4455 commented Oct 17, 2024

About the pull request

This PR Contains working CN20 Gas variants for:
Mortar Shells
Dropship Missiles (Banshee variant)
OB (Fuckhueg cloud)

All tested, all work fine.

Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying. -->

Explain why it's good for the game

GM's always want more fire support stuff, and CN20 has been mentioned by name several times now especially in chemical weapons ops, since using it without spawning a person and having them chuck nades can be difficult

Testing Photographs and Procedure

I'll add some after everything's in maybe (I said this for all my other PR's and half of them I forgot lmao)

Screenshots & Videos

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

Changelog

🆑
add: CN20 rounds for: Dropship, Mortar, OB
qol: FS Menu contains CN20 rounds for Dropship, Mortar, OB
ui: FS UI, dunno if I have to mention this here though
/:cl:

@GriffinMan4455 GriffinMan4455 marked this pull request as ready for review October 17, 2024 20:11
@GriffinMan4455 GriffinMan4455 changed the title Chemical Weapons (CN20) in the FS Menu [TM Ready] Chemical Weapons (CN20) in the FS Menu Oct 21, 2024
code/modules/cm_marines/dropship_ammo.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/dropship_ammo.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/dropship_ammo.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/orbital_cannon.dm Outdated Show resolved Hide resolved
#define ORDNANCE_OPTIONS list("Banshee Missile", "CN-20 Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile", "Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "GAU-21", "Heavy GAU-21", "High Explosive", "Incendiary", "Cluster", "High Explosive", "Incendiary", "Fragmentation", "Flare")
#define MISSILE_ORDNANCE list("Banshee Missile", "CN-20 Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile")
#define ORBITAL_ORDNANCE list("High Explosive OB", "Incendiary OB", "Cluster OB", "Nerve Gas OB")
#define MORTAR_ORDNANCE list("High Explosive Shell", "Incendiary Shell", "Fragmentation Shell", "Flare Shell", "Nerve Gas Shell")
Copy link
Contributor

Choose a reason for hiding this comment

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

You add a "Nerve Gas Shell" to the options, but do not specify what that option will do within the InterceptClickOn proc. Need to specify it as you did with "CN-20 Missile" and "Nerve Gas OB".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh! I was working on these a couple days ago, I just completely forgot to finish them up, my bad lmao
I think I set the actual mortar shell coding aside when someone, Amory maybe, suggested seperating the chemical weapons to a new menu subpart entirely and I started looking into how to do so w/ the TGUI

GriffinMan4455 and others added 7 commits October 23, 2024 16:47
Ah, yup that'd be because I stole most of the code for each of these from a respective fire support item (This one's from the banshee I'm pretty sure). I don't remember any secondary explosions from my tests which is weird, though.

Co-authored-by: Doubleumc <[email protected]>
Aaaah, I see. Thanks for the help UMC!

Co-authored-by: Doubleumc <[email protected]>
I actually did space out a couple of things after seeing it formatted that way on other PR's, I must've just missed this one

Co-authored-by: Doubleumc <[email protected]>
…k up my accidental merge conflict I just made
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants