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

Cargo order overhaul #6193

Merged
merged 12 commits into from
Mar 14, 2021
Merged

Conversation

SluggyWuggies
Copy link
Contributor

@SluggyWuggies SluggyWuggies commented Mar 7, 2021

  • Separates Armory from Security section.
  • Separates Engine Construction from Engineering section.
  • Combines Mining and Cargo sections.
  • Adds Livestock section.
  • Adds Customes and Toys section.

Changes:
Security:

  • Adds Armor Crate
  • Adds Heavy Armor Crate
  • Adds Helmets Crate
  • Adds Bulletproof Helmets Crate
  • Adds Lasers Crate - Or replaces already existing one?
  • Adds Stun Batons Crate
    Armory:
  • Adds Shotgun Ammo Crate (Why was this not already a thing?)
  • Adds R550c PDW Rifle Ammo Crate
  • Adds E-Gun Crate
  • Riot Suppression Crate (Bundle of Armor and Shields with Batons.)
  • Adds Riot Suit Crate
  • Adds Riot Helmet Crate
  • Adds Riot Shields Crate
  • Adds SWAT Gear Buncle Crate (Bundle of two MKISWAT Suits, two Nanotrasen SWAT Helmets, two Security Gas Masks, and two Combat Gloves.)
    Medical:
  • Medical Bundle Crate (Box of Beakers, four Medical Spray Bottles, Box of Syringes, Box of Body Bags, two First Aid Kits, two Burn Treatment Kits, four Toxin Pills, and a Radiation Treatment Kit. What a deal!)
  • Medical Misc. Crate (Gloves, Beakers, Body Bags, Analyzers and Glasses.)
  • Surgical Supplies Crate
    Science:
  • Robotics Assembly Crate (Firebot, Cleanbot, and Floorbot Creation Kit.)
    Engineering:
  • Tool Crate
  • Tool Box Crate
  • Engineering Gear Crate
  • Insulated Gloves Crate
  • Low Voltage Cable Crate
  • Medium Voltage Cable Crate
  • High Voltage Cable Crate
  • Conveyor Assembly Crate
    Engine Construction:
  • Field Generator Crate (Non-Functional. Seriously, where the hell did they go.)
  • Anti-Breach Field Generator Crate
  • Radiation Collector Crate
  • Grounding Rod Crate
    Service:
  • Cleaning Supplies Crate (Now with soap!)
  • Exotic Carpet Crate
  • Party Equipment Crate (Wooooo!)
  • Premium Carpet Crate
    Food and Hydroponics:
  • Pizza Crate
    Livestock:
  • Bird Crate
  • Cat Crate
  • Corgi Crate
  • Chicken Crate
  • Cow Crate
  • Fox Crate
  • Pug Crate
  • Monkey Cube Crate (Individually Wrapped.)
    Mining/Cargo:
  • Cargo Supplies Crate
  • Shaft Miner Starter Kit
  • Cargo Tech Starter Kit
    Emergency:
  • Biological Emergency Crate
  • Emergency Bot/Internals Crate
  • Explosives Emergency Crate
  • Firefighting Crate
  • Internals Crate
  • Radiation Protection Crate
  • Oxygen Canister Crate
    Miscellaneous:
  • Big Band Instrument Crate
  • Bureaucracy Crate
  • Calligraphy Crate
  • Wrapping Crate
  • Festive Wrapping Crate
  • Religious Supplies Crate
  • Functional Supplies Crate
    Customes and Toys
  • Foam Force Crate
  • Laser Tag Crate
  • Formalwear Crate
  • Original Costume Crate
  • Theatre Costume Supply Crate
  • Wizard Costume Crate

Changelog

CL: adds a bunch of new orders and reorganize categories in cargo console.

@ThatDan123
Copy link
Contributor

ThatDan123 commented Mar 7, 2021

i dont like the huge list of items which is gonna have to be spawned for those carpet tiles crates, spawning hundreds of gameobjects will just be a lag fest

@ThatDan123
Copy link
Contributor

You'll just need to remove them for now, until the cargo system supports setting stackable

@SluggyWuggies
Copy link
Contributor Author

During some short testing, I didn't see any major issues with lag. They came out stacked in the crate, so no issues with atmos f*ckery welding the server to its frame.

@ThatDan123
Copy link
Contributor

humm ok, didnt realise it supported it. Thats good.

@SluggyWuggies
Copy link
Contributor Author

