Commit Graph

44 Commits

Author SHA1 Message Date
DieselMohawk
2f7ad782c5 Trooper Uniform and Hat (#31997)
* Adds entities, sprites, and loadout accessibility

* Fixing Uniform file issues
2024-09-09 13:19:16 -06:00
lzk
512d27ca6b Add black suspenders (#29055)
* Black suspenders

* fix

* fix linter
2024-08-28 11:43:30 +02:00
metalgearsloth
afd0618a60 Station AI (#30944)
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

# Conflicts:
#	Content.Client/Silicons/StationAi/StationAiOverlay.cs

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
2024-08-28 10:57:12 +10:00
Mr. 27
df88c93574 Added clown skirt (#31207)
inital
2024-08-23 14:59:17 +10:00
lzk
e6e5365062 Give clown the second jester suit (#30673)
* Give clown the second jester suit

* hat
2024-08-23 03:29:50 +02:00
Nemanja
5c21b4e174 Small strange jackboots buff (#30586)
* Small strange jackboots buff

* Update ClothingSlowOnDamageModifierComponent.cs
2024-08-22 10:56:46 -04:00
themias
6ba7d268b0 Uplink: Combat Bakery Kit (#31179)
* save

* sprites

* mime survival kit has baguette

* add weapon/uplink

* cherry-pick croissant changes

* uplink

* Switch baguette to slashing damage

* fixes

* update attribution

* fix typos

* review comments

* reduce TC cost

* switch to regular box

* fix regular baguette rotation
2024-08-19 12:57:29 -06:00
PoorMansDreams
793eb87f31 Adds a Dinky Star Sticker for security officers (#29767)
* Sec-Star-TASTIC

* fix license

* now counts as trash

* Sticks to people + wearable

* no more sticky

* no more sticky

* mystery-space

* Update Loadout Yaml
2024-08-15 11:50:55 +10:00
pigeonpeas
7153e43946 Fixes the grey mantle (#30971)
add the thing i missed
2024-08-13 22:13:50 +10:00
pigeonpeas
329a0a875b Grey mantle in winterdrobe (#29774)
* add the mantle

* fix a few things

* fix merge conflict stuff, remove from winterdrobe and lathe.

* Add mantle to loadouts (20 hour requirement)
2024-08-13 19:20:12 +10:00
Ubaser
c6209cc725 Make mantles loadout only. (#30929)
* remove cloaks and mantles from dresser

* remove mantles from lathe

* add role timer loadout thing

* add back cloak dresser

* fix test fail

* potentially fix test fail (?)
2024-08-12 01:14:45 -06:00
TakoDragon
9bc1fabdb3 Added suitskirt for psychologist (#30709)
* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta
2024-08-10 08:51:54 -04:00
Errant
15aa75f092 Updated remaining ghostroles for species loadouts (#29746)
* LoadoutSystem change, deathsquad species loadout

* survival gear loadouts for disaster victims

* skrek

* centcom

* syndicate agent

* cburn

* ERT

* syndicates

* Is it ever gonna be enough?

* Take what you can

* Move startingGearEquippedEvent after Loadouts are spawned

* skreee

* even more formatting

* Unbreak auto internals activation

* undo AddAllRoleLoadouts change

* syndicate reinforcement survival loadouts

* re-enable vox ghostroles
2024-08-07 19:26:40 +10:00
Errant
9522dbc655 Vox nukies and ninjafix (#29783)
* Nukie species gear

* antagselectionsystem autointernals

* nukie vox

* skrek

* Remove duplicate code

* skrek

* EVA tank loadouts, vox ninja update

* fix prototype duplication

* skrek

* fix summary

* fixed empty startinggear error

* enable vox ninjas

* Comments

* removed comment because startinggearprototype should not be used on antagselection aaaanyway

* squish that if

* Update Content.Shared/Clothing/LoadoutSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-08-06 20:58:28 +10:00
metalgearsloth
9a8620d9d8 De-duplicate loadout gear (#30341)
* De-duplicate loadout gear

Needs supporting code, probably with an interface with StartingGearPrototype which would also use it, but I regexed the yaml.

* Code updates

* Remaining yaml

* Fix automatic naming

* raiseEvent

* Don't code when tired kids
2024-08-05 00:42:25 -04:00
Errant
223ade9b3f Starting gear for vox crewmembers (#29685)
* tank harness

* weh

* Suit Storage Whitelist

* Revert "Suit Storage Whitelist"

This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79.

* suit storage filter

* vox spawn gear

* weh
2024-07-04 12:01:03 +10:00
Errant
ba39b6f551 Survival box loadout group cleanup (#29379)
cleanup
2024-06-23 08:41:34 -04:00
Errant
c418758a3a Fix for missing survival boxes (#29336)
storagefill order fix
2024-06-22 20:43:18 +10:00
Tayrtahn
831d962e5a Make Loadout MinLimit not count failed attempts (#29264)
Loadout MinLimit doesn't count failed attempts
2024-06-21 10:15:37 +10:00
Ghagliiarghii
b90c6acacd golden plunger (#29043)
* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-21 00:24:36 +10:00
Errant
d15eafe133 Survival Box Loadouts, Nitrogen Emergency tanks (#29131)
* Nitrogen survival boxes

* Zero-setup workaround

* clown box

* cleanup and universal tanks

* cleanup

* more cleanup

* hide loadoutgroups

* remaining survival boxes

* space ninja

* Revert "space ninja"

This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label
2024-06-21 00:05:01 +10:00
lzk
2b885272c8 Musician's skirt (#29203)
* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
2024-06-19 17:06:03 +03:00
Cojoke
26f809aebf Instruments for Musician lodouts (#29059)
* Musician Instruments to Musician lodouts

* Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory

* Whoops, I removed bagpipes for some reason
2024-06-16 21:27:35 +10:00
Cojoke
280b0a1c24 Adds New Shoes to Sec loadouts (#29018)
* Adds New Shoes to Sec loadouts

* Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
2024-06-15 18:38:28 -04:00
lzk
6d3d92cd50 Fix mime mask loadout minlimit (#29056) 2024-06-15 17:32:49 -04:00
Mr. 27
7d22897d02 Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)
*
2024-06-03 19:52:15 -04:00
Hanz
77ee0088f9 CMO Drip DLC (#26153)
* All the stuff

yes yes

* THE GOD DAMN META

bruh

* New sprites and all that jazz

yay

* loadouts working?
2024-05-09 17:53:55 -04:00
cool dolphin
64548a7ead More trinkets for loadouts (#27292)
* woo yea more tinket

* plushie has no timer
2024-05-07 17:55:03 +02:00
Verm
133d9280ae Add correct lawyer bags to loadouts (#27573)
* add lawyerbackpack to locale

* lawyer backpack group

* Add bags

* add loadout group

* Be less lazy and spot formatting problems
2024-05-01 18:48:28 +10:00
cool dolphin
4f056672f9 Glasses in loadouts (#27286)
* loadouts now have aaall the glasses

* cheap sunglasses dont exist at all

* empty commit to rerun tests, there's no way i fucked something up
2024-04-26 01:18:39 +02:00
Alzore
fb8dcfe6bf Add rainbow jumpsuit to passenger loadout. (#27211)
* Add all colored jumpsuits to passenger loadout

* onlyrainbowiguess
2024-04-21 21:53:08 +10:00
SpeltIncorrectyl
b6d751eb70 Adds security webbing and security belts to Security Officer loadout (#27189)
* added filled security webbing

* moved sec belt to loadout

* added webbing for head of security and warden
2024-04-21 00:19:20 -06:00
Ghagliiarghii
380ace4ef0 Fixed potential duplicate engraved lighter steal objective (#27177)
* Fixed potential duplicate engraved lighter steal objective

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Implement pigeonpeas' suggestion

* Also replaced the one if the vending machine, unsure if this vending machine is used or if vended items retain their fills, but figure can't hurt

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-04-21 07:32:24 +10:00
Verm
58e21a8532 Add medical gloves and sterile masks to medical loadouts (#27029)
* Add medical gloves to loadouts

* Realize I don't need to duplicate them

* Re-add extra lines

* I did it wrong...

* Format it back to how it was this time for sure

* For real this time

* ...

* Add sterile masks too

* I can't spell officer apparently

* Standardize order of where gloves are

* Add Nurse Hat to doctors

* Remove duplication of gloves and masks

* Remove extra space

* Name glove protos similiar to other ones

* Remove latex gloves proto from medical (sci has it)
2024-04-20 16:22:48 +10:00
Mr. 27
c8202dd80d add roboticist gear to science loadout (#27045)
* inital

* yes

* g

* death

* DEATH
2024-04-18 19:38:17 -04:00
Pancake
3c1ec9ac34 Add Hardhats to Station Engineer Loadouts (#27044)
* Add hardhats to loadout.

* Update Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-18 13:00:55 +10:00
Mr. 27
06ecf2af05 add greysec loadout (#27023)
* inital

* George orwell
2024-04-17 21:22:09 -04:00
lzk
e2341c0089 Add jani gloves loadout (#27011) 2024-04-17 19:38:49 +10:00
Mr. 27
5742dee84a add ancient jumpsuit to passenger loadout (#27035)
inital
2024-04-17 01:37:50 -06:00
Bellwether
7114b1939c Add Nun Hood to Chaplain loadout options (#27025)
Adds Nun Hood to starting Chaplain loadout options
2024-04-17 13:36:44 +10:00
Mr. 27
34fa48bff9 Add winter coats and shoes to loadouts (#27022)
* inital

* Update loadout-groups.ftl

* fix order

* add winter boots

* fix test fails
2024-04-17 12:49:53 +10:00
Doctor-Cpu
d5b7e4baf2 Add autism pins to loadout (#27034)
add autism pins to loadout
2024-04-17 11:10:52 +10:00
Mr. 27
e2be85bc52 Fix senior ID cards and other loadout shit (#27017)
* remove senior backpacks

* fix ID cards

* Update atmospheric_technician.yml
2024-04-16 22:17:06 +02:00
metalgearsloth
12766fe6e3 Loadouts redux (#25715)
* Loadouts redux

* Loadout window mockup

* More workout

* rent

* validation

* Developments

* bcs

* More cleanup

* Rebuild working

* Fix model and loading

* obsession

* efcore

* We got a stew goin

* Cleanup

* Optional + SeniorEngineering fix

* Fixes

* Update science.yml

* add

add

* Automatic naming

* Update nukeops

* Coming together

* Right now

* stargate

* rejig the UI

* weh

* Loadouts tweaks

* Merge conflicts + ordering fix

* yerba mate

* chocolat

* More updates

* Add multi-selection support

* test

h

* fikss

* a

* add tech assistant and hazard suit

* huh

* Latest changes

* add medical loadouts

* and science

* finish security loadouts

* cargo

* service done

* added wildcards

* add command

* Move restrictions

* Finalising

* Fix existing work

* Localise next batch

* clothing fix

* Fix storage names

* review

* the scooping room

* Test fixes

* Xamlify

* Xamlify this too

* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* ben

* Margins

---------

Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
2024-04-16 22:57:43 +10:00