Commit Graph

68 Commits

Author SHA1 Message Date
Tad "Taddy" Johnson 2a847859fb
Give Rodentia Survival Boxes (#1773)
ez quickfix, adjust survival.yml to give rodentia oxygenbreather surv box
2024-09-08 15:11:16 +01:00
beck-thompson 34e6527123
Add ringbox and loadout rings! (#1738)
* First commit

* I blame VS code

* Huh

* pls fix it
2024-09-03 15:12:45 +01:00
lzk c7bb10e795 Add black suspenders (#29055)
* Black suspenders

* fix

* fix linter
2024-08-30 07:55:41 +01:00
metalgearsloth d58bdd65ec 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.

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
2024-08-30 07:53:19 +01:00
deltanedas fa4150d725
remove duplicate mime survival box (#1709)
remove duplicate mime box

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-08-30 01:29:09 -03:00
lzk 009511c10e Give clown the second jester suit (#30673)
* Give clown the second jester suit

* hat
2024-08-27 00:40:02 +01:00
Nemanja 18baa2b72d Small strange jackboots buff (#30586)
* Small strange jackboots buff

* Update ClothingSlowOnDamageModifierComponent.cs
2024-08-27 00:34:13 +01:00
themias 43c502ab74 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-21 16:15:31 +01:00
deltanedas f941121384
upstream merge (#1636)
* uncomment grappling gun

* Remove rest of Geras files (#30912)

remove remaining geras stuff

* tweak(AgeRequirement): Make the requiredAge more sensible (#30913)

* chrore(ageRequirement): fix grammar. atleast -> at least (#30914)

* Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918)

* Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971

* Fixed HoS Turtle not covering all butt pixels

---------

Co-authored-by: Zachary Yona <magicalusf@gmail.com>

* Add execution component to all energy sword weapons (#30909)

Co-authored-by: plykiya <plykiya@protonmail.com>

* Automatic changelog update

* chore(grammar): correct some mistakes (#30916)

* Add diamond mining drills, buff regular mining drills (#30814)

* why do I have to change so much just to add drills

* diamon

* Automatic changelog update

* give trash a reusable entity table (#30921)

* Contraband marking & examining (#28688)

* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Automatic changelog update

* Removes variant cube migration (#30934)

add

* First Review Pass Contraband Fixes (#30930)

* First pass contra fix

* bam

* More

* Security crates are now marked as security restricted

* Syndicate raid suit is contra

* damn I forgot gatfruit

* Add conducting gloves to the maintenance loot table (#30904)

* add

* lower weight

* Fix DoDrop to DropNextTo in container cases (#30911)

* Fix DoDrop to DropNextTo in container cases
DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method

* codestyle change

* Fix Reagent Fire Stacks (#30766)

* Fix Reagent Fire Stacks

* Comments on code

* little nicer wording?

* Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva… (#30954)

Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.

* Automatic changelog update

* Fix permission check for whitelists in player panel (#30948)

* Automatic changelog update

* 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)

* Automatic changelog update

* Sliceable doAfter (#30824)

* init

* wtf git

* Automatic changelog update

* Add capfruit, a gatfruit mutation. (#30850)

* add base

* add fake suffix and flavor fix

* address some reviews

* parent it

* fix test fail

* add FoodSequence support and address small review

* Automatic changelog update

* Fixes the grey mantle (#30971)

add the thing i missed

* Add keybinds for rotating and flipping objects (#30540)

* add keybinds for rotating and flipping objects

* no popup for verbs

* Automatic changelog update

* tweak(Shuttle_honki): Remove DeviceQuantumSpinInverter from honki shuttle. (#30618)

* Make the Borgs Names Appear When they Make an Announcement (#30107)

* Make the Borgs Names Appear When they Make an Announcement

* bwomp

* re-order

* Use Name instead of metadata

* goiup

* Automatic changelog update

* disable contraband examine

* rename our SliceFoodEvent

* Throngler Plushie Sprite (#30969)

Throngonkler Plush sprite

* Fix bug with rotating shelves (#30978)

* Main

* Update shelfs.yml

* Little bug fix

* No weather on concrete tiles (#30952)

* concrete weather

* miss

* development build ghostrole lottery changes (#30980)

debug ghostrole lottery changes

* Automatic changelog update

* Add a saline syringe to the combat medical kit (#29954)

saline

* Automatic changelog update

* fix the admin verbs trying to kill players by filling their lungs with plasma (#30991)

fix the admin tools trying to kill players by filling their lungs with plasma

* Custom Taco & Kebabs - FoodSequence 2 (#30905)

* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Fix popups not working properly with an eye offset (#30990)

* Adds a random smokable spawner (#30870)

* Textures to make lamps mappable to East/West.

* Adds a random smokable spawner

* remove double derma

* Increase chance for just basic cig

* Update to enitity tables

* Tweak values

* Remove space

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

* Fix lizards being unable to eat custom burgers (#31005)

* Fix lizards being unable to eat custom burgers

* ensure tag comp

* Automatic changelog update

* Sedin (#27110)

* Sedin

* almost forgot this.

* what

* Did a few fixes, tried to readd popup

* Fix popup, ready for merge

* minor change

* Generalize seed removal/destruction system, add popups in general.

* fix

* fix (again)

* deadcode is no more

* Sedin buff (nerfing the recipe soon)

* godont

* webedit moment

ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit

* CRIKEY

* Revert "CRIKEY"

This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.

I was not supposed to commit that >:/

* Alright, it should be good now but I havent tested it

* ready for merge/review

* prob -> probability

* Requested changes nodoc

* Review nodoc

* documento

* thumb up emoji

* Automatic changelog update

* 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

* Automatic changelog update

* tweak(hospital): Reduce diamond stack from 30 to 1 (#31027)

* tweak(experiment): Reduce diamond stack from 30 to 1 (#31025)

* replace mapped diamond stacks with single

* Figurine voicelines (#30865)

* initial commit

* tweaks to the new voice lines

capitalizations of I's and the Y on hos 3 voice lines
also changed the captain figuring voice line 2 to something completely different

* capitalized one letter

man i really suck at capitalization

* more capitalization

i never thought this pr would need so many changes

* changed one comma to a dot

* Update Resources/Locale/en-US/datasets/figurines.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Adding shock collar and electropack (#30529)

* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Greatly improve the usability of the Gas Analyzer. (#30763)

* greatly improve how the gas analyzer behaves

* don't close the analyzer when the object goes out of range

* cleanup

* always switch to the device tab when a new device is analyzed

* modern api part one

* modern api part 2

* modern api part three

* file scope namespace

* Automatic changelog update

* Fix false and true in player-panel.ftl (#31043)

Fix false and true in player-panel

Add a new True string

* Contra Review Passs - Round 2 (#30942)

* Contra pass round two

* command too

* Stamps

* oopsied a bracket

* Namespace cleanup around Mind Roles (#30965)

* namespaces

* Comment does not need a semicolon

---------

Co-authored-by: Vasilis <vascreeper@yahoo.com>

* Contraband Review Pass - The Threequel (#30970)

Contraband pass number three

* Golden toilet (#31049)

* golden toilet

* Destructible

* sprite

* fix

* copyright

* Automatic changelog update

* Salvage Spawners (#31020)

* treasure entities and spawners

* no more smiles

* remove nyano shock collar code

* Event scheduler setting tweaks (#31018)

tweaks

* Automatic changelog update

* remove meteor swarms rule for a moment

* Revamped Meteor Swarm (#28974)

* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.

* Missing meteor presets (#29044)

* add meteors into missing game presets

* changes for real

* implement code

* this too

* Meteors now leave behind a bit of ore (#30419)

* Meteors that leave behind asteroid ore

* bigger offset

* Bit more generic

* Better defaults

* hrm?

* I HATE CUSTOM SERIALIZERS

* More comments

* renamed a variable

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* refactor event schedulers to use explicit game rules (#29320)

* works, still has testing values, im sure I did stupid shit.

* shitvent crapfactor

* snap extra word out of existence

* shit I died of old

* remove useless inaccurate design comments

* Oopsie, handle requirement params in RandomRuleSystem too

* I'm a slash slinging hasher

* Address reviews, add admin alerts I forgor

* EntityMan saves the day

* address reviews 1

* eh, I actually don't care about the cargo gifts thing.

* started

* Do reviews

* you actually meant 1.2 lmao

* dependency inheritance is a fickle bitch

* I have no idea.

* Threads are for sheets not computers.

* fix traitor rule test

* fix round type tattling

* break things

* It worky

* Toolshed makes we want to drink depresso.

* Finished?

* remove debug values

* timings

* use defaults

* alphabetize

* bobby drop tables

* Float required fr fr

* continue

* more continence

* uno mas

* obsolution

* cleanup and documentations

* Yell at self

* use the right value defaults

* housekeeping

* Event scheduler setting tweaks (#31018)

tweaks

* Automatic changelog update

* remove(NukeopsRuleComponent): Remove a trap from the component file (#31029)

ah

* Fix bug with holding objects (#31009)

Main

* Automatic changelog update

* Replace obsolete map functions in IconSmoothSystem (#30958)

* first part

* second part

* Automatic changelog update

* Fix reagents with ReagentData being duplicated  (#30983)

Initial commit

* :trollface:

* :trollface:

* actually untroll

* a

* 50 burger

* add back old meteor code

* fix

* use some live config options in dev

* remove old shock collar icon

* make ammo more consistent and work more

* clean up lathes diff to upstream

* a

* move rubber bullets to deltav folder

* a

* untroll

* more untrolls

* more untrolls

* untroll

* :trollface:

* a

* b

* remove it for real

* add missing lathe recipes

* replace cvars with component field

* remove taco from roboisseur

* migrate cardboard box with smg mags

* remove kebabs

* a

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Co-authored-by: Zachary Yona <58833995+Magicalus@users.noreply.github.com>
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Token <esil.bektay@yandex.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: LeoSantich <108027402+LeoSantich@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
Co-authored-by: IgorAnt028 <118114530+IgorAnt028@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Eris <eris@erisws.com>
Co-authored-by: FATFSAAM2 <saamboroujerdi@gmail.com>
Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: Mervill <mervills.email@gmail.com>
Co-authored-by: Vasilis <vascreeper@yahoo.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
2024-08-18 17:21:07 +00:00
portfiend 68e1a9cde1
AAC tablet for speech-impaired characters (#1491)
* basic AAC tablet prototype

using station map as a base

* set up aac component/system

* quick phrase prototype

will probably touch this up later

* basic example phrases

just so i have data to work with

* get AACWindow to iterate over quick phrases

* add the rest of the job phrases

* fix this one job name

* actually fix prison guard name

* buttons for aac window

* fix phrase inheritance

* add tabs to aac contaner

* fix column spacing and add button padding

* aac tablet button colors

* AAC tablet sends messages now

* add aac tablet voice sound yay

* add a 1 second cooldown between phrases

* subjects for most departments

* location phrases

* more phrases

* cleanup + sort buttons alphabetically

* fix these phrases

* even more departmental subject phrases

* common phrases

* cleanup imports

* show name of player that pressed button

* aac tablet can be used by multipel people

after all it does not rely on state changes and also multiple people can press buttons on a tablet at once

* capitalize aac

its an acronym

* you know what it is its more phrases!!!!

* SAFETY PHRASES

* last second phrases

* redundant phrase

* and one more hazard phrase for the road

* change voice of aac tablet from borg to alto

just sounds nicer

* localize ALL Phrases

i love utility scripting to automate tedious tasks

* add AAC tablet to loadout

* add AAC tablet to medfab

* tweak: use multiple parents instead of whatever this is

* add: justice department phrases

* add: time quantity phrases

* add: ores and kitchen appliance phrases

* fix: resolve duplicate phrases

* add: aac tablet sprites

* add: justice button style

* fix: misplaced this line oops

* add: justice dept locations

* remove: redundant phrase

* re-run tests

* fix: move aac tablet loadout format

* fix: use Identity instead of Name for aac tablet sender

* fix: return on send phrase if id is invalid

* fix: remove redundant line

* fix: use LocId instead of String for phrase text type

* add: new phrases bc upstream updates

* fix: newlines

* tweak: add end comments to these style comments

* fix: this phrase was broken lol

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-08-12 15:15:33 +00:00
deltanedas aecc1f1bae remove duplicate trinkets 2024-08-12 12:27:07 +01:00
TakoDragon 6d9af94220 Added suitskirt for psychologist (#30709)
* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta
2024-08-11 14:42:48 +01:00
deltanedas 118cbf21e5 :trollface: 2024-08-10 15:12:19 +01:00
Errant fe4060ec3a 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-10 14:51:35 +01:00
Errant d9f8c782ce 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-08-10 14:50:00 +01:00
deltanedas d958f54951 :trollface: 2024-08-10 13:32:18 +01:00
Errant 1bd22674e1 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-08-10 13:28:18 +01:00
deltanedas f47fb6ff84 untroll 2024-08-10 12:59:35 +01:00
deltanedas 56e4726d2f rewrite senior id shit 2024-08-10 12:38:56 +01:00
Mr. 27 12621627df :trollface: 2024-08-09 21:49:10 +01:00
Cojoke b72d05e40f Adds New Shoes to Sec loadouts (#29018)
* Adds New Shoes to Sec loadouts

* Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
2024-08-09 21:01:46 +01:00
deltanedas b4596ce418 :trollface: 2024-08-09 20:58:22 +01:00
slarticodefast f6a850476c Add tooltips to the agent ID job icons and improve status icon prototypes (#28575)
* add tooltips to agentid job icons

* forgot to stage this

* make StatusIconPrototype abstract

* minor visual improvements

* cleanup

* use currentculture to sort job names

* review
2024-08-09 19:17:05 +01:00
Errant 70481ce755 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-09 19:01:45 +01:00
Errant 60c2ee6f00 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-09 18:57:58 +01:00
metalgearsloth 24bbd04a5a 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-09 18:51:00 +01:00
Errant 7baaf31f23 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-08-09 17:30:57 +01:00
Colin-Tel 08754c2d15
Adds some alternate job titles (#1584)
* Adds Visitor

* Adds 3 passenger alt PDAs

* Adds Bartender Alt

* Adds chef alts

* Adds Medical alts

* Adds alt atmos titles

* Adds Engineer alts

* Fix Mail Carrier name

* Added Cargo & Salvage alts

* Adds Scientist alts

* Adds Clown alts

* renamed atmos scientist

too similar to atmos tech

* Sci PDA fix

also gives roboticist the proper icon

* oops

* removed redundant states
2024-08-08 15:07:00 +00:00
Timemaster99 617eac5deb
HOP Resprite (#1501)
* HOP resprited

* Fixed attribution

* Resprited hop cap

* Fixed merge slipup

* Added formal suit to HOP locker

* greenified HOP

* Greenified hop signs

* Revert "Added formal suit to HOP locker"

This reverts commit 806c2ee0e9.

* Revert "Greenified hop signs"

This reverts commit 38d6eec433.

* Revert "greenified HOP"

This reverts commit c6724edea0.

* Added formal suit to HOP locker again, oops
2024-07-30 23:54:22 -05:00
Nemanja e057218952
Machine-code cleanup (#28489) 2024-07-25 01:11:54 +02:00
Tayrtahn 384e43bca4
Make Loadout MinLimit not count failed attempts (#29264)
Loadout MinLimit doesn't count failed attempts
2024-07-25 00:39:25 +02:00
Ghagliiarghii 60bf5fe896
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-07-25 00:38:38 +02:00
lzk c85807a0a8
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-07-25 00:32:10 +02:00
Cojoke 4083ac232e
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-07-25 00:15:28 +02:00
null ed71a646e3
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/07/05-upstream-merge
# Conflicts:
#	Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
2024-07-25 00:07:10 +02:00
Timemaster99 0db6c0482c
Tiny loadout patch (#1316)
* Fixed a couple loadout issues

* Moved HoP loadout changes to deltaV file

* Readded MG cloak and beret to loadouts

* Added missing trailing newline

* Added hos parade uniform to loadouts

---------

Co-authored-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
2024-07-22 15:18:17 -03:00
Null 49831071bd
Revert "Security resprite and loadout revision" (#1517) 2024-07-22 09:56:03 +02:00
Colin-Tel 7fbacb27fa
Allows green jumpsuits/hats for service workers (#1499)
* Service workers get their green back

clothing, that is

* Update role_loadouts.yml

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2024-07-21 11:44:23 -05:00
lzk 245f0fa88f
Fix mime mask loadout minlimit (#29056) 2024-07-05 20:37:47 +02:00
TadJohnson00 f4fd6603d3 Fix typo 2024-06-14 00:16:48 +10:00
TadJohnson00 a542300ac9 Further finetuning 2024-06-14 00:09:47 +10:00
TadJohnson00 7fde508683 Removed duplicate mentions 2024-06-13 23:57:03 +10:00
TadJohnson00 4729c11a80 Finetune security loadouts
Tweaked some role items, added comments, etc.
2024-06-13 23:50:23 +10:00
TadJohnson00 8a20e6cc62 Merge remote-tracking branch 'upstream/master' into secrespritefinally 2024-06-13 21:02:50 +10:00
Haltell 9c049d7ae3
Add More Loadout Options (#1269)
* Add More Loadout Options

Added new loadout options for Captain, Chemist, Passenger, and Security.

Added Filled Jack Boots for security loadouts.

* Fixed Commenting

Properly Commented Out MedicalGloves/Shoes instead of deleting them.

* More Security Options

Added Blue Jumpsuit to Sec Officer
Added Red Beret to Sec Officer and Cadet
Added Durathread Vest to Officers
Added Red Scarf to all of Security

* Logistics Officer Beret

Fixed LogiOfficerBeret not being in loadout_groups.yml

* Command Loadout Options

Added Glove Options for Captain and HoP
Added More Uniform Options for HoP
Added More Outer Clothing Options for HoP
Added Shoe Options for Captain and HoP

* Winter Options

Scarfs added to most roles, with the following exceptions:
- Assistant Roles
- Captain
- Chef
- Mantis
- Prison Guard
- Station Specific Jobs (except Corpsman)

Stethoscope added as option for Medical Doctors, CMOs, and Paramedics

Salvager Cape added and Miner Winter Boots replaced Logi Winter Boots as option for salvagers

Heads of Staff Winter Boots Added for Respective Heads

Paramedic Winter Boots added for Paramedics

Removed Requirement for Engineers to wear a hat
Added hats option for Atmospheric Technicians

Added Roboticist Coat Option for Scientists

* Musician Eyewear

Fixed musician's customizable eyewear by removing their default sunglasses.

Musician no longer able to buy expensive sunglasses.

Cheap sunglasses available through glasses loadout group with 2 hours of musician time.

* Beer Goggles

Changed Bartender's Glasses Options to include beer goggles.

* Update glasses.yml

Add blankspace to the end of glasses.yml

Fix the ad hoc cheap sunglasses timer

* Update glasses.yml

Fix sunglasses timer

* Clothing Options

Added extra clothing options for Chemist and Musician. Formal attire and red dress respectively.

---------

Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-06-01 21:32:32 +00:00
TadJohnson00 fa041538a0 Merge remote-tracking branch 'upstream/master' into secrespritefinally 2024-05-30 13:33:38 +10:00
therealDLondon 359754cada
Make Senior Roles Dept Playtime Only (#1246)
* Make reqs only department playtime

* Re-adds then comments out specific role reqs, with DV tags
2024-05-25 23:23:49 -05:00
Null e055f22bbb
Senior loadouts require whitelist (#1219)
Require whitelist for senior gear
2024-05-18 19:34:28 +02:00
Hanz ecd3bd5276
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-18 13:36:00 +02:00
cool dolphin d57b400d74
More trinkets for loadouts (#27292)
* woo yea more tinket

* plushie has no timer
2024-05-18 13:30:38 +02:00