Commit graph

36326 commits

Author SHA1 Message Date
Vigers Ray
0c802671e3 упс 2025-06-16 04:03:30 +03:00
Sunrise-Bot
c68494484d Automatic changelog update 2025-06-16 04:00:23 +03:00
Sunrise-Bot
0f30698114 Automatic changelog update 2025-06-16 04:00:23 +03:00
KaiserMaus
881a849ecb
Бауер-127 Лон опсу и удаление S Кота (#2383)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-06-16 01:58:10 +01:00
KaiserMaus
775e01a8f3
Свой Аплинк Лон опсу (#2382)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-06-16 03:36:11 +03:00
Vigers Ray
3ff9113976 фиксы апстрима 2025-06-16 03:33:38 +03:00
Vigers Ray
6e8e359a66 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Locale/en-US/_strings/flash/components/flash-immunity-component.ftl
#	Resources/Locale/en-US/_strings/tiles/tiles.ftl
#	Resources/Prototypes/Actions/changeling.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
#	Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Stacks/floor_tile_stacks.yml
#	Resources/Prototypes/Tiles/floors.yml
#	Resources/Textures/Objects/Tiles/tile.rsi/meta.json
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
#	Resources/Textures/Tiles/xeno_flooring.png
#	Resources/Textures/Tiles/xeno_maint.png
#	Resources/Textures/Tiles/xeno_steel.png
2025-06-16 01:51:55 +03:00
Vigers Ray
afd7ef0635 ы 2025-06-16 01:47:28 +03:00
Vigers Ray
52694e8982 фикс культа крови 2025-06-16 01:42:46 +03:00
Helix-ctrl
1d4cf48c31
Add hints towards flash protection to all items which provide it (#37267)
* Update welding.yml

* Update FlashSystem.cs

Add subscriber event for flash immunity examine text

* Create flash-immunity-component.ftl

* Removed changed description text

* change to use entity version

* fixed mistake
2025-06-15 18:38:36 -04:00
pacable
e5ccc4b6b3
Чат санитизация против набегаторов. (#2298)
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2025-06-16 01:27:03 +03:00
banumbas
ac82435a47
Добавлен заряд энерго-щиту (#2305) 2025-06-16 01:26:47 +03:00
iDesmond
54a8af200f
AntiSpam minor update (#2366) 2025-06-16 01:26:09 +03:00
ThereDrD
cbf3dc07f3
Расширение функционала зависимости работок от работок (#2372)
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
2025-06-16 01:21:26 +03:00
GARD
5f555fa2fe
Небольшие дополнения к худам (#2374) 2025-06-16 01:20:37 +03:00
pacable
73dc6320a0
Перемещено логгирование PowerNetSystem и AtmosphereSystem в Debug (#2377) 2025-06-16 01:20:19 +03:00
PJBot
c83420fca5 Automatic changelog update 2025-06-15 21:12:59 +00:00
beck
b636e3fcba
Randomized Markings (#34765)
randomized markings
2025-06-15 14:11:52 -07:00
PJBot
ef832141c6 Automatic changelog update 2025-06-15 19:11:31 +00:00
SlamBamActionman
9af0b354e3
Exo Station - Upstream Playtest Version (#33144)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-15 12:10:22 -07:00
ScarKy0
bc9059a72d
Armblade Tweaks (#38337)
init
2025-06-15 20:23:02 +02:00
PJBot
be5df666f0 Automatic changelog update 2025-06-15 09:37:28 +00:00
SlamBamActionman
239f1c511e
Ensure large entities don't get stuck on conveyor belt corners (#37466)
* Initial commit

* Also avoid the friction change doesn't make turned-off conveyor belts continue going

* Ensurecomp on conveyor starting

* i give up

* Minor brackets edit

* Documentation
2025-06-15 11:36:18 +02:00
github-actions[bot]
b2e8cff3ed
Update Credits (#38321)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-06-15 11:26:03 +02:00
PJBot
b3561e0c3a Automatic changelog update 2025-06-15 08:28:40 +00:00
FungiFellow
43bad8184f
Give Syndie-Cats Syndie Access (#38318)
* Update animals.yml

* Update animals.yml
2025-06-15 10:27:32 +02:00
PJBot
63ee7f6272 Automatic changelog update 2025-06-14 18:30:13 +00:00
ScarKy0
208b245dcb
Retractable items system + Arm Blade action (#38150) 2025-06-14 21:29:06 +03:00
Vigers Ray
adc3bd06a9 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Damage/DamageSpecifier.cs
#	Resources/Locale/en-US/markings/undergarment.ftl
#	Resources/Maps/_Sunrise/Shuttles/DSO/Other/alt_representative_shuttle.yml
#	Resources/Maps/_Sunrise/Station/xeno.yml
#	Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
#	Resources/Prototypes/Polymorphs/polymorph.yml
2025-06-14 20:37:34 +03:00
Vigers Ray
c234bc389e Merge remote-tracking branch 'origin/master' 2025-06-14 20:34:50 +03:00
Sunrise-Bot
76a92d3448 Automatic changelog update 2025-06-14 20:31:55 +03:00
ThereDrD
7cd43b639c
Исправления панели телепорта призрака (#2361) 2025-06-14 20:29:54 +03:00
pacable
a264c841e5
Починил миниатюру в README.md (#2360) 2025-06-14 20:29:32 +03:00
Non-stop-smetana
d0374ab096
фикс сейфов (#2359) 2025-06-14 20:29:18 +03:00
Vigers Ray
a490932c7c Вайтлист айпишек 2025-06-14 20:26:27 +03:00
PJBot
635ea4b2b4 Automatic changelog update 2025-06-14 17:23:52 +00:00
nikitosych
1bbf094c79
Fix for holoparasite's ability to attack the host through mech (#36659) 2025-06-14 20:22:45 +03:00
PJBot
7cd7e33ae3 Automatic changelog update 2025-06-14 16:10:12 +00:00
Sparlight
937326460f
Add pet bag - wearable backpack for pets (#37440)
* Add pet bag

* Trailing whitespace moment

* make the linter happy

* Fix trailing whitespace concern.

* Fix Construction component oopsy-daisy

* yml guideline moment

* remove weird extra whitespace

* make the maintainer happy

* Adjusted bag visuals based on feedback

* Allow the fox aghost admin to use pet bags
2025-06-14 09:09:05 -07:00
PJBot
f1ef41fad5 Automatic changelog update 2025-06-14 09:08:56 +00:00
Sparlight
67c8d1db87
Add corgium (#37951)
* Add corgi essence

* Adjust spacing concerns

* Renamed 'corgi essence' to 'corgium' based on maintainer discussion
2025-06-14 11:07:48 +02:00
PJBot
f276035f79 Automatic changelog update 2025-06-14 09:00:50 +00:00
Nox
d68990fd7a
Added warden's uniforms to their dresser. (#38283)
* Added warden's uniforms to their dresser.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added warden's guitar

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed armored coats and guitar from warden dresser.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-06-14 10:59:40 +02:00
SyaoranFox
0518be5d38
Zombies won't attack Initial Infected (#38128)
* Added Zombie faction roles everywhere that makes sense for initial infected to be associated with Zombies.

* Adding faction component to round start zombie. (not hopeful)

* Removed stupid attempts and added zombie faction component to the zombie system when the player is given the ability to force themself to zombify.

* Changed use of "zombie" for ProtoId<NpcFactionPrototype>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Removed faction component from ZombieOutbreak event. Shouldn't cause problems with the event as II gets component with their ability to self zombify.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-13 17:56:57 -07:00
PJBot
deb92514d3 Automatic changelog update 2025-06-13 19:19:05 +00:00
Deerstop
34826a2cf6
Elkridge - Major Update (#38259)
* swap HOP and vault, fix cams, new genpop, shit ton of stuff

* fixed some initialised open doors, added posters to HOP/EVA

* implemented suggestions and feedback, lots of things
2025-06-13 15:17:57 -04:00
PJBot
ac9eb1a1ff Automatic changelog update 2025-06-13 18:55:28 +00:00
Kittygyat
98031d13a1
Added monkey/kobold emergency EVA sprites & the ability for them to wear them. (#37660)
* Added monkey/kobold emergency eva suit sprites, and the ability for them to wear it

* Added tag, fixed indentation

* Ok actually fixed the indentation this time
2025-06-13 20:54:21 +02:00
PJBot
0dbb01d623 Automatic changelog update 2025-06-13 16:12:22 +00:00
slarticodefast
ae8fdbfa51
Fix puncturase cauterizing bleeding (#38289)
fix puncturase cauterizing bleeding
2025-06-13 12:11:15 -04:00