Commit graph

31827 commits

Author SHA1 Message Date
Vigers Ray
bcab36d8f5 Обновил update-wiki.yml на .NET 9 2025-01-18 04:07:25 +03:00
Vigers Ray
4cea6ee655 Апдейт локализации 2025-01-18 03:19:56 +03:00
GayBot
6115bd1c3f Automatic changelog update 2025-01-18 03:06:32 +03:00
banumbas
8f0dd48edb
добавил самовосстанавливающийся пирогомёт (#1132) 2025-01-18 03:10:01 +03:00
Vigers Ray
fed7696e69 фикс ToggleableGhostRoleComponent 2025-01-18 03:03:53 +03:00
Vigers Ray
250b39ad0e ы 2025-01-18 02:55:33 +03:00
Vigers Ray
8cb09ff0c4 Апстрим локализации 2025-01-18 02:35:42 +03:00
Vigers Ray
6728c2cfe3 в пизду 2025-01-18 02:30:37 +03:00
Vigers Ray
b57e3d3271 ы 2025-01-18 02:19:48 +03:00
Vigers Ray
285de885e0 Фиксы 2025-01-18 02:18:36 +03:00
Vigers Ray
20f1b27161 имена гридов утилям 2025-01-18 02:07:27 +03:00
Vigers Ray
beb8574387 Тише звук конца раунда 2025-01-18 02:06:21 +03:00
Vigers Ray
ed78394752 Фикс кислотного и структурного урона мехов 2025-01-18 02:01:47 +03:00
Vigers Ray
470a036732 Борги получают структурный и кислотный урон 2025-01-18 01:57:05 +03:00
Vigers Ray
94c22d73a5 чейнжлог 2025-01-18 00:57:45 +03:00
Vigers Ray
a691ef9724 Животных можно брать на руки, фелиниды еще легче 2025-01-18 00:57:39 +03:00
Vigers Ray
038b3c184e Фикс телепортации в крио зомби и боргов 2025-01-18 00:43:38 +03:00
Vigers Ray
55e9f93983 Очки ОСЩ видят майншилд 2025-01-18 00:39:25 +03:00
Vigers Ray
501a9d337b фикс отображения майншилда боргам 2025-01-18 00:38:03 +03:00
Vigers Ray
a67d953845 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Maps/_Sunrise/Shuttles/engineer_ert_shuttle.yml
2025-01-18 00:35:29 +03:00
Vigers Ray
90c50bb158 фикс кучи целей на убийства у агентов 2025-01-18 00:34:09 +03:00
chromiumboy
efd5d644e8
Holopad networking rework (#34112)
* Initial commit

* Finalizing main changes

* Addressed reviews

* Fixed a few issues

* Switched to using global overrides

* Removed unnecessary references
2025-01-17 14:09:59 -06:00
Vigers Ray
b7cf62ee82 чейнжлог 2025-01-17 22:52:05 +03:00
Vigers Ray
6cccbdbc9d бафф скорости разгермы 2025-01-17 22:51:56 +03:00
Vigers Ray
f69122a851 Revert "Уменьшение урона от давления"
This reverts commit 0b547932f1.
2025-01-17 22:33:02 +03:00
Vigers Ray
14536bfadf Revert "Уменьшение урона от удушения"
This reverts commit a925a2b055.
2025-01-17 22:32:56 +03:00
Vigers Ray
427665841e Фиксы типов ролей для ролей санрайза 2025-01-17 22:32:05 +03:00
PJBot
464f68dad0 Automatic changelog update 2025-01-17 17:27:12 +00:00
Tobias Berger
2fa4f0a286
Update nix flake for .NET 9 (#34480) 2025-01-17 18:26:04 +01:00
Vigers Ray
a28f3ebc03 Merge remote-tracking branch 'origin/master' 2025-01-17 16:01:58 +03:00
Minemoder5000
50bb5e0c13
Replace the djstation intercoms with freelance intercoms (#34478)
* Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys

* removed a new line
2025-01-17 14:01:06 +01:00
Vigers Ray
4d39fb5e3a ы 2025-01-17 15:58:24 +03:00
KaiserMaus
d85f00f555
GhostTheme: Ревенант (#1124)
* Revenant GhostTheme

* Лишнее
2025-01-17 15:54:19 +03:00
Vigers Ray
3f577b39b5 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Locale/en-US/_strings/escape-menu/ui/options-menu.ftl
2025-01-17 15:51:44 +03:00
GayBot
2cb2992052 Automatic changelog update 2025-01-17 15:50:51 +03:00
PJBot
ac04604b8a Automatic changelog update 2025-01-17 11:36:10 +00:00
Southbridge
8295bfbf8d
Pride Scarves (#34448)
* More scarfs (#216)

* Sprites + Colored Scarf Implimentation

Doesn't include into quickthreads or other clothing vendors

* File Paths are important

* Metas, items exist, winterdrobe

I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk

* File Path Fix

* Typo fix

* Resolved merge conflict

* Moved scarves around

* Moved scarf textures out of the _CD directory

* Removed final CD folder

* Removed extra scarfs

* Removed extra scarfs, again

* Replaced ClothingNeckBase with ClothingScarfBase

---------

Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>
2025-01-17 12:35:03 +01:00
PJBot
40e049603e Automatic changelog update 2025-01-17 07:25:58 +00:00
c4llv07e
4809ee25ff
Add option to disable bwoink sound. (#33782)
* Add option to disable bwoink sound.

* Now it's working only with active admin status.

* No bwoink, only "notification sound"

* Moar changes

* Another one
2025-01-17 10:24:50 +03:00
PJBot
5d9311dff9 Automatic changelog update 2025-01-16 20:50:54 +00:00
Southbridge
06a1615605
Additional Ionstorm Law Updates (#34197)
* Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment"

* Fixed another awkward grammar situation

* Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas

* Reverted pylons, and added more entries to help fill out the lists more

* reverted all deletions

* implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there

* realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error

* Removed Portugal again, added more Musts since that list was the new shortest one.
2025-01-16 21:49:47 +01:00
Vigers Ray
a23c00eadb ы 2025-01-16 20:20:51 +03:00
Vigers Ray
1b61551b4d Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/Implants/SubdermalImplantSystem.cs
#	Content.Server/Silicons/Borgs/BorgSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl
#	Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml
#	Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
2025-01-16 20:00:41 +03:00
ScarKy0
cec5816acf
BorgChassis transfer their mind to a dropped BorgBrain fix (#34464)
Fix
2025-01-16 15:08:08 +01:00
PJBot
4e7c21fba3 Automatic changelog update 2025-01-16 12:26:14 +00:00
Gansu
3b39439945
fix for climbable pianos (#33690)
fix for climable pianos

Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
2025-01-16 13:25:07 +01:00
ApolloVector
1e35cfb11e
Fix the HoS mantle metashield break (#33831)
Changes 'nukies' to 'syndicate agents' in the HoS mantle's description.
2025-01-16 13:04:22 +01:00
PJBot
b32c07c5d8 Automatic changelog update 2025-01-16 11:41:28 +00:00
Patrik Caes-Sayrs
de8a2775ec
FIX: Uranium, Cak, and BreadDog are not garbage! (#34192)
* FIX: Uranium, Cak, and BreadDog are not garbage!

* Fixed bread typo for spacegarbage change.

* Style: moved ediblebase

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-16 12:40:21 +01:00
eoineoineoin
820517eb38
Fix inconsistent borg flashlight state (#33027)
* Fix borg light being stuck on if no cell is inserted

* Fix HandheldLightComponent.Activted becoming out of sync with SharedPointLightComponent.Enabled

* Fix for entities which don't have a handheld light component
2025-01-16 11:34:11 +01:00