Commit graph

36 commits

Author SHA1 Message Date
Morb0
28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Commands/AdminWhoCommand.cs
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-01 23:06:19 +03:00
Verm
a9a65b7e0d
Randomizes more humanoid appearances (#27997) 2024-06-01 00:51:07 -04:00
Arthur Asimov
0b621a7b7e Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Content.Shared/Preferences/ICharacterProfile.cs
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING-reptilian.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
2024-04-17 11:57:44 +03: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
Morb0
4f43e73d14 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
2024-03-11 08:37:54 +03:00
Errant
84a07315dd
Species info in Guidebook and at chargen (#25844)
* guidebook pages defined

* species info button in character profile editor

* if current species has no guidebook page then open the parent page

* skrek

* destroying evidence of secret vox plot

* icon size adjustment, no icon if guidebook page for species does not exist

* finished pages

* additional info

* weh
2024-03-10 20:01:32 -07:00
Morb0
92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Locale/en-US/chat/sanitizer-replacements.ftl
#	Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
Errant
5a9ab3b315
Vox names, species prototype cleanup, some cosmetic changes (#24994)
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad
2024-02-14 14:08:45 +11:00
Morb0
259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
DrSmugleaf
2d58d19b07
Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
Morb
3af93f83f2
Species sponsor (#1480) 2023-10-03 02:50:23 +03:00
Morb0
34a8740819 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/build-test-release.yml
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
DrSmugleaf
a44fa86b68
Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
Morb0
5277dceed2 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Morb0
c124b716a3 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Traits/TraitSystem.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Research/technologies.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/moose.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Moony
e92a8fedab
Refactor stations to properly use entity prototypes. (stationsv3) (#16570)
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-05-19 15:45:09 -05:00
Morbo
892634065a Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/rnd.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
2023-03-14 05:18:41 +03:00
Leon Friedrich
f0cf4e7a22
Add missing DataDefinition constructors (#14603) 2023-03-12 16:37:24 -07:00
Morbo
f3bd98ceed Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Content.Shared/Humanoid/HumanoidComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
2023-01-25 22:46:52 +03:00
Leon Friedrich
48bcd30ef9
Makes humanoid appearance component networked. (#13009)
Fixes https://github.com/space-wizards/space-station-14/issues/12248
2023-01-24 11:38:19 +11:00
Morbo
cdfcfe6722 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-22 00:07:21 +03:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morbo
d7d2dd96c0 Merge remote-tracking branch 'upstream/master' into upstream-sync2
# Conflicts:
#	Content.Client/PDA/PDAMenu.xaml
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
2022-11-09 03:02:01 +03:00
Nemanja
fd9bedae9a
New Species: Diona (#11497)
* new species: Diona

* more diona stuff

* dey breathing now

* test fixe

* fix a merge

* now actually fix the merge

* foobar

* oversight

* ok now the rest of em
2022-11-08 14:26:59 -06:00
Morbo
a93a3fb752 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/bar.png
#	Resources/Textures/Tiles/clown.png
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/hydro.png
#	Resources/Textures/Tiles/kitchen.png
#	Resources/Textures/Tiles/laundry.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/Textures/Tiles/white.png
2022-10-23 17:55:21 +03:00
Rane
916c4f9522
Unhardcode species age ranges (#11979) 2022-10-22 15:13:46 -07:00
Morbo
8ffba84896 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-21 19:51:57 +03:00
Flipp Syder
0fe9f38968
Actual randomized humanoids (#11574) 2022-10-21 00:46:05 +11:00
Morbo
57d8a459bb Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Humanoid/Sex.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
2022-10-16 02:03:26 +03:00
Rane
c70e423ff6
Let species prototypes define valid sexes (Sex Refactor) (#11520) 2022-10-15 14:45:47 -07:00
Morbo
7fa98d7e4d Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Links/UILinks.cs
#	README.md
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
2022-09-30 17:57:03 +03:00
Flipp Syder
0e1a190e0e
Humanoid fixes (#11538)
* humanoid sexmorph sprite restoration

can't believe i broke sex/gender AGAIN

* fixes default species appearances with no profile, tweaks randomization to no longer randomize species

* A

* fixes an oops

#11494
2022-09-26 14:46:57 -05:00
Morbo
a301bf012b Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2022-09-23 16:31:55 +03:00
Flipp Syder
5a0a04bde7
Humanoid appearance refactor (#10882)
* initial commit
- species prototype modifications
- markings points as its own file
- shared humanoid component

* adds a tool to convert sprite accessories to markings (in go)

* removes a fmt call

* converts sprite accessory to markings

* adds hair and facial hair to marking categories

* multiple changes
- humanoid visualizer system
- markings modifications for visualizer
- modifications to shared humanoid component
- lays out a base for humanoid system

* hidden layers, ports some properties from appearance component, shrinks DefaultMarkings a little

* squishes the initialize event calls into one function

adds stuff to set species/skin color externally from a server message - currently laid out as if it a dirty call to a networked component, may be subject to change (server-side has not been implemented yet)

* makes the sprite pipeline more obvious

* apply all markings, hidden layer set replacement

* ensures that markings are cleared when the new set is applied

* starts refactoring markingsset (unfinished)

* more additions to the markingset api

* adds constructor logic to markingset

* adds a method to filter out markings in a set based on a given species

* fixes enumerators in markingset

* adds validator into MarkingSet, fixes ForwardMarkingEnumerator

* modifications to the humanoid visual system

* ensuredefault in markingset

* oop

* fixes up data keys, populates OnAppearanceChange in visualizer

* changes to humanoid component, markings

marking equality is now more strict, humanoidcomponent is now implemented for client as a child of sharedhumanoidcomponent

* markings are now applied the visualizer by diffing them

* base sprites are now applied to humanoids from humanoidvisualizer

* passes along base sprite settings to the marking application so that markings know to follow skin color/alpha or not (see: slimes)

* custom base layers on humanoids

* merges all data keys into one data class for humanoid visualizers

* setappearance in sharedhumanoidsystem, removes custombaselayercolors

* humanoidcomponent, system (empty) in server

* adds some basic public API functions to HumanoidSystem

* add marking, remove marking

* changes appearance MarkingsSet to a List<Marking>, adds listener for PlayerSpawnCompleteEvent in HumanoidSystem

* ensuredefaultmarkings, oninit for humanoids

* markingmanager API changes

* removes MarkingsSet

* LoadProfile, adjusts randomization in humanoid appearance to account for species

* base layer settings in humanoidsystem, eye color from profile

* rearranges files to centralize under Humanoid namespace

* more reorganization, deletes some stuff

gotta break stuff to make other things work, right?

goodbye SpriteAccessory...

* fixes a good chunk of server-side issues

still does not compile, yet

* singlemarkingpicker xaml layout

* singlemarkingpicker logic

* magic mirror window (varying pieces of it, mostly client-oriented)

* removes some imports, gives MagicMirror a BUI class (not filled in yet)

* populates magic mirror BUI functionality / window callbacks

* fixes up some errors in humanoidprofileeditor

* changes to SingleMarkingPicker

SingleMarkingPicker now accepts a List<Marking>, species, and total possible markings available in that marking category

* fixes up hair pickers on humanoid profile editor

* fixes the errors in markingpicker

* markingsystem is now gone

* fixes a bunch of build errors

* so that's why i did it like that

* namespace issues, adds robustxamlloader to singlemarkingpicker

* another robustxamlloader

* human, lizard sprites/points

* prototype fixes, deletion of old spriteaccessory

* component registration, fixes dwarf skin toning

no, 'ReptilianToned' does not exist

* removes component registration from abstract humanoid component

* visualizer data now cloneable

* serialize for visualizer key

* zero-count edge case

* missing semi-colon moment

* setspecies in humanoidsystem

* ensures that default markings, if empty, will cause ensuredefault to skip over that given category

* tryadd instead of add

* whoops

* diff and apply should properly apply markings now

* always ensure default, fixes double load for player spawning

* apply skin color now sets the skin color property in humanoidcomponent

* removes sprite from a few species prototypes

* sprite changes for specific base layers based on humanoid sex

* layer ordering fix, and a missing base layer should now disallow markings on that layer

* anymarking base layer, adds the right leg/foot for humans

* loading a profile will now clear all markings on that humanoid

* adds missing layers for humans

* separates species.yml into respective species prototype files

* ensures that if layer visibility was changed, all markings have to be reapplied

* server-side enforcement of hiding hair (and other head-related markings) when equipping things that hide hair

* slime fix, clothingsystem now dictates layer visibility server side

* sussy

* layer settings should now ensure a marking should match the skin tone

* whoops

* skincolor static class and functions in UI

* skin color validation in humanoidcharacterappearance

* markingpicker now shows only the markings for the selected category in used

* getter for slot in singlemarkingpicker now ensures slot is 0 if markings exists

* FilterSpecies no longer attempts to do removal while iterating

* expands for SingleMarkingPicker

* humanoid base dummy has blank layers now (and snout/tail/headside/headtop)

* fixes an issue with visualizer system if the marking count was different but the markings themselves were (somewhat) the same

* whoops

* adds edge case handlers for count differences in humanoid markings

* preview now loads profile instead of directly setting appearance

* moves marking set loading to update controls

* clones a marking set in markingpicker by using the deep clone constructor

* whoops (deep cloning a marking now copies the marking id)

* adds replace function for markingset

* points should now update after the markings are remove/added

* merging base layer sprites into a humanoid should now clear them before merging

* sets dirty range start to count only if the dirty range start was never set above 0

* fixes up some issues with singlemarkingpicker

* color selector sliders in single marking picker should now expand

* hair from hair pickers should now apply in profile loading (client-side)

* category in singlemarkingpicker now sets the private category variable

* slot selector should now populate

* single marking picker buttons now have text, also shows the category name over all user-clickable elements

* removes a comment

* removing hair slots now sets it to bald, defaults to zero used slots if current hair is bald on hair/facial hair

* random skin color, eye color

* populate colors now checks if the marking count is greater than zero in singlemarkingpicker

* hair/facial hair pickers now just get the first possible hair from the respective species list

* different approach to random skin color

* oh, that's why it wasn't working

* randomize everything now just updates every single control

* selecting a new marking in SingleMarkingPicker should attempt to copy over old colors, populate list now uses cache,

* markingmanager now uses OnlyWhitelisted to populate by category and species

* filterspecies now uses onlyWhitelist to filter markings based on whitelist or not

* oops

* ui fix for singlemarkingpicker, ensures that cache is not null if it is null when populatelist is called

* order of operations for the horizontal expand for add/remove

* hair pickers should now update when you add/remove the hair slot

* fixes variable naming error in character appearance

* loc string fix in singlemarkingpicker

* lizards, vox now have onlyWhitelist, vox restriction for hair/facialhairs

* having zero possible hairs should no longer cause an exception in randomization

* setting species should now update hair pickers

* ignore categories for marking picker

* and a clear as well for the category button

* places that functionality in its own function instead

* adds eye base sprite, vox now also have their own custom eye sprites

* loading a profile client-side should do FilterSpecies for markings now

* client-side load profile does filter species after adding in the hairs now

* magic mirror

* callbacks now call the callback instead of adding it on construct

* whoops

* in removemarking too

* adds missing synchronize calls

* comments out an updateinterface call in magic mirror

* magic mirror window title, minimum sizing

* fixes minsize, adds warning for players who try to set their hair for species that have no hair

* removes spaces in xaml

* namespace changes/organization

* whoopsie (merge conflicts)

* re-enables identity from humanoid component

* damagevisuals now uses the enum given to it instead of the layerstate given on that layer tied to the enum

* removes commas from json

* changes to visuals system so the change is consistent

* chest

* reptilian

* visualizer system now handles body sprite setting/coloration, similar to how characterappearance did it

not a big fan of this

* adds a check in applybasesprites

* adding/removing parts should now make them invisible on a humanoid

* body part removal/adding now enumerates over sublayers instead

* synchro now runs in bodycomponent startup

* parts instead of slots

* humanoidcompnent check

* switches from rsi to actualrsi

* removes all the body stuff (too slow)

* cleans up resolves from humanoid visualizer system

* merging sprites now checks if the base sprites have been modified or not (through things like species changes, or custom base sprite changes)

* not forgetting that one again

* merging now returns an actual dirty value

* replaces the sequenceequal with a more accurate solution

* permanent layers, layer visibility on add/remove part in body

* should send all hidden layers over now

* isdirty in visualizer system for base layers

* isdirty checks count as well

* ok, IsDirty should now set the base layers if the merged sprites are different

* equals override in HumanoidSpritePrototypes.cs

temporary until record prototypes :heck:

* makes fields readonly, equates IDs instead

* adds forced markings through marking picker

* forced in humanoidsystem api, ignorespecies in markingpicker

* marking bui

* makes that serializable as well

* ignore species/forced toggles now work

* adds icon to modifier verb, interface and keys to humanoid bases

* needs the actual enum value to open, no?

* makes the key the actual key

* actions now propagate upwards

* ignore species when set now repopulates markingpicker

* modifiable base layers in the markings window

* oops!

* layout changes

* info box should now appear

* adds ignorespecies for marking picker, collapsible for base layer section of appearance modification window

* collapsible layout moment

* if base layers have changed, all markings are now dirty (and if a base layer is missing, the marking is still 'applied' but it's now just invisible

* small change to marking visibility

* small changes to modifier UI

* markings now match skin on zombification

* zombie stuff

* makes the line edit in marking modifier window more obvious

* disables vox on round start

* horizontal expand on the single label in base layer modifiers

* humanoid profiles in prototypes

* randomhumanoidappearance won't work if the humanoid has a profile already stored

* removes unused code

* documentation in humanoidsystem server-side

* documentation in shared/client

* whoops

* converts accessory into marking in locale files (also adds marking loc string into single marking picker)

* be gone, shared humanoid appearance system from the last upstream merge

* species ignore on randomization (defaults to no ignored species)

* more upstream merge parts that bypassed any errors before merge

* addresses review (also just adds typeserializers in some places)

* submodule moment

* upstream merge issues
2022-09-22 17:19:00 -05:00