Upstream sync #590
Merged
Upstream sync #590
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…eam-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
…eam-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
…eam-sync # Conflicts: # Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/ninja.rsi/meta.json # Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/fire.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/coatengi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.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/coatsci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json # Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json
…eam-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
…am-sync # Conflicts: # Resources/Locale/ru-RU/game-ticking/game-presets/preset-pirates.ftl # Resources/Locale/ru-RU/reagents/meta/medicine.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl # Resources/Locale/ru-RU/xenoarchaeology/artifact-analyzer.ftl
…eam-sync # Conflicts: # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
* Syndi-Cat Wideswing, Shoes, and Explosion Resist * Damn you Plykiya * 10/10Pierce/Structural -> 6/6/15 Pierce/Slash/Structural * Update animals.yml
remove stupid constant
frontal sprite fix
The microwave system would update UserInterface on any container changed instead of just the microwave_entity_container. This would cause it to error when trying to update the UI when ConstructionSystem inserted the circuit board and components.
Remove barozine from mutatuib
Update belts.yml
* light * flares quieter
* light * neckfrills * Delete Resources/Prototypes/XenoArch/Effects/normal_effects.yml * Revert "Delete Resources/Prototypes/XenoArch/Effects/normal_effects.yml" This reverts commit 6e6fad609a66a0615abcd545009cdb2f52c9b955. * Revert "light" This reverts commit d1f111d4c64da4d2a64907f7dfead104892d1462. --------- Co-authored-by: metalgearsloth <[email protected]>
* Melee swing effect: Allow rotation * Make melee weapon effects follow the user
* Size based whitelisting * namespace and misc refactor * modern datafields, what will they think of next Co-authored-by: Nemanja <[email protected]> * the future is now Co-authored-by: Nemanja <[email protected]> * Update TagSystem to work with ProtoId lists * I guess someone might run into these too, one day * copypaste moment * update to sawmill * Okay, but what if it just worked --------- Co-authored-by: Nemanja <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.