Yee. It really should be fine, though if it causes any issues, I can always change it. But from what I've seen, there shouldn't be a problem.

@ThatDan123
Copy link
Contributor

Missing reference found in scriptable object CargoData field Element 0
Missing reference found in scriptable object CargoData field Element 1

@SluggyWuggies
Copy link
Contributor Author

Hmm.. okay.

@SluggyWuggies
Copy link
Contributor Author

Huh. Welllll. Apparently Field Generators are not a thing.

@ThatDan123
Copy link
Contributor

probably just lost its reference, you'll need to put it back

@SluggyWuggies
Copy link
Contributor Author

They disappeared around the map, too, interestingly enough.
How would I add the reference back?

@corp-0
Copy link
Member

corp-0 commented Mar 7, 2021

click the empty field and select the field generator again

@SluggyWuggies
Copy link
Contributor Author

What I am saying is that it is gone. Completely. From the map and from the project tab.

@SluggyWuggies
Copy link
Contributor Author

Its a lil' wacky

@SluggyWuggies
Copy link
Contributor Author

image

lootCount: 3
fanOut: 0
poolList:
- probability: 0
Copy link
Member

Choose a reason for hiding this comment

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

probability 0 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah probably a mistake. i can change at next commit

@SluggyWuggies
Copy link
Contributor Author

merging with dev doesn't fix it. dammit where did the field gens go

@Bod9001
Copy link
Member

Bod9001 commented Mar 10, 2021

Missing reference found in scriptable object CargoData field Element 0
Missing reference found in scriptable object CargoData field Element 1
cargo is missing some stuff wish it was more descriptive

@github-actions github-actions bot added the Status: Merge Conflicts No one likes conflicts, solve them! label Mar 10, 2021
@corp-0
Copy link
Member

corp-0 commented Mar 13, 2021

Are you conflicting with yourself?

@SluggyWuggies
Copy link
Contributor Author

ignore that for now

@SluggyWuggies
Copy link
Contributor Author

and.. probably

@SluggyWuggies
Copy link
Contributor Author

whyyyyy conflicc

@corp-0
Copy link
Member

corp-0 commented Mar 13, 2021

you're a very conflictive person

@corp-0 corp-0 removed the Status: Merge Conflicts No one likes conflicts, solve them! label Mar 13, 2021
@corp-0
Copy link
Member

corp-0 commented Mar 14, 2021

Found possible cargo order exploit in: 
Security/Armor Crate.
Buy price: 400 Sell price: 500

Found possible cargo order exploit in: 
Service/Janitorial Supplies Crate.
Buy price: 400 Sell price: 500

Found possible cargo order exploit in: 
Mining/Cargo/Cargo Supplies Crate.
Buy price: 350 Sell price: 500

Found possible cargo order exploit in: 
Mining/Cargo/Cargo Tech Starter Kit.
Buy price: 400 Sell price: 500

Found possible cargo order exploit in: 
Emergency/Biological Emergency Crate.
Buy price: 400 Sell price: 500

Found possible cargo order exploit in: 
Emergency/Explosive Emergency Crate.
Buy price: 400 Sell price: 502

Found possible cargo order exploit in: 
Emergency/Firefighting Crate.
Buy price: 400 Sell price: 540

Found possible cargo order exploit in: 
Emergency/Internals Crate.
Buy price: 400 Sell price: 500

Found possible cargo order exploit in: 
Miscellaneous/Wrapping Crate.
Buy price: 300 Sell price: 500

Found possible cargo order exploit in: 
Miscellaneous/Festive Wrapping Crate.
Buy price: 360 Sell price: 500

You didn't pass the stonks test

@SluggyWuggies
Copy link
Contributor Author

Awwe. Okie, fixing right now

@corp-0
Copy link
Member

corp-0 commented Mar 14, 2021

you passed this time.

@corp-0 corp-0 merged commit dd2bef5 into unitystation:develop Mar 14, 2021
PetMudstone added a commit to PetMudstone/unitystation that referenced this pull request Mar 26, 2021
* Massive Extraordinarily Complex Issue

* hopefullly this doesnt break or ill cry

Guaranteed!:tm:

* Update CargoData.asset

* ree

* e

* last one i swear

* Retaking the Stonks Test
@PerfectTangent PerfectTangent added the System: Cargo Tasks related to cargo occupation label Apr 2, 2021
@PerfectTangent PerfectTangent added the Type: Balance related to game balance label Apr 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
System: Cargo Tasks related to cargo occupation Type: Balance related to game balance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants