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.

Sign up for GitHub

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

Jump to bottom

Frontier Port: Pretty Money #2398

Merged
merged 3 commits into from
Dec 18, 2024
Merged

Frontier Port: Pretty Money #2398

merged 3 commits into from
Dec 18, 2024

Conversation

Unkn0wnGh0st333
Copy link
Contributor

About the PR

Adds frontier's variant of Spesos that are honestly so much more nicer to look at

Why / Balance

ANIMATED PRETTY MONEY!!

Technical details

Changes stack coding slightly with frontier additions to make it functional. I don't think it'll cause THAT many issues haha...

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changes some C which I can't read so good luck

Changelog
🆑

  • Spesos now have a new pretty look transferred from the Frontier Station.

@Unkn0wnGh0st333 Unkn0wnGh0st333 requested review from IamVelcroboy and a team as code owners December 9, 2024 00:01
@github-actions github-actions bot added S: Needs Review size/L 256-1023 lines Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi labels Dec 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 9, 2024 •
edited
Loading

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

Resources/Textures/_NF/Objects/Economy/cash.rsi

State Old New Status
cash Added
cash_10 Added
cash_100 Added
cash_1000 Added
cash_10000 Added
cash_100000 Added
cash_25000 Added
cash_250000 Added
cash_500 Added
cash_5000 Added
cash_50000 Added

Edit: diff updated after 0a20054

@whatston3
Copy link
Contributor

For the love of god, fix the pink one, it's awful.

@Unkn0wnGh0st333
Copy link
Contributor Author

For the love of god, fix the pink one, it's awful.

Its animated in game and looks a lot better than the SS, I advise you test it to see for yourself

@whatston3
Copy link
Contributor

whatston3 commented Dec 9, 2024 •
edited
Loading

Its animated in game and looks a lot better than the SS, I advise you test it to see for yourself

new-frontiers-14/frontier-station-14#1496
It was me, Austin.
It was me all along, Austin.
Truly though, it's been mildly chaffing me ever since I made the stupid thing.

Edit: really not trying to wreck the place. I'll post an update here if I end up respriting that one.

@dvir001
Copy link
Contributor

dvir001 commented Dec 9, 2024

For the love of god, fix the pink one, it's awful.

Its animated in game and looks a lot better than the SS, I advise you test it to see for yourself

MFW He made the sprite

@deltanedas deltanedas requested a review from a team as a code owner December 17, 2024 04:52
Lyndomen
Lyndomen previously approved these changes Dec 17, 2024
View reviewed changes
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

Good spritework, good feature yes

deltanedas
deltanedas requested changes Dec 17, 2024
View reviewed changes
Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

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

test fail real

@deltanedas deltanedas merged commit 6b83754 into DeltaV-Station:master Dec 18, 2024
18 checks passed
@Unkn0wnGh0st333 Unkn0wnGh0st333 deleted the Spesos branch December 20, 2024 18:18
sleepyyapril added a commit to Simple-Station/Einstein-Engines that referenced this pull request Feb 4, 2025
@sleepyyapril
Deltamerge Part 1 (#1697)
9901f46 
# 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
@Unkn0wnGh0st333 @whatston3 @angelofallars
Frontier Port: Pretty Money (DeltaV-Station#2398)
da77261 
* Frontier Port: Pretty Money

* Update Resources/Prototypes/Entities/Objects/Misc/space_cash.yml

Co-authored-by: Whatstone <[email protected]>
Signed-off-by: Unkn0wn_Gh0st <[email protected]>

* Updated 100k texture

---------

Signed-off-by: Unkn0wn_Gh0st <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@whatston3 whatston3 whatston3 left review comments

@deltanedas deltanedas deltanedas approved these changes

@Lyndomen Lyndomen Lyndomen left review comments

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Unkn0wnGh0st333 @whatston3 @dvir001 @deltanedas @Lyndomen