Commit graph

6829 commits

Author SHA1 Message Date
Morb
94de2bea3d
News fix (#1417) 2023-09-15 00:12:11 +03: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
deltanedas
6953070d40
ninja bombing target whitelist warp point (#19977)
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:04:00 -06:00
Interrobang01
3e42c86e9e
Fix cognizine not working on entities with minds (#19951) 2023-09-10 12:21:54 -08:00
Leon Friedrich
a08c381018
Make replays record ghost chat (#19957) 2023-09-10 21:49:45 +10:00
metalgearsloth
4d1c3ae66a
Revert "Remove IContainer and move functions to the container system.… (#19975) 2023-09-10 21:46:36 +10:00
deltanedas
24810d916b
ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Arimah Greene
a6af59e3bf
Make PA constructible again (#19428)
* Change construction graph correctly

https://github.com/space-wizards/space-station-14/issues/18511#issuecomment-1687893199

* Remove unnecessary call to UpdatePathfinding
2023-09-09 23:42:42 -04:00
deltanedas
152a1d1e75
Make monkeys better (#19407)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 12:51:51 +10:00
Leon Friedrich
b45e53603d
Remove IContainer and move functions to the container system. (#19834) 2023-09-10 12:16:37 +10:00
Leon Friedrich
2d71eec6f9
Remove AllComponentsOneEntityDeleteTest (#19965)
* Remove AllComponentsOneEntityDeleteTest

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2023-09-09 19:35:05 -05:00
DrSmugleaf
09bce85f19
Fix actions not being usable, ordering, and containers (#19964) 2023-09-09 16:14:17 -07:00
drteaspoon420
6a005640cd
Improve plant chemical and gas crossing (#19950)
Chemicals and gasses are not all wholesale swapped but given 50/50 for every chemical or gas.
2023-09-09 13:54:37 -08:00
Kevin Zheng
1be963cfa5
Add method for real atmos tick rate (#19861)
Atmos takes a variable number of atmos sub-ticks to complete processing depending on the configuration options.
2023-09-09 10:48:34 -08:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
Nemanja
cc5e185c6e
Fix initial infected transformation (#19735) 2023-09-08 17:29:49 -04:00
deltanedas
7e77720f01
Scale radiation intensity with stack size (#19869) 2023-09-07 13:59:08 -08:00
chromiumboy
ad9c4433f4
Adjust file namespace scope (#19824) 2023-09-07 10:49:55 -08:00
Vasilis
2446c6a37b
Hypo can inject solutions back into beakers (#19877)
* Inject to beakers

* Stop fighting in my pr

* Review
2023-09-07 09:49:02 -07:00
lzk
d577511c19
Change nukies auto-replace to empty string (#1392) 2023-09-07 16:11:10 +03:00
Errant
63c7bca04e
Add pressure limit to gas tanks (#19879) 2023-09-06 21:37:23 -08:00
Morb
610a10fb85
Use full file path for temp replays (#19002) 2023-09-07 13:56:33 +10:00
Varen
8590d32760
FTL on a spaced tile yeets instead of gibs (#19883)
* -Changes gibbing on FTL when on a spaced tile to yeeting on FTL if you're not buckled and on a space tile.

* -Throw relative to local shuttle position instead, fine for most cases and more performant
-Use throw code to throw.

* Blanks removal

woops

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-09-06 22:13:31 -04:00
deltanedas
58812c6ae7
fix weldable (#19878)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-06 14:18:11 -04:00
deltanedas
f2669b5771
Clean up APCs (#19841)
While here, fix an issue where APCs don't update the UI state after a load change.
2023-09-05 13:19:43 -08:00
deltanedas
6d5c310b36
Make constructed hydro trays start empty (#19620) 2023-09-05 12:15:06 -08:00
Slava0135
81388f77ed
Add gas tank valve (#19830) 2023-09-05 09:20:05 -08:00
deltanedas
a096e5be7e
prevent magnet deconstruction when active (#19849)
* raise ToolUseAttemptEvent on target as well as tool

* prevent using tools on magnet when active

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-05 19:20:54 +03:00
DrSmugleaf
0527d2e719
Fix barriers not working (#19774) 2023-09-04 15:33:40 -07:00
Leon Friedrich
e4ca6f4fb9
Allow solutions to store extra reagent data (#19323) 2023-09-05 07:55:10 +10:00