space-station-14 icon indicating copy to clipboard operation
space-station-14 copied to clipboard

Published 20 hours ago • verified publisher icon space-wizards

Guns as clothing PR (suit storage, back, belt)

Open Peptide90 opened this issue 2 years ago • 10 comments

About the PR

So this was on Sloths to do list but thought I'd liberate it since they're been focusing on more badass stuff I have nfi about, plus this was all easy yaml.

Once this is merged I'll work on making empty variants of all guns so we can give those to sec rather than them coming pre-loaded with lethals.

This PR also tries to fix some of the inconsistent indentation in meta.json files for guns, did this as I went since it made sense.

Changelog:

  • Added suit storage and back storage to most guns. Anything larger than 50 in size will not fit in suit storage.
  • Made all small guns (pistols and revolvers) fit on belt slot (waist band gun).
  • Increased sniper size to 50, they do not fit in suit storage, only back.
  • Mini jetpack now fits in suit storage too.

TO DO Possibly not in this PR depending on the knowledge required.

  • [ ] Probably a visualiser for all guns on the belt slot too.
  • [ ] Blacklist component: Gun from anything that isn't a hardsuit, such as lab coats etc. Apparently this is hard coded or something and adding a storage blacklist didn't do shit since it's not storage it's a UI slot element thingy.

Screenshots

variety

akms akms2

akms1

Changelog

:cl:

  • tweak: Mini Jetpack now fits in your suit storage slot.
  • tweak: All big guns fit on your back and most fit in suit storage. LMGs, Snipers and Launchers are back only.
  • tweak: All handguns now fit on your belt slot (waistband right?)

Peptide90 avatar Jul 01 '22 13:07 Peptide90

TO DO Possibly not in this PR depending on the knowledge required.

  • [ ] Make all guns that are in the back slot show up on the character. (Do we need a visualiser for this or something? Could have sworn people wear shotguns and guitars on their back but I'm probably misremembering.

no, you just need an equipped-BACKPACK.png sprite in the RSI for these, shouldn't be hard

mirrorcult avatar Jul 15 '22 02:07 mirrorcult

TO DO Possibly not in this PR depending on the knowledge required.

  • [ ] Make all guns that are in the back slot show up on the character. (Do we need a visualiser for this or something? Could have sworn people wear shotguns and guitars on their back but I'm probably misremembering.

no, you just need an equipped-BACKPACK.png sprite in the RSI for these, shouldn't be hard

Sweet, thought we had the means just wasn't sure how, I'll try get on it tomorrow :)

Peptide90 avatar Jul 17 '22 19:07 Peptide90

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

github-actions[bot] avatar Jul 27 '22 10:07 github-actions[bot]

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

Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi

State Old New Status
equipped-BACKPACK Added
Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

State Old New Status
equipped-BACKPACK Added
Edit: diff updated after ffb70b948a32250ef141b624ab88929f3e3e9224

github-actions[bot] avatar Jul 29 '22 19:07 github-actions[bot]

Painstakingly added back sprites for everything big. Attached screenshots to the original post.

Peptide90 avatar Jul 30 '22 14:07 Peptide90

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

github-actions[bot] avatar Aug 07 '22 01:08 github-actions[bot]

After this is merged the minimum gun size should be made 30 tbh.

metalgearsloth avatar Aug 10 '22 11:08 metalgearsloth

Review addressed.

Peptide90 avatar Aug 10 '22 18:08 Peptide90

Tests still failing

metalgearsloth avatar Aug 13 '22 13:08 metalgearsloth

Tests still failing

Fixed, just bumped up the ERT backpack size.

Peptide90 avatar Aug 14 '22 10:08 Peptide90

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

github-actions[bot] avatar Aug 19 '22 06:08 github-actions[bot]

Fixed conflicts, give me strength.

Up to ya'll maintainers now. Still has the issue with suit storage being hardcoded so you can't blacklist big guns from being put inside a lab coat for example but I feel that's a fairly minor issue...and it's out of my hands since I tried in yaml.

Peptide90 avatar Aug 30 '22 20:08 Peptide90