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

Suit-storage update to all delta V sprite guns. #1092

Merged
merged 3 commits into from
Apr 19, 2024

Conversation

Adrian16199
Copy link
Contributor

About the PR

Gives a sprite to delta V guns, all guns that I noticed that dont have it.

All guns included:
Enforcer
image
IK-60 laser carbine
image
Kammerer
image
Adjutant
image
double-barreled shotgun
image
improvised shotgun
image
sawn-off shotgun
image
BB gun
image

Why / Balance

Because I adore suitslot and no sprite makes me cry because no cool factor.

Technical details

Copies backpack sprites into storage suit in meta.json

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • fix: Most shotguns and some guns have a suitslot sprite now.

@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an rsi label Apr 14, 2024
Copy link
Contributor

github-actions bot commented Apr 14, 2024

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/enforcer.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
equipped-SUITSTORAGE Added

Edit: diff updated after d3c1871

Copy link
Member

@IamVelcroboy IamVelcroboy left a comment

Choose a reason for hiding this comment

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

Is good

@IamVelcroboy IamVelcroboy enabled auto-merge (squash) April 18, 2024 17:35
@IamVelcroboy
Copy link
Member

I don't know how to get that last test to run. Otherwise, I'd merge this. 🤷‍♂️

@NullWanderer NullWanderer disabled auto-merge April 19, 2024 01:05
@NullWanderer NullWanderer merged commit 7459f28 into DeltaV-Station:master Apr 19, 2024
12 checks passed
@Adrian16199 Adrian16199 deleted the gun-suitslot branch May 16, 2024 11:01
sleepyyapril added a commit to Simple-Station/Einstein-Engines that referenced this pull request Feb 4, 2025
# Description

## **!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!**

Merges a lot of PRs from Delta-V, most of these are plain YML changes so
they shouldn't cause wizmerge-like issues.
- DeltaV-Station/Delta-v#1008 
- DeltaV-Station/Delta-v#1077
- DeltaV-Station/Delta-v#1092
- DeltaV-Station/Delta-v#1094
- DeltaV-Station/Delta-v#1143
  - Excluded the lobby art with DeltaV branding.
- DeltaV-Station/Delta-v#1176
- DeltaV-Station/Delta-v#1209
- DeltaV-Station/Delta-v#1227
- DeltaV-Station/Delta-v#1252
- not directly cherry-picked due to harpy singing now being stored in a
different file, but implemented the same thing in
df50140
- DeltaV-Station/Delta-v#1261
- DeltaV-Station/Delta-v#1271
- DeltaV-Station/Delta-v#1272
- Also made available to Humans and Tajarans like the other Felinid
tails.
- DeltaV-Station/Delta-v#1426
- DeltaV-Station/Delta-v#1462
- DeltaV-Station/Delta-v#1542
- DeltaV-Station/Delta-v#1759
- DeltaV-Station/Delta-v#1763
- DeltaV-Station/Delta-v#1765
- DeltaV-Station/Delta-v#1780
- DeltaV-Station/Delta-v#1781
- DeltaV-Station/Delta-v#1804
- DeltaV-Station/Delta-v#1814
- TODO in another pr, vulp sprite for the colorable neck gaiter (PR only
adds vulp states to pre-existing black/red neck gaiters)
- DeltaV-Station/Delta-v#1828
  - Added to Loadouts for Corpsman, costs 2 points.
- DeltaV-Station/Delta-v#1838
- DeltaV-Station/Delta-v#1877
- DeltaV-Station/Delta-v#1905
  - Added to Loadout Uniforms, costs 1 point. 
- DeltaV-Station/Delta-v#1910
- DeltaV-Station/Delta-v#1935
- DeltaV-Station/Delta-v#1946
- DeltaV-Station/Delta-v#1994
- DeltaV-Station/Delta-v#1997
- DeltaV-Station/Delta-v#1998
- DeltaV-Station/Delta-v#2031
- DeltaV-Station/Delta-v#2089
- DeltaV-Station/Delta-v#2113
- DeltaV-Station/Delta-v#2213
- DeltaV-Station/Delta-v#2209
- DeltaV-Station/Delta-v#2210
- Prerequisite Wizden PR added:
space-wizards/space-station-14#29243
- Prerequisite Wizden PR added:
space-wizards/space-station-14#30856
- DeltaV-Station/Delta-v#2233
- DeltaV-Station/Delta-v#2245
- DeltaV-Station/Delta-v#2250
- DeltaV-Station/Delta-v#2266
- DeltaV-Station/Delta-v#2267
- DeltaV-Station/Delta-v#2294
- DeltaV-Station/Delta-v#2307
- DeltaV-Station/Delta-v#2318
- DeltaV-Station/Delta-v#2398
- DeltaV-Station/Delta-v#2410
- DeltaV-Station/Delta-v#2462
- DeltaV-Station/Delta-v#2478
- DeltaV-Station/Delta-v#2501
- DeltaV-Station/Delta-v#2503
- DeltaV-Station/Delta-v#2504
- Prerequisite Wizden PR added:
space-wizards/space-station-14#30957
- DeltaV-Station/Delta-v#2524
- DeltaV-Station/Delta-v#2539
- DeltaV-Station/Delta-v#2635
- Prerequisite Wizden PR added:
space-wizards/space-station-14#32193
- Prerequisite Wizden PR added:
space-wizards/space-station-14#32327

## Changelog

Too much changes to count so some changes are unlisted

:cl: Several Contributors
- add: Added Lone Digger by Caravan Palace to the jukebox! (by MilonPL)
- add: Added Deck The Halls by Kevin Macleod to the jukebox! (by
Lyndomen)
- tweak: Now medical belts have a slot for medkits. (by Radezolid)
- add: Added a way for muskets, flintlocks, and musket cartridges (NOT
.60) to be crafted. (by Tryded)
- add: Added Vulpkanin-specific sprites to a lot of helmets and masks.
(by Adrian16199, TadJohnson00)
- add: Security dogs (such as Laika) now have Vulpkanin vocal emotes.
Howl! (by Remuchi)
- add: Split the Emag into the Cryptographic Sequencer and the Airlock
Access Override. (by Warmechanic)
- add: Added Corpsman Glasses, no more getting flashed as Corpsman! Also
available in Loadouts. (by Unkn0wnGh0st333)
- add: Harpies can now mimic harps! (by TheOneWhoIsManyFrame)
- tweak: Cats will now play with mouse toys. (by Deltanedas)
- add: Added a black turtleneck, available in Loadouts! (by Aikakakah)
- add: Added the Binary Translator Key to the uplink costing 1 TC and
the listening post operative headset. (by Radezolid)
- add: Spesos now have a new pretty look transferred from the Frontier
Station. (by whatston3)
- add: The home-run bat has been re-added to the traitor uplink.
- add: Added the CrystalThistle, mutated from the Galaxythistle that
generates Quartzite which when heated produces glass sheets. (by
jimmy12or)
- add: Added a Ghost Pepper! A friendly looking Pepper that's so Spicy,
it hurts! (by jimmy12or)
- add: Added a Cosmic Revenant! A spooky mutation of the Ghost pepper
that produced Ectoplasm. (by jimmy12or)
- add: Added blue and purple tomato soup, made using Blue Tomatoes. (by
DisposableCrewmember42)
- add: Added new drinks: the double ice cream (by dge21) and Dr. Gibb
Blood Red (by BlitzTheSquishy).
- add: Some drink reactions now require shaking with the shaker or
stirring with a spoon. (by Vermidia)
- add: Added "Selene" wing customization option for moths (by
boogiebogus)
- add: Added the tiger tail sprite for Felinids, Humans and Tajarans.
(by Adrian16199)
- add: NanoTrasen has established business relations with HydroCo! You
can now order powdered milk and juice via your Logistics department. (by
DisposableCrewmember42)
- tweak: Bar and kitchen shelves no longer restrict the items that can
be placed in them. (by Velcroboy)
- tweak: Bookshelves can now fit any kind of item, not just books. (by
Deltanedas)
- add: New magic crayons have appeared in the sector, artists rejoice!
(by AvalonProto)
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Feb 10, 2025
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants