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
LankLTE
88ec2aa77c
Fixes Syndicate Bomb logs ( #20240 )
...
* Fixed logs
* fix dumb entity stuff
2023-09-18 21:51:13 -04:00
Pspritechologist
6dd579a385
Adds Duration to EMP Event ( #18437 )
2023-09-18 08:28:05 -04:00
deltanedas
fc6638d7e0
gateway changes ( #20304 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-18 11:09:21 +10:00
Leon Friedrich
df3ff0cee4
Fixes a borg error that was causing random test failures ( #20297 )
2023-09-18 11:06:56 +10:00
DrSmugleaf
c558f00a74
Fix Fultons losing their beacon when split ( #20179 )
2023-09-17 20:22:26 -04:00
Morb
d5e5cdeb12
Hotfix news content ( #1424 )
2023-09-17 13:06:35 +03:00
metalgearsloth
e5d6d7f1eb
Make GetExplosionResistance event a struct ( #20274 )
...
Also fixed a typo.
2023-09-17 04:04:04 -05:00
metalgearsloth
93ccd1b77d
Fix drain return ( #20276 )
2023-09-16 21:08:05 -08:00
deltanedas
30259e7234
make objective blacklist work ( #20256 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 14:25:56 -07:00
TomaszKawalec
282db32ad8
MutationSystem style changes ( #19954 )
2023-09-16 12:25:53 -08:00
deltanedas
621e102c93
refactor nukeops rule a bit ( #19792 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 21:48:42 +10:00
Leon Friedrich
7d9693d976
Fix replay recording temporary paths not supporting subdirectories ( #19887 )
2023-09-16 21:46:12 +10:00
metalgearsloth
e08b0954e5
Add navmap beacons ( #19388 )
2023-09-16 18:11:47 +10:00
deltanedas
f7711edbe3
Objectives ecs rework ( #19967 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:18:10 +10:00
deltanedas
e8c58d1574
Microwaved pais get scrambled name + randomly bricked ( #19982 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:07:36 +10:00
deltanedas
8aba52d796
fix gateway destinations ( #20172 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 15:56:35 +10:00
ShadowCommander
425af9e742
Cleanup GhostSystem ( #17526 )
2023-09-16 15:21:33 +10:00
Leon Friedrich
f7d7f5cc7f
Rename DummyPuppet to VentriloquistPuppet ( #19777 )
2023-09-16 14:54:46 +10:00
612
236a97d190
Disable kuzdu pending growth rate fix ( #20200 )
2023-09-15 09:16:03 -08:00
metalgearsloth
7e4f755d7f
Suppress pathfinding debug assert ( #20101 )
2023-09-15 23:34:01 +10:00
Nemanja
c34913b227
Try and fix mob prototypes ( #19859 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-09-14 20:10:30 -07:00
Morb
8bcab77bc4
Disable SSD indicator for NPC ( #20027 )
...
* Make ActiveNPCComponent shared
* Check if entity have ActiveNPC component
* Make networked
* Fix path
* fix
2023-09-14 22:15:26 -04:00
Morb
94de2bea3d
News fix ( #1417 )
2023-09-15 00:12:11 +03:00
chromiumboy
3753fed920
Fix adding/removing airlock protections via welding ( #19926 )
2023-09-13 21:54:49 -08:00
Doru991
3f51795cc7
Add plant species mutations ( #19960 )
2023-09-13 20:56:24 -08:00
Whisper
1b3f4c3d7b
Guardians (Holo and holoclown) have syndicate faction ai ( #19816 )
2023-09-13 20:51:10 -07:00
Kevin Zheng
a622844a5f
Make slow spacing variables CCVars ( #19862 )
2023-09-13 19:38:56 -08:00
Morb0
d34fad151c
Use NetEntity
2023-09-13 20:29:59 +03:00
Morb0
dd162a01e3
Fix loadout system
2023-09-13 17:28:46 +03: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
7dc3347181
Fix planet docking ( #20104 )
2023-09-13 22:06:15 +10:00
metalgearsloth
ac66224a3a
Fulton fixes ( #20102 )
2023-09-13 18:01:22 +10:00
Doru991
266dc47b80
welder fix ( #20090 )
2023-09-13 14:35:04 +10:00
deltanedas
b53e5d6661
ninja hotfixes ( #20032 )
...
* check that slot is power cell slot
* add BatteryChangedEvent
* use BatteryChangedEvent when enabling gloves and replacing battery
* sort gloves dependencies
* increase stun duration and cooldown
* play sound when stunning people
* remove dirty for non networked field
* NinjaBatteryChangedEvent
* real
* fake
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 14:54:18 -06:00
drteaspoon420
a7980be623
Ensure plants always have some reagents after crossing ( #20078 )
2023-09-12 11:40:11 -08:00
metalgearsloth
7064f262b4
Add ore bag area pickups ( #19358 )
2023-09-12 22:34:04 +10:00
metalgearsloth
fd60d39bc7
Remove instruments compref ( #19560 )
2023-09-12 14:43:06 +10:00
eclips_e
133ca98655
Hardbombs & Defusables ( #15380 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
2023-09-11 18:42:38 -07:00
chromiumboy
c853f0bfb7
Artifact containers can safely store radioactive objects (version 2) ( #19652 )
...
* Artifact containers suppress the radioactive of artifacts inside them
* Updated to reflect changes to RobustToolbox
* Made necessary changes after updating RT
* Removed test code
* Made requested change
* Updated due to changes to RobustToolbox
* Renamed function
* Updated to accommodate changes to RobustToolbox
* Actually resolve merge conflict?
* Removed unnecessary change
* Made requested changes
* retrigger checks
* Retrigger checks
---------
Co-authored-by: root <root@DESKTOP-HJPF29C>
2023-09-11 15:58:25 -04:00
metalgearsloth
d5bd1c6f86
Predict StorageComponent ( #19682 )
2023-09-11 21:20:46 +10:00
metalgearsloth
99b77bc2d3
Remove lights compref ( #19531 )
2023-09-11 19:18:06 +10:00
metalgearsloth
e1a91466f1
Fix playtime tracker ( #20014 )
2023-09-11 17:42:25 +10:00
metalgearsloth
28bf3a6240
Remove SharedEye (but content) ( #19481 )
2023-09-11 16:15:23 +10:00
Kara
64a29f0d8a
InAir tweaks & chasm fixes (#19707 )
2023-09-11 16:03:16 +10:00
metalgearsloth
b77265314b
Make role timer tooltips pretty ( #19605 )
...
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-09-11 15:44:21 +10:00
Leon Friedrich
5bc14d86ed
Fix crew monitor ( #20003 )
2023-09-11 15:01:53 +10:00
metalgearsloth
3c0439167a
Fix makeghostrole eui ( #19998 )
2023-09-11 14:31:45 +10:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
