VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.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/WinterCoats/coatwarden.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.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.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/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/migration.yml
2024-07-31 03:54:09 +03:00
pacable
a1d8454cd2
Фикс зомбей ( #258 )
...
* фикс зомби
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* cleanup
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* review changes от вигерса
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* вернул реген физы
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* надеюсь?
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* в 10 меньше структурного. теперь укрепленное окно ломается не мгновенно
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* апдейт текстурок
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* Update ZombieComponent.cs
* Update ZombieComponent.cs
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-07-31 03:47:30 +03:00
pacable
56d8e23d48
Казни: возвращение ( #256 )
...
* Казни: возвращение
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* отключил казнь соседей
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-31 03:44:16 +03:00
pacable
4dad2eb4fb
Это вам не просто смайл ( #255 )
...
* улучшенный смайл
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* у смайла есть суперспособность
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* -костыль
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* зомби-смайл теряет способности
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* более надежный метод взятия трансформа
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* Update smile_actions.yml
* Update pets.yml
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-07-31 03:43:40 +03:00
Babaev
480086bc81
Новая способность ревенанту ( #261 )
...
* init
* ой
2024-07-31 03:38:25 +03:00
TemporalOroboros
bea8c1a0b8
Relocate TemperatureProtectionComponent ( #30437 )
...
Moves it from the atmos module to the temperature module where it is actually used.
2024-07-30 12:31:55 -07:00
Cojoke
247222beab
Remove Walking out of Containers while You can't Walk ( #30391 )
...
* Require Standing to Exit Containers
* whoops, forgot a not
* You can't walk out if cuffed
* GUAH(requested stuff)
* bwomp(tiny cleanup)
2024-07-30 09:53:44 -04:00
Repo
a72445c419
aHelp fixes and improvements ( #28639 )
...
* Clear search criteria on loading aHelp window
* Pinning technology.
* Relay to aHelp window and discord if a user disconnect/reconnect
* Fix pinning localization
* Log disconnect, reconnects, bans to relay and admin in aHelp
* Drop to 5min to hold active conversations
* Update Content.Server/Administration/Systems/BwoinkSystem.cs
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* discord text styling if diconnect,reconnect,banned message.
* Pin icons instead of text
* Better Icons
* space
* Move button generation in to its own XAML
* List entry control
* Fix spaces
* Remove from active conversations on banned
* Discord if else block cleanup
* Better pin icons
* Move icons to stylesheet styleclass
* Better field order.
* PR review fixes
* fixes
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-07-30 18:28:32 +10:00
themias
92210ff51b
Fix ACC wire light not appearing ( #30453 )
2024-07-29 23:04:17 -04:00
osjarw
669cc55ba4
Allow the creation of recursive HTNs ( #30138 )
...
Allow recursive HTNs
2024-07-30 12:18:53 +10:00
Plykiya
031eb9606c
Make magic mirror do-after longer, add popups to notify the target ( #30366 )
...
* Make magic mirror do-after longer, add popups to notify the target
* Turns out I do have access to the user
* More detailed popups
* Helmets protecc
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-30 12:17:27 +10:00
nikthechampiongr
2f42e1d18e
Vanquish inaccurate docs ( #30449 )
2024-07-30 12:14:34 +10:00
Mervill
ec19f9f4a9
Make the powered examine text fully client predicted ( #30441 )
...
* Make the powered examine text fully client predicted
* switch to using the Entity<T> API for the examine event
2024-07-29 00:28:17 -07:00
lzk
da5918c951
FINALLY FIX APPROVER IN CARGO INVOICE!!! ( #29690 )
...
* OH DEAR LORD I WASTED 2 HOURS ON THIS STUPID SHIT!!!
* change some logic
2024-07-28 23:19:43 -07:00
pacable
a454597d95
Парикмахер ( #252 )
...
* барбер работает, осталось замаппить его кабинет
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* bruh
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* прототип электробритвы и красителей для волос
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* красители для волос
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* добавил функционал электробритве
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* барбервенд
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* спаунпоинт
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* обрезал механ зеркала
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* грамматическая ошибка
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* до конца убрал костыль
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* до конца убрал костыль2
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* перенос из папки оффов
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* праздник щиткода!
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* коробка
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* продвинутая униформа
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-29 06:26:32 +03:00
Plykiya
79fa810b9c
Update stomach removal and lung removal smite to not use Component.Owner ( #29927 )
...
* Update stomach removal and lung removal smite
* New function makes things simple
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-28 01:25:40 -07:00
IProduceWidgets
925d1e3ac8
Prevent gridfill from leaking ( #30395 )
...
dont forget to set the airtights when the tights are aired
2024-07-28 13:20:29 +10:00
metalgearsloth
093054f7e3
Move vgroid much closer ( #29943 )
...
* Move vgroid much closer
General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.
* Decrease max
* Tweaks
* godzilla
* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
2024-07-28 13:14:18 +10:00
Errant
f49fc5a89c
Do not duplicate Job Greeting on antag selection ( #30407 )
...
Silence MindAddRoles in AntagSelectionSystem
2024-07-27 07:58:19 -07:00
VigersRay
60c1f85990
фикс AntagSelectionSystem
2024-07-27 14:43:54 +03:00
Vigers Ray
842f1e677a
Бафф зомби ( #249 )
2024-07-27 13:20:14 +03:00
Vigers Ray
bb2e9f677e
Коллективный разум ( #248 )
...
* Коллективный разум
* Колективный разум гуманоидному ксеносу
2024-07-27 12:09:05 +03:00
VigersRay
81ae9435a3
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
2024-07-27 10:30:01 +03:00
Vigers Ray
4ee05b0350
Продвинутые борги ( #247 )
...
* Ну типа всё
* InnateItemSystem и фичи для пИИ
2024-07-27 10:23:34 +03:00
metalgearsloth
8f250581be
Fix VGRoid grid spam ( #29946 )
...
Specifically if a grid splits under the cvar size it doesn't get a label. This also stops stuff like shuttles splitting in half creating new entries for the new grids. Splitting code leaves the largest grid as the existing one so this will always prefer to keep it large (but if there's multiple splits it won't adjust).
2024-07-27 11:54:38 +10:00
VigersRay
7e989794b7
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-07-27 00:32:31 +03:00
chavonadelal
582e6d2010
Localization of the title of the job ( #30353 )
2024-07-26 14:47:07 -04:00
themias
e72393df71
Fix arcade machines ( #30376 )
2024-07-26 10:30:49 -07:00
VigersRay
aa85072728
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-07-26 18:20:57 +03:00
VigersRay
c50d0b476e
Мейби бейби
2024-07-26 18:16:12 +03:00
Brandon Hu
a99ae6211d
fix(cmd-Jobwhitelistadd): Fixed typo in Loc.GetString ( #30355 )
...
LET ME IN THE BAR LET ME IN THE BAR LET ME IN THE BAR. IM 18 I SWEAR PLEASE PPLEASE NOOOO I SWEAR PLEASE PLEASE I WANNA GET CRUNK
2024-07-25 23:55:44 -06:00
VigersRay
47566865ec
Merge remote-tracking branch 'origin/master'
2024-07-26 04:36:31 +03:00
SplikZerys
73f4405ccf
Corrected Felinid Race ( #242 )
...
* FelinidAccent OWO comeback
* Revert min max Felinid age
* Update OwOAccentSystem.cs
* Update felinid.yml
* Update speech.yml
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-07-26 04:29:49 +03:00
VigersRay
8d415f6bde
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
2024-07-26 04:21:22 +03:00
VigersRay
a6aef44ec5
Фикс статы
2024-07-26 04:20:18 +03:00
Plykiya
2a7883b92e
Update vomit organ smite to not use Component.owner ( #29926 )
...
* Update vomit organ smite to not use Component.owner
* is this what you want...?
* am I winning, dad?
* update the comment
* we love entity<t>
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-25 05:24:40 -07:00
lzk
f56e4f6624
Replace some to do with TODO ( #30346 )
...
Replace to do with TODO
2024-07-25 11:04:03 +03:00
Vigers Ray
f1aef2edb9
Статистика конца раунда ( #239 )
2024-07-25 02:01:01 +03:00
VigersRay
b90d87c1c5
Добавил все режимы в голосование, скрыл голоса игроков.
2024-07-25 01:17:34 +03:00
VigersRay
eacf56b05d
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-07-25 00:54:29 +03:00
VigersRay
2d4cbd5046
нёрф OwO акцента
2024-07-25 00:52:57 +03:00
VigersRay
864219a5d1
Фикс коефициента зеков и охранников тюрьмы
2024-07-25 00:51:26 +03:00
VigersRay
f4081b90fe
Исправил отсутсвие целей на убийства у агентов.
2024-07-25 00:48:02 +03:00
osjarw
aa886ca494
Make NeedHand modifiable for injectorSystem ( #29870 )
...
* Get needhand from yml
* MovementThreshold modifiable + inheritdoc
2024-07-24 12:26:52 -07:00
VigersRay
5a4b9eb80a
Поблажки экипажу
2024-07-24 21:47:15 +03:00
VigersRay
e5797fd507
Фикс злого двойника
2024-07-24 21:35:04 +03:00
VigersRay
5cbdf34536
фикс LateJoinSpawnRule
2024-07-24 20:46:09 +03:00
VigersRay
31b256cce8
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Traits/disabilities.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
2024-07-24 20:36:22 +03:00
VigersRay
2ad85c7b58
Возмодно фикс спавна на транзите
2024-07-24 20:31:34 +03:00
Benjamin Velliquette
a32f9ff711
Fix Reagent Grinder being able to do work without being powered ( #30267 )
...
* Check if grinder is powered before doing work
* Use existing extention method.
2024-07-23 14:02:07 -07:00
