Morb0
0eba25c0eb
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
Errant
93c7bdc134
Mind Role Entities ( #31318 )
...
* Mind Role Entities wip
* headrev count fix
* silicon stuff, cleanup
* exclusive antag config, cleanup
* jobroleadd overwerite
* logging stuff
* MindHasRole cleanup, admin log stuff
* last second cleanup
* ocd
* minor cleanup
* remove createdTime datafield
* now actually using the event replacement I made for role time tracking
* weh
2024-10-10 10:48:56 +02:00
Morb0
a0bce916fb
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
Errant
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
2024-08-15 20:26:57 +02:00
Arthur Asimov
b97dcf215a
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# .github/labeler.yml
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.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/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/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.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/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-02 11:29:44 +03:00
Plykiya
aded74a88a
Syndicate Reinforcement Specializations: Medic, Spy, Thief ( #29853 )
...
* Syndicate thief, spy, medic
* Fixes description for nukies
* update description for uplink
* Implement the radial menu
* forgot these were necessary to push lol
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-21 20:32:25 +10:00
Morb0
ce4a90a054
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
# Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
# Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
# Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
# Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
# Resources/Textures/Structures/Power/apc.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/panel.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-06-17 23:51:01 +03:00
Tayrtahn
89a9f07c3a
Add a system for modifying entity names without causing conflicts ( #27863 )
2024-06-16 15:38:53 -04:00
Morb0
28edee0fe2
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Commands/AdminWhoCommand.cs
# Content.Server/Administration/Commands/PlayTimeCommands.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-01 23:06:19 +03:00
Nemanja
a1a8f04036
Decouple interactions from hands, cleanup old events, add new fears ( #28393 )
...
* ok basic shit
* second part
* pretend it isn't real it can't hurt you.
* 👁️ 👁️
* shadowcommander review
2024-05-31 13:26:19 -07:00
Morb0
d97a09543d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
2024-05-15 18:53:52 +03:00
Vasilis
b860774d7c
Do not wake up NPC if there is still a mind attached. ( #27651 )
...
* Do not wake up NPC if there is still a mind attached.
This became apparent with diona nymphs (?) and slime gyras (?). This caused players that disconnected while a nymph, gyras or other npc to resume their NPC behavior. Which I would call unwanted. This fixes that.
* Zombies become AI anyway
* Update Content.Server/NPC/Systems/NPCSystem.cs
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-05-11 11:01:28 -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
metalgearsloth
c584f6444a
Pulling rework v2 ( #24936 )
...
* Pulling rework
Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.
* More pulling cleanup
* stats
* More cleanup
* First draft
* More pulling
* weh
* Fix puller
* Pulling working
* Fix merge
* Dunked
* Self-merge time
* Fix hotkey
* Fix container changes
* oop
* Fix multi-pulling
* Move alerts cleanup.
* pulling fixes
2024-03-19 14:30:56 +11:00
deltanedas
7561bef6a7
Move faction exception and everything it needs to shared ( #25154 )
...
* move faction prototype to shared
* move faction exception and member stuff to shared
* fix breaking changes for random stuff
* move pettable friend stuff to shared
* mostly fix
* final fixy
* dragonops
* final fixy II
* use querys and fix warpspeed fish (probably)
* fixer
* Rrrr!
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-18 18:23:25 +11:00
Morb0
837a7f9b0d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2024-03-13 17:02:47 +03:00
Mr. 27
3981173a15
Zombie wideswing and misc fix ( #26064 )
...
* inital
* b
* Update MeleeWeaponComponent.cs
* Update Content.Shared/Zombies/ZombieComponent.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-13 21:02:10 +11:00
Jezithyr
c15b0691ec
Emergency revert for pulling ( #24923 )
...
Revert "Pulling rework (#20906 )"
This reverts commit 0d8254b2a2
2024-02-03 10:32:30 -08:00
metalgearsloth
0d8254b2a2
Pulling rework ( #20906 )
...
* Pulling rework
Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.
* More pulling cleanup
* stats
* More cleanup
* First draft
* More pulling
* weh
* Fix puller
* Pulling working
* Fix merge
* Dunked
* Self-merge time
2024-02-03 14:36:09 +11:00
Morb0
32a8d1a21e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Power/Generator/GeneratorSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
2024-02-03 03:38:29 +03:00
Arendian
ecea561e44
Paraplegicn't zombies ( #24169 )
...
* The zombie virus now cures paraplegia.
* no wheelchairbound anymore
2024-02-01 22:06:05 +11:00
Morb0
f062cbcec2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# 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/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/Neck/Cloaks/hos.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
# 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/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/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
# Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
# Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
2024-01-02 23:07:58 +03:00
Łukasz Mędrek
3a7fda10df
Fix reptilians pulling after being zombiefied ( #23066 )
...
* Fix reptilians pulling after being zombiefied
Now being zombefied removes ability to pull objects, regardless of if
the entity could pull without using their hands.
Fix #23043
* Apply changes from review
2024-01-01 18:31:36 -05:00
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
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
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
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
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
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
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
