pacable
e21990ae1f
Ведущие роли + мелкие изменения ( #143 )
...
* Мелкий фикс локализации
* Еще более мелкий фикс локализации
* Вернул серьёрные должности
* Изменение флотского панципя и добавление его в лоадаут ПЦК
* undo mapedit
* удалил ненужные больше прототипы
2024-06-23 20:33:02 +03:00
GayBot
a500322d84
Automatic changelog update
2024-06-23 20:32:33 +03:00
Rinary
cc815ace5a
фикс времени в КПК ( #142 )
...
* Time fix
* Some editings
* fix
* changes
* fix
2024-06-23 20:31:28 +03:00
GayBot
f2ccddb943
Automatic changelog update
2024-06-22 12:42:34 +03:00
Babaev
2f78b468c6
Локализация советов ( #141 )
2024-06-22 12:41:29 +03:00
GayBot
c33a03c2b9
Automatic changelog update
2024-06-22 05:08:05 +03:00
pacable
59ad6f35dc
Мелкие фиксы ( #140 )
...
* Изменен цвет Синего Щита. Починил форму горничной у уборщика
* пофиксил доступы у сейфа БЩ
2024-06-22 05:07:00 +03:00
VigersRay
ff1429a9a9
Merge remote-tracking branch 'origin/master'
2024-06-21 20:30:59 +03:00
VoidVepayn
00798eda59
Агост может видеть должность и мш ( #139 )
2024-06-21 20:30:38 +03:00
VigersRay
b8d0cda6bb
Починил job-name-iaa
2024-06-21 20:30:12 +03:00
VigersRay
69558b6148
Запретил некоторым расам быть на ролях ОБР и ЭС
2024-06-21 18:15:39 +03:00
VigersRay
9fd0e0cff7
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
2024-06-21 18:08:24 +03:00
mhamster
c1eee9e473
Fix Cyborgs.xml typo ( #2313 )
...
(cherry picked from commit fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba)
2024-06-21 18:06:33 +03:00
Pieter-Jan Briers
f041f58a6d
Add time index to connection log ( #29281 )
...
* Add time index to connection log
Queries go nyoom.
* Don't let me code shit at 5 AM
2024-06-21 15:29:10 +02:00
PJBot
730a4d289d
Automatic changelog update
2024-06-21 12:07:14 +00:00
nikthechampiongr
76a65c8e43
Implement BlacklistedRange exempt flag ( #29258 )
...
* Implement a new kind of ip range ban that only applies to new players
* Put determining whether a player record exists to its own function
* Make BlacklistedRange bans get bypassed by any ban exemption
* Stop trying to get another DbGuard while already having one
This does break with convention on the functions in that area but
considering the use of this function it's probably fine?
I could alternatively just move the place it's called from.
Also I was suppossed to wait for tests to finish locally just to be
sure, but nah. I am pushing this now
2024-06-21 14:06:07 +02:00
PJBot
6b13f5f0cb
Automatic changelog update
2024-06-21 10:51:58 +00:00
Leon Friedrich
70a40b62cb
Fix some buckle interactions ( #29293 )
2024-06-21 03:50:52 -07:00
PJBot
38439996e9
Automatic changelog update
2024-06-21 09:43:00 +00:00
TsjipTsjip
949a837720
Ghostrole rule updates ( #29249 )
...
* First batch of ghostrole rule updates
* Second pass
* Re-word free agent
* Apply review comments
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* You heard it here first folks
God rules are weird to write.
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Honkbot -> Free Agent
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Mimebot -> Free Agent
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Jonkbot -> Free Agent
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Softer blue
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2024-06-21 04:41:54 -05:00
Alex Pavlenko
711acedfe5
feat: update cyborg parts naming for them to be ordered consistently,… ( #29272 )
...
feat: update cyborg parts naming for them to be ordered consistently, closes #29270
2024-06-21 09:43:15 +03:00
PJBot
7ef1002101
Automatic changelog update
2024-06-21 05:43:23 +00:00
slarticodefast
d62dddcfcb
fix initial infected icons and add a briefing to the character menu ( #29259 )
2024-06-21 15:42:17 +10:00
VigersRay
7085c8a1ae
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-21 06:25:27 +03:00
VigersRay
a536a480cf
Фикс строки поиска в аплнке
2024-06-21 06:25:01 +03:00
VigersRay
79a026f2a8
Убрал из наших ролей в startingGear BoxSurvival
2024-06-21 06:12:17 +03:00
Tayrtahn
880fef507d
Replace BlockSolutionAccessComponent with an attempt event ( #26988 )
...
* BlockSolutionAccessComponent now only blocks one specified solution.
* Significant overhaul
Separated spilling when worn functionality into its own component/system.
Removed BlockSolutionAccessComponent.
Added an event for solution access.
2024-06-21 13:04:02 +10:00
PJBot
f94d663452
Automatic changelog update
2024-06-21 03:03:30 +00:00
MilenVolf
9cd2705d6b
Make stasis bed power toggleable ( #29268 )
...
Stasis bed is now power toggleable
2024-06-21 13:02:23 +10:00
VigersRay
f20cdd1222
Merge remote-tracking branch 'origin/master'
2024-06-21 05:59:47 +03:00
VigersRay
932dcc0b94
Фиксы разумной болезни
2024-06-21 05:59:40 +03:00
VigersRay
06ddc32535
фикс transformable-container-component-glass
2024-06-21 05:59:25 +03:00
VigersRay
16ba6cea72
Включить TTS -> TextToSpeach интеграция
2024-06-21 05:43:47 +03:00
GayBot
3ba9b16093
Automatic changelog update
2024-06-21 05:36:14 +03:00
Lgibb18
ad39b4f298
Disease boowomp ( #135 )
...
* disease
* eula
2024-06-21 05:35:09 +03:00
VigersRay
7a811c6c39
фиксы YAMLLinter
2024-06-21 05:33:36 +03:00
VigersRay
a05f3a5849
чейнжлог
2024-06-21 05:32:31 +03:00
VigersRay
e54e10b870
Фиксы апстрима
2024-06-21 05:15:52 +03:00
VigersRay
2b29ccb77e
удалил StartingGear из SpeciesPrototype
2024-06-21 05:11:45 +03:00
VigersRay
fbc89c6ac5
Survival лоадауты для наших ролей
2024-06-21 05:09:22 +03:00
VigersRay
957fd05826
упси-дупси
2024-06-21 05:07:55 +03:00
VigersRay
5245c5ddcb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png
# Resources/migration.yml
2024-06-21 05:04:06 +03:00
VigersRay
740e37a704
"#34e06d" in BaseSubstation
2024-06-21 04:48:45 +03:00
MureixloI
f6888183ae
Fix wooden counter sprites ( #2305 )
...
(cherry picked from commit c574f97d8ee38dbba7c108c82d72dd4c286c8f7f)
2024-06-21 04:48:13 +03:00
VigersRay
7f09ce2d2a
MinPlayers/MaxPlayers in StationGoalPrototype
2024-06-21 04:48:01 +03:00
lzk
fd67cb15ac
Frontal lisp tweaks ( #2264 )
...
(cherry picked from commit 362e5ca2578bde38935b74d93724d8b0c2d7b507)
2024-06-21 04:46:25 +03:00
lzk
316341aa86
ой
2024-06-21 04:45:48 +03:00
MureixloI
acee5ee9df
Fix poster sprite ( #2300 )
...
(cherry picked from commit 388d023034fb9d19e20b8e457aef4fc8c5dc570d)
2024-06-21 04:41:01 +03:00
SonicHDC
b01f6fdfdd
Substation origin sprites ( #2298 )
...
(cherry picked from commit c6bda37954c98c7f257eedfc38930deeed668bcc)
2024-06-21 04:40:56 +03:00
lzk
25b010bdf7
NewPlayer guidebooks translate ( #2265 )
...
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
(cherry picked from commit ae6ed32d03449a32d5d665f55986a894370c373c)
2024-06-21 04:40:51 +03:00
