Commit Graph

11585 Commits

Author SHA1 Message Date
Ed
9425908ef2 adapt codebase 2025-09-15 14:49:58 +03:00
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)"
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
2025-09-14 20:42:51 +02:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175)
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-13 22:30:17 -07:00
Nim
fbef31dfa6 return simple armour (#1770) 2025-09-13 15:22:02 +03:00
Nim
62a9ca1cfc nerf fire trap (#1768) 2025-09-12 17:24:18 +03:00
ApolloVector
8cc1b29ba4 Clake frag round fix (#40294)
make the frag work
2025-09-11 18:36:10 -07:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
ScarKy0
1f1c71919b Remove unused BulletTennis (#40285)
init
2025-09-11 16:36:39 +02:00
SlamBamActionman
9519eb5f7a Fix Linter errors (#40283)
Fix yoml
2025-09-11 15:17:37 +02:00
SlamBamActionman
b3e06de0e5 They're milk jugs, not milk cartons! 2025-09-11 14:02:05 +02:00
SlamBamActionman
8a4a6ec7ab Food Item Size Adjustment (#39203) 2025-09-11 13:37:25 +02:00
IProduceWidgets
276e4df749 No take; Only throw. (#40143)
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-09-11 12:57:30 +02:00
Kit
ab0add0f32 Condense (#1765) 2025-09-11 12:33:03 +03:00
ToastEnjoyer
46f59300ac Laser rifle is contraband again (#40253)
* Fixed contraband tag

* practice isnt contraband

* Added base

* Removal
2025-09-10 19:37:10 -07:00
Princess Cheeseballs
2601853791 Cardboard Box Weightless Fix (#40260)
Box is no longer space faring

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-11 00:13:58 +02:00
imatsoup
35bb5c633c Make Butterflies zombie immune (#40265)
butterfly zombie no longer
2025-09-10 23:48:53 +02:00
Red
38f1a765d7 Some random tasks (#1763)
* Update venicialis.yml

* Update CP14CurrencySystem.Converter.cs

* fix #1759

* fix #1605

* fix #1604
2025-09-11 00:22:21 +03:00
SweetAplle
ff54410d6a "idk" no longer shrugs, instead sanitizing to "I don't know" (#39024)
* idk no longer shrugs

* accidentally had this in here!

* this was accidentally in here too!

* fucked up the removal

* fucked it up again this should HOPEFULLY be the last one

turns out it's hard to revert the edit of a file that's just numbers and spaces who woulda thunk?

* Restore SpaceStation14.sln to master

* Restore development.toml

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-09-10 13:09:58 -07:00
Alexsey Bezyuk
a210244768 Goblins T2 Athletic (#1762) 2025-09-10 18:39:23 +03:00
Red
8e18c5e121 Bugfix + Carcat nerf (#1761)
* fix #1758

* nerf carcat

* fix #1747
2025-09-10 15:51:16 +03:00
Stefano Pigozzi
960174acc5 Fix RGB staff not working (#40258)
Add missing `TargetAction` to `ActionRgbLight`

This fixes the RGB staff not working.
2025-09-10 13:42:33 +02:00
Deerstop
a05d466a5e Decal spawners spawn on a higher layer (#39956)
changed decal spawn layer
2025-09-10 11:58:06 +03:00
4g10w
e6695858cb Armorattus Valoricus (#1675)
* Rat and armor

Added rat mob and rat armor.
Slightly changed interaction popup system to allow for both picking up
and hugging interaction. This adds an "Interact" item to context menu of
interactable (huggable) objects.
Trying to make it in a way that allows for more pets to be added later.

* Rat ghost role

Rat:
- added ghost role with descriptions and rules
- added hand
Rat armor:
- added crafting recipe

* Ghost role, armor and adjustments

Added:
- Ghost role spawner for rat

Changed:
- AI-controlled rat will now retaliate if attacked
- Rat is now a bit slower
- Playable humanoid races can no longer wear rat armor

Removed:
- Rat's hand because it leads to unwanted interactions
- Rat will no longer stabilize the demiplane, so it will collapse if rat
is the only player-controlled entity left. This is done because without
a hand rat cannot leave the demiplane on it's own

* Armor cost, Rat hunger, Rat ghostrole
Tweaks and Fix
Added:
- Rat's hunger level is now visible when examining it
Changed:
- Rat gets hungry slower than before. When starving it takes less damage and slows
  down by less amount
- Rat ghostrole prototype moved to it's own directory
Fixed:
- Rat armor physical composition now makes sense and costs exactly like
  it's ingredients

* fixing the rat armor composition... again

* Armor and HP tweaks

Changed:
- Lowered protection values given by rat armor to lower the price
- Increased crafting price for rat armor from 2 iron ingots to 6. A lot
of wasted material for such delicate work I suppose.
- Increased rat's HP by 10 to counter armor changes

* Removed interaction
Reverted InteractionPopupSystem and deleted interaction texts for rat

* Updated licenses and authorships of sprites

* fixed license and removed interaction from rat prototype

* Fixed armor looking wrong in rat's dead state

* Removed unnecessary images from rat.rsi

* Removed IronSmelting skill requirment since currently smith is removed

* Rat's size changed from Tiny to Normal to reflect how bigass this rat really is

---------

Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
2025-09-10 11:31:44 +03:00
Viator-MV
def6b4a372 Venicialis guard-guild upate (#1754)
* guard-guild

* fix1

* guild weaponry and bioms
2025-09-10 01:32:48 +03:00
Nim
fb18edcedc MessyDrinker (#1756)
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-09-09 10:44:10 +03:00
Kittygyat
cb4bbf3d38 Reworded the Galoshes description to be more clear about what they actually do. (#40200)
Reworded the Galoshes description to be more clear about what they do
2025-09-08 19:47:45 -07:00
Centronias
82b94ec6de Derelict Mediborgs can Scan Solutions and see Mob Health (#40206)
Add mediborg unique components to derelict mediborg
2025-09-08 19:44:31 -07:00
Nim
5dddaf4033 Merge pull request #1719 from Nimfar11/translate7
Перевод на RU
2025-09-08 17:32:36 +03:00
SlamBamActionman
905935e6ed Lets diona sap trigger artifact blood nodes (#40211) 2025-09-08 15:56:59 +02:00
Ed
5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml
2025-09-08 13:12:50 +03:00
keronshb
f885075d2e DoAfter support for Actions (#38253)
* Adds Action DoAfter Events

* Adds DoAfterArgs fields to DoAfterComp

* Adds a base doafter action

* Adds Attempt action doafter logic

* Adds doafter logic to actions

* Changes Action Attempt Doafter and action doafter to take in Performer and the original use delay. Use delay now triggers when a repeated action  is cancelled.

* Readds the TryPerformAction method and readds request perform action into the action doafter events

* Adds a force skip to DoAfter Cancel so we can skip the complete check

* Adds a Delay Reduction field to the comp and to the comp state

* Fixes doafter mispredict, changes doafter comp check to a guard clause, sets delay reduction if it exists.

* Cancels ActionDoAfter if charges is 0

* Serializes Attempt Frequency

* Comment for rework

* Changes todo into a comment

* Moves doafterargs to doafterargscomp

* Adds DoAfterArgs comp to BaseDoAfterAction

* Removes unused trycomp with actionDoAfter

* Replaces DoAfterRepateUseDelay const with timespan.zero

* Removes unused usings

* Makes SharedActionsSystem partial, adds DoAfter partial class to ActionSystem, moves ActionDoAfter logic to the SharedActionsSystem.DoAfter class

* Cleanup and prediction

* Renames OnActionDoAfterAttempt to OnActionDoAfter, moves both to Shared Action DoAfter

* Removes ActionAttemptDoAfterEvent and moves its summaries to ActionDoAfterEvent. Converts OnActionDoAfterAttempt into TryStartActionDoAfter

* Removes Extra check for charges and actiondoafters

* Sloptimization

* Cleanup

* Cleanup

* Adds param descs

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-08 12:55:13 +03:00
Ed
67e5ef8ecb Refactor Food component to Edible in meal and cooking entities
Replaced the deprecated 'Food' component with the 'Edible' component in bowl, plate, and pie_pan YAML prototypes. Updated base cooking entity whitelist to include 'Edible' for compatibility. This change standardizes food consumption logic and improves maintainability.
2025-09-08 12:49:43 +03:00
Ed
a246db9ec1 remove random food 2025-09-08 11:51:45 +03:00
Ed
f84e1ba04d Merge branch 'master' into ed-25-08-2025-upstream-sync
# Conflicts:
#	Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml
2025-09-08 11:33:44 +03:00
Ed
e659a2a007 Merge branch 'master' into ed-25-08-2025-upstream-sync 2025-09-08 11:31:28 +03:00
OrbitSystem07
b7d595b57e Lets diona sap trigger artifact blood nodes 2025-09-07 21:23:45 -07:00
Kit
d9814b1eb2 Alch guidebook refactor (#1717)
* ALCHEMY GUIDEBOOOK!!!!!

* forgoten translation

* FIXES!!!!!

* Requested translation changes
2025-09-08 02:45:11 +03:00
Kit
063a9a87d6 some changes (#1749)
* some changes

* lower health regen

* spine guard more common

* MORE!!!!
2025-09-08 01:37:53 +03:00
Red
ab7e3204f1 Adventure guild returns (#1745)
* adventure guild

* fix order board

* fixes

* loadout + fix

* commit
2025-09-07 19:15:29 +03:00
ArtisticRoomba
a93f6b8cdf Atmos dP Guidebook Entry (#40194)
* Add Atmos dP guidebook

* Update Resources/ServerInfo/Guidebook/Engineering/DeltaPressure.xml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-07 17:10:39 +02:00
Hannah Giovanna Dawson
a699639834 Allow Vulps With Human Hair To Be Shaved Without Clyde Joining The Circus (#40171)
* Revert "Disable vulpkanin human hair (#40144)"

This reverts commit d02aa1a4e2.

* You can once again shave your pet Vulp

* I can see the ass, I'm safe

* Rectified docstring as I am a good person

* I am doing this instead of playing Silksong please help

* Fix forgetting to re-add shader overriding
2025-09-07 16:36:38 +02:00
Crude Oil
fb454351d2 Restore transfer amounts on regular syringes to 5, 10, 15 (#40197)
add transferamounts to regular syringes
2025-09-07 16:01:26 +02:00
Red
ad46932d11 Balance tweaks (#1741)
* disable lurker pulling

* fix pack

* fix pack

* fak pix

* vampire objective tweak

* buff vampire search

* Update air_saturation.yml

* fix

* fix

* Update EntityTest.cs

* Update EntityTest.cs

* tick

* Update EntityTest.cs

* remove forkfiltered filter

* Update EntityTest.cs
2025-09-07 14:22:30 +03:00
ArtisticRoomba
ae9f56b234 fix: Atmos dP Window Inheritance (#40192) 2025-09-07 02:13:29 -07:00
ArtisticRoomba
8f8db391d8 Atmospherics Delta-Pressure YAML refactor (#40174) 2025-09-07 00:56:37 -07:00
Mr. 27
4eab05b55e Add some alternate jumpsuit designs which can be toggled (#31213)
* inital

* testfa

* New Sec sprite

* Update atmos

* Update meta.json

* Update meta.json

* 0

* Update meta.json
2025-09-06 13:55:02 -04:00