Dmitry
4f4b71e8de
merge remote wizden stable
2025-12-22 00:33:29 +07:00
Pieter-Jan Briers
b4fa6f4a07
Fix loadout entity names not being exported/imported ( #41891 )
...
Fix entity names not being saved in loadouts.
Just missing a [DataField]
2025-12-18 09:13:35 +00:00
slarticodefast
4484f0f351
Fix prototypes so they pass analyzer checks (again) (AGAIN) ( #41882 )
...
fix
2025-12-17 18:15:49 +00:00
Dmitry
da0796d7d3
merge remote stable upstream
2025-11-10 21:59:58 +07:00
Atakku
abd9aec8bd
Implemented parenting and minimum default for loadout groups ( #40861 )
...
* Implemented parenting and minimum default for loadouts
* Fix a mistake
* Apply suggestion from @iaada
Co-authored-by: āda <ss.adasts@gmail.com>
* Implement @iaada's suggestion to rename MinDefault to DefaultSelected
* happy little accidents
* Moved Parents and Abstract fields to under ID, added inheritdoc
---------
Co-authored-by: āda <ss.adasts@gmail.com>
2025-10-27 22:33:56 +00:00
Dmitry
9d6fa7e57d
upstream - merge remote "stable"
2025-10-13 20:59:28 +07:00
Absotively
096f998c3f
Fix species default skin tones ( #40707 )
...
fix so that all default Urist entities don't spawn with the same default human skin tone (cursed skin tone Urist McSlime)
(cherry picked from commit 8d9564c23856c342bc3a35834c462e659f5ebd5b)
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
2025-10-05 20:53:58 +00:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
Dmitry
5a40c9b8e5
Merge remote-tracking branch 'source/stable' into Upstream9
2025-09-12 11:17:32 +07:00
Errant
90662bc6ee
Merge branch 'master' into fix-conflict-40263
2025-09-10 19:52:34 +02:00
Princess Cheeseballs
fc36a7a7c8
[HOTFIX] Fix Loadout Validations ( #40189 )
...
p0 bugfix
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-10 19:31:12 +02:00
Pieter-Jan Briers
0c97520276
Fix usages of TryIndex() ( #39124 )
...
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115 )
This then resulted in TryIndex() getting modified to log errors (94f98073b0#39098 )
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-09 18:17:56 +02:00
Centronias
c709d4d55c
Add CVar for disabling loadout item role timers ( #36775 )
2025-09-03 13:04:44 +02:00
Dmitry
57307b718c
upstream master sync
2025-08-11 18:16:45 +07:00
Krosus777
e307fd69b0
HumanoidCharacterProfileFix ( #39333 )
2025-08-02 17:14:16 +02:00
Dmitry
60c835f02c
master 21.7 syns
2025-07-21 00:27:46 +07:00
Tayrtahn
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId ( #38814 )
...
* The easy ones
* For certain values of easy
* Easy test
* Hair
* Fix sandbox violations
* Sort usings
2025-07-07 21:57:05 +02:00
Dmitry
76f0d2d12b
upstream syns
2025-06-19 15:45:02 +07:00
qrwas
f8cf4dc829
Add group for loadouts ( #36951 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-16 02:36:06 -07:00
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
YotaXP
e404e45ffc
Persist construction menu favorites server-side ( #35867 )
...
* Persist construction menu favorites to player profile
* Use `ProtoId`s for construction favorites
* Validate construction favorites updates from the client
* Actually await the async database call
2025-05-17 13:37:19 -04:00
āda
de24413bd5
HumanoidCharacterProfile and IdCardConsoleComponent constants moved to cvar. Sync id card length with character name length ( #35407 )
...
* commit
* mark TODOs
* compiles
* cleanup
* cleanup
* oops
* changed my mind
* requested changes
* genpop fix
2025-05-17 15:27:39 +10:00
Morb
4a9a730810
Fix inventory loadout save ( #3148 )
2025-05-01 17:48:21 +03:00
JerryImMouse
f76d1edf27
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
# Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2025-03-27 23:01:47 +05:00
Tayrtahn
86aa82f2b6
Cleanup: Remove redundant prototype name specifications ( #35793 )
...
* Remove redundant prototype name specifications
* These can stay
2025-03-19 19:30:31 +01:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
Tayrtahn
6f925dd610
Fix prototypes so they pass analyzer checks ( #35435 )
2025-02-24 15:21:59 +11:00
lzk228
0af3e04fd8
Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Doors/Systems/AirlockSystem.cs
# Content.Server/Holopad/HolopadSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
# Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/Textures/Objects/Tiles/tile.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
metalgearsloth
15b28936df
Add loadout names ( #31303 )
...
* Add loadout names
Did it for AI, breaking change for pgsql + migrations in general. Nothing atm uses it.
* the box
* Spawning cherry pick
* Fix nit
* revert
* Final cleanup
* Real
* Name UI fix
* Migrations
* a
* Review
* Re-run migrations
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2025-02-11 18:30:24 +01:00
Hyper B
e752561d20
Fix nonsensical RegEx for name restriction ( #34375 )
...
* Fixed nonsense RegEx
"-" character is a range, caused an error.
No need for "," to repeat so much, it's not a separator.
"\\" - just why?
* Further optimized RegEx structure
Added:
"@" delimiter for consistency
"/" to escape "-" for good and to avoid further problems
2025-01-15 16:59:04 +01:00
Morb0
6106783f01
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/labeler.yml
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Mobs/Vox.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
2024-12-26 00:30:02 +03:00
Ed
1c33073af4
Multiple items in loadouts ( #33193 )
...
* loadouts update
* Update loadout_groups.yml
* darts to candles
* Update Resources/Prototypes/Loadouts/dummy_entities.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-24 01:24:19 +01:00
MilenVolf
b66fd98514
Localize ai dataset names ( #33608 )
...
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-06 16:38:00 +01:00
Morb0
0f339baab5
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Stations/base.yml
2024-09-01 22:20:47 +03:00
Winkarst
88dcc831c1
Remove calls to FormattedMessage obsolete methods ( #31706 )
...
* Remove FormattedMessage obsolete methods
* Oops
2024-09-01 13:00:53 +02:00
Morb0
721f7bfecf
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
2024-08-28 16:40:36 +03:00
metalgearsloth
afd0618a60
Station AI ( #30944 )
...
* Station AI overlay
* implement
* Bunch of ports
* Fix a heap of bugs and basic scouting
* helldivers
* Shuffle interactions a bit
* navmap stuff
* Revert "navmap stuff"
This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.
* AI wires implemented
* Fix examines
* Optimise the overlay significantly
* Back to old static
* BUI radial working
* lots of work
* Saving work
* thanks fork
* alright
* pc
* AI upload console
* AI upload
* stuff
* Fix copy-paste shitcode
* AI actions
* navmap work
* Fixes
* first impressions
* a
* reh
* Revert "navmap work"
This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.
# Conflicts:
# Content.Client/Silicons/StationAi/StationAiOverlay.cs
* OD
* radar
* weh
* Fix examines
* scoop mine eyes
* fixes
* reh
* Optimise
* Final round of optimisations
* Fixes
* fixes
2024-08-28 10:57:12 +10:00
Morb0
7990ca8f46
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
2024-08-08 01:38:43 +03:00
metalgearsloth
9a8620d9d8
De-duplicate loadout gear ( #30341 )
...
* De-duplicate loadout gear
Needs supporting code, probably with an interface with StartingGearPrototype which would also use it, but I regexed the yaml.
* Code updates
* Remaining yaml
* Fix automatic naming
* raiseEvent
* Don't code when tired kids
2024-08-05 00:42:25 -04:00
Ed
a95d2257c3
JobRequirement refactor ( #30347 )
...
* refactor JobRequirements
* add profile support
* fix
* Update quartermaster.yml
* sloth fixes
* inport 30208
* Update DepartmentPrototype.cs
* species restriction
* left tweak stick
* stringbuilder is cool!
2024-08-05 14:25:49 +10:00
Morb0
a7492708b6
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Datasets/ion_storm.yml
2024-07-01 14:55:33 +03:00
metalgearsloth
ab268b6e77
Make accentless cost 2 points ( #29603 )
...
Not an easy way to do this so if someone wants the default to be better be my guest.
2024-06-30 09:47:22 -04:00
metalgearsloth
6937857446
Ensure trait groups get validated ( #28730 )
...
* Ensure trait groups get validated
The only validation being done was on the UI. I also made the "Default" group match the PascalCase naming schema so might be a slight breaking change but the original PR only got merged a few days ago.
* overwatch
2024-06-29 15:39:57 +10:00
Morb0
da333a1972
Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
2024-06-27 13:40:52 +03:00
Tayrtahn
c2f8984e6c
Apply RoleLoadout MinLimit fix to EnsureValid too ( #29358 )
...
Apply MinLimit fix to EnsureValid too
2024-06-23 12:17:28 +10:00
Morb0
bffaecf157
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# 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
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png
2024-06-21 16:32:00 +03:00
Tayrtahn
831d962e5a
Make Loadout MinLimit not count failed attempts ( #29264 )
...
Loadout MinLimit doesn't count failed attempts
2024-06-21 10:15:37 +10:00
Errant
9b2f9ce05f
Hidden loadout groups ( #29170 )
...
* loadout hiding
* department of redundancy department
2024-06-19 10:26:46 +10:00
Morb0
da4af61aee
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
2024-06-15 10:39:49 +03:00
metalgearsloth
8f12e90b90
Don't use invalid defaults for loadouts ( #28740 )
...
* Don't use invalid defaults for loadouts
At the time it made more sense but now with species specific stuff it's better to have nothing.
* Loadout SetDefault only applies valid loadouts
2024-06-15 16:53:42 +10:00
