Commit graph

40 commits

Author SHA1 Message Date
Morb0
5a6058666e Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
DrSmugleaf
3f3ba6ac62
Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
Morb0
1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components (#19591)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-08-28 16:53:24 -07:00
Morb0
4b873cf1cd Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Tiles/plating.png
2023-08-06 06:33:32 +03:00
Vordenburg
cc8b642444
Add linter-friendly WeightedRandom prototypes (#18729) 2023-08-06 12:31:25 +10:00
metalgearsloth
ead47c541d
Fix humanoid appearances for placement manager (#18291) 2023-08-05 14:25:47 +10:00
Morb0
0cffa43345 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
#	Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
#	Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
#	Resources/Textures/Decals/bricktile.rsi/dark_box.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
#	Resources/Textures/Decals/bricktile.rsi/meta.json
#	Resources/Textures/Decals/bricktile.rsi/steel_box.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_w.png
#	Resources/Textures/Decals/minitile.rsi/dark_box.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_e.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_n.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_s.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_w.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_e.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_n.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_s.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_w.png
#	Resources/Textures/Decals/minitile.rsi/meta.json
#	Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
#	Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
#	Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
#	Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_e.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_n.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_s.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_w.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_e.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_n.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_s.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_w.png
#	Resources/Textures/Decals/minitile.rsi/white_box.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_se.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
#	Resources/Textures/Decals/minitile.rsi/white_end_e.png
#	Resources/Textures/Decals/minitile.rsi/white_end_n.png
#	Resources/Textures/Decals/minitile.rsi/white_end_s.png
#	Resources/Textures/Decals/minitile.rsi/white_end_w.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_se.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
#	Resources/Textures/Decals/minitile.rsi/white_line_w.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/bar.png
#	Resources/Textures/Tiles/clown.png
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/dark_diagonal.png
#	Resources/Textures/Tiles/dark_diagonal_mini.png
#	Resources/Textures/Tiles/dark_herringbone.png
#	Resources/Textures/Tiles/dark_mini.png
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/dark_offset.png
#	Resources/Textures/Tiles/dark_pavement.png
#	Resources/Textures/Tiles/dark_pavement_vertical.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_diagonal.png
#	Resources/Textures/Tiles/steel_diagonal_mini.png
#	Resources/Textures/Tiles/steel_herringbone.png
#	Resources/Textures/Tiles/steel_mini.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/steel_offset.png
#	Resources/Textures/Tiles/steel_pavement.png
#	Resources/Textures/Tiles/steel_pavement_vertical.png
#	Resources/Textures/Tiles/white.png
#	Resources/Textures/Tiles/white_diagonal.png
#	Resources/Textures/Tiles/white_diagonal_mini.png
#	Resources/Textures/Tiles/white_herringbone.png
#	Resources/Textures/Tiles/white_mini.png
#	Resources/Textures/Tiles/white_mono.png
#	Resources/Textures/Tiles/white_offset.png
#	Resources/Textures/Tiles/white_pavement.png
#	Resources/Textures/Tiles/white_pavement_vertical.png
2023-08-02 15:13:51 +03:00
PrPleGoo
7c088ac1de
Job icons are stored on ID cards (#18233) 2023-07-29 18:25:27 +10:00
faint
bf4e12fdf3 Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-23 14:29:20 +03:00
TemporalOroboros
df1dcb74ac
Dewarns access (#16666)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-07-23 14:19:51 +10:00
Morb0
636bea81df Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.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/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
#	Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
0x6273
247c7a1d4d
Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10: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
Morb0
45cde15648 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-05-07 12:51:16 +03:00
deltanedas
44f9c098ec
uplink locking/unlocking, minor pda refactor (#15842)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-01 16:30:08 +10:00
Morbo
47d49bf035 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
2023-04-11 22:36:33 +03:00
DrSmugleaf
b947856431
Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Morbo
bfe04b191e Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
2023-03-30 09:49:30 +03:00
Nemanja
66ff565e16
Add support for true randomized characters (#14918) 2023-03-28 18:30:00 -07:00
Morbo
c58729755f Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
metalgearsloth
f3a06a0696
Add arrivals (#14755)
* Arrivals

* More arrivals and shitty uhh preload

* cvar

* a

* clockin + maps

* shitter prevention

* Placement

* a

* cvar for tests and dev

* weh
2023-03-22 04:29:55 -05:00
Morbo
ca189b0db4 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/CCVar/CCVars.cs
2023-03-21 02:50:29 +03:00
Scribbles0
9f8f85ccf6
Nukeops Preferred Species (#14327)
* nukeops PC species

* cleanup

* invalid species fallback

* cleanup
2023-03-19 17:48:05 -07:00
Morbo
b6ac4e3e59 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png
#	Resources/Textures/Structures/Storage/canister.rsi/frezon.png
#	Resources/Textures/Structures/Storage/canister.rsi/meta.json
2023-03-15 10:43:49 +03:00
Flipp Syder
eb04c43db4
Invalid species fallback on spawn/profile validation (#14675)
* if a player's profile has an invalid species, station spawning will always try to fallback to the default humanoid species

* validation always ensures that if a species can't be indexed, the species falls back to the default species
2023-03-14 23:47:40 -05: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
Morb
fd9c06a458
TTS (Text-To-Speech) (#618) 2023-01-10 18:01:20 -08: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
metalgearsloth
1e30848cf7
Add a debug overlay for accessreaders (#9681)
> didnt pjb have issues with doing the control stuff in an overlay and just wanted direct texture draw

I ended up doing dis.
2022-09-14 19:33:25 +10:00
Kara
2d5ec7f85c
Id[entity] 2.0 (real) (#9612)
* starter API

* network ID cards

* Port more stuff from old identity

* Re-implement identity representation + name updating

* move

* proper name returning for `IdentityName`

* move everything important to server, give in to  temptation

* shared / server / client split sadly. move ensure to shared and spawn to server

* identity update queueing + identityblocker

* fixes

* and just like that it's usable for admins

* huge identity pass

* pass dos

* jesus christ

* figs :D

* fuck u

* fix bad merge.

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-07-10 20:36:53 -05:00
Rane
cfe39123a7
Allow non-humanoid roles (#9604) 2022-07-10 20:10:03 -05:00
Morber
7a14c6f331
Localize jobs (#8968)
* Localize job supervisors

* Rename supervisors file

* Localize job names

* Remove localization for fallback job name

* Use LocalizedName for Job

* Fix job names case
2022-06-28 22:55:05 +10:00
Pieter-Jan Briers
a4685bab4c
Extended access system (#8469)
* Extended access system

Allows jobs to specify "extended" access levels, which will be granted if the round-start crew count is below a certain threshold.

* Extended accesses for jobs

* Spook
2022-05-26 21:01:07 -07:00
Veritius
3b7e202044
Flavor text (#8070) 2022-05-13 15:58:45 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
wrexbe
61d147aea9
Fixing warnings (#8131) 2022-05-13 15:35:13 +10:00
Moony
36181334b5
StationSystem/jobs/partial spawning refactor (#7580)
* Partial work on StationSystem refactor.

* WIP station jobs API.

* forgor to fire off grid events.

* Partial implementation of StationSpawningSystem

* whoops infinite loop.

* Spawners should work now.

* it compiles.

* tfw

* Vestigial code cleanup.

* fix station deletion.

* attempt to make tests go brr

* add latejoin spawnpoints to test maps.

* make sure the station still exists while destructing spawners.

* forgot an exists check.

* destruction order check.

* hopefully fix final test.

* fail-safe radstorm.

* Deep-clean job code further. This is bugged!!!!!

* Fix job bug. (init order moment)

* whooo cleanup

* New job selection algorithm that tries to distribute fairly across stations.

* small nitpicks

* Give the heads their weights to replace the head field.

* make overflow assign take a station list.

* moment

* Fixes and test #1 of many.

* please fix nullspace

* AssignJobs should no longer even consider showing up on a trace.

* add comment.

* Introduce station configs, praying i didn't miss something.

* in one small change stations are now fully serializable.

* Further doc comments.

* whoops.

* Solve bug where assignjobs didn't account for roundstart.

* Fix spawning, improve the API.
Caught an oversight in stationsystem that should've broke everything but didn't, whoops.

* Goodbye JobController.

* minor fix..

* fix test fail, remove debug logs.

* quick serialization fixes.

* fixes..

* sus

* partialing

* Update Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Use dirtying to avoid rebuilding the list 2,100 times.

* add a bajillion more lines of docs (mostly in AssignJobs so i don't ever forget how it works)

* Update Content.IntegrationTests/Tests/Station/StationJobsTest.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Add the Mysteriously Missing Captain Check.

* Put maprender back the way it belongs.

* I love addressing reviews.

* Update Content.Server/Station/Systems/StationJobsSystem.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* doc cleanup.

* Fix bureaucratic error, add job slot tests.

* zero cost abstractions when

* cri

* saner error.

* Fix spawning failing certain tests due to gameticker not handling falliability correctly.
Can't fix this until I refactor the rest of spawning code.

* submodule gaming

* Packedenger.

* Documentation consistency.

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-05-10 13:43:30 -05:00