27488 Commits

Author SHA1 Message Date
metalgearsloth
34d2330604 Throttle MagicMirror do_afters (#23867)
Doesn't fix the gross network spam but that's for later.
2024-01-10 17:08:42 -07:00
Emisse
a35c91fc76 marathon update (#23904) 2024-01-10 17:07:48 -07:00
Emisse
eee7aef63a remove ame parts from cargo (#23903) 2024-01-10 17:07:41 -07:00
Flareguy
31cc9babaa Makes lights use the "old" light fixture sprites (#23898)
returns the ss13 light fixture sprites
2024-01-10 17:07:14 -07:00
Pieter-Jan Briers
a39999fb9c Fix admin log key order. (#23052)
The keys for admin logs were set as (log_id, round_id). This made no sense because logs are usually accessed per round.
2024-01-11 01:03:25 +01:00
Emisse
c7ad10d0ad make intercoms draw above table (#23897)
Update intercom.yml
2024-01-11 10:05:59 +11:00
nikthechampiongr
ef132c8a7b Fix tranquiliser shells not working (#23886)
* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02 which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids
2024-01-10 18:02:37 -05:00
lzk
1fbb63f7d3 aspid update (#23872)
aspid

- connected missed external airlocks
- replaced water tank on hight-capacity water tank at jani room
2024-01-10 15:42:32 -07:00
lzk
80a44a6362 bagel update (#23870)
bagel

- connected missed external airlocks
- removed vendor mapped names
- skub
2024-01-10 15:42:15 -07:00
luckyshotpictures
036cf42a26 Gemini Hotfix (#23869)
hotfix hotfix hotfix
2024-01-10 15:41:43 -07:00
lzk
e7a4c5c4fc box update (#23871)
box

- removed mapped vendor names
- connected missed external airlocks
2024-01-10 15:41:29 -07:00
Arendian
23e714e523 Fix borg becoming emag immune if emag attempted with panel closed. (#23729)
* Fix borg becoming emag immune if emag attempted with panel closed.

* new event

* removed code added in accessreader

* fix emag 1984
2024-01-10 17:01:38 -05:00
nikthechampiongr
7aee192d52 Aghosts and other powerful beings no longer burn their hands on lights. (#23879)
Make aghosts and other things that can't take burn damage not burn their
hand when changing lightbolbs
2024-01-10 16:39:56 -05:00
Arendian
464f24d040 Fix roller skates debug assert (#23876)
Networkedcomponent
2024-01-10 16:38:24 -05:00
sneb
9c294d7258 Fixed opened cargo airlock sprite (#23889)
fix cargo door open sprite
2024-01-10 14:12:46 -07:00
rhailrake
58ebc489ce [feat] Sorted hop console
# Conflicts:
#	Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
2024-01-11 00:30:18 +07:00
rhailrake
6202617b8c [feat]enableShuttleCall command and button to admin menu 2024-01-11 00:29:39 +07:00
rhailrake
2fc83dce19 [feat] Bloodbath 2024-01-11 00:29:28 +07:00
rhailrake
c41e58fa3e [feat] Stalin manager
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/GameTicking/Commands/JoinGameCommand.cs
#	Content.Server/GameTicking/GameTicker.Lobby.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
2024-01-11 00:26:12 +07:00
rhailrake
976b6788a8 Customvote now shows number of votes for each option 2024-01-11 00:18:36 +07:00
rhailrake
d2b52acee3 [tweak] more logs
# Conflicts:
#	Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
#	Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
2024-01-11 00:18:11 +07:00
rhailrake
509a5d6862 [tweak] critical logs in admin chat
# Conflicts:
#	Content.Server/AME/AMENodeGroup.cs
#	Content.Server/AME/Components/AMEControllerComponent.cs
#	Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
#	Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
#	Content.Server/Gravity/GravityGeneratorSystem.cs
#	Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
#	Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
#	Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
2024-01-11 00:13:25 +07:00
rhailrake
ea4f7595a2 [feat] TTS
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Server/Database/ServerDbBase.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
2024-01-10 23:56:07 +07:00
themias
1cf07fadac Fix flippo sprite layer (#23877) 2024-01-10 10:58:01 -05:00
rhailrake
e9b7473e1a [feat] shaking on meteor event
# Conflicts:
#	Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
2024-01-10 22:28:59 +07:00
rhailrake
49f0114574 [add] spawn logs 2024-01-10 22:24:53 +07:00
rhailrake
4e5232f0f2 [fix?] you can`t re/call when you not on station
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
2024-01-10 22:24:42 +07:00
rhailrake
cd6483a665 [feat? i dunno] SetGlobalZoomCommand 2024-01-10 22:22:48 +07:00
rhailrake
aca6843c0a [feat] Sockets, i guess mm hmm
# Conflicts:
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Shared/CCVar/CCVars.cs
2024-01-10 22:21:52 +07:00
rhailrake
eeec02119d [tweak] forget bout it.. 2024-01-10 21:51:27 +07:00
rhailrake
83160bb89f [tweak] brig timers now announce
# Conflicts:
#	Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
#	Content.Server/MachineLinking/Components/SignalTimerComponent.cs
#	Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
2024-01-10 21:50:12 +07:00
rhailrake
f42c361c89 [feat] RoleBan UI
# Conflicts:
#	Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
2024-01-10 21:32:07 +07:00
rhailrake
122988d384 [tweak] Sleeping while cloning
# Conflicts:
#	Content.Server/Cloning/CloningSystem.cs
2024-01-10 21:31:07 +07:00
rhailrake
20c1628913 colorfull chat system
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
2024-01-10 21:29:10 +07:00
rhailrake
95165aacae [feat] ru and eng keycodes
# Conflicts:
#	Content.Shared/Chat/SharedChatSystem.cs
2024-01-10 21:28:23 +07:00
rhailrake
505caa556e [feat] roundid command 2024-01-10 21:27:54 +07:00
rhailrake
b33fe6ec06 [tweak] publish, build info
# Conflicts:
#	.github/workflows/publish.yml
2024-01-10 21:27:34 +07:00
Remuchi
31979e68df fixooooo 2024-01-10 21:14:43 +07:00
rhailrake
e52d533b2c [feat] Discord hooks
# Conflicts:
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
2024-01-10 21:14:25 +07:00
rhailrake
37a34cbf2a [feat] new hair, and white sprites 2024-01-10 20:53:43 +07:00
rhailrake
4e85539ec6 [feat] donate
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
2024-01-10 20:52:59 +07:00
rhailrake
0cbb69d0a1 [feat] SlangSatinization
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
2024-01-10 20:24:10 +07:00
rhailrake
dfb3a1e6c4 [tweak] timers 2024-01-10 20:15:43 +07:00
Remuchi
d79a5e3190 fix: фикс фиксик фиксулька 2024-01-10 20:14:49 +07:00
rhailrake
cfa31be8d4 [feat] bleeding alert, separated chat is default
# Conflicts:
#	Content.Server/Body/Components/BloodstreamComponent.cs
#	Content.Server/Body/Systems/BloodstreamSystem.cs
#	Content.Shared/Alert/AlertType.cs
2024-01-10 20:13:48 +07:00
rhailrake
2f1976a749 [tweak] lobbyscreens, music
# Conflicts:
#	Resources/Prototypes/SoundCollections/lobby.yml
2024-01-10 20:04:14 +07:00
rhailrake
ca64b5ee5d [tweak] ru names, datasets
# Conflicts:
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
#	Resources/Prototypes/Datasets/Names/military.yml
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Prototypes/Datasets/Names/skeleton_first.yml
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Datasets/verbs.yml
2024-01-10 20:03:23 +07:00
rhailrake
c4f378b4a8 [tweak] accent adaptation 2024-01-10 19:53:13 +07:00
rhailrake
423c3db243 locale
# Conflicts:
#	Resources/ServerInfo/Guidebook/Botany.xml
#	Resources/ServerInfo/Guidebook/Controls/Controls.xml
#	Resources/ServerInfo/Guidebook/Controls/Radio.xml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
#	Resources/ServerInfo/Guidebook/Security/DNA.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
2024-01-10 19:52:08 +07:00
metalgearsloth
a46f6f3f85 Fix ruins being added to station grid (#23865) 2024-01-10 23:44:09 +11:00