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
SlamBamActionman
7aa4beede6
Fix lizard snouts disappearing when wearing masks ( #25716 )
...
* fixes it
* Snout fix
* Partway commit
* Partway commit
* Update masks and helmets to use the new system
2024-04-19 15:39:47 +10:00
Morb0
2329662efd
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
2024-04-18 07:04:01 +03:00
Errant
7120e8736a
Cleanup in HumanoidCharacterAppearance ( #26974 )
...
* namespace
* Tidy up the code for selecting random humanoid color
2024-04-18 13:27:11 +10:00
Arthur Asimov
0b621a7b7e
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING-reptilian.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
2024-04-17 11:57:44 +03:00
metalgearsloth
12766fe6e3
Loadouts redux ( #25715 )
...
* Loadouts redux
* Loadout window mockup
* More workout
* rent
* validation
* Developments
* bcs
* More cleanup
* Rebuild working
* Fix model and loading
* obsession
* efcore
* We got a stew goin
* Cleanup
* Optional + SeniorEngineering fix
* Fixes
* Update science.yml
* add
add
* Automatic naming
* Update nukeops
* Coming together
* Right now
* stargate
* rejig the UI
* weh
* Loadouts tweaks
* Merge conflicts + ordering fix
* yerba mate
* chocolat
* More updates
* Add multi-selection support
* test
h
* fikss
* a
* add tech assistant and hazard suit
* huh
* Latest changes
* add medical loadouts
* and science
* finish security loadouts
* cargo
* service done
* added wildcards
* add command
* Move restrictions
* Finalising
* Fix existing work
* Localise next batch
* clothing fix
* Fix storage names
* review
* the scooping room
* Test fixes
* Xamlify
* Xamlify this too
* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* ben
* Margins
---------
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
2024-04-16 22:57:43 +10:00
Morb0
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
Errant
84a07315dd
Species info in Guidebook and at chargen ( #25844 )
...
* guidebook pages defined
* species info button in character profile editor
* if current species has no guidebook page then open the parent page
* skrek
* destroying evidence of secret vox plot
* icon size adjustment, no icon if guidebook page for species does not exist
* finished pages
* additional info
* weh
2024-03-10 20:01:32 -07:00
Morb0
92bd0148fe
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Locale/en-US/chat/sanitizer-replacements.ftl
# Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
Errant
5a9ab3b315
Vox names, species prototype cleanup, some cosmetic changes ( #24994 )
...
* voxnames
* New generator parameters, names are more readable
* bunch of missing vox stuff
* more names
* sad
2024-02-14 14:08:45 +11:00
Morb0
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
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
deathride58
43d1be51fb
Limits the minimum base skin color brightness for species with Hue coloration ( #23605 )
...
adds a minimum skin tone for hue skin colors
2024-01-06 20:40:29 +11: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
b6bd82caa6
Use ECS prototype-reload events ( #22613 )
...
* Use ECS prototype-reload events
* better constructors
* Maybe this fixes tests?
2023-12-23 01:13:45 +11: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
259233ad78
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/CharacterSetupGui.xaml
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Resources/Prototypes/Catalog/Fills/Boxes/general.yml
# Resources/Prototypes/Entities/Clothing/Back/satchel.yml
# Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +03:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
Morb
3af93f83f2
Species sponsor ( #1480 )
2023-10-03 02:50:23 +03:00
Morb0
09111343cc
Fix speaker color
2023-10-02 02:29:56 +03:00
Morb0
34a8740819
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
DrSmugleaf
2f11a749f6
Remove cloneData parameter from AutoNetworkedField ( #20596 )
2023-09-30 15:14:16 +10:00
DrSmugleaf
d2578370a7
Fix not networking markings ( #20588 )
2023-09-28 17:44:47 -07: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
58ef40767e
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
Nemanja
fdbadbe579
closet skeleton event ( #19802 )
2023-09-19 15:05:17 +10: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
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Morb0
4516e1ceef
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
2023-08-22 08:22:56 +03:00
Nemanja
3f2ea17bb7
fix species skin colors ( #19417 )
2023-08-21 19:05:24 -07: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
Morb0
82b4572421
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2023-06-28 16:02:06 +03:00
metalgearsloth
90110183be
Fix a bunch of logger warnings ( #17691 )
2023-06-27 23:56:52 +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
