Morb0
782d82c0cd
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusEffects/job.yml
# Resources/Prototypes/StatusEffects/security.yml
# Resources/Textures/Decals/bricktile.rsi/white_box.png
2024-04-12 02:17:14 +03:00
deltanedas
2f5c639a15
predict humanoid identity examine ( #26769 )
...
* predict humanoid identity examine
* actually server doesnt need proto anymore
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-08 11:16:21 -04:00
Morb0
8daf4b3f32
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/meta.json
2024-03-21 01:15:13 +03:00
Tayrtahn
4a83c36585
Code cleanup: Dirty(Comp) ( #26238 )
...
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.
* Missed a few
* Revert changes to pulling
* No
2024-03-19 23:27:02 -04: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
LordCarve
aafe815122
Obsolete Logger cleanup for EntitySystems ( #25941 )
...
* Small obsolete Logger cleanup
* Fixed three EntitySystem logs that weren't doing it right.
2024-03-10 01:15:13 +01:00
Morb0
b55930ab55
Remove Corvax speaker color
2024-01-26 01:37:25 +03:00
Morb0
09111343cc
Fix speaker color
2023-10-02 02:29:56 +03: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
metalgearsloth
ead47c541d
Fix humanoid appearances for placement manager ( #18291 )
2023-08-05 14:25:47 +10: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
csqrb
b3a327988f
Fix slime hair translucent ( #14478 )
...
* fix
* move
2023-03-11 13:04:58 -08:00
Morbo
82a466f4ff
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Audio/Announcements/license.txt
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
csqrb
8b3d7728d7
Marking default coloring ( #13039 )
...
* Marking coloring WIP
* EnsureDefault now supports coloring!
* Now markings have coloring when they get added
* Many things
* yml files
* cleanup
* Some requested changes
* Nullable type and WIP caching
* Time to resolve that thing with deprecated hair fields
* Latest reviews + im still trying to use these hair markings
* FirstOrDefault thing and Tattoo docs
* IDK
* It's now works a bit more properly in preferences GUI
* THEY SYNCING! However preferences GUI still broken and doesn't work properly
* Markings now updating when changing in GUI. However they still don't work properly with bald humanoids
* Forgor...
* Default hair-colored markings will not color to hair if there is no hair
* Fixed default colors for customizable markings
* Fixed bug in prefs GUI that set current hair to null
* Now markings that must match skin color because of limb (e.x. Slimes) - will match skin color
* final tweaks: if hair uses skin color then markings will use skin color as hair color (slimes)
* fix
* fixed dirty. no more funni invis bug
* Mirrors and client profile loading
* default colors soon TM
* review + better coloring
* Hardcode is gone
* diona markings
* oh my god
* fixed CategoryColoring
* cool fallback, clean up and some other tweaks
* code style
* more style
* a
2023-03-04 18:59:07 -08:00
Morbo
0e5004268b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
2023-02-28 20:00:24 +03:00
wrexbe
5e6a446c02
Copy eyecolor, and age on cloning ( #14296 )
2023-02-28 11:40:02 -04:00
Morb
b66709887d
Add colored chat names ( #844 )
2023-02-19 16:01:57 -08: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
Alex Evgrashin
ef452b38a9
Audible emotes ( #12708 )
...
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2023-01-25 08:29:41 -08: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
