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
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
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
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
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
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
Morb
2484a01a39
Revert "Replace TTS provider" ( #2289 )
2024-06-18 13:00:33 +03:00
Morb
1728443d1a
Replace TTS provider ( #2278 )
2024-06-17 23:17:08 +03:00
Morb0
49bb4deaba
Fix upstream
2024-05-15 19:36:04 +03:00
Morb0
d97a09543d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
2024-05-15 18:53:52 +03:00
metalgearsloth
332f54a3ae
Lobby refactor + species loadouts support ( #27576 )
...
* Vox stuff
* Species loadouts and lobby refactor
The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.
* a
* Bulk changes
* a
* weh
* Character import / export
* finalise
* woops this stuff too
* Also datafield exporting
* comments
* Review
2024-05-12 09:18:21 +10:00
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.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/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
Nemanja
161fd6c83c
Mega Antag Refactor ( #25786 )
...
* Mega Antag Refactor
* last minute delta save
* more workshopping
* more shit
* ok tested this for once
* okkkkk sure
* generic delays for starting rules
* well darn
* nukies partially
* ouagh
* ballin' faded and smonkin wed
* obliterated the diff
* Spread my arms and soak up congratulations
* I've got plenty of love, but nothing to show for it
* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity
* ok this junk
* OOK!
* fubar
* most of sloth's review
* oh boy
* eek
* hell yea!
* ASDFJASDJFvsakcvjkzjnhhhyh
2024-04-25 11:31:45 +10:00
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
b55930ab55
Remove Corvax speaker color
2024-01-26 01:37:25 +03:00
Morb0
5aa1642ba2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Structures/Walls/solidrust.rsi/full.png
# Resources/Textures/Structures/Walls/solidrust.rsi/meta.json
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png
# Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png
2024-01-26 01:14:50 +03:00
ike709
6cbe4a8fb6
Ports colored chat names ( #24478 )
...
* Ports colored chat names
* Update name color on every message
---------
Co-authored-by: ike709 <ike709@github.com>
2024-01-25 01:39:00 -07:00
Morb0
4426394d78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
2023-12-23 02:53:18 +03:00
Leon Friedrich
907b873145
Fix various errors/exceptions ( #22841 )
...
* Fix entity storage localization
* Fix HumanoidAppearanceComponent resolve
* Fix null reference exceptions
* Fix duplicate key error
* Fix artifact error spam
* actually maybe this is what its meant to do
* Fix entities playing sounds on deletion
2023-12-22 00:26:08 -07: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
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Morb
835bde4c6e
Sex restriction for markings ( #19894 )
...
* Add sex restriction to markings
* Apply to existing systems
2023-09-19 16:56:10 -04:00
Morb0
e21ee44f9e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
Morb0
22283a01f1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Content.Shared/Chat/SharedChatSystem.cs
2023-08-15 00:08:39 +03:00
Vordenburg
7582474f1a
Lint more const string prototypes ( #18922 )
2023-08-13 20:26:59 -04:00
Morb
aa5731df3b
Fix speaker color ( #1272 )
2023-08-06 10:18:50 +03:00
Morb0
8ca0d5e802
Remove pacifist component usage
2023-08-06 06:54:29 +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
1b79af1fc2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Changelog/ChangelogManager.cs
# Content.Client/Doors/AirlockVisualizer.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
Flipp Syder
c29968372e
Adds validation bool for setting humanoid skin color ( #15360 )
2023-04-23 19:16:59 +10:00
Morbo
71fb0edcdd
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-04-07 19:58:15 +03:00
Flipp Syder
c02824a85c
Skin color validation ( #15140 )
2023-04-05 17:41:11 -06: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
Morb
b66709887d
Add colored chat names ( #844 )
2023-02-19 16:01:57 -08:00
Morbo
8bff10af81
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-01-27 21:05:54 +03:00
Leon Friedrich
e8838af395
Fix humanoid appearance error ( #13721 )
2023-01-26 18:04:58 -04:00
Morbo
d9c226480b
Move TTS code to Humanoid dir
2023-01-25 23:36:39 +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
