191 Commits

Author SHA1 Message Date
Charlotte Tezuka
1595f938d3 Merge remote-tracking branch 'corvax/master' into wl-upstream 2025-11-11 16:35:48 +02:00
Litogin
58a14021ee Update height (#219)
* add ADHI

* Update ADHI

* In train

все что было сделано в поездке

* work UI

* delet MetamorphosisSlimeSystem

* Set min and max height
2025-10-26 17:52:56 +03:00
Dmitry
9d6fa7e57d upstream - merge remote "stable" 2025-10-13 20:59:28 +07:00
Charlotte Tezuka
1d11757bb0 Upstream 09.10 2025-10-09 14:18:23 +02:00
B_Kirill
0c9d33d5d6 Cleanup warnings: CS0414, CS8524 (#40776)
* Cleanup

* CS8524
2025-10-08 12:43:59 +00:00
Dmitry
58eaa4b3be upstream remote merge 2025-10-02 04:36:42 +07:00
āda
320e67a411 Predict identity (#40185)
* crossing the pond

* share some station records

* share some criminal records

* single system

* comments

* minor touchups

* I always forget this part

* requested changes

* revert predicted spawn

* requested changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-09-24 01:32:20 +02:00
Charlotte Tezuka
d5e69e73e5 Upstream from corvax/master 19.09 2025-09-19 00:42:32 +02:00
Dmitry
f01a60f5c7 upstream 9.1 2025-09-17 06:41:33 +07:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175)
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-13 22:30:17 -07:00
Pieter-Jan Briers
0c97520276 Fix usages of TryIndex() (#39124)
* Fix usages of TryIndex()

Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)

This then resulted in TryIndex() getting modified to log errors (94f98073b0), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)

This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.

Fixes #39115

Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.

* fix tests

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-09 18:17:56 +02:00
ScarKy0
a590d65dc5 Add SnoutCover appearance layer (#39949)
* init

* cover
2025-08-29 19:12:51 +02:00
ssdaniel24
8b848fc21a Merge remote-tracking branch 'corvax/master' into wl-upstream-sync 2025-08-12 11:47:33 +03:00
Dmitry
57307b718c upstream master sync 2025-08-11 18:16:45 +07:00
poklj
f76e3b63b7 Changeling devour and transform (#34002)
* Initial:

Create Devour componentry, preliminary identity storage and the systems
for Devouring

* I have genuinely no idea what i'm doing

- added the radial menu, it has nothing in it.

- trying to get it to populate. the event under the event is broken,
i don't know why, but apparently it's not typed right

- Added a placeholder transform

- oh also fixed up some devour stuff and moved some things around.

* Holey moley, Transform, better devour, oh my!

- Move DnaComponent into Shared because we need it for the DNA cloning

- Make Transform MOSTLY work on the LAST identity devoured.

- Fix some issues on devour that involved prediction, canceling and
Damage exeucting (Thanks Plykiya for pointing out AttemptFrequency!)

* Proper tail stealing and Damage modifier attempt

Add check to add a wagging component on the Changeling if the victim's
species Prototype had one.

attempt to add the Damage mitigation check

* MAJOR CLEANUP AND FIXES AUGH 3 DAYS!!!

- Nullspaced a clone of a victim

- fix audio using server virtualized Pvs (i hate this)

- fix the mispredicted doafters

- Clean up a wholelotta code

- utilize clone systems to clone appearances

- Move CloneAppearance from server to shared So we can actually access
it

* Examine stuff, more cleanup, Jumpsuit ripping

- make rotting prevent the action

- Add ripping of clothing (guh why is it also server)

- add some System stuff for pushing husked corpse inspection

- clean up more badcode

* Doing things properly, UI sorta kinda works.

- Utilize Relayed events for Devour checking

- Get a UI that partially works, Says the name of identities, doesn't
show their looks

- Make use of the New Dynamic BUI assignment

- commit the sin of no client prediction cause nullspace entities aren't
networked

* Got an entity for the Frontend transform

Issue with the looks

* Stick a camera into a fake mobs forehead

- Get the UI to see the net entity in pause space by using a
ViewSubscriber to get the Pvs from the initially stored identity entity

- Remove all the other parts used to try to get this to work before hand

* Raaaaadiallllllls also fix protection coefficents

- Change FancyWindow to Radial

- Fix Issue where coeffeient checking was the wrong way round

* absolutely massive cleanup, no more camera in mobs

- cleaned up event variables that are not needed

- Removed the use of a Pause space and go back to Nullspace usage

- use a PvsOverride rather than ViewSharing

- Remove old commented out code and Lots of unused code

* Fix "Ui elements" dying  on the screen

- some minor cleanup

- don't start the entities that get cloned

* ftl, cleanup, and fixing missing transform details

- add replace functionality to TypingIndicatorSystem and
BodyEmotesSystem

- add placeholder sounds and functions to TransformBodyEmotes

- add extra Pvs handling for later use

- attributions for the funny straw sound

- Sound collections for all of the sounds

- various cleanups

* Some extra cleanup

* Fix some false assumptions about TypingIndicator

- Bubbles now transfer on spawned humans rather than used humans

- Clean up YET MORE CODE

- make it so you can't eat yourself

* Oooprs, forgot to add a Husked Corpse Loc

* Missing period in the husked corpse loc

* bad devour windup placeholder

* Husking and WIP Lungs

- Husking now will be prevented from Revival fully and will change
the appearance of players

* Add finalized Sprites for actions and final meta

- add devour on and off sprites

- add transform action sprite

- Add Armblade sprite for future use

- Credit obscenelytinyshark for the sprites <3

* Remove ling lungs, Entity<> everything

- Remove the ling lungs stuff for now... body system is overly
complicated, makes my head hurt

- Switch every method to use Entity<> from Uid, Comp format

* cleanup, admin logging, WIP Roles

* Admin verb, Roundstart, gamerule stuff

- add a Admin verb to make Changelingification easy!

- Add game rule stuff for admin verb and to tell the hapless
goober how to be a changeling... sorta

- clean up parts to make VV easy... USE THE VERB!!

* Armor Coefficent Check

- Remove bespoke changeling armor check and replace it
with a generic armor coefficient query.

* move to UnrevivableComponent instead of husked

- Move UnrevivableComponent to shared

- add Analyzable and ReasonMessage to UnrevivableComponent
to give granular control of the message and whether or not it shows up
in the analyzer

- remove the check for HuskedComponent in DefibrillatorSystem

* aaaaaaa CopyComp

- Some cleanup

- make Vocal system shared

- make VocalSystem Not make more Actions than it needs

- Use some code from ChameleonProjector so we can copy components

- partially ungod method the Transform system

* Cleanup, Moving more things to CopyComp

- TransformBodyEmotes now uses CopyComp (it's a server component so i
need to tell the server to deal with it

- TypingIndicatorComponent also now uses CopyComp

- cleaned up old, now unused "replace" methods in favor of CopyComp

- BodyEmotesSystem now has a publically accessable LoadSounds to deal
with the same problem Screaming had

* WIP

* Devour Windup noise, ForensicsSystem cleanup

* Revert VocalSystem Changes

- Reverted Moving VocalSystem to shared, copy comp acomplishes it

- added component.ScreamActionEntity = null; for copy comp

* cleanup unneeded comments

* revert an accidental line removal

* Remove duplicate SharedHumanoidAppearanceSystem

* Cleanup Typo's and import Forensics components for Dna

* Some more forensics calls

* cleanup use CopyComp for now until CopyComps

* CR cleanup

* Undo some SharedHumanoidAppearanceSystem changes

* Confound these spaces

* Some Copycomp stuff and fixing some PVS override

* use the proper TryCopyComps that are merged

* Change TransformMenu with RadialWithSector

* All sounds done, Fix lack of typing indicator issue

* Updated attributions to include used sound authors

* some ftl typos and mind_role text issue

* DNA, Screaming, appearance, grammar, wagging

- reduced all of the above using ApplyComponentChanges

- Issue still remains with bodyEmotes sticking around in the UI

* Fix UI stuff, partials, entprotoid, good practices

- bunch of partials added

- UI now has a predicted message

- EntProtoID in the admin verb

- RipClothing now uses Entity<ButcherableComponent>

- husking is now optional (off by default) for testing/till we have
hivemind/when we figure out what were doing with devour

- remove TransformGrammarSet

* More CR stuff and documentation

- Make TargetIsProtected less of a meme, with a prototype
set of DamageTypes to check

- Documenation everywhere

- Move DevourEvents into its own file

* Predicted sounds and fix the comp clone list

- Made all start and stop sounds shared

- Split out the rest of the events and UI stuff into subfiles

- Fixed some Clone comp list issues where comments had -'s causing them
to be read incorrectly

* Damage cap check, Identity Shutdown cleanup, cleanup

* Sound stuff (but actually this time)

* Missed documentation

* Missed Documentation and a EntProtoId

* Remove unused dependency

* Remove a nullcheck

* Some dummy minplayers

* CR - Husked now uses a rem/ensure

* Update Actions in the Prototype

* Fixup mindswap handover

- cleanup and handover PVS on mindswap

* Fixup Missing meta from accidental "Take-theirs"

* Add the Armblade to the roundstart-role

* Cleanup, CR (everything but the UI and renames)

* missed a spot

* missed some more whitespace

* Renames

* Primary constructor and a space in these trying times

* User interface stuff for Slime transformation

* popup prediction

* Ling devour no longer makes duplicate identities

- added a key to identities to the original victim

- Add some extra clone settings

* add guard statements to OnClones

* SentOnlyToOwner additions

* fix for sound stoppage error

* Move Organ deleter into soon to be atomized husk

* clone event inventory

* mono sounds

* lower sound volume

* Fix networked sound warning

* Clone comps thing

* review

* attributions

* Fix clobbered changes

* I'm gonna weh out

- whole bunch of CR changes

* fix some very buggy git

* okay its fixed

* address most review points

* fix inventory

* we hate entityuids

* fix test and more cleanup

* move this

* fix more stuff

* fix validation and rootable

* Remove Quickswitch due to some UI quirks

* oops left out some better explanation

* remove dangling LastConsumed component fields

* fix test fail

* try this

* cleanup cloning subscriptions, add movement speed modifier

* fix slime storage

* fix cloning setting inheritance

* Add session information to transform admin logs

* slay the integration test hydra

* dwarf size

* more volume tweaks

* comments

* improve comments and unpredict deletion due to errors when shutting down the server

* fix displancement cloning

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-06 21:55:49 +02:00
Dmitry
25df03bcb1 upstream master 30.07 2025-07-30 14:35:52 +07:00
ssdaniel24
6591aabe4f Merge remote-tracking branch 'corvax/master' into upstream-07-23 2025-07-23 22:35:40 +03:00
Pieter-Jan Briers
af4ff4e9de Update content to remove redundant Robust math types (#38930)
Vector3, Vector4, Matrix4, and Quaternion are now gone. This switches us over to System.Numerics where applicable.
2025-07-22 12:29:17 +02:00
Dmitry
60c835f02c master 21.7 syns 2025-07-21 00:27:46 +07:00
Tayrtahn
c565b44965 Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)
* The easy ones

* For certain values of easy

* Easy test

* Hair

* Fix sandbox violations

* Sort usings
2025-07-07 21:57:05 +02:00
Tayrtahn
f09bade8e7 Validate remaining ProtoId strings (#38747)
Validate remaining ProtoId strings
2025-07-04 22:55:45 +02:00
Nemanja
d0c067f006 Fix human skin tone distribution (#38701) 2025-07-04 15:22:26 +02:00
Dmitry
76f0d2d12b upstream syns 2025-06-19 15:45:02 +07:00
slarticodefast
aa15371049 fix polymorph errors (#38409)
fix polymorph error
2025-06-17 16:16:24 -04:00
beck-thompson
d8b70a3887 Revert "Randomized Markings" (#38345) 2025-06-16 00:50:17 -07:00
beck
b636e3fcba Randomized Markings (#34765)
randomized markings
2025-06-15 14:11:52 -07:00
Pupchansky
566ff082e8 all fixes (#138) 2025-06-05 14:08:12 +03:00
ssdaniel24
d399099102 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
Conflicts:
   Content.Client/Humanoid/HumanoidAppearanceSystem.cs
   Content.Client/LateJoin/LateJoinGui.cs
   Content.Client/Stylesheets/StyleNano.cs
   Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
   Content.Server/Fax/FaxSystem.cs
   Content.Server/GameTicking/GameTicker.Spawning.cs
   Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
   Content.Server/Station/Systems/StationSpawningSystem.cs
   Content.Shared.Database/LogType.cs
   Content.Shared/Ghost/GhostComponent.cs
   Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
   Content.Shared/Preferences/HumanoidCharacterProfile.cs
   Content.Shared/Roles/SharedRoleSystem.cs
   README.md
   Resources/ConfigPresets/Corvax/common.toml
   Resources/Credits/GitHub.txt
   Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
   Resources/Maps/Shuttles/trading_outpost.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
   Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
   Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
   Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
   Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
   Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
   Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
   Resources/Prototypes/Entities/Structures/Power/substation.yml
   Resources/Prototypes/GameRules/cargo_gifts.yml
   Resources/Prototypes/GameRules/events.yml
   Resources/Prototypes/GameRules/meteorswarms.yml
   Resources/Prototypes/Maps/bagel.yml
   Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
   Resources/Prototypes/Reagents/chemicals.yml
   Resources/Prototypes/Reagents/medicine.yml
   Resources/Prototypes/Reagents/pyrotechnic.yml
   Resources/Prototypes/Reagents/toxins.yml
   Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
   Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
   Resources/Prototypes/Roles/Jobs/Command/captain.yml
   Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
   Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
   Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
   Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
   Resources/Prototypes/Roles/Jobs/Science/research_director.yml
   Resources/Prototypes/Roles/Jobs/Security/detective.yml
   Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
   Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
   Resources/Prototypes/Roles/Jobs/Security/warden.yml
   Resources/Prototypes/Voice/disease_emotes.yml
   Resources/Prototypes/Voice/speech_emotes.yml
   Resources/Prototypes/radio_channels.yml
   Resources/Textures/Effects/speech.rsi/meta.json
   Resources/Textures/Interface/Default/Slots/id.png
   Resources/Textures/Interface/Minimalist/Slots/pda.png
   Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
   Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
   RobustToolbox
2025-06-02 12:30:02 +03:00
Dmitry
25c5e59248 Upstream (#3172)
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Stomf <5dorkydorks@gmail.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com>
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: J <billsmith116@gmail.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: archee1 <archee3@hotmail.co.uk>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: poklj <compgeek223@gmail.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
2025-05-24 11:00:17 +03:00
LEVELcat
b4be60af0f Merge branch 'master' of https://github.com/space-syndicate/space-station-14 2025-05-16 10:50:51 +03:00
faint
31ac760871 Fix sponsor-only markings filter (#3161) 2025-05-12 13:15:09 +03:00
slarticodefast
5d26a38a1d fix clone appearance (#37130) 2025-05-02 21:26:12 -04:00
J
ded94ebc3d Various sharedsystem spring cleaning (#36200)
* Various shared system warnings cleanup

* More shared system warnings cleanup

* Rearranging changes

* Using correct transform for unbuckle

* Small changes

* Revert buckle change

* Update Content.Shared/Ghost/SharedGhostSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-21 20:40:31 +02:00
Verm
dd308c6d2d Makes EventRole Ids properly set ID names. (#28958)
* Add id binding system

* Change so it activates when added too

* Add to eventhumanoid

* Add PDA binding, try to fix some things

* Still not fixed, PDA is working right

* Move to server, add on mind instead

* Implement suggestions

* Fix things

* Finish review stuff

* Messed up cluwne

* Remove after only changing id too

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-21 14:25:22 -04:00
Ed
f6a29e24a2 Markings overhaul (#35938)
* markings displacement setup

* ok i got it!

* fix map updating

* remove trackingLayers

* markings clean up and modernizize

* marking disabling displacements

* markings restriction

* dehihienize

* dehihiniezize 2

* aa

* nice
2025-04-20 17:01:50 -04:00
LEVELcat
a993e57f37 fix NamingSystem 2025-04-07 18:01:03 +03:00
LEVELcat
790070d410 Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstreamAgain
# Resolved Conflicts:
#	.github/workflows/publish.yml
#	Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
#	Content.Server/DetailExaminable/DetailExaminableystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Content.Server/Light/EntitySystems/PoweredLightSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Listings.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared.Database/LogType.cs
#	Content.Shared/Damage/Systems/StaminaSystem.cs
#	Content.Shared/Eye/VisibilityFlags.cs
#	Content.Shared/Humanoid/Markings/MarkingCategories.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Directory.Packages.props
#	Resources/Audio/Lobby/attributions.yml
#	Resources/Credits/GitHub.txt
#	Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
#	Resources/Prototypes/Corvax/Reagents/Consumable/Drink/alcohol.yml
#	Resources/Prototypes/Corvax/lobbyscreens.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Mobs/Species/moth.yml
#	Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
#	Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/SoundCollections/lobby.yml
#	Resources/Prototypes/Species/arachnid.yml
#	Resources/Prototypes/Species/diona.yml
#	Resources/Prototypes/Species/moth.yml
#	Resources/Prototypes/Species/reptilian.yml
#	Resources/Prototypes/Species/vox.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Corvax/LobbyScreens/attributions.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-04-06 08:43:40 +03:00
LEVELcat
1d4ba544cc Merge branch 'fixUPWL3' of https://github.com/Litogin/Ho
# Resolved Conflicts:
#	Content.Client/Sprite/ContentSpriteSystem.cs
#	Content.Server/Corvax/StationGoal/StationGoalCommand.cs
#	Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Silicons/Borgs/BorgSystem.cs
#	Content.Shared.Database/LogType.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Audio/Magic/attributions.yml
#	Resources/Changelog/ChangelogSyndie.yml
#	Resources/Credits/GitHub.txt
#	Resources/Locale/ru-RU/guidebook/guides.ftl
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
#	Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Entities/Structures/Power/apc.yml
#	Resources/Prototypes/Entities/Structures/Power/substation.yml
#	Resources/Prototypes/Research/experimental.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png
2025-04-05 16:17:55 +03:00
JerryImMouse
f76d1edf27 Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts:
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
#	Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2025-03-27 23:01:47 +05:00
Tayrtahn
b780b74bbd Validate some SpeciesPrototype fields (#35965)
* Convert SpeciesPrototype strings to ProtoIds

* Simplify protoman indexing calls
2025-03-20 21:15:30 +01:00
paige404
2e7f01b99e Fix broken layer hiding on clothes with multiple equipment slots (#34080)
* Fix broken layer hiding on clothes with multiple equipment slots

* Refactor ToggleVisualLayers, HideLayerClothingComponent, and ClothingComponent to allow more
precise layer hide behavior and more CPU efficient layer toggling.

* Adjust HumanoidAppearaceSystem to track which slots are hiding a given layer (e.g. gas mask and welding mask)
Add documentation
Change gas masks to use the new HideLayerClothingComponent structure as an example of its usage

* Fix the delayed snout bug

* Misc cleanup

* Make `bool permanent` implicit from SlotFlags

any non-permanent visibility toggle with `SlotFlags.None` isn't supported with how its set up. And similarly, the slot flags argument does nothing if permanent = true. So IMO it makes more sense to infer it from a nullable arg.

* Split into separate system

Too much pasta

* Remove (hopefully unnecessary) refresh

* Fisk mask networking

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Keep old behaviour, use clearer names?

I'm just guessing at what this was meant to do

* english

* Separate slot name & flag

* dirty = true

* fix comment

* Improved SetLayerVisibility with dirtying logic suggested by @ElectroJr

* Only set mask toggled if DisableOnFold is true

* FoldableClothingSystem fixes

* fix bandana state

* Better comment

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2025-03-21 00:30:47 +11:00
Tayrtahn
86aa82f2b6 Cleanup: Remove redundant prototype name specifications (#35793)
* Remove redundant prototype name specifications

* These can stay
2025-03-19 19:30:31 +01:00
Zekins
7d6f564344 Merge remote-tracking branch 'upstream/master' into upstream 2025-03-18 02:40:46 +03:00
MilenVolf
bcf3390c88 Remove unneeded Loc.GetString (#35739) 2025-03-09 11:06:11 +01:00
slarticodefast
4735097385 Fix integration tests (#35727)
* test

* fix names

* fix more
2025-03-08 20:38:18 +01:00
MilenVolf
1abd2d3a08 Localize all dataset names (#32893)
* Use `LocalizedDatasetPrototype` instead of `DatasetPrototype` in `RoleLoadoutPrototype`

* Localize ai names

* Replace to `LocalizedDatasetPrototype` in `NamingSystem`

* Localize arachnid first and last names

* Localize atv names

* Localize autoborg names

* Forgot to change type to localizedDataset

* Localize borer names

* Localize borg names

* Localize cargo shuttle names

* Localize clown names

* Localize death_commando names

* Localize diona names

* Localize fake_human names

* Localize first and last names

* Localize first male and female names

* Localize fortunes descriptions

* Forgot about equal sign

* Localize golem names

* Localize hologram names

* Localize military names

* Localize moth first male and female names

* Localize moth last names

* Fix autoborg name error

* Localize mushman first and last names

* Localize ninja names

* Localize operation names

* Localize regalrat names

* Fix mushman_first

* Forgot about `Loc.GetString`

* Move comments into comment section & fix names

* Localize reptilian male and female names

* Localize revenant names

* Fix locale word order in operation

* Localize rollie (btw it was never used and was added as "for the futuгe" long time ago)

* Localize skeleton_first names

* Localize syndicate names

* Localize vox names

* Localize wizard first and last names

* `{owner}-name-dataset` -> `names-{owner}-dataset`

* Change `DatasetPrototype` to `LocalizedDatasetPrototype` and make sure it works properly

GetFTLName is no more the static method, we need it to be able to use `Loc.GetString`

* I hate those mothname comments

* Combine name datasets prototypes

* Move every ftl from` /en-US/names` to ` /en-US/datasets/names`

* Remove ftl files

* Get every dataset yml back

* Remove changes for planets. Move it in another PR

* Revert these changes (Moved to another PR)

* How

* Apply suggested changes
2025-03-08 20:04:26 +01:00
SlamBamActionman
27cfc0939c Add undergarments & "Censor Nudity" toggle to options (#33185)
* Initial commit

* Attribution

* Review changes

* Added comment for upstream
2025-03-05 10:14:01 +01:00
Tayrtahn
6f925dd610 Fix prototypes so they pass analyzer checks (#35435) 2025-02-24 15:21:59 +11:00
lzk228
0af3e04fd8 Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Doors/Systems/AirlockSystem.cs
#	Content.Server/Holopad/HolopadSystem.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Maps/amber.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/convex.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/plasma.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/RTG.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
#	Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
#	Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
#	Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
#	Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
#	Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/candle.png
#	Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
#	Resources/Textures/Objects/Storage/boxes.rsi/clown.png
#	Resources/Textures/Objects/Storage/boxes.rsi/darts.png
#	Resources/Textures/Objects/Storage/boxes.rsi/disk.png
#	Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
#	Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
#	Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
#	Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
#	Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
#	Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
#	Resources/Textures/Objects/Storage/boxes.rsi/headset.png
#	Resources/Textures/Objects/Storage/boxes.rsi/heart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/holo.png
#	Resources/Textures/Objects/Storage/boxes.rsi/implant.png
#	Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
#	Resources/Textures/Objects/Storage/boxes.rsi/internals.png
#	Resources/Textures/Objects/Storage/boxes.rsi/latex.png
#	Resources/Textures/Objects/Storage/boxes.rsi/light.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
#	Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
#	Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meson.png
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
#	Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pda.png
#	Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
#	Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
#	Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
#	Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
#	Resources/Textures/Objects/Storage/boxes.rsi/swab.png
#	Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
#	Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
#	Resources/Textures/Objects/Storage/boxes.rsi/vials.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing.png
#	Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
#	Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
#	Resources/Textures/Objects/Tiles/tile.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
#	Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
Zachary Higgs
8b46538e3f Move CloneAppearance to Shared (#35017)
* Move CloneAppearance

- Move CloneAppearance from HumanoidAppearanceSystem
to SharedHumanoidAppearanceSystem

* CR - Fix the sins of the past
2025-02-10 04:13:27 +01:00