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

More Sec Loadout Guns #1158

Merged
merged 3 commits into from
Nov 2, 2024

Conversation

VMSolidus
Copy link
Member

Description

Media

image


Changelog

🆑

  • add: Added Python, Pollock, Webley, K38, Fitz, Wood Furniture Viper, Energy Pistol, PDW-9, and Svalinn to security loadouts as new Duty Weapon options.
  • tweak: Modified the descriptions of all handguns obtained via Security Officer Loadouts to explicitly state that they actually belong to the security officer. Apparently people were being stupid and confiscating weapons from their own Secoffs that they were entirely intended to have.

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Oct 28, 2024
Copy link
Contributor

github-actions bot commented Oct 28, 2024

RSI Diff Bot; head commit 696f29a merging into 18a38e8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi

State Old New Status
base Modified
bolt-open Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Weapons/Guns/Pistols/N1984nl.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/Objects/Weapons/Guns/Pistols/mk58nl.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/Objects/Weapons/Guns/Pistols/vipernl.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
suppressor Added

Edit: diff updated after 696f29a

@DangerRevolution
Copy link
Contributor

Instead of le entity bloat; At minimum, a system should be considered that lets loadout entries override names / descriptions instead of shitting out 40 new weapons so Security can use them.

@VMSolidus
Copy link
Member Author

Instead of le entity bloat; At minimum, a system should be considered that lets loadout entries override names / descriptions instead of shitting out 40 new weapons so Security can use them.

That's literally what parenting is for.

@DangerRevolution
Copy link
Contributor

Instead of le entity bloat; At minimum, a system should be considered that lets loadout entries override names / descriptions instead of shitting out 40 new weapons so Security can use them.

That's literally what parenting is for.

Instead of a system that allows for a modified name / description on a gun; we've now added 15 new entities with 40 components on each entity just to change the name and description.

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

@VMSolidus
Copy link
Member Author

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

@VMSolidus
Copy link
Member Author

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

@DEATHB4DEFEAT
Copy link
Member

Instead of le entity bloat; At minimum, a system should be considered that lets loadout entries override names / descriptions instead of shitting out 40 new weapons so Security can use them.

Adding new entities is fine for now, I have plans for user-set names and descriptions soon.
Loadouts can override their name/description in the character editor already though.

@VMSolidus
Copy link
Member Author

Instead of le entity bloat; At minimum, a system should be considered that lets loadout entries override names / descriptions instead of shitting out 40 new weapons so Security can use them.

Adding new entities is fine for now, I have plans for user-set names and descriptions soon. Loadouts can override their name/description in the character editor already though.

This does demonstrate that there is a use-case for loadouts overriding the name/description of the item to be spawned, but that is also still waaaaay outside of the scope of this PR, and is an unreasonable thing to ask here.

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

@VMSolidus
Copy link
Member Author

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

@Eagle-0
Copy link
Contributor

Eagle-0 commented Oct 28, 2024

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

Then take a second and look at the gun before shooting them? This is is a player issue, not a loadout issue lmao.

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

Then take a second and look at the gun before shooting them? This is is a player issue, not a loadout issue lmao.

"look at the gun before shooting them"
my brother in space christ you'd have to run directly towards them, open their strip menu, then inspect the item thats in their hand before figuring out if its syndicate or sec
also you are overestimating how smart the average secoff is

@VMSolidus
Copy link
Member Author

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

First of all why are you round-removing antags on MRP servers? When the standard of behavior on MRP servers is not to be going around round removing people? Do you have any idea how many people I've banned from DS14 because they were round removing people who had a pack of cigarettes? Or security officers gibbing people once they've been arrested?

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

First of all why are you round-removing antags on MRP servers? When the standard of behavior on MRP servers is not to be going around round removing people? Do you have any idea how many people I've banned from DS14 because they were round removing people who had a pack of cigarettes? Or security officers gibbing people once they've been arrested?

i'm not, but you also imply that EVERY SINGLE EE BASED SERVER runs off of mrp

@VMSolidus
Copy link
Member Author

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

First of all why are you round-removing antags on MRP servers? When the standard of behavior on MRP servers is not to be going around round removing people? Do you have any idea how many people I've banned from DS14 because they were round removing people who had a pack of cigarettes? Or security officers gibbing people once they've been arrested?

i'm not, but you also imply that EVERY SINGLE EE BASED SERVER runs off of mrp

We outright have it in our fork design document that we don't cater to NRP or LRP servers. That's Wizden's territory.

@bruhmogus
Copy link

no no no god please no do not make DEATH SQUAD and MORE SYNDICATE weapons sec gear 😭

