Commit Graph

11028 Commits

Author SHA1 Message Date
Red
30d7da4b2b Ed 06 07 2025 guards trading (#1505)
* guard trading

* Refactor trading reputation special and update guard assets

Renamed CP14AddGlobalReputationSpecial to CP14AddTradingReputationSpecial and updated its logic to use a configurable set of factions. Updated job prototypes for guard, guard commander, investigator, and merchant to use the new special and specify relevant factions. Also updated guard helmet textures and metadata.
2025-07-06 17:35:49 +03:00
Red
6b6d6ae3f9 return guards to Comoss (#1504)
* return guards to Comoss

* salary system

* Update Frigid_Coast.yml

* Update migration.yml
2025-07-06 14:28:57 +03:00
Red
6570b1b4b6 Public market + Solutions requests (#1503)
* Add platform markup to trading platform prices

Introduces a PlatformMarkupProcent field to CP14TradingPlatformComponent and applies it to price calculations in both client and server logic. Adds a new public trading platform entity with a higher markup and updates related sprites and metadata.

* Add platform markup percent to selling platforms

Introduces a PlatformMarkupProcent field to CP14SellingPlatformComponent, allowing selling platforms to apply a markup or markdown to item prices. Updates server logic to use this value when calculating payouts and UI state. Adds a new public selling platform entity with a lower markup in the trade_platform.yml prototype.

* Add Brad Potions trading requests prototype

Introduces a new YAML prototype defining multiple cp14TradingRequest entries for the BradPotions faction, each specifying requirements for various potion effects with minimum purity and amount.

* Apply platform markup to selling prices and payouts

Updated the selling request control and platform window to factor in the platform's markup percentage when displaying prices. Adjusted the server-side payout logic to multiply the payout by the platform markup percentage, ensuring consistency between client display and server rewards.

* replace mapping to public platforms

* bug + remove eepy potions request

* Clarify purity requirement in workbench reagent text

Updated the reagent requirement string in both English and Russian locale files to indicate that the required purity is '{$purity}%+' instead of just '{$purity}%'. This clarifies that the purity must be at least the specified percentage.
2025-07-06 00:09:03 +03:00
Red
14b0fc5b4a Workbench and crystals (#1502)
* solutionResource

* fuck research system + QoL workbench update

* colorful quartz returns

* Refactor workbench skill requirements handling

Replaces the SkillRequired requirement with a direct RequiredSkills field on CP14WorkbenchRecipePrototype. Updates client and server logic to check skills directly, simplifying recipe skill checks and related UI logic.

* Initial commit

Add initial project files and setup.
2025-07-05 20:44:38 +03:00
Red
a68da0eacd Magotech (#1498)
* Add brass material, bars

Introduces the new brass material, including its prototype, stack, and bar entities, along with associated sprites. Updates English and Russian localization files to include brass and adds a new construction condition for mana power. Also moves glass sheet entities to the correct file.

* Add CP14ManaFilled construction condition

Introduces a new construction condition that checks if an entity's mana container is fully filled. Includes examination feedback and construction guide entry for user clarity.

* electromancy respawn

* Update T2.yml

* Update meta.json

* ffif

* Update speed_ballade.yml

* Update thaumaturgy.yml

* Update undead.yml
2025-07-05 14:54:09 +03:00
Kit
84ec067d57 grer terra (#1500) 2025-07-05 10:07:15 +03:00
Kit
17873f415b Solutions tweaks (#1497)
* soothing cooling

* warming well warming

* incind buff

* Ice cooling unsafe

* blood potions nerfs

* Stamina Chromium slime
2025-07-04 18:32:44 +03:00
Nim
cb01a6b66c Reprise of doors, vials, and labeler (#1495)
* birch door

* hand labeler

* vial

* fix door

* vials

* frame
2025-07-04 17:35:59 +03:00
Kit
94455f55f2 Saturating and moisture recipes (#1496)
* Bestia Essence

* Target Recipies

* Essence bestia stuff

* Magic type fix
2025-07-04 17:29:20 +03:00
Ed
18f58c9fe5 move speed ballade to electro 2025-07-03 18:16:03 +03:00
Nim
dc1922c6f2 Food and cutlery (#1483)
* food and cutlery

* goblet

* jelly

* ham in cheese

* Klanir stuffed pumpkin

* fix

* jelly fix
2025-07-02 17:17:39 +03:00
Viator-MV
b808990720 fort (#1494) 2025-07-02 17:16:50 +03:00
gogenych
890af47853 The carpets update! (#1461)
* carpets!

* fix

* second fix

* 3 fix

* crafts 2

* locale

* some changes

* price

* names

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-07-01 16:24:03 +03:00
Kit
d8fa6f0a0b STAMINA SOLUTIONS!!!! (#1492) 2025-07-01 13:10:08 +03:00
Nim
4dc06e42f1 Wooden weapon (#1471)
* wooden weapon

* Stamina
2025-07-01 13:07:09 +03:00
Ermucat
293053d4e7 Adds kick whitelist (#1493)
* kick whitelist

* well shit
2025-06-29 20:58:38 +03:00
Ed
874cb2e310 comoss update 2025-06-29 18:21:49 +03:00
Tudibidab
71f16a4976 MobFairy (#1465)
* MobFairy

New mob Fairy. Magic parasite.
Mana Splitting now deals damage when the target has no mana.

* Update attributions.yml

Добавил чёрточки

* Update fairy.yml

* Update modifier_sets.yml

* Update fairy.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update fairy.yml

* Update fairy.yml

* Update mobs.yml

* Update fairy.yml

* Update fairy.yml

* Update fairy.yml

* Update fairy.yml

* minor fixes

* add to demiplane generation

---------

Co-authored-by: Viator-MV <egor44148@gmail.com>
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-06-29 17:06:55 +03:00
Ed
e949969d5c Update misc.yml 2025-06-29 17:06:10 +03:00
JustSome1Nearby
a1c995fdd7 Birch Grips (Craft, Sprite) (#1488)
* BirchHandle

* BirchHandle2

* GRAAAH JUST CALL IT BIRCH ITS ALLREADY WOOD

* Delete gitlog

* Delete BirchWood for just wood

* Delete BirchWood2

* Update Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-29 15:34:27 +03:00
Red
af0a502dab Alchemy furnace integration (#1489)
* furnace integration + fix gates

* fix

* d
2025-06-29 13:38:05 +03:00
Nim
104eb4310f Monster blood (#1481)
* monster blood

* taikamyrky
2025-06-29 12:51:10 +03:00
Red
777c5f9a29 Electromancy magic branch (#1485)
* basic electromancy tree

* electric strike

* Update CP14SpellProjectile.cs

* fix throwing
2025-06-29 12:20:47 +03:00
Red
ecadfb3ea5 Big content update (#1484)
* Add investigator's cloak entity and sprites

Introduced a new investigator's cloak for senior investigators, including its entity definition and associated sprites. Also updated helmet sprites for the guard role.

* Add Investigator job to CP14 roles and assets

Introduces the Investigator job, including English and Russian localization, job prototype, loadout, play time tracker, and status icon. Updates department and role loadout configurations to include the new job. Enables setPreference for Guard and Guard Commander jobs. Adds Investigator job icon and updates related metadata.

* Rebalance mana splitting spell parameters

Reduced mana cost from 15 to 10, adjusted mana change effect, and updated spell event to use a toggleable action with new cast time and distance threshold. Also changed visual effect colors for the spell impact.

* job spawner

* remove mana splitting from mana glove

* Update tools.yml

* reduce memory points to 0.5 for tier magics

* Add CP14 spell to create beams and extend beam system

Introduces CP14SpellCreateBeam, a new spell effect for creating beams using the shared beam system. Adds a virtual TryCreateBeam method to SharedBeamSystem and overrides it in BeamSystem to support shared spell functionality.

* athletic branch refactor

* second wind skill

* minor fixes

* remove skeletons specific spells

* small magic splitting

* Update migration.yml

* clear references

* guidebook species update, -0.5 people memory, innate athletic to carcat, nerf night vision

* disable guards again
2025-06-29 00:02:04 +03:00
Ed
c04f08c2ac Update peace_ballade.yml 2025-06-28 17:43:29 +03:00
Ed
811a91aa8f Update audio_music.yml 2025-06-28 16:32:10 +03:00
Ed
ad2aaeb4c4 Update precurser.yml 2025-06-27 18:30:16 +03:00
Ed
7667db6d0c Update precurser.yml 2025-06-27 18:29:16 +03:00
Red
0b7b8be299 Alchemist trading tweaks (#1479)
* Remove poison and vomit effects from precursor reagents

Eliminated poison-related health changes and vomiting effects from several reagent definitions in precurser.yml. Also adjusted the cold damage value for one reagent. These changes likely aim to rebalance reagent effects or simplify their behavior.

* Rename and update vial prototypes to use small parent

Renamed vials_filled_reagents.yml to vials_filled_precursor.yml and updated all vial entities to use 'CP14VialSmall' as their parent instead of 'CP14VialTiny'. This standardizes the vial size for these precursor reagents.

* Update vials_filled_precursor.yml

* Update vials_filled_precursor.yml

* agaric added

* Update vials_filled_precursor.yml
2025-06-27 12:55:36 +03:00
Red
11ad05058e Remove mithril lock & keys from Cozy House (#1478)
* Add LumeraMagicVision skill and update trading requests

Introduces the LumeraMagicVision skill to the Lumera demigod skill tree, granting access to the Magic Vision action. Also removes several 30-minute jewelry trading requests (Ruby, Emerald, Sapphire, Topaz) from thaumaturgy.yml. Additionally, improves price scanner logic to skip items with non-positive price.

* Remove Rep 3 trading positions from cozy_house.yml

Deleted the CP14KeyMithrilBlank and CP14LockMithril trading positions for reputation level 3 from the cozy_house.yml file, leaving only the gold lock product for HomeDecor.
2025-06-27 00:25:47 +03:00
Red
ddbca29b73 Add LumeraMagicVision skill and update trading requests (#1477)
Introduces the LumeraMagicVision skill to the Lumera demigod skill tree, granting access to the Magic Vision action. Also removes several 30-minute jewelry trading requests (Ruby, Emerald, Sapphire, Topaz) from thaumaturgy.yml. Additionally, improves price scanner logic to skip items with non-positive price.
2025-06-26 22:20:18 +03:00
Nim
16ed544eb2 fix cucumber (#1476) 2025-06-26 20:17:22 +03:00
Alexsey Bezyuk
9c393ff8b5 [TRADE] Reagent and Food price rework and 4 new contracts: Butchers, Diary, Gardeners and Tailors (#1453)
* contracts

* meat prices

* cheese and egg

* blue and aged cheese

* aged and blue parts and slices

* cheese json

* contracts

* cheese and egg

* blue and aged cheese

* aged and blue parts and slices

* cheese json

* revert meat prices

* Cheese prices

* egg price remove

* revert meat prices

* factions

* contracts

* meta.json

* remove monster part price

* sickle, hoe

* up price per unit

* Trade ref, cheese fix, plate PhysCompos

* Update coins.yml

* prices reagents rework, raw nutrient decrease, food container rework

* prices

* materials, remove bars

* tailors faction

* factions

* sprite fixes

* enyity fix

* Physical compositions

* tailord dye and loot in crate

* comment

* Ore buy to bar

* move to buy positions

* factions and contracts in main page

* move flint position

* Квартц вместо стекла

* quartz price up

* glass sheet sell position

* price precurser. Again

* essences prices

* english comment

* ooops missed

* price up

* sell requests and small flowers variations

* yaml fix

* test fix?

* flowers => to vials

* 2 => 1 count

* flowers icons

* remove small variations

* clear

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-26 18:18:19 +03:00
Red
81e044758f Magical vision skill (#1467)
* fix firewave error spamming

* basic magic traces entities

* Add magical vision system and mana trace entities

Introduces the magical vision mechanic, including the CP14MagicVisionComponent, marker entities, and related systems for tracking and displaying magical traces. Adds new actions, skill integration, localization strings, and icons for magical vision and trace markers. Magic traces are now spawned on spell use and mob state changes, with directional pointers and localized descriptions.

* Show time passed for magic vision markers

Adds a display of the time elapsed since a magic vision marker was spawned, using a localized string. Updates English and Russian locale files with the new 'cp14-magic-vision-timed-past' entry.

* aura imprints

* Update critical and death messages for inclusivity

Revised the 'critical' and 'dead' messages in both English and Russian locale files to use more inclusive language, replacing references to 'magical creature' with 'someone'.

* Move magic vision spawn on mob state change to server

Transferred the logic for spawning magic vision markers on mob state changes (Critical/Dead) from CP14SharedMagicVisionSystem to CP14AuraImprintSystem. This centralizes the event handling on the server side. Also increased the duration of magic vision markers for spell usage from 20 to 50 seconds.

* Integrate magic vision with visibility mask system

Added a CP14MagicVision flag to VisibilityFlags and updated the magic vision and religion systems to use the visibility mask system. Magic vision markers now use the Visibility component, and visibility is refreshed when relevant components are added or removed. Removed client-side toggling logic in favor of server-driven visibility.

* drowsiness overlay

* noir shader

* sfx design
2025-06-26 13:49:53 +03:00
SenorJaba
0cc7b6bf36 Asian clothing! (#1459)
* Asian clothing

* Fix
2025-06-26 13:46:38 +03:00
Nim
ee1222dcf4 slice (#1472) 2025-06-26 13:45:52 +03:00
Sefaia
a8c741a6b5 Merge pull request #1468 from Sefaia/Leftover-Executions
Added Executions for Non-Modular Weapon Base and Ice Dagger.
2025-06-25 00:08:20 +03:00
Red
0542ed4446 Upstream sync (#1464)
* Fix soap recipe so it actually works (#37923)

Change soap recipe

* Automatic changelog update

* Automatic changelog update

* Added security mime mask (#37890)

* Added security mime mask

* Improved security mime mask equipped sprites

* Improved security mime mask icon sprite

* meta.json spacing fix

* Reorganized Turret Prototypes (#37863)

* Reorganized turret prototypes

* Added circuit board to migrations

* Fixed frequencies

* Fixed typos and set the base control panel to abstract since it's technically not constructable yet

* Fixed the typo in the migrations

* Addressed changes

* Whitespace fixes

* Whitespace check fix

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Automatic changelog update

* Sellable syndicate contraband (#37835)

* Sellable syndicate contraband

* 1984 tests, laughible

* Balancing

* Standardized running and walking speed debuffs for equipped gear. (#37828)

Co-authored-by: RedBookcase <Usualmoves@gmail.com>

* Add hair back to hardhats (#38086)

adds hair back to hardhats

* Automatic changelog update

* Access Reader Refactor (#37772)

* Initial commit

* Integration test fix

* Removed redundant dirtying of accessreader

* Adds individual Bulldog magazines to the syndicate uplink (#37917)

* Brief commit to update branch

* added more magazines to uplink, corrected spelling in ftl file for uplink, corrected sprite state for incendiary bulldog mag

* removed incendiary drum, increased cost of slug drum

* Emogarbage swoop

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Improve Potted Plant Movability and Availability (#37591)

* Added Purchasable Potted Plant Crate

* Removing some whitespace that made it in elsewhere

* Making Potted Plants Items and pickupable

* Revert Making potted plants not fade

This reverts part of commit a50a7def80c06e5be68a37263306007739952a28.

* Adding self to credits

* Fixing sus spacing

* Automatic changelog update

* Rifle crate order (#35535)

* lecter crate and gift

* revert cargo gift security armor change

* rifle cost down to 8000 spesos

* Automatic changelog update

* Muzzles reduce emote sound (#34444)

* Muzzles reduce emote sound

* update based on review comments

* review comments

* Automatic changelog update

* Added Scrap Armor [Reupload]. (#37601)

* Added Scrap Armor v2.

* Added a note to scrap helmet about vision reduction.

* Removed protection from step triggers.

* The patient needs broken kneecaps to live.

* Add in missing tag

* Missing tags pt 2

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Make improvised explosive devices minor contra (#38088)

pipe bomb and fire bombs are minor contra

* Automatic changelog update

* emergency shuttle emergency lockers (#38095)

* Cleanup unused/redundant dependencies (#38099)

* Shark toys use the bite animation. (#38113)

* Automatic changelog update

* Fix throwing items into disposal units (#38106)

* Increase throwing into disposal chance (#38116)

* Automatic changelog update

* Don't show climb verb for objects that cannot be climbed (#38115)

fix climb verb

* Reduce Liquid Frezon Duration (#38100)

testing

* Add player autofill to rename command. (#38074)

* simple enough

* switch to CompletionResult.FromOptions and CompletionHelper.SessionNames

* cleanup

* Light Up Landmines (#38092)

* Adjust landmines to have unshaded lights.

* Someday I will give myself credit for the work I do.

* Adjust animation speed.

* Automatic changelog update

* fix wallmount vending machine dispense direction (#38112)

fix wallmount vending machine direction

* Automatic changelog update

* Fix serialization of `SunShadowCycleComponent` (#38002)

* Use a struct to hold the items for `Directions` in `SunShadowComponent`, fix serialization.

* actually make them datafields...

* Add NetSerializable to datadef

* this is why we can't have nice things

* ShowEmergencyShuttleCommand and MeleeSpreadCommand LEC conversion. (#37993)

progress

* Add name to chameleon controller implanter (#38117)

Update implanters.yml

* Automatic changelog update

* chem.yml cleanup (#38129)

Update chem.yml

* Reduce disabler capacity to 16 shots (#36019)

* 14 shots

* 14 to 16

* Automatic changelog update

* Genpop wall lockers (#38102)

* sprites

* genpop wall lockers

* number 5 alive

* slight boilerplate code, thank you slarti

* fix: allow ejecting diamonds from lathes/silos (#38132)

* Automatic changelog update

* make PacifiedComponent session specific (#38137)

* Fix stripping window for more than 2 hands (#37577)

* Automatic changelog update

* Forbid string literals for `NpcFactionSystem` methods (#38140)

* Add ForbidLiteral attribute to NpcFactionSystem methods

* Cleanup resulting warnings

* Update Credits (#38143)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* No raffle for space carp (#38101)

No raffle for carp

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

* Automatic changelog update

* adjreagent now accepts float (#38134)

* adjreagent now accepts float

* var

* Automatic changelog update

* MapManager warnings cleanup Server Edition 2003 (#36781)

* now you see me

* unused depen

* test fail fix attempt 1

* test fail fix attempt 2

* fix test fail attempt 3

* shot in the dark.

* Does this work?

* import cleanup

* taking a shot at this.

* Convert PersistenceSaveCommand to LocalizedEntityCommands.

* requested changes

* requested changes. also dealt with improperly named private const

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

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

* Update Content.Server/GameTicking/GameTicker.Spawning.cs

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

* Convert PlanetCommand to LocalizedEntityCommand

* Update BiomeSystem.cs

* Update Content.Server/Salvage/SalvageSystem.Runner.cs

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

* Update Content.Server/Procedural/DungeonSystem.Rooms.cs

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

* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs

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

* Update Content.Server/Station/Systems/StationBiomeSystem.cs

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

* revert to latest master.

* slartis suggestion.

* Update SetMapAtmosCommand.cs

* cleanup

* Update PersistenceSaveCommand.cs

* finish localizing persistencesavecommand

* this is icky, I change.

* :sigh:

* revert whatever I did here?

* oh I see, some inconsistencies.

* revert this

* Update PlanetCommand.cs

* move this ftl to the commands folder

---------

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

* Missing contraband tags on explosives (#37521)

* Firebombs as minor contraband

* Pipebombs as minor contraband

* Seismic charge as cargo/sec contra (like crushers)

* Modular payloads

* Automatic changelog update

* Improved Health examination text (#38126)

* more health examinations

* better blood

* fix

* tweaks

* sizeable

* silicon fix

* tweaks

* bleeding color tweaks

* fix

* Automatic changelog update

* Assorted device and core inhands (#38162)

* Assorted device and core inhands

* whoops forgot the thief objective

* i missed literally on pixel on the fulton argh

* inhand pinpointer update

* Automatic changelog update

* Add FixedPoint2TypeParser (#38169)

* Update submodule to 262.0.0 (#38174)

* Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce (#38164)

* Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce

* Usings fix

* Usings fix

* Usings fix

* Usings fix

* CVar fix

* Predicted ppups

* Openable predicted popup

* Fix audio prediction

* Automatic changelog update

* Allow cargo request computers to send orders to the primary account (#37943)

* Automatic changelog update

* Revert "Add trailing whitespace check workflow" (#38179)

Revert "Add trailing whitespace check workflow (#37367)"

This reverts commit be35f6e9ce.

* Give unique names to all curtain construction recipes (#38182)

* Give unique names to all curtain construction recipes

* Duplicate entry

* Cleanup unused fields in `DrinkSystem` (#38181)

Cleanup unused fields in DrinkSystem

* New Recipes: Breakfasts (#37279)

* Adds full english and american breakfasts and respective recipes

* sprite tweak and added random spawner

* reagent rebalance

* reagent re-rebalance

* spawner ID fix

* ACTUALLY actually fixed the spawner, also description changes

* reagent re-re-rebalance

* spawner fix so the linter stops screaming at me

* different check failed kekw

* trailing whitespace fix attempt #1

* identation fix? i think?

* indetation fix part 2, also vox cant eat this anymore

* more yaml fixes

---------

Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>

* Typo fix in coffin description (#38193)

* Automatic changelog update

* Derotate and remove several maps, remove unused maps (#38190)

* Automatic changelog update

* Emergency Shuttles Update (#38186)

* Automatic changelog update

* hi-viz vest laser reflect (#38180)

* Update vests.yml

* Update vests.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

---------

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

* Automatic changelog update

* Bring back low pressure damage to its unnerfed value (#38196)

* Automatic changelog update

* Remade the AI Camera Static Shader (#38093)

Redid the camera static shader

* Automatic changelog update

* stop amber AI core from inducing seizures (#38209)

* Automatic changelog update

* HOTFIX: Stop AI turrets from causing flickering lights (#38212)

no power draw

* Add missing locale in Criminal Records Computer (#38217)

add missing filter locale

* WHYYYYYYY (cleanup) (#38220)

* WHYYYYYYYY

* Delete Resources/Locale/en-US/actions/actions/rootable.ftl

* cleanup mirror.yml (#38222)

* Add stamina damage resists to the bloodred raid/hard-suits (and ERT hardsuits). [TEST MERGE] (#37040)

Add stamina damage resists to the bloodred suits.

* Automatic changelog update

* Fix missing bike horn implant cooldown (#38237)

* Automatic changelog update

* Cleanup `ChameleonJobLoadoutTest` (#38229)

Cleanup ChameleonJobLoadoutTest

* Fix construction menu grid view quirky button selection (#38214)

* make hover and info use construction proto name, not entity name

* recipeButtons uses IDs as keys, not names

* return making item green when selected

* Replace Speech bubble time accumulator with TimeSpan (#38241)

* Replace SpeechBubble time accumulator with TimeSpan

* CurTime -> RealTime

* Add test that entity prototypes don't use LocIds for name/description (#38234)

* Add test that entity prototypes don't use LocIds for name/description

* Fix violation

* Guitar Sprite Fix (#38207)

* Modified Guitar Sprites

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Attributions

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Add technology to tech disk names (#38157)

* Automatic changelog update

* Forbid string literals for `SharedToolSystem` methods (#38250)

* Forbid string literals for ToolSystem methods

* Cleanup violations

* Sort usings

* Fix mops, rags, and towels interacting with drains (#38252)

added the stuff

* Automatic changelog update

* Cherrypick 38241

* Makes the grenadine bottle start closed. (#38219)

* whywhywhy

* removes unneeded line

* Automatic changelog update

* Fix reinforced plasma window blocking laser shots (#38041)

* init

* stuff

* Automatic changelog update

* Improve some `BinSystem` functionality (#38262)

* BinSystem improvements

* Prevent double-add

* Cleanup 2 `SpriteComponent.GetPrototypeTextures` uses (#38263)

Cleanup 2 SpriteComponent.GetPrototypeTextures uses

* Add the instrument names to the MIDI channel selector (#38083)

* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews

* Automatic changelog update

* Add disambiguation to most construction menu recipe names (#38197)

* Magazine rsi Cleanup + Magazine Type Recolor (#37709)

* Automatic changelog update

* Basilisk Nerfs for Gameplay (#38089)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Automatic changelog update

* Launchers require wielding (#38110)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Automatic changelog update

* Cleanup exosuit fab recipes, add modules category (#38069)

* Fix `StomachSystem` PVS error (#38268)

Fix StomachSystem PVS error

* scar availability for more species (#35645)

* :D

* updated for new scars

* small eye scar

* Automatic changelog update

* Minor Relic improvements (#38269)

* Automatic changelog update

* Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189)

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Add propeller hat & swirl lollipop (#38260)

* Automatic changelog update

* Cleanup chat highlighting code (#38235)

* Cache regexes

* Convert static LocManager to resolved

* Use Any instead of Count > 0

* Use var instead of explicit types

* Make _highlights readonly

* Fix some popup issues with pipe layer changes (#38244)

* fix: only show pipe layer popups to the user changing them

* fix: don't show pipe layer subfloor popup when not using a screwdriver

* fix: properly pass down user and used for serverside pipe layer changes

Technically this doesn't matter as the Shared codepath for this method
doesn't actually use these on the server: only the user is used for a
clientside popup. Still, will be good to have these for future changes
that might need them.

* Make BODAs start with Russian accent. (#38275)

long hand of Kremlin

* fix: Correct respath for lizard smite icon (#38288)

* Fix gas analyzer and anom scanner wrong state (#38285)

* Fix gas analyzer and anomaly scanner UI activation issue

* save

* fix comment

* milkalyzer

* Automatic changelog update

* Use correct on-head rainbow lizard plushie sprite (#38286)

* Prediction for use of utensil on incompatible food (#38297)

Prediction our beloved

* Automatic changelog update

* Fix crafting steps with modular machine parts (#38299)

fixed lines that were messing with construction menu entries for machine parts

* Automatic changelog update

* Transparent tear gas (#36440)

* tweaked tear gas

* changed color of tear gas

* sped up metabolism rate of tear gas

* sped up tear gas passing more

* reduced tear gas content in grenades

* added threshold for better effect end timing

* removed clickable component from foams

* Suggestion changes

* Hide in spawn menu

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>

* Automatic changelog update

* Fix visitor mindshields (#36537)

* Make visitor mindshields removable, and give disaster victims mindshields.

* Fix whitespace

* Fix ALL the whitespace

* Automatic changelog update

* Rat King changed to Antag (#38124)

* Changed rat king to be antag
Rat King guide updated to show antag rules

Initial infected given zombie faction
Zombies given zombie faction too (not sure if redundant or not)

* Given zombie faction to Initial Infected and Zombies in mind_roles

* Changed MindRoleGhostRoleAntag to MindRoleGhostRoleSoloAntagonist

removed components from antag listings

* Removed changes for zombies

* Update Resources/Prototypes/Roles/Antags/zombie.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Update Resources/Prototypes/ai_factions.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Changed mob prototype to match

* Forgot solo again

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Automatic changelog update

* fix missing locale for Undergarment (#38304)

* Automatic changelog update

* Fix puncturase cauterizing bleeding (#38289)

fix puncturase cauterizing bleeding

* Automatic changelog update

* 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

* Automatic changelog update

* 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

* Automatic changelog update

* 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>

* 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>

* Automatic changelog update

* Add corgium (#37951)

* Add corgi essence

* Adjust spacing concerns

* Renamed 'corgi essence' to 'corgium' based on maintainer discussion

* Automatic changelog update

* 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

* Automatic changelog update

* Fix for holoparasite's ability to attack the host through mech (#36659)

* Automatic changelog update

* Retractable items system + Arm Blade action (#38150)

* Automatic changelog update

* Give Syndie-Cats Syndie Access (#38318)

* Update animals.yml

* Update animals.yml

* Automatic changelog update

* Update Credits (#38321)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* 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

* Automatic changelog update

* Armblade Tweaks (#38337)

init

* Exo Station - Upstream Playtest Version (#33144)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Automatic changelog update

* Randomized Markings (#34765)

randomized markings

* Automatic changelog update

* 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

* Revert "Randomized Markings" (#38345)

* Add group for loadouts (#36951)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Automatic changelog update

* Commands for adding and removing actions (#38317)

* Automatic changelog update

* Fix Smart Corgis not being targeted by hostile faction entities (#38349)

* Automatic changelog update

* Exo - Day 1 Patch (#38348)

* Automatic changelog update

* Cleanup duplicate dependency in `AddActionCommand` (#38360)

Cleanup duplicate dependency in AddActionCommand

* Gun Inhand Sprite Fixes (#38294)

* cobra, viper, pulse pistol

* c20 and wt550

* l6 + attributions

* Thieves can innately pickpocket - thieving gloves rework (#38123)

* Thieves can innately pickpocket (#107)

Pickpocketing a skyrim guard's armor off

(cherry picked from commit 21b9f1ddb251ea3c7c6803e78871abefcaecbfb4)

* this isnt moff

* Make predicted, cleanup

* !skating-basketball

* orks are NOT the best trollface

* Implement much more sensible component replication prevention

---------

Co-authored-by: DuckManZach <144298822+duckmanzach@users.noreply.github.com>

* Automatic changelog update

* Objectives that do not fit requirements are now deleted (#38365)

* Fix

* Update Content.Server/Objectives/ObjectivesSystem.cs

Thanks Tayrathn!

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* predicted hyposprays (#38046)

* G O I D A

* how

* now proper

* a

* Update HypospraySystem.cs

* good catch

* Apply suggestions from code review

---------

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

* Automatic changelog update

* Adds the Estoc DMR to the syndicate uplink (#38122)

* Initial commit, adds the prototype, sprites and attributions, entries into syndicate uplink for weapon bundle and magazines

* Reduced weapon spread when wielded

* minor visual updates to sprites

* slightly adjusted burst rate down

* Update duffelbag.yml

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>

* Automatic changelog update

* Spider web visuals update (#38175)

* web update

* Update Resources/Prototypes/Entities/Structures/spider_web.yml

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

* Update Resources/Prototypes/Entities/Structures/spider_web.yml

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

* review

---------

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

* fix: no longer accidentally rotate held items (#38331)

Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>

* Fix SharedActionSystem spamming errors (#38358)

* Fixed mis-labeled component filter (#38383)

* Automatic changelog update

* Fix adjacent north/south cable terminals breaking east/west HV cable (#38377)

* Fix some crafting menu oddities (#38372)

* Automatic changelog update

* Command resolve and LEC conversion batch 3 (#38378)

* I'm just a silly goober

* requested changes

* Update Content.Server/Interaction/TilePryCommand.cs

---------

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

* remove explosions from destroying a explosive payload (#38049)

* Automatic changelog update

* Increased Borg Density (Drag Speeds) (#38232)

Raised borg drag speeds

* Automatic changelog update

* Thief objectives now verify animal stealing objectives if they actually exist (#38332)

* Holy shit it's real. Theres actually animals in this joint

* WHITESPACE SPOTTD KILL KILL KILL

* Accidentally did a bad yaml oopsie

* Apply suggestions from code review

* when the stars kiss the sky

* Apply suggestions from code review

---------

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

* Automatic changelog update

* fix: erase expedition disks when their map is deleted (#38322)

* fix: erase expedition disks when their map is deleted

* fix: include paused entities in disk query, add dirty

* Scale down 4k parallax textures (#38390)

* Scale down 4k textures, add false preload to new parallaxes

* Add filter effect, also make sure the preload yml actually has the correct name...

* Switch Discord integration to use NetCord instead of Discord.Net (#38400)

* Add directionality to cable terminal port nodes (#38394)

* Command resolve mega pr 6 (#38398)

commit progress

* Command resolve killing and LEC conversions batch 2 (#38367)

commit progress

* Command resolve killing, LEC conversions, and general cleanup. (#38338)

* i'm just gonna put this here.

* I'm just gonna do it.

* Update ShowHTNCommand.cs

* I feel dumb.

* may as well with this too.

* this does in fact not work

* :/

* fix polymorph errors (#38409)

fix polymorph error

* Command resolve mega pr batch 5 (#38389)

* commit progress

* requested changes

* Convert `AtmosphereSystem` sound path strings to `SoundSpecifier`s (#38403)

* Convert AtmosphereSystem sound path strings to SoundSpecifiers

* Convert to SoundCollections

* fix: deglitchify drowsiness effect on macOS (#37817)

* Command resolves (#38415)

touchups

* show reflection prob on examine (#38199)

* goaaaaaaaal

* hmmmmmmmmmm... sorry aeshus, but thats sucks

* adwaswa

* reviev

* awdasdws

* redo

* should work

* mistake

* change
Co-authored-by: Tayrtahn Tayrtahn@users.noreply.github.com

* Update Resources/Locale/en-US/reflect/reflect-component.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Automatic changelog update

* Fixed vapes unintentionally dealing all burn damage types (#38423)

Fixed vapes dealing all burn damage types

* Automatic changelog update

* Remove `SalvageShuttleCircuitboardStealObjective` from the objective group (#38428)

So this was causing vulture to fail to round start because it could not find the prototype... this is being migrated into null anyway so no point in it being here

* Cleanup static `Logger` use in `ChatBox` (#38405)

Convert static logger to resolved, resolve entman

* Random empty commit to be able to publish again

* Fix stacks only recycling one instead of the stack amount (#38433)

* fix

* Fixes

* Automatic changelog update

* Relocate SetOutfit method to ServerClothingSystem and LEC setoutfit command. (#38391)

* that'll do

* requested changes.

* missed this.

* Command resolves and LEC conversions batch 4 (#38382)

* reeeecolllaaaaaaaa

* gonna convert these to public while I'm here for consistency sake

* requested changes.

* Playtime Reminders - Raising awareness of addiction by highlighting excessive playtime (#36483)

* grass touch protocol - Rebases to latest master to fix conflicts

* aight local tests are passing lets see if our golf works

* It is 5 am and our ass COMPLETELY overcomplicated this lmaooo

* Addresses feedback - Clarifies comments, swaps internal var names for grasstouchless and selfdestructive, makes the third tier a little less demanding, and fixes 1 hours

* Addresses review - conflict fix

* This too

* Axes playtime exclusion for ghosts

* Use switch expression

code style nit

* Refactor/cleanup

Use IGameTiming.RealTime to track time instead of DateTime. Use nullable instead of magic values.

Expose the current day value through a property that is always up to date, instead of making the API to read the CVar that updates at inconsistent times. This also makes it trivial to debug with VV.

Other minor cleanup like using string interp, code style fixes, comments, etc.

---------

Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>

* Automatic changelog update

* Exo - Minor balance changes and fixes (#38435)

* Automatic changelog update

* Add advertised reagents to puddles (#38432)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Give APCs wirepanels (#38443)

init

* Automatic changelog update

* Revert "Add stamina damage resists to the bloodred raid/hard-suits (and ERT hardsuits). [TEST MERGE]" (#38447)

Revert "Add stamina damage resists to the bloodred raid/hard-suits (and ERT h…"

This reverts commit 8c6b288853.

* Adds dog-shaped sprite variants for the most common hardsuits (#36875)

Co-authored-by: dandy <203235481+casiliuscestus@users.noreply.github.com>
Co-authored-by: Raccoononi <70777222+raccoononi@users.noreply.github.com>
Co-authored-by: Scrubdelub <196583332+scrubdelub@users.noreply.github.com>
Co-authored-by: Tiniest Shark <176858593+TiniestShark@users.noreply.github.com>

* Automatic changelog update

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: vmzd <33641966+vmzd@users.noreply.github.com>
Co-authored-by: August Sun <45527070+august-sun@users.noreply.github.com>
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Xeri Marai <8867601+Xeri7@users.noreply.github.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: jkwookee <157201244+jkwookee@users.noreply.github.com>
Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Co-authored-by: Spanky <180730777+spanky-spanky@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: hoshizora <willhornbeck12@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Nox <nebulousnox38@gmail.com>
Co-authored-by: Archee <archee3@hotmail.co.uk>
Co-authored-by: Orsoniks <orsoniksstuff@gmail.com>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Disp-Dev <91643998+Disp-Dev@users.noreply.github.com>
Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>
Co-authored-by: cnv41 <cnv41g@gmail.com>
Co-authored-by: nabegator <stunprod228@outlook.com>
Co-authored-by: qrwas <aleksandr.vernigora93@gmail.com>
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Co-authored-by: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: Seam_Less <kai.julian.watson@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: Vortebo <64214314+Vortebo@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Qerd <73325910+BigfootBravo@users.noreply.github.com>
Co-authored-by: Nikovnik <116634167+nkokic@users.noreply.github.com>
Co-authored-by: M1tht1c <mytht1c@proton.me>
Co-authored-by: SyaoranFox <99053675+SyaoranFox@users.noreply.github.com>
Co-authored-by: Kittygyat <202250949+Kittygyat@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: Sparlight <twiksparlight@gmail.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Co-authored-by: beck <163376292+widgetbeck@users.noreply.github.com>
Co-authored-by: Helix-ctrl <kylemccann08@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: DuckManZach <144298822+duckmanzach@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
Co-authored-by: Citrea <citrea.lingua@gmx.net>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: KamTheSythe <kamil.dolowiec01@gmail.com>
Co-authored-by: TheFlyingSentry <AFlyingSentry@gmail.com>
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: dandy <203235481+casiliuscestus@users.noreply.github.com>
Co-authored-by: Raccoononi <70777222+raccoononi@users.noreply.github.com>
Co-authored-by: Scrubdelub <196583332+scrubdelub@users.noreply.github.com>
Co-authored-by: Tiniest Shark <176858593+TiniestShark@users.noreply.github.com>
2025-06-24 01:05:19 +03:00
Red
969b85740f fix (#1466) 2025-06-23 22:55:26 +03:00
Nim
61511edc19 Hot potato (#1463)
* hot potato

* Temperature
2025-06-23 16:42:02 +03:00
Ed
b581f5d132 Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
# Conflicts:
#	.github/workflows/check-trailing-whitespace.yml
#	Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
#	Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Maps/Pools/default.yml
2025-06-23 16:37:22 +03:00
Nim
e1e32ee8fc Перевод на RU (#1443)
* translate

* fries

* fix

* ква

* desc

* execution

* pieni c

* monster kill

* del
2025-06-23 13:12:02 +03:00
SenorJaba
6ae8d2639d Plushies! (#1456)
* I NEED THEM PLUSHIESgit add -A!

* Typo in attributions oops

* My greggit add -A!

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-23 12:53:05 +03:00
Ed
3f2b5d45d7 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-06-23 12:30:57 +03:00
Ed
2048e42641 Update dwarf_mining.yml 2025-06-23 12:30:04 +03:00
Nim
94ce2b0c2f Big bear (#1442)
* bear

* spawner

* voice

* target action

* animation
2025-06-23 12:25:20 +03:00
Red
9c1c1c4456 modular fix (#1462) 2025-06-23 12:19:02 +03:00
Red
b1a9fca5ee Trading request system (#1460)
* mapping public stores update

* base selling platform update

* basic UI setup

* Update coin icon textures

Refreshed the c, g, p, and s coin images in the interface textures. This likely improves their appearance or corrects previous visual issues.

* parse requests data into UI

* selling platform UI state now include price

Updated the selling platform UI to display the calculated price of placed items. Moved the UpdateSellingUIState logic from the shared system to the server system, and modified the CP14SellingPlatformUiState to include a price field. The client window now uses the state-provided price instead of a hardcoded value.

* Update selling UI state on item placed or removed

Added event subscriptions for ItemPlacedEvent and ItemRemovedEvent to update the selling UI state when items are placed or removed from the selling platform. Refactored UpdateSellingUIState to remove the user parameter, as it is no longer needed.

* sell button works now

Replaces the previous sell request mechanism with a new CP14TradingSellAttempt message for selling items on the platform. Updates client and server logic to use this new message, adds a CanSell helper for item validation, and refactors related UI and event handling code for improved clarity and maintainability.

* auto pricing requirements

* Refactor reputation reward to use cashback rate

Reputation rewards for selling requests are now calculated as a percentage (cashback) of the sale price, rather than a fixed value. Updated the relevant UI, server logic, and prototype fields to reflect this change. Also cleaned up the brad_potions.yml prototype file by removing a duplicate entry and correcting an ID.

* request rerolling
2025-06-23 01:21:25 +03:00
Red
f4abe1cf35 Fix lumera actions (#1446)
* ZLevelMover

* fix

* Update CP14ReligionSystem.cs
2025-06-21 02:46:01 +03:00
Nim
552f12d39b minor changes crossbow (#1431)
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-20 16:19:32 +03:00