Commit graph

31901 commits

Author SHA1 Message Date
Vigers Ray
692e1bcdf0 вот так 2025-01-20 07:08:43 +03:00
Vigers Ray
e295eb56c6 Терминатора нельзя застанить 2025-01-20 06:49:34 +03:00
Vigers Ray
23a3cc509e вампир все таки соло 2025-01-20 06:44:38 +03:00
Vigers Ray
57b8d14fcb фикс антаг ролей для ДО и культа плоти 2025-01-20 06:43:40 +03:00
Vigers Ray
7deb43d4fe фикс дублей космолокаций 2025-01-20 06:40:06 +03:00
Vigers Ray
28ba3e857b Фикс выпадение предметов с импланта хранилища в апстриме 2025-01-20 06:07:01 +03:00
Vigers Ray
3923c36da2 Вернул кайфовые звуки интерфейса 2025-01-20 05:57:43 +03:00
Vigers Ray
5a40924eec Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/PowerSink/PowerSinkSystem.cs
#	Resources/Maps/centcomm.yml
#	Resources/manifest.yml
2025-01-20 05:46:59 +03:00
GayBot
9e879c5674 Automatic changelog update 2025-01-20 05:30:39 +03:00
KaiserMaus
2825c1c9f8
Fix Abuse (#1138) 2025-01-20 05:34:08 +03:00
GayBot
0940f10748 Automatic changelog update 2025-01-20 05:28:42 +03:00
KaiserMaus
7fe2873138
Clean (#1149) 2025-01-20 05:32:23 +03:00
KaiserMaus
e0d1abf59b
Ковбоиииии (#1152) 2025-01-20 05:32:11 +03:00
Vigers Ray
ef80c28831 баланс имба брони капитана 2025-01-20 05:30:38 +03:00
GayBot
9a7c39aacb Automatic changelog update 2025-01-20 05:02:25 +03:00
Perl404
81249918e5
Печать патологоанатома (#1153)
* Pathologist stamp added

* Fixes

* Fix pathologist

* Fix pathologist rubber amount in locker

* Pathologist stamp localization eng

* Pathologist stamp localization ru

* yamlextractor script

* Pathologist stamp localization
2025-01-20 05:05:52 +03:00
GayBot
2ca8cffded Automatic changelog update 2025-01-20 05:00:25 +03:00
KaiserMaus
98ab05c77d
Tweak Robo (#1154) 2025-01-20 05:03:54 +03:00
PJBot
6b6dc13664 Automatic changelog update 2025-01-20 01:25:46 +00:00
Leon Friedrich
c4ed3fc275
Update engine to v240.1.1 (#34527) 2025-01-20 12:24:40 +11:00
PJBot
a84b67a686 Automatic changelog update 2025-01-20 00:33:51 +00:00
K-Dynamic
6ed60fecde
Welding gas mask toggleable with action (#32691)
welding mask removable
2025-01-20 01:32:45 +01:00
PJBot
9485cb6eb8 Automatic changelog update 2025-01-20 00:22:32 +00:00
ArtisticRoomba
ed44f3263f
Fixes some mobs not being able to honk/weh (#33777)
* fixes some mobs not being able to honk/weh

* addresss review
2025-01-20 01:21:25 +01:00
Leon Friedrich
40f9170078
Update engine to v240.1.0 (#34524) 2025-01-20 11:07:19 +11:00
Leon Friedrich
ef50219455
Fix emergency_elkridge being saved as a map (#34496)
Save `emergency_elkridge` as a grid
2025-01-20 10:59:42 +11:00
PJBot
c0fcf4b93b Automatic changelog update 2025-01-19 19:50:07 +00:00
Winkarst
b09cd1ca8c
Make storage implant drop items on gibbing (#33493)
* Make storage implant drop items on gib/removal

* Better way

* Fix error

* Forgotten trash

* Cleanup

* Unused var

* Update Content.Server/Implants/ImplantedSystem.cs

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: 0x6273 <0x40@keemail.me>
2025-01-19 11:48:58 -08:00
github-actions[bot]
2894f49c4c
Update Credits (#34507)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-01-19 15:54:27 +01:00
Tezzaide
a83fd7b916
Fixed minor spelling mistake in Noir Trenchcoat description. (#34519)
Update coats.yml
2025-01-19 14:34:46 +01:00
Alfred Baumann
bf59371656
Add Airlocks with Bar and Kitchen access (#33821)
* Add kitchen access to Bar-Cafeteria airlocks on Cog

* Fix merge conflict

* Remove mapping changes

* Add Glass and Maints versions
2025-01-18 22:42:01 -07:00
TytosB
c917bcc2a9
Cog power setup fix (#34188)
* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

* cog power setup was bad

* made it artsy

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2025-01-18 22:39:02 -07:00
PJBot
5fb8ebbe61 Automatic changelog update 2025-01-19 05:33:40 +00:00
War Pigeon
b471c1094d
CentComm Map Updates (#34475)
* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype
2025-01-18 22:32:33 -07:00
PJBot
a2df7719b1 Automatic changelog update 2025-01-19 01:48:01 +00:00
K-Dynamic
2f8f536601
New dry fire sound (#34447)
* new empty.ogg

* source to tg commit
2025-01-18 17:46:54 -08:00
Vigers Ray
eee538e057 Merge remote-tracking branch 'origin/master' 2025-01-19 03:28:50 +03:00
Vigers Ray
c75d1f6845 Убрать цель на вирус культа пока его нету 2025-01-19 03:28:01 +03:00
Vigers Ray
17804a2410 фикс игнора карпами культистов плоти 2025-01-19 02:52:24 +03:00
PJBot
428fcd65a7 Automatic changelog update 2025-01-18 22:57:48 +00:00
Nox
993b5c46b5
Rarer Highcaps (#34469)
* Removed highcap from seclite

* Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to.

* Gave cyborgs back their medcap

* Rounded seclite wattage down to 0.5
2025-01-18 14:56:42 -08:00
Vigers Ray
4dbb838649 мда 2025-01-18 22:05:45 +03:00
GayBot
94c557a1dd Automatic changelog update 2025-01-18 21:41:12 +03:00
Inquisitorrr
f214ce9076
Торжественная куртка капитана в его же шкафчик (#1140)
* торжественная_куртка_капитана_в_шкафчик_кепа

ы

* Update heads.yml

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-01-18 21:44:41 +03:00
PJBot
4a015d133d Automatic changelog update 2025-01-18 18:28:54 +00:00
Minemoder5000
1840160fdc
Add a 10u vial of plasma to the chemical locker (#33871)
Add 10u plasma to the chemistry locker so the chemists stop stealing tables.
2025-01-18 10:27:46 -08:00
PJBot
5d06ee2894 Automatic changelog update 2025-01-18 16:59:59 +00:00
Winkarst
86cf3a46e2
Change MaskComponent to accommodate sprites namings (#33451)
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
2025-01-18 08:58:51 -08:00
Myra
026d65dc43
Staging -> Master merge (#34489) 2025-01-18 16:26:08 +01:00
Leon Friedrich
f3324b458c
Update engine to v240.0.1 (#34497) 2025-01-18 16:11:53 +01:00