-
Notifications
You must be signed in to change notification settings - Fork 1
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
The World Expands - New guns, new energy swords, lighters, radios, sprites, and more! #92
Open
lectronyx
wants to merge
68
commits into
master
Choose a base branch
from
New-Moreguns
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ported from Paradise Station, with a new original yellow one added as well.
Added two new icons for energy sword colors - Orange and Hegemony
pretty things up a bit, yeah? Thanks to Paradise Station!
Random zippo spawns can now be engraved; adds the Faithful (priest) and Fancy (contractor) zippos
all but sten should be here
uses the sten sprites
uhhhh I really... really don't understand this.
Adds mobs that further cement Aurora influence in our lore. Credits to Aurorastation for Threshbeasts and Miervesh!
Hopefully fixes SF13 guns! Also, adds 3 new colors to threshbeasts - brown, red, and grey
in this house, we dont stan shitty lore little did anyone expect this PR to become a continued Kalixcis lore removal effort, but here we fucking are.
please be my friend, im begging you,
… compile errors. Build.bat sucks ass
fixed hegemony sword
make that shit WORK - this time, actually tested!
I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS I HATE KALIXCIS
solfed is not space switzerland, that's so fucking boring
Interesting situation: we've got two people trying to fix an issue, and... well, right now riding threshbeasts doesn't seem to be working out all that great. My biggest concern is making sure it runs, though. SOS |
Closed
… into New-Moreguns
… into New-Moreguns
that's just a mean update on our upstream's part, frankly.
… into New-Moreguns
… into New-Moreguns
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Code change
Watch something violently break.
DME Edit
Map Change
Tile placing is hard. Thank you for your service.
Ship
Sound
USSR Anthem 2.66 MB file.
Sprites
A bikeshed full of soulless bikes.
TGUI
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Another one of my infamous Kitchen Sink PRs, because my ADHD knows no bounds. The goal here is to add more ruin loot and make the game prettier. This also includes most of the content from shiptest-ss13/Shiptest#3815 but adjusted to fit our lore, as well as restoration of lore implemented in #58
This PR also adds the recolorable jumpsuits and jumpskirts from shiptest-ss13/Shiptest#4115 as well as caps, flapcaps, and windbreakers from shiptest-ss13/Shiptest#4114 for good measure!
The new guns the branch was named for - the TP-83 Shotgun, ALK SMG, and Butcher Shotgun:
![image](https://private-user-images.githubusercontent.com/78713019/404526494-cce7ef02-df13-4150-91a2-adedf6d1a872.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNjcxMjQsIm5iZiI6MTczOTM2NjgyNCwicGF0aCI6Ii83ODcxMzAxOS80MDQ1MjY0OTQtY2NlN2VmMDItZGYxMy00MTUwLTkxYTItYWRlZGY2ZDFhODcyLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDEzMjcwNFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTYwMGY1ZWY5NDU4YTVmMjMwMmM0YjE3MzBmZWQ4NGIwYzJhODViZTk2MTJkZmY4ZDU4NTYxY2I4YTNhYzcyMzImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.Bp1wL7887m2rhDARV5IM_sIEznwHdMTbXoZpvw4Q86w)
x
New radio colors:
![image](https://private-user-images.githubusercontent.com/78713019/404519483-e9f4b074-237b-47fb-9b34-849dbf5b676d.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNjcxMjQsIm5iZiI6MTczOTM2NjgyNCwicGF0aCI6Ii83ODcxMzAxOS80MDQ1MTk0ODMtZTlmNGIwNzQtMjM3Yi00N2ZiLTliMzQtODQ5ZGJmNWI2NzZkLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDEzMjcwNFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTE2ZmM0NDkxMzQyMmIzYzAxZWMxMzc0M2YyM2ZiY2RkZGQ4MTlmNzc5ODlhNDQ1MjhlYTRjNzgyZTRhNzY5YjUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.-AL4xcQbpWvH_QgTuwXzC2-KCx7KzNkiUQfZ2OnrkOw)
![image](https://private-user-images.githubusercontent.com/78713019/404519572-7df95e07-9569-46fa-ac61-f6787d4c595e.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNjcxMjQsIm5iZiI6MTczOTM2NjgyNCwicGF0aCI6Ii83ODcxMzAxOS80MDQ1MTk1NzItN2RmOTVlMDctOTU2OS00NmZhLWFjNjEtZjY3ODdkNGM1OTVlLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDEzMjcwNFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTRmMDRiNTBkYmJmNGNiZDlmYjIzNDY5MjZiYmY1MGY5YWFkOTlhMmJmNzZlNmI0NDVkYzU2MzA2ZjYwZGNmOGMmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.oDBugyaqO2lQwdvNDzYzrsHBujU-6IW6Xcrk-_phc9c)
New energy swords - a regular orange one, as well as an exotic one imported from Moghes:
![image](https://private-user-images.githubusercontent.com/78713019/404519792-ce4a7bc6-35c3-4290-9285-f8861eae2d5d.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNjcxMjQsIm5iZiI6MTczOTM2NjgyNCwicGF0aCI6Ii83ODcxMzAxOS80MDQ1MTk3OTItY2U0YTdiYzYtMzVjMy00MjkwLTkyODUtZjg4NjFlYWUyZDVkLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDEzMjcwNFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWRlNzRjOTBmZmM0NGM4MjYzYzlkOGY1YTM3MTkyZmFiZjUwOGRkYmY1MDRmZTA5YTk0NjAwOTM2MDY3ODI0MGUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.Sbcl0OBYN8ACZH4_sdzgd7H2j9oMsTNVRfYmv5pUmsA)
![image](https://private-user-images.githubusercontent.com/78713019/404525086-a7e7b5b5-6888-48af-99aa-acb95a216a8b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNjcxMjQsIm5iZiI6MTczOTM2NjgyNCwicGF0aCI6Ii83ODcxMzAxOS80MDQ1MjUwODYtYTdlN2I1YjUtNjg4OC00OGFmLTk5YWEtYWNiOTVhMjE2YThiLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDEzMjcwNFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTFiZTQ2N2I5YjA4ODVmNTBkMzJmOWFlMjY0ZmRmYzcwM2U5YmU1ZDE1MThjNjQwZDFiNTI2NDA5YTMwMWI1NWQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.fUyxHp3-iB6TN43WvkNJliVgjnPmHMRYzblUki2l9MA)
Threshbeasts, available in four colors:
![image](https://private-user-images.githubusercontent.com/78713019/404525132-983037b4-8209-495e-a37d-33639cc22dc0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzNjcxMjQsIm5iZiI6MTczOTM2NjgyNCwicGF0aCI6Ii83ODcxMzAxOS80MDQ1MjUxMzItOTgzMDM3YjQtODIwOS00OTVlLWEzN2QtMzM2MzljYzIyZGMwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDEzMjcwNFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTU2YjA5M2Y0NmY3MmIyNGRjZmY3MGI0NWY5N2JjN2FmZDA5NTZkNGMwN2JlNzkwNzczZmFmZGFjNTlmY2U2NWImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.UKWXcLGTYc42XTpjL7MCxlTpCmFqjddAjpJj4sJBgVY)
Why It's Good For The Game
We're not just expanding the game content - we're making it pretty, too.
This content further implements our lore in a way that only adds to the experience. I'm not going to pretend everything in this PR is a lore addition, but the things that aren't still add to potential loot pools!
Changelog
🆑
add: TP-83 triple barrel break action shotgun, The Butcher shotgun hatchet, ALK pirate SMG, and the Condor shotgun
add: Small Red and Paradise radios
add: Orange Energy Sword and Moghesan Energy Sword
add: Added Threshbeasts! These are domesticated mobs you can befriend and ride (if they have a saddle)
add: Changed Sinta'Unathi language to Sinta'Azaziba; Yeosa'Unathi language to Yeosa'Azibala
add: AutoWiki ship table (does our autowiki even work?)
add: recolorable generic jumpsuit and jumpskirt!
add: civilian flapcaps, as well as a recolorable one in the loadout
add: recolorable jumpsuit in loadout, replacing individual color options
add: windbreakers! a recolorable one is found in the loadout.
imageadd: New orange and Hegemony eswords
imageadd: Paradise Station eswords
imageadd: paradise station signaller, paradise station walkie talkie
imageadd: Aurorastation threshbeasts, plus three new, original colors.
imageadd: Aurorastation Miervesh
imageadd: paradise station e-swords, with new colors in yellow and orange. Bonus energy sword variation from Moghes!
imagedel: old signaller sprite
tweak: Ship Prefixes are now immutable.
tweak: Makes many formerly SRM items available publicly, which will help open the floodgates for Wild West-themed items being used by indies.
tweak: Crew manifest is prettier. Mark is 100% right on this and I will fight you.
fix: Replaced references to Kalixcis and Sarathi with more appropriate text, referring to things that actually exist in our lore.
fix: Removes the word "cuck" from a recording in an act of cringe removal.
fix: Changes Solarian Confederation to Solar Federation, SolGov to SolFed to fit the direction we want to take things; continued removal and replacement of PGF with Epsilon Eridani.
fix: Sinta'Unathi should no longer be chilly on ships and on regular tiles, lizard temperature resistance restored to former values.
fix: Reassigned Panacea to Cybersun as the new Seiiki to make up for the removal of the Aegis
fix: returned Kansatsu as Soundcheck to Roseus Galactic
fix: hollowpoint 8x50 boxes now contain the correct ammo
fix: Replaced some links to the Shiptest codebase's github to links to our own.
/:cl: