iertis
d513cda5b6
Фиксы ношения на руках ( #2547 )
2025-07-18 01:47:19 +03:00
pacable
c38aa07752
КД на повторное поднятие для фелинидов ( #1936 )
2025-05-05 14:53:16 +03:00
Vigers Ray
933c7a19bf
фикс поднятия фелинидов
2025-01-18 05:01:09 +03:00
Vigers Ray
a691ef9724
Животных можно брать на руки, фелиниды еще легче
2025-01-18 00:57:39 +03:00
Vigers Ray
ea0e2275ca
фикс ношения на руках
2025-01-07 05:15:15 +03:00
haiwwkes
5192d120ea
Новая панель эмоутов. ( #891 )
...
* wacky
* work
* work
* work
* work
* eff
* a
2024-12-24 23:27:09 +03:00
Rinary
23dba7f1ad
init ( #414 )
2024-09-30 16:18:51 +03:00
pacable
61f4a724f0
фикс ( #328 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-30 16:12:46 +03:00
Rinary
64f1aed90c
Большие изменения ( #345 )
...
* init
* мать масштаба тарабанил
* fix
* upd
* upd
* upd
* upd
* upd
* console spam fix
* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........
* fix
* fix
* upd
* upd
* some fixes
* fix
* upd
* upd translation for steal obj
* teg translate
* upd
* fix locale + add advertisements
* translate configurator
* Fully translate
* upd
* Я манал это переводить, позже переведу
* upd en-US
* fix Linter
* upd
* fix
* upd
* fix
* fix
* fix
* Возврат ПНТ
* remove agent non silent equipment
* add acid to uplink
* carrySystem new popups
* fix
* fix
* fix disease locale
* add Disease Guide
* upd locale
* upd
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
* fix
* upd
* upd
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.
# Conflicts:
# Content.Server/Dragon/DragonRiftSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
# Resources/Changelog/Changelog.yml
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Store/categories.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/migration.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.
# Conflicts:
# Resources/Changelog/Changelog.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.
# Conflicts:
# Resources/Changelog/Changelog.yml
# Resources/Prototypes/Hydroponics/randomMutations.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.
# Conflicts:
# Resources/Changelog/Changelog.yml
* fix
* upd
* upd uplink
* upd
* fix linter
2024-09-16 19:05:38 +03:00
VigersRay
3bbae85466
фиксы апстрима
2024-09-16 13:13:35 +03:00
Rinary
b562c25f54
Фиксы ( #211 )
...
* init
* deleted
* fix
* fix
* нет такой переменной для cluwne-name-prefix
* смешная хуита, проверяет на то, добавлен ли компонент, но когда добавляеться комбат екшен он по дефолту фолз, а чекает на тру
* это рофл нахуй, я его так, он ошибку выдает, я его сяк он ошибку выдает
* fix
* roboanalyzer fix
* target для этого не существует
* carrying System fix
* удалить обратно
* опять нет target
* some map fixes
* fix Centcomm spawn
* all vanilla map disable Law
* remove pilot from marathon
* revert security pilot
* пу-пу-пу
* Lawyer Headset
* Lawyer headset locale
* fix
* fix
* swine not cat
* roboanalyzer update
2024-07-18 17:30:42 +03:00
VigersRay
e54e10b870
Фиксы апстрима
2024-06-21 05:15:52 +03:00
Vigers Ray
a77768d293
Фикс бросания людей
2024-06-11 05:23:50 +03:00
Vigers Ray
599c3f6b05
Исправление системы переноса гуманоидов
2024-06-09 17:18:58 +03:00
Babaev
f51d4aef47
Возможность брать людей на руки ( #31 )
...
* carry
* fix
* carriable update
* Removed carriable from vox, slime
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-09 17:01:25 +03:00