No. Referring to completely generic items as being "SYNDICATE" is both cringe and NRP.

the problem is wizden compared to this because 90% of the secoff guns are "kill this guy" material and get people shot on inspecting the person

We aren't wizden, we don't care what Wizden does, we aren't interested in following Wizden's design decisions, what Wizden does has zero factor in what we're doing.

you missed my point completely. not everyone SOLELY plays specifically ee servers, mostly they play wizden, and having what would normally be "nobody should ever have this" weapons as 90% of the secoff weapons would absolutely fuck over not only traitor detection but also confuse everyone new to ee but not the Basic Bitch™ branch, it'd get too many people shot over "oh shit that was just jerry's gun and not a syndicate agent, whoops"

Literally the only people who can get these guns are Security Officers. If you see absolutely anyone other than Security carrying a gun, you are 100% safe to treat them as a threat. If you open fire on a Secoff for carrying a handgun, you are 100% in the wrong. I'd also like to point out that the Mk58 handgun, the "Default vanilla security gun" is available in traitor uplinks.

the issue with that line of thinking is that its easy to round remove someone BEFORE realising their gun was just security instead of syndicate

First of all why are you round-removing antags on MRP servers? When the standard of behavior on MRP servers is not to be going around round removing people? Do you have any idea how many people I've banned from DS14 because they were round removing people who had a pack of cigarettes? Or security officers gibbing people once they've been arrested?

i'm not, but you also imply that EVERY SINGLE EE BASED SERVER runs off of mrp

We outright have it in our fork design document that we don't cater to NRP or LRP servers. That's Wizden's territory.

it still doesn't solve the problem of having to walk all the way over to a possible antag JUST to check if they need to be shot with a Gun™ or just hit with the funni shock stick

@Eagle-0
Copy link
Contributor

Eagle-0 commented Oct 28, 2024

Once again we face the issue of asking people to roleplay in a roleplay game. Truely it's over for spessgame.

@VMSolidus
Copy link
Member Author

VMSolidus commented Oct 28, 2024

Literally not even a problem. It's an entirely binary decision tree of:

  • See person wearing extremely obvious Security Uniform = "Oh they must be Security. It's their job to be armed."
  • See person who isn't wearing an extremely obvious Security Uniform and waving around a gun, regardless of what gun that is = "Oh they aren't Security, they shouldn't be armed. I should run away from them or else they might shoot me"

@gluesniffler
Copy link
Contributor

if only all of the brainpower and passion on this whole discussion thread went over to bugfixes and core systems instead 🙏

@Mnemotechnician
Copy link
Contributor

if only all of the brainpower and passion on this whole discussion thread went over to bugfixes and core systems instead 🙏

Amen.

@VMSolidus
Copy link
Member Author

Summon the maintainers and approve it to end the annoying discussion lmao.

@bruhmogus
Copy link

Literally not even a problem. It's an entirely binary decision tree of:

  • See person wearing extremely obvious Security Uniform = "Oh they must be Security. It's their job to be armed."
  • See person who isn't wearing an extremely obvious Security Uniform and waving around a gun, regardless of what gun that is = "Oh they aren't Security, they shouldn't be armed. I should run away from them or else they might shoot me"

once again you completely missed what im trying to say, if they ARE security with the gun, sure, fine, but if they AREN'T sec has to do the job of "shoot them to be safe but waste meds and possibly get yelled at by everyone OR try to stun them and risk dying" in a span of three seconds

@DEATHB4DEFEAT
Copy link
Member

Summon the maintainers and approve it to end the annoying discussion lmao.

I have an idea

@Simple-Station Simple-Station locked as too heated and limited conversation to collaborators Oct 28, 2024
@Remuchi
Copy link
Contributor

Remuchi commented Oct 29, 2024

i'm not, but you also imply that EVERY SINGLE EE BASED SERVER runs off of mrp

The solution to your problem was invented a few decades ago.
It's called REVERT COMMIT.

I, however, want to raise another point of concern here.
I do not care about the guns being syndicate or Deathsquad or ert or whatever
What I do care about is the guns balancing. For instance, lets take the Python. 6 rounds cylinder revolver with 2.0 firerate. Seems legit, yeah? Until we take a look at the Inspector, an issued to detective revolver. It has the same 6 rounds cylinder while having 1.5 fire rate.

It was fine before since weapons being in uplink should be generally better than regular ones by design. But with this approach it all goes to the waste.

The PR looks fine otherwise. Expect the bloat but it was raised before already.

@VMSolidus VMSolidus merged commit 9ecae9f into Simple-Station:master Nov 2, 2024
20 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants