Commit Graph

23842 Commits

Author SHA1 Message Date
Ed
f59de85047 Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync
# Conflicts:
#	Content.Client/Overlays/StencilOverlay.Weather.cs
#	Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
#	Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
2025-07-21 11:27:53 +03:00
Trosling
0be18fafd4 Issue#974 Fix (#1556)
* Renamed all instances of mentioned entities

* Corrected loc

* Added migration entry
2025-07-21 11:06:18 +03:00
Vasilis The Pikachu
752f44945b Revert "Kobold/monkey AI holograms (#38888)"
This reverts commit 97fcebb92b.

Please check the maintainer meeting and the recording at time 41:58 for further information

https://docs.spacestation14.com/en/maintainer-meetings/maintainer-meeting-2025-07-19.html
2025-07-20 17:13:59 +02:00
CrystallEdge Server
238ca1b4a8 Automatic changelog update 2025-07-20 15:47:06 +03:00
Red
8721f736e1 Cooking simulator 3: Pies (#1540)
* enum -> prototype

* move sprites

* more dirt sprites

* some food data stucking fixing

* pumpkin fix

* pie move sprites

* refactor components

* pie refactor

* remove outdated proto

* new pie types

* Update SliceableFoodSystem.cs

* Refactor food cooking system and add fat flavor

Added 'Fat' to the flavor profile. Refactored food cooking logic to use CreateFoodData and UpdateFoodDataVisuals instead of CookFood and ApplyFoodVisuals. Introduced RenameCooker property to CP14FoodCookerComponent to control entity renaming during cooking. Improved separation of food data creation and visual updates.

* Update migration.yml

* Refactor food visual and sliceable logic in cooking system

Moved sliceable food logic from OnCookFinished to UpdateFoodDataVisuals for better encapsulation. Made UpdateFoodDataVisuals overridable and updated its usage in random food initialization. Added Rename field to CP14RandomFoodDataComponent and cleaned up unused BecomeSliceable field in CP14FoodCookerComponent. Updated pie_pan.yml to add SliceableFood and a new random food entity.

* Update pie_pan.yml

* fill levels
2025-07-20 15:45:59 +03:00
CrystallEdge Server
6b98c91f73 Automatic changelog update 2025-07-19 13:25:35 +03:00
Nyranu
fcd29f9696 Coal (#1521)
* передача температуры + заготовка для плавления

* Небольшая сортировка + комментарии...

* pp

* Уголь!

* Казан!!

* Лицензия, уборка мусора.

* Лицензия, теперь точно

* Очистка мусора

* пу-пу-пу

* уголь*

* 1

* Up KAZAN

* cleaning up the trash. Sprites for the cauldron. Updating the cauldron

* meta

* wtf is not tag...

* Затычки.... господи..

* Tag

* Fuck, he's been here all this time: FlammableEntityHeating...

* Dead KAZAN

* Coal

* bi

* clo

* up

* cl

* cl6

* cl7

* cl_up

* cl_dm

* wd
2025-07-19 13:24:29 +03:00
CrystallEdge Server
b8cdbe71b3 Automatic changelog update 2025-07-19 03:04:35 +03:00
Deserty0
f7c05accdf Twitch chatsan (#1548)
* 1234

* Update speech-chatsan.ftl
2025-07-19 03:03:30 +03:00
CrystallEdge Server
7efb78ef7d Automatic changelog update 2025-07-19 03:00:50 +03:00
Kit
13b44285f9 Tiefling's gambit (#1549) 2025-07-19 02:59:44 +03:00
cool dolphin
5d99c08871 mercenary (#1550) 2025-07-19 02:59:12 +03:00
CrystallEdge Server
ec156ce59a Automatic changelog update 2025-07-18 21:39:39 +03:00
Deserty0
e9ae3a63c8 Sharpening Stone fix (#1546)
* fix

* 1234567
2025-07-18 21:38:32 +03:00
CrystallEdge Server
e3003447aa Automatic changelog update 2025-07-18 12:00:42 +03:00
cool dolphin
5641792f04 Bottomless goblet (#1534)
* added bottom goblet

* artifact suffix and donotmap category
2025-07-18 11:59:37 +03:00
CrystallEdge Server
7b84988747 Automatic changelog update 2025-07-18 01:04:44 +03:00
Viator-MV
aa7daf7a89 lele (#1538) 2025-07-18 01:02:59 +03:00
Admiral-Obvious-001
a002c83074 Metashield Rules Update (Removal) (#38953) 2025-07-17 22:56:21 +02:00
PJBot
00ce19dfb1 Automatic changelog update 2025-07-17 17:02:45 +00:00
Quantum-cross
17559db1c7 Add supercritical sounds for ALL anomalies (#36425)
* add supercritical sounds for flesh anomaly and shadow anomaly

* fix attribution yml

* use sound collections, add TWO -- count em TWO tech anomaly supercrit sounds.

* add sound for present anomaly

* wrong soundcollection for flesh

* actually add the present anomaly sound...

* add fire anom sound

* add gravity anomaly supercritical sound

* add electric anomaly supercritical sound

* add bluespace anomaly supercritical and explosion sound

* add ice anomaly supercritical sound

* add fluid anomaly supercritical sound

* fix busted link

* typo

* add floral supercritical sound, fix typos

* Add supercritical sounds to injected anomalies

* add rock anomaly supercritical sound

* supercritical sound follows the entity, important for injected anomalies

* make the rock crit rumble a little less subtle at the start

* use CC0 freesound alternatives where available

* New pyro anomaly sound by GonTar

* New sounds by GonTar. Change AnomalyComponent so that you can change the length of supercritical properly in the prototype.

* oopsie, forgot the traps

* use TimeSpan for duration
2025-07-17 10:01:37 -07:00
PJBot
2715933a46 Automatic changelog update 2025-07-17 16:35:07 +00:00
qwerltaz
affcc22784 NPC spiders sometimes spin webs 🕷️🕸️ (#38319)
* NPC spiders now spin webs

* oops

* move logic to always update next spawn, to prevent rare web spam

* WebSpawnCooldown is timespan

* remove vv

* add web spawn method, no sus action event method call

* dont spin web immediately at spawn

* move NextWebSpawn value init to update

* oop

* remove unused game timing

* web spawn cooldown to 45
2025-07-17 12:34:00 -04:00
FlipBrooke
89fa7c2914 Wearable banana peels (#38868)
* Add wearable helmet sprites for banana and mimana peels

Made it so banana peels and their variants can be worn as head gear. The sprites were done by myself, so feel free to change or update them! Includes hamster compatibility.

* fixed a minor state bug

* Review fixes

- Removed blank space
- Added "FlipBrooke" to all modified meta.jsons, with the added note of which sprites I got the colors from/referenced.

* I forgot a comma

adds a comma and some periods
2025-07-17 12:29:36 -04:00
FungiFellow
93e04de36b Carps Can No Longer Suicide (#39033)
Update carp.yml
2025-07-17 11:30:01 -04:00
CrystallEdge Server
848778a8d3 Automatic changelog update 2025-07-17 17:36:19 +03:00
Red
759778782c Cooking simulator 2: Soups (#1535)
* Update shield.yml

* Add soup bowls

Introduced new bowl entities (wooden, iron, gold, copper) for soups, including their sprites and prototype definitions. Added 'Soup' to the CP14FoodType enum and updated the food holder logic. Removed the unused CP14Plate tag from plate.yml and misc.yml.

* Add misc soup ingredient sprites and metadata

Introduced new 32x32 sprites for various soup ingredients, including flyagaric, flylumish, lumish, meat, meat2, meat_salad, mole, mud, pumpkin, sawdust, trash, and veg_stew. Added corresponding meta.json with state definitions and licensing information.

* veg soup recipe for testing

* soup displacement maps

* meal displacement eating

* fix double cookin plates

* soup cooking

* Update cooking_pot.yml

* Refactor solution handling for cooking and containers

Updated solution component names and types for cooking pots, bowls, buckets, barrels, and wells to improve consistency and functionality. Added and removed solution-related components, adjusted transfer logic, and cleaned up unused solution states and visual metadata. Also added food type checks in cooking system to prevent incorrect transfers.

* new soup recipes

* Unit test

* fix

* trading requests

* Update CP14Cooking.cs

* Update CP14Cooking.cs

* audio improve, egg and bread fix

* fix bugs

* integration
2025-07-17 17:35:13 +03:00
PJBot
8c6a43fe72 Automatic changelog update 2025-07-17 13:34:56 +00:00
SlamBamActionman
f7c64ab86c Make diagonal windows prevent electrocution (#39032)
Add the window tag
2025-07-17 09:33:46 -04:00
Perry Fraser
43d04a44fe Re-id 'Medical Doctor' guide entry to 'MedicalDoctor' (#39029)
chore: re-id 'Medical Doctor' guide entry
2025-07-17 00:26:12 -07:00
Prole
a921594f1e Inconsistent Produce Inhands Fix (#38860)
* V1 Sprites

* Adding heldPrefix

* Updated Sprites

* 4 New Inhands & Sprite Tweak

* WaterMelon/HolyMelon Front Change

* Meta Guh

* Sugarcane Updated Inhands
2025-07-16 15:51:09 -07:00
PJBot
86093a548c Automatic changelog update 2025-07-16 22:36:21 +00:00
slarticodefast
2a496bf93f Give admin bags explosion resistance (#38384)
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
2025-07-16 15:35:14 -07:00
PJBot
faa8152bf6 Automatic changelog update 2025-07-16 20:28:29 +00:00
CrystallEdge Server
e14ae1a930 Automatic changelog update 2025-07-16 08:16:14 +03:00
Red
7bb7ea2183 Cooking Simulator (#1529)
* frying pan start

* fix data saving

* Refactor cooking system and add localization support

Refactored food data handling in the cooking system to use Visuals instead of FoodData on holders, improved food transfer logic, and added popups and examine messages for user feedback. Added English and Russian localization files for cooking examine and meal descriptions, and updated prototype files to increase plate solution volume and add a whitelist for the cooking furnace.

* Refactor cooking system solution handling

Removed Solution field from CP14FoodData and updated CP14SharedCookingSystem to use solution containers directly. Improved solution transfer, mixing, and overflow handling during cooking. Increased pan max volume from 30 to 100 in cooking_furnace.yml.

* Improve cooking system trash handling and update food sprites

Enhanced trash distribution in CP14SharedCookingSystem to randomly assign trash to plates, only adding all trash to the last plate. Updated meat_dish and salad prototypes to use new wooden plate sprites. Added wideAnimationRotation and DrainableSolution to cooking_furnace for improved functionality.

* Remove unused usings and redundant comments in cooking components

Cleaned up CP14 cooking-related components by removing unused using directives and empty XML comments. This improves code readability and maintainability.

* Add tag-based cooking requirements and new meal recipes

Introduces tag-based cooking requirement classes (TagRequired, TagBlocked, SolutionRequired) and updates the cooking system to support tag checks. Adds new tags for food items, updates food and meal prototypes to include relevant tags, and implements new meal recipes (Zellasian Breakfast, Monster Egg) with corresponding sprites and localization. Also refactors and renames some tag and structure prototype files for better organization.

* Refactor and expand CP14 cooking recipes and tags

Reworked meal recipes to use tag-based requirements, added new tags for food categorization (meat, cheese, vegetables, etc.), and removed hardcoded entity recipes for ham in cheese and stuffed potato. Updated and added new meal recipes (bread plate, ham in cheese, stuffed potato), localized their names and descriptions, and migrated/added corresponding sprites. Deprecated SolutionRequired requirement, cleaned up unused tags, and improved TagRequired/TagBlocked logic. Updated prototype files to use new tags and added missing tags to food entities.

* Refactor and expand green salad recipes and assets

Replaces the old green salad entity and workbench recipe with new cooking recipes for green salad and green salad with meat. Updates English and Russian localization, moves and adds new salad textures, and removes obsolete salad assets and trading request.

* mashed potatoes

* Add mashed potatoes with herbs meal

Introduced a new 'mashed potatoes with herbs' meal, including English and Russian localization, recipe definition, and associated sprite. Updated the texture metadata and added the new image asset.

* Update dye.yml

* Fix frying pan item size and update plate recipe

Moved the 'size: Ginormous' property to the correct component in frying_pen.yml. Renamed the plate recipe and result from 'CP14Plate' to 'CP14PlateWooden' in misc.yml for clarity.

* Update meals.yml

* Update migration.yml

* fixes

* fix heating food sounds

* Nyranu temperature transmission

* Update plate.yml

* Cooking DoAfter works

* burning logic

* cooking more work

* auto transform transformable

* Update CP14SharedCookingSystem.DoAfter.cs

* cool burning visuals!

* Add MIT license headers to cooking system files

Added sublicensing notice and MIT license header to all files in the CP14 cooking system. Also made minor code cleanups, such as removing unnecessary default initializations and improving XML documentation for clarity.

* constant heating required

* cooking visuals improve!

* sandwiches with processed cheese + reagent burnt fuckuping

* inhand pan sprites + FIRE fuckup

* crafting & buying pan

* fix predicting

* random food spawner + chef closet

* mapping update

* Update frying_pen.yml

* move WIP to blacksmith lol
2025-07-16 08:15:08 +03:00
PJBot
f6c8bb9b16 Automatic changelog update 2025-07-16 03:20:05 +00:00
CrystallEdge Server
60d9f4ee3b Automatic changelog update 2025-07-16 05:53:03 +03:00
gogenych
60d4366ed4 new glow portal frame (#1533) 2025-07-16 05:51:57 +03:00
PJBot
988a35bc5a Automatic changelog update 2025-07-16 00:44:27 +00:00
nabegator
4e59b61749 Whitelist extension for tool belt (#35212)
* sd

* xd

* im so dumb

* revert to just remote signaller

* forgot

* add code comment

---------

Co-authored-by: shampunj <140359015+shampunj@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-16 02:43:19 +02:00
Tayrtahn
604435d807 Convert some voice samples to mono (#39002)
* Convert Xenoborg voice sounds to mono

* Convert female human cough sounds to mono
2025-07-15 16:36:44 -04:00
Hannah Giovanna Dawson
1d4c945561 Remove the Qur'an (#39000) 2025-07-15 03:52:05 -07:00
PJBot
b5ad346fd8 Automatic changelog update 2025-07-15 02:48:54 +00:00
Velken
b18a7ccdd3 Moproaches (#38700)
* MOPROACHES

* rerun test - random test fail of doom

* added to random pest event, with same prob as cancer mouse

* rerun test - random test fail of doom 2 electric boogaloo

* changed moproach obtain methods

* no crafting of moproaches allowed :(

* Reverted content of file.

* requested changes

* requested changes

* requested changes

* Increase moproach health by 5 - requested by Emo on discord

* spaaaaaaaaaaaaaaaaaaaaaaaaace

* microwave recipe added

* no surgery this week

* spaaaaaaaaaaaaaaaaaaace 2 more space for your space

* space

* new mopshoes sprite

* in-hands

* inhands v2

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-14 22:47:47 -04:00
PJBot
5dbef8a924 Automatic changelog update 2025-07-15 00:52:21 +00:00
SlamBamActionman
f8322d548e Adjust throwables hitboxes to match sprites (#38985)
Initial commit
2025-07-14 17:51:14 -07:00
PJBot
3122adbd34 Automatic changelog update 2025-07-15 00:50:37 +00:00
RedBookcase
34cc49ccf0 Made the Mosin bayonet usable. (#38295)
* Made mosin an alt-melee weapon, added reagent fill for the weapon.

* fixes

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-07-14 17:49:27 -07:00
Trosling
6053509ceb New holy books (#38986)
* Adds a few new holy books, implements one existing, and makes them pickable from loadout

* Almost forgot the yaml

* Forgot to change fork-specific paths

* Modified copyright to be less specific as requested by maintainer

* Newlines

* Replaced scroll torah with a book-bound tanakh, as recommended by dvir001

* Changed all mentions to use tanakh instead of torah
2025-07-14 17:49:08 -07:00