Simple-Station / Einstein-Engines

A Space Station 14 upstream repository, inspired by Baystation12.
https://einstein.simplestation.org
GNU Affero General Public License v3.0
26 stars 51 forks source link

More Loadout Items Wave 1 #425

Open VMSolidus opened 1 month ago

VMSolidus commented 1 month ago

Description

The original release of Loadouts to EE did not have much in the way of actual implementation as far as the item list was concerned. This PR seeks to get a head start at fixing that by implementing a fairly sizeable chunk of new items that can be bought with loadout points.

One important addition is the use of "non-clothing-job-related items", which helps further set this version of Loadouts apart from the /tg/ style of loadouts implemented elsewhere. One of the key strengths of this loadout system is that it's not limited to just replacing a job's clothing selections, but can also add items unrelated to clothing. My given example for this is the new option for Security characters(provided they have sufficient number of hours as a Security Officer) can spend roughly half their loadout points to start with a spare magazine for their handgun.

Secondly, we also now have an opportunity to place non-nanotrasen corporate items in the game, in such a way that players can tie their characters to other corporations. Ostensibly this is to build up to the idea of "Contractor" characters. I hope that this will help broaden people's horizons.

On "Syndie" items

I'd like to take this as an opportunity to kind of push people away from the whole thing of "THATS A SYNDICATE ITEM!!!!" wherever possible. For the most part this is very much NRP behavior that I'd like to discourage. With some notable exceptions, this doesn't mean outright antag items should be obtainable through Loadouts. To that end, items such as Interdyne branded smokes, Cybersun branded clothing, and other items with "In-Universe Company Brands" should be moved away from their identity as strictly antag objects, and instead things characters could reasonably have bought with their paycheck.

Technical Changes

I had to make some improvements to the way Loadouts handles species, namely it wasn't previously possible to have an item require any entry from a list of species. I updated it so that SpeciesRequirement takes a list of Species, and will accept any entry from that list. My given example for this is the entries for Nitrogen air tanks, which can only be purchased in loadouts by SlimePersons and Vox(who are not currently playable, but I am accounting for them). Other usage of this is in the Oni-specific Security items. I do hope to use this as an opportunity to introduce more species-specific goods in the future.

Media

Outerwear image

More job-related selections available to some departments image

More variety of trinkets and items, including instruments! image

Species Specific Items! image

Changelog

:cl: VMSolidus

VMSolidus commented 1 month ago

By intentional design, the Slime nitrogen tanks are 1 point cheaper than oxygen tanks. They are discounted by the cost a human would have had to pay to start with a spare emergency oxygen tank. This is meant to reimburse them for the obnoxious fact that they start with an emergency oxygen tank in their survival box.

github-actions[bot] commented 4 weeks ago

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

VMSolidus commented 3 weeks ago

image

I have significantly increased the number of existing categories, as well as moved things around, and added more items to fit said categories. I think for a lot of things, any items listed as "exclusive: true" should probably be discounted if they're a job related item that is replacing something you already start with. Such as for example, the option for Security to start with security webbing instead of a belt(I had to add a FILLED webbing just for this purpose).

Also fun fact, the "Insulated gloves" that are for assistant only, are actually budget insuls. By popular request, assistants can now gamble loadout points on killing themselves with the budget roulette.

VMSolidus commented 2 weeks ago

I've added the Sol Common Translator to loadouts, as a somewhat cheap entry for the items tab. This will serve as a way of simply introducing to players that the translator items exist, and gives an easy tie-in with Languages and Loadouts. image

github-actions[bot] commented 1 week ago

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

github-actions[bot] commented 1 week ago

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

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_cybersun.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_five_points_armory.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_gilthari_exports.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hawkmoon_aquisitions.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_interdyne.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi/equipped-OUTERCLOTHING.png) | ![]() | Removed

Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi

| State | Old | New | Status | --- | --- | --- | --- | | peacock_tail_eyes | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png) | ![]() | Removed | peacock_tail_feathers | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png) | ![]() | Removed

Resources/Textures/Structures/cargo_pallets.rsi

| State | Old | New | Status | --- | --- | --- | --- | | cargo_pallet_buy | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_buy.png) | ![]() | Removed | cargo_pallet_sell | ![](https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/287f33cc3ec96bf444c91d5e3982ed27a7803790/Resources/Textures/Structures/cargo_pallets.rsi/cargo_pallet_sell.png) | ![]() | Removed

Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/VMSolidus/Einstein-Engines/2d7866ee43f053bead53f3a45536d7494622e124/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png) | Added

VMSolidus commented 1 week ago

I ACCIDENTALLY BUNGLED THIS ENTIRE PR. FUCK.

github-actions[bot] commented 1 week ago

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