VigersRay
c8e9b7bbf4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Roles/RoleSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/GameRules/midround.yml
# RobustToolbox
2024-10-10 19:09:17 +03:00
lzk
33042b00d0
Fix cryo locale again ( #32654 )
...
* Fix cryo locale again
* yeep
2024-10-08 11:50:54 +02:00
VigersRay
c11a6636f5
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/migration.yml
2024-09-19 16:58:09 +03:00
lzk
e490b69b4e
fix conjugate have in cryo locale string ( #31993 )
2024-09-19 15:50:59 +02:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
Winkarst
2d85b4e7e9
Move OnGhostAttempt to GhostSystem ( #31445 )
...
* Move OnGhostAttempt to GhostSystem
* Remove unused dependencies and sort them
2024-08-26 14:15:33 +02:00
Vigers Ray
72affc5f7a
Очередь озвучки анонсов, фиксы багов и оптимизация генерации ттсов. ( #35 )
...
* Очередь на озвучку оповещений
* Фикс ошибок клиента и оптимизация ттса
* Укоротил сообщения о кодах
* чейнжлог
2024-06-07 11:04:08 +03:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10:00
Tayrtahn
9b97a2e05d
Fix cryostorage identifying unknown characters as captain ( #26927 )
...
Fixed cryostorage getting captain's record for unknown jobs.
Also localized Unknown job string.
2024-04-14 12:19:42 +10:00
lunarcomets
9d62b3c3e6
Cryogenic storage tweaks ( #26813 )
...
* make cryo remove crewmember's station record when going to cryo
* Revert "make cryo remove crewmember's station record when going to cryo"
This reverts commit 9ac9707289b5e553e3015c8c3ef88a78439977c6.
* make cryo remove crewmember from station records when the mind is removed from the body
* add stationwide announcement for people cryoing (remember to change pr title and desc)
* minor changes
* announcement actually shows job now
* requested changes
* get outta here derivative
2024-04-11 16:48:46 -04:00
c4llv07e
ee614dec5c
Fix cryostorage removing minds of players who have entered ghost role ( #24991 )
...
* fix cryo removed minds of players who entered ghost role
Signed-off-by: c4llv07e <kseandi@gmail.com>
* better way to handle cryo with mind in it
Signed-off-by: c4llv07e <kseandi@gmail.com>
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
2024-02-28 17:09:02 -05:00
Ed
498ad2d5d7
Lock Anomaly generator to research access ( #24464 )
...
* small patch
* fix
* remove garbage
* fix
* moved to shared events
* fix
* LocId
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-01 19:45:24 +11:00
Nemanja
e145a8f696
try and purify cryosleeper code ( #24165 )
2024-01-16 16:02:26 -07:00
Nemanja
736b9dd7df
Cryogenic Sleep Units ( #24096 )
...
* Cryogenic sleep units
* pause map support
* no more body deletion
* Cryogenic Storage Units
* boowomp
* no more emag, no more dropping present people
2024-01-14 23:35:28 -07:00
