Morb
2484a01a39
Revert "Replace TTS provider" ( #2289 )
2024-06-18 13:00:33 +03: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
Morb
1728443d1a
Replace TTS provider ( #2278 )
2024-06-17 23:17:08 +03:00
deltanedas
c332677971
remove robotics console emag checking, make it a bit fairer ( #27876 )
2024-06-16 23:30:10 -04:00
Cojoke
390f8d19d1
Makes Eyepatches Flippable ( #26277 )
2024-06-16 23:21:29 -04:00
Nemanja
9348a5cea6
Apc & Substation resprite ( #28998 )
...
* substation
* apcs
* top pixels
* new screens
2024-06-16 05:43:22 -05:00
Partmedia
e633fe801b
Widen power monitoring widget ( #29062 )
2024-06-15 21:06:54 -04:00
DrSmugleaf
2ddebba0e9
Fix speech bubble occlusion being checked from the player's position instead of the eye's ( #29012 )
2024-06-15 17:35:05 -04:00
ShadowCommander
789453adf0
Make firelock warning light not require power and add a PointLight ( #29024 )
...
* Add a PointLight to firelocks when warnings are active
* Remove power requirement for lights
2024-06-15 11:17:16 -04:00
nikthechampiongr
9dc9e22d13
Bwoink fix ( #28899 )
...
* Fix incorrect usage of loc string
* Make it so you can no longer ahelp someone who is no longer selected
2024-06-15 04:25:42 -07:00
Morb0
da4af61aee
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
# Resources/Prototypes/GameRules/events.yml
# Resources/Textures/Objects/Devices/nuke.rsi/meta.json
2024-06-15 10:39:49 +03:00
metalgearsloth
8f12e90b90
Don't use invalid defaults for loadouts ( #28740 )
...
* Don't use invalid defaults for loadouts
At the time it made more sense but now with species specific stuff it's better to have nothing.
* Loadout SetDefault only applies valid loadouts
2024-06-15 16:53:42 +10:00
LankLTE
bb61191b24
Set ahelp new player icon to use minutes, not seconds ( #29014 )
...
Replace seconds with minutes
2024-06-15 16:35:34 +10:00
AJCM-git
c339773b5f
Fixes the ShowRulesCommand and the client not syncing rules correctly ( #28752 )
2024-06-15 00:41:25 -04:00
Nemanja
748e5831e8
Add moon boots ( #29009 )
2024-06-14 20:43:23 -07:00
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03:00
Tayrtahn
6c343ddae2
Move SleepingSystem to Shared & cleanup ( #28672 )
...
* Move SleepingSystem to Shared & cleanup
* Remove empty OnShutdown handler
2024-06-14 12:15:29 +10:00
deltanedas
8c514b90fd
fix pda ui troll ( #28896 )
...
* fix pda ui troll
* bruh
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-12 20:10:53 +02:00
Deserty0
90354fa6d3
Fix "no materials loaded" messege in lathes ( #28885 )
...
fix
2024-06-12 13:32:11 +03:00
dffdff2423
f571e23037
Enable save button on changing job unavailable preference ( #28839 )
...
Enable save button on changing unavailable pref
Fix an issue where the save button was disabled when just changing your job unavailable preference
2024-06-11 12:48:23 +10:00
Hannah Giovanna Dawson
1bb9d9451f
Panic Bunker uses minutes not hours ( #28805 )
...
* Panic Bunker uses minutes not hours
* Fixing an instance of hours
2024-06-09 22:45:47 +02:00
Nemanja
50d83b9360
Cap scramble tag ( #28804 )
2024-06-09 16:01:05 -04:00
Julian Giebel
de07c291de
Implement map text ( #28705 )
2024-06-09 15:18:54 -04:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) ( #28763 )
2024-06-09 14:58:10 -04:00
AJCM-git
346ac44a28
Open the guidebook when people with less than an hour playing join the round ( #28774 )
...
* Open the guidebook when people with less than an hour playing join the round
* Filter for gameplayState
* Fix tests
* tweaks
* saltern update (#28773 )
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Fix admin menu objects list (#28787 )
* Make `MakeAntag()` log errors instead of throwing exceptions (#28771 )
Make `MakeAntag()` log errors instead of throw
* add default page support for the guidebook (#28772 )
* Probably a better way to handle this
---------
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-06-09 12:26:48 -04:00
Nemanja
c549573f7a
add default page support for the guidebook ( #28772 )
2024-06-09 11:55:21 -04:00
Leon Friedrich
8d52f6b617
Fix admin menu objects list ( #28787 )
2024-06-09 09:51:02 -04:00
Tayrtahn
5f91c3f27f
Strip markdown from silicon laws before saying them ( #28596 )
2024-06-09 09:57:07 +10:00
Leon Friedrich
7ef7fe6761
Try fix RGBee ( #28741 )
2024-06-08 20:27:21 +10:00
Leon Friedrich
2c7598fd5b
Fix flatpacker ( #28736 )
...
* Fix flatpacker
* a
2024-06-08 18:48:23 +10:00
DrSmugleaf
0762f9da17
Fix action icons when dragging an active action to another slot ( #28692 )
2024-06-07 22:34:48 -07:00
Plykiya
d19b430a92
Swap some InRangeUnobstructed for InRangeUnoccluded ( #28706 )
...
Swap InRangeUnobstructed to InRangeUnoccluded
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-07 20:57:07 -04:00
AJCM-git
63e0ee08cb
Fixes client having authority over rules popup cvars ( #28655 )
...
* Fixes client having authority over rules popup cvars
* Delete duplicate migration
* Pre-update
* Post-update
2024-06-07 21:53:20 +02:00
Leon Friedrich
b632a65385
Add JobRequirementOverride prototypes ( #28607 )
...
* Add JobRequirementOverride prototypes
* a
* invert if
* Add override that takes in prototypes directly
2024-06-07 09:43:02 -07:00
AJCM-git
accf8adf97
Fixed the guidebook listing every single rule ( #28680 )
...
* Well i tried this way
* New approach (start)
* Did it
* makes spacelaw available, put it under sec
2024-06-07 06:28:55 -05:00
Nemanja
b317fa4ccf
Flatpacker fixes ( #28417 )
2024-06-06 20:55:35 -04:00
Leon Friedrich
e7f2ae52ab
Give jobs & antags prototypes a guide field ( #28614 )
...
* Give jobs & antags prototypes a guide field
* A
* space
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
* Add todo
* Fix merge errors
---------
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-06-06 05:05:58 -07:00
Nemanja
1333b48747
Convert rules to use guidebook parsing ( #28647 )
2024-06-06 03:11:26 -04:00
Repo
039fd932b2
Fix Admin Object tab sorting and search ( #28609 )
2024-06-06 02:41:11 -04:00
Chief-Engineer
fea2bc9422
Update rules ( #28452 )
2024-06-05 19:59:22 -04:00
Nemanja
729e67af7f
Machine-code cleanup ( #28489 )
2024-06-05 16:23:23 -04:00
Leon Friedrich
adeed705e6
Add Job preference tests ( #28625 )
...
* Misc Job related changes
* Add JobTest
* A
* Aa
* Lets not confuse the yaml linter
* fixes
* a
2024-06-06 00:19:24 +10:00
Hannah Giovanna Dawson
d4fe7eda51
SS14-26964 Clown Waddling Replicates, etc ( #26983 )
2024-06-04 09:23:09 -04:00
Plykiya
c5ff647ca6
Replace obsolete EntityWhitelist IsValid usages part 2 ( #28506 )
2024-06-03 17:40:03 -04:00
Ed
a4d1601758
Accent trait limit ( #28046 )
2024-06-03 14:47:06 -04:00
AJCM-git
619d82ed42
Small code cleanup to health bar ( #28554 )
2024-06-03 12:22:26 -04:00
AJCM-git
8c10581010
Cleans up StatusIconSystem and fixing some bugs ( #28270 )
2024-06-03 12:12:21 -04:00
Tayrtahn
0d864d324c
Add support for HeldPrefix to SolutionContainerVisualsSystem ( #28532 )
2024-06-03 01:12:13 -04:00
AJCM-git
be35a5d369
Header of Gas tank UI screen now fetched from Entity name and local ( #28545 )
2024-06-02 23:33:30 -04:00
Morb0
6a6bf86856
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/GameRules/events.yml
2024-06-02 19:57:53 +03:00
