Commit graph

107 commits

Author SHA1 Message Date
Morb0
29a7082223 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/Names/military.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
2023-12-11 21:56:43 +03:00
Sirionaut
c095b7cd4a
Animals obey conservation of matter unless they are undead (#21922) 2023-12-10 19:20:41 -08:00
Simon
bd3bea176c
Cooler zombie moths (#21744) 2023-12-10 19:17:55 -08:00
Morb0
caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +03:00
Leon Friedrich
287d22cc49
Inventory slot enumerator rejig (#21788) 2023-12-08 08:20:51 +11:00
Arthur Asimov
f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
metalgearsloth
269c93245d
Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
Morb0
804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
#	Resources/Prototypes/SoundCollections/lobby.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
nikthechampiongr
99cdff2b87
Tiny mobs can no longer pass on the zombie disease (#21676)
This reverts f391ff28 and implements an alternate messure where mice and other small animals can no longer infect people as zombies.

This is done through a component which if present cancels the check that would cause zombie components to be added on people that get infected due to a bite.

This still allows other special stuff that happens in that function that may affect already infected individuals.
This is a compromise between what's discussed in discord which would much rather see mice and other animals just die from the infection and people on github which would see no change happen.

Since bats can't go under doors it may not be necessary to make them non spreaders.
If someone disagrees please tell me to just add it back.
2023-11-19 14:28:05 -08:00
Morb0
3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Audio/Announcements/license.txt
#	Resources/Audio/Effects/Shuttle/licenses.txt
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Textures/Structures/Storage/tanks.rsi/meta.json
2023-11-14 16:35:33 +03:00
Nemanja
ac5e9cd70b
Fix borg mobstates (#21307)
* Add dead states to borgs

* this?

* ack
2023-11-09 16:14:06 -07:00
Morb0
00cfed5ce5 Remove corvax zombie pacified rem 2023-11-09 11:58:23 +03:00
Morb0
7a328a7635 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-11-08 14:28:45 +03:00
Vasilis
490ebdc9ae
No more passive zombies (#21506) 2023-11-07 18:27:49 -07:00
Morb0
611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
themias
843a7d1d46
Fix ambuzol zombie damage (#21432) 2023-11-04 13:57:21 -04: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
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
keronshb
17f3fc1287
Moves cloning comp & cloning event to shared (#21253) 2023-10-28 09:47:42 -04: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
64f1e79a5a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png
#	Resources/manifest.yml
2023-09-28 17:32:44 +03:00
nikthechampiongr
5ff79120e6
EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-28 21:34:21 +10: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
Leon Friedrich
684b334806
Action container rejig (#20260)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-09-23 18:49:39 +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
DrSmugleaf
09bce85f19
Fix actions not being usable, ordering, and containers (#19964) 2023-09-09 16:14:17 -07:00
Morb0
5a6058666e Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
DrSmugleaf
3f3ba6ac62
Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
Morb0
1b513f0c1a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components (#19591)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-08-28 16:53:24 -07: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
Doru991
ecd145b274
Fix zombie eye appearance (#19427) 2023-08-23 00:51:59 -04:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -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
Nemanja
6a125b55df
Fix various IC states not counting as dead (#19049) 2023-08-13 23:34:18 -04:00
Morb0
83dcb2970d Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Datasets/tips.yml
2023-08-14 03:22:26 +03:00
PixelTK
1e36976d3a
Arachnid zombie hands fix (#19073)
* zombie hands begone

* the shortening

* Move it to SharedHandsSystem

* do the requested changes
2023-08-13 15:51:20 -04:00
Morb0
f5c44e5bd0 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/typing_indicator.yml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
#	Resources/Textures/Effects/speech.rsi/alien0.png
#	Resources/Textures/Effects/speech.rsi/alien1.png
#	Resources/Textures/Effects/speech.rsi/alien2.png
#	Resources/Textures/Effects/speech.rsi/alienroyal0.png
#	Resources/Textures/Effects/speech.rsi/alienroyal1.png
#	Resources/Textures/Effects/speech.rsi/alienroyal2.png
#	Resources/Textures/Effects/speech.rsi/blob0.png
#	Resources/Textures/Effects/speech.rsi/blob1.png
#	Resources/Textures/Effects/speech.rsi/blob2.png
#	Resources/Textures/Effects/speech.rsi/clock0.png
#	Resources/Textures/Effects/speech.rsi/clock1.png
#	Resources/Textures/Effects/speech.rsi/clock2.png
#	Resources/Textures/Effects/speech.rsi/default0.png
#	Resources/Textures/Effects/speech.rsi/default1.png
#	Resources/Textures/Effects/speech.rsi/default2.png
#	Resources/Textures/Effects/speech.rsi/guardian0.png
#	Resources/Textures/Effects/speech.rsi/guardian1.png
#	Resources/Textures/Effects/speech.rsi/guardian2.png
#	Resources/Textures/Effects/speech.rsi/holo0.png
#	Resources/Textures/Effects/speech.rsi/holo1.png
#	Resources/Textures/Effects/speech.rsi/holo2.png
#	Resources/Textures/Effects/speech.rsi/lawyer0.png
#	Resources/Textures/Effects/speech.rsi/lawyer1.png
#	Resources/Textures/Effects/speech.rsi/lawyer2.png
#	Resources/Textures/Effects/speech.rsi/machine0.png
#	Resources/Textures/Effects/speech.rsi/machine1.png
#	Resources/Textures/Effects/speech.rsi/machine2.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Effects/speech.rsi/robot0.png
#	Resources/Textures/Effects/speech.rsi/robot1.png
#	Resources/Textures/Effects/speech.rsi/robot2.png
#	Resources/Textures/Effects/speech.rsi/slime0.png
#	Resources/Textures/Effects/speech.rsi/slime1.png
#	Resources/Textures/Effects/speech.rsi/slime2.png
#	Resources/Textures/Effects/speech.rsi/swarmer0.png
#	Resources/Textures/Effects/speech.rsi/swarmer1.png
#	Resources/Textures/Effects/speech.rsi/swarmer2.png
#	Resources/Textures/Effects/speech.rsi/syndibot0.png
#	Resources/Textures/Effects/speech.rsi/syndibot1.png
#	Resources/Textures/Effects/speech.rsi/syndibot2.png
#	Resources/Textures/Structures/Machines/microwave.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mw.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
#	Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
#	Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
2023-08-13 05:40:29 +03:00
Nemanja
98fa00a21f
Borgs (#18136)
* Laws

* positronic brain and PAI rewrite

* MMI

* MMI pt. 2

* borg brain transfer

* Roleban support, Borg job (WIP), the end of mind shenaniganry

* battery drain, item slot cleanup, alerts

* visuals

* fix this pt1

* fix this pt2

* Modules, Lingering Stacks, Better borg flashlight

* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.

* sprotes

* no zombie borgs

* oh fuck yeah i love a good relay

* charger

* fix the tiniest of sprite issues

* adjustable names

* a functional UI????

* foobar

* more modules

* this shit for some reason

* upstream

* genericize selectable borg modules

* upstream again

* holy fucking shit

* i love christ

* proper construction

* da job

* AA borgs

* and boom more shit

* admin logs

* laws redux

* ok just do this rq

* oh boy that looks like modules

* oh shit research

* testos passo

* so much shit holy fuck

* fuckit we SHIP

* last minute snags

* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
Morb0
23ba4fe4c6 Remove pacifist component usage 2023-08-06 06:54:40 +03:00
Morb0
0cffa43345 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png
#	Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
#	Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
#	Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png
#	Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
#	Resources/Textures/Decals/bricktile.rsi/dark_box.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
#	Resources/Textures/Decals/bricktile.rsi/meta.json
#	Resources/Textures/Decals/bricktile.rsi/steel_box.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_w.png
#	Resources/Textures/Decals/minitile.rsi/dark_box.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
#	Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_e.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_n.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_s.png
#	Resources/Textures/Decals/minitile.rsi/dark_end_w.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
#	Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_e.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_n.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_s.png
#	Resources/Textures/Decals/minitile.rsi/dark_line_w.png
#	Resources/Textures/Decals/minitile.rsi/meta.json
#	Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
#	Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
#	Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
#	Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_e.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_n.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_s.png
#	Resources/Textures/Decals/minitile.rsi/steel_end_w.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
#	Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_e.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_n.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_s.png
#	Resources/Textures/Decals/minitile.rsi/steel_line_w.png
#	Resources/Textures/Decals/minitile.rsi/white_box.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_se.png
#	Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
#	Resources/Textures/Decals/minitile.rsi/white_end_e.png
#	Resources/Textures/Decals/minitile.rsi/white_end_n.png
#	Resources/Textures/Decals/minitile.rsi/white_end_s.png
#	Resources/Textures/Decals/minitile.rsi/white_end_w.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_se.png
#	Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
#	Resources/Textures/Decals/minitile.rsi/white_line_w.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/bar.png
#	Resources/Textures/Tiles/clown.png
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/dark_diagonal.png
#	Resources/Textures/Tiles/dark_diagonal_mini.png
#	Resources/Textures/Tiles/dark_herringbone.png
#	Resources/Textures/Tiles/dark_mini.png
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/dark_offset.png
#	Resources/Textures/Tiles/dark_pavement.png
#	Resources/Textures/Tiles/dark_pavement_vertical.png
#	Resources/Textures/Tiles/hydro.png
#	Resources/Textures/Tiles/kitchen.png
#	Resources/Textures/Tiles/laundry.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/steel_diagonal.png
#	Resources/Textures/Tiles/steel_diagonal_mini.png
#	Resources/Textures/Tiles/steel_herringbone.png
#	Resources/Textures/Tiles/steel_mini.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/steel_offset.png
#	Resources/Textures/Tiles/steel_pavement.png
#	Resources/Textures/Tiles/steel_pavement_vertical.png
#	Resources/Textures/Tiles/white.png
#	Resources/Textures/Tiles/white_diagonal.png
#	Resources/Textures/Tiles/white_diagonal_mini.png
#	Resources/Textures/Tiles/white_herringbone.png
#	Resources/Textures/Tiles/white_mini.png
#	Resources/Textures/Tiles/white_mono.png
#	Resources/Textures/Tiles/white_offset.png
#	Resources/Textures/Tiles/white_pavement.png
#	Resources/Textures/Tiles/white_pavement_vertical.png
2023-08-02 15:13:51 +03:00
metalgearsloth
c31c848afd
Shooting NPCs and more (#18042)
* Add pirate shooting

* Shooting working

* Basics working

* Refactor time

* More conversion

* Update primitives

* Update yml

* weh

* Building again

* Draft

* weh

* b

* Start shutdown

* Starting to take form

* Code side done

* is it worky

* Fix prototypes

* stuff

* Shitty working

* Juke events working

* Even more cleanup

* RTX

* Fix interaction combat mode and compquery

* GetAmmoCount relays

* Fix rotation speed

* Juke fixes

* fixes

* weh

* The collision avoidance never ends

* Fixes

* Pause support

* framework

* lazy

* Fix idling

* Fix drip

* goobed

* Fix takeover shutdown bug

* Merge fixes

* shitter

* Fix carpos
2023-08-01 19:48:56 -05:00
Morb0
23eef7660d Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-28 01:02:37 +03:00
Nemanja
d55cd23b0a
Zombie Mode 𝓡𝓮𝓭𝓾𝔁 (#18199)
* zombie mode redux

* the great zombie changes

* fix this

* 65 down to 50

* empty

* Changes to address stalling

* make zombie nukies no longer nukies

* actually work
2023-07-25 15:31:35 -06:00
faint
076d2e339b Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
#	Content.Client/LateJoin/LateJoinGui.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
#	RobustToolbox
2023-07-10 07:03:24 +03:00
LankLTE
9e6bd30aa4
Ambuzol Plus (#17884)
* Added component and functionality.

* Fixed ZombieImmune.

* Zombies now have zombie blood.

* Ambuzol plus.

* Ambuzol plus spawns in bundle.

* Fine CBURN get one too.

* Reworked the reaction

* No more magic blood refilling.

* ok CE i fixed it

* Component change.
2023-07-09 16:01:35 -06:00
Morb0
636bea81df Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.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/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
#	Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
#	Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
ShadowCommander
dd7032a860
Mind ECS (#16826) 2023-06-19 04:33:19 +10:00