Morb0
55a91108c1
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
# Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-10-15 17:52:02 +03:00
DrSmugleaf
ed15b93926
Make starting gear automatically find hands for inhand items ( #20861 )
2023-10-14 10:28:52 -07:00
Leon Friedrich
ce76a03d5e
Small ExplosionSystem Cleanup ( #20817 )
2023-10-15 03:48:25 +11:00
TemporalOroboros
0775ab6a14
Moves SolutionContainerManagerComponent to Shared. ( #20944 )
2023-10-15 03:45:28 +11:00
Kara
546fa44526
Kill SharedUnoccludedExtensions ( #20914 )
2023-10-15 03:42:37 +11:00
DrSmugleaf
8639df7a74
Add pop sound effect when using the erase admin verb ( #20988 )
2023-10-14 02:53:02 -07:00
DrSmugleaf
f02a54497d
Make the panic bunker UI send cvar updates on focus exit, add erase verb tooltip message ( #20987 )
2023-10-14 02:28:08 -07:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel ( #20985 )
2023-10-14 02:02:56 -07:00
DrSmugleaf
3a2482420f
Show total playtime in player list and AHelp window ( #20980 )
2023-10-14 01:55:40 -07:00
Nemanja
5ecd5f7521
Fix hostile simplemob rotation ( #20900 )
2023-10-14 00:15:20 -07:00
deltanedas
33e5dfb9a8
add igniter ( #20962 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-14 00:11:50 -07:00
liltenhead
60f88b1fd6
Decrease AME stability damage ( #20963 )
2023-10-13 16:42:46 -07:00
chromiumboy
4c630d0b17
Radiation collector sprite update ( #20956 )
2023-10-13 19:08:00 -04:00
Morb0
6f6cbb14af
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/Changelog/ChangelogManager.cs
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# SpaceStation14.sln
2023-10-14 00:39:46 +03:00
DrSmugleaf
db4ad40430
Add panic bunker UI and automatic panic bunker ( #20954 )
2023-10-13 11:56:12 -07:00
Ed
5fa0e7dd49
Animals make hearts when you pet them ( #20859 )
2023-10-13 09:34:18 -08:00
chromiumboy
535b013f63
SMES and substation require power cells as machine parts ( #20344 )
...
* Initial commit
* Balancing and tweaks
2023-10-12 12:06:03 -04:00
DrSmugleaf
b53f10fbb2
Fix not removing RevolutionaryRoleComponent from minds on mindshield application ( #20832 )
...
* Fix not removing RevolutionaryRoleComponent from minds on mindshield application
* Simplify other part of the mindshield code
* Fix being able to mindshield head revs
* Other way around
2023-10-11 18:14:00 -04:00
lzk
6a4dca04ea
Update chat sanitize for :O emote ( #1493 )
2023-10-11 21:28:47 +03:00
Leon Friedrich
1f21826c21
Fix inventory relay by-ref events ( #20816 )
...
* Fix inventory relay ref events
* this works too (avoid duplication)
---------
Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-10-11 19:31:10 +03:00
Morb0
d2a4a3b16b
Change default announce sound and decrease changes
2023-10-11 17:05:07 +03:00
Morb0
75443d7fb6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Communications/CommunicationsConsoleSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
2023-10-11 16:56:19 +03:00
Kara
7dd20f7af1
Kill ComponentExt ( #20907 )
2023-10-11 20:19:46 +11:00
Kara
dbb7c7065a
Kill ContainerHelpers ( #20908 )
2023-10-11 20:18:49 +11:00
Kara
14dac914ce
Kill UserInterfaceHelpers ( #20912 )
2023-10-11 20:17:59 +11:00
deltanedas
e911c9e516
Rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent ( #20782 )
2023-10-10 22:34:51 -08:00
Leon Friedrich
440a578047
Add mind entities to PVS overrides ( #20847 )
2023-10-11 14:45:05 +11:00
Vasilis
bf6827f1e9
Hopefully??? ( #20865 )
2023-10-10 23:11:46 -04:00
metalgearsloth
d99d85500c
Fix shuttle throwing ( #20884 )
...
The original PR had a lot of strange and unperformant code.
2023-10-10 23:07:21 -04:00
DrSmugleaf
9bcf67753a
Replace string data fields with LocId where relevant ( #20883 )
2023-10-10 23:06:24 -04:00
metalgearsloth
edbfef22d6
Climbing refactor ( #20516 )
2023-10-10 16:41:11 -07:00
metalgearsloth
425e49bbc8
Fix salvage mission biome seed ( #20885 )
2023-10-10 14:35:50 -07:00
metalgearsloth
83062e39b0
Fix shuttle planet FTL overlapping markers ( #20887 )
2023-10-10 14:33:04 -07:00
Slava0135
6f8c2b7e52
Use conditions to store progress for Ninja objectives ( #20254 )
...
* TryGetObjectiveComp
* helper function to get objective
* store N of jacked doors in condition
* store called in threat bool in condition
* store techs in steal research condition
* fix access
* remove unused transform system
* use popup from shared system
* fix formatting
* condition => obj everywhere
* i fogror to remove downloaded nodes from role
* change signature
* use query
* View Variables
* spider charge detonated => condition
2023-10-10 09:32:10 +03:00
Nemanja
2c8a97fe02
Revert "Revert "Reenable kudzu."" ( #20876 )
2023-10-09 20:34:41 -07:00
Nemanja
46d1890844
Fix fast kudzu ( #20875 )
2023-10-09 20:32:34 -07:00
brainfood1183
ad17adfb63
Polymorph Artifact Effect ( #20660 )
...
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-10-09 16:49:42 -07:00
Sailor
a62b9ea19b
Revert "Reenable kudzu." ( #20843 )
2023-10-09 00:08:42 -07:00
DrSmugleaf
be346c3cf3
Add Exists check and try catch when creating replay dir ( #20852 )
2023-10-08 23:34:10 -07:00
DrSmugleaf
f776251925
Fix error on round restart when terminating spreaders ( #20850 )
2023-10-09 17:16:08 +11:00
Nemanja
6ec02db63f
Make MMIs work again ( #20844 )
2023-10-08 21:49:20 -07:00
DrSmugleaf
3e509d7630
Give ringtone setting a 0.25 second cooldown, style and fixes ( #20780 )
2023-10-08 17:25:08 -04:00
Leon Friedrich
364c9b7f0a
DamageableSystem cleanup & performance improvements ( #20820 )
2023-10-09 03:27:41 +11:00
Nemanja
2a75e7213e
Wow kudzu is back! ( #20822 )
2023-10-07 13:59:39 -06:00
DrSmugleaf
e4c4d9b0a4
Fix sleeping action not working ( #20813 )
2023-10-07 15:11:02 -04:00
Leon Friedrich
3101e5a18d
Fix action-granting items not being predicted ( #20778 )
...
* Ensure actions are predicted
* Fix test fail
2023-10-07 15:08:13 -04:00
DrSmugleaf
a0341ec53e
Add test to load all config presets ( #20705 )
2023-10-06 19:31:08 -07:00
Leon Friedrich
427cae2d25
Misc mind tweaks and fixes ( #20614 )
2023-10-06 18:00:48 -07:00
Nemanja
02df8cd263
Add mob retaliation ( #19901 )
2023-10-06 17:56:18 -07:00
deltanedas
6af7c90b73
make tinned foods use openable ( #19884 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-06 17:35:32 -07:00
