Commit Graph

29155 Commits

Author SHA1 Message Date
Leon Friedrich
3917998edd Change some EntityQueryEnumerator to AllEntityQuery (#27969)
(cherry picked from commit 1f03111ff8affe1554a5fac4d1a49b1cccdf2fbb)
2025-07-20 21:28:27 +10:00
slarticodefast
20266bc0b6 remove wanted list cartridge from captain PDA (#33084)
remove wanted list from captain PDA

(cherry picked from commit 8ddc5435a6241973fdb74b5c8280b0bd862c3161)
2025-07-20 21:28:26 +10:00
BramvanZijp
634a0c719f More pda space (#32601)
* Rebalance the max programs that a PDA can hold

* Give Caps PDA more programs too.

* Make the max programs a static 8

* I forgor sec and med

* CaseCase

* Empty commit to re-run checks

* The final change, I hope.

(cherry picked from commit a08da9d31f1f1c63f5124edff5a23d5443659bfc)
2025-07-20 21:28:25 +10:00
lzk
34673a77dd Fix cadet pda (#32399)
(cherry picked from commit 95104de11772a6aba1b914b9b0b4743ef5f4641f)
2025-07-20 21:28:24 +10:00
Эдуард
7d9eb7da03 Wanted list cartridge (#31223)
* WantedListCartridge has been added

* WantedListCartridge user interface works

* WantedListCartridge is added as standard in some PDAs

* The CriminalRecordsSystem can now also take into account who created the record

* Added offense history table

* Fix of missing loaderUid for a cartridge without installing the program

* Added personalized information about the target

* The crime history has been finalized

* Added StatusList

* The officer's name has been added to the automatic history

* WantedListCartridge has been added to the HOS locker

* WantedListCartridge has been removed from brigmedic's preset programs

* The StealConditionSystem now takes into account whether a cartridge is inserted or installed

* Added target to thief on WantedListCartridge

* Merge fix

* Removing copypaste

* Fix merge 2

* The sprite of WantedListCartridge has been changed

* Update pda.yml

* Fix scrollbar in the history table

* Upstream localization fix

* `StatusList` has been replaced by `ListContainer` with `TextureRect`

* Margin fix

(cherry picked from commit 1468cbdb8a59beb2dfc9188a3108157496549a57)
2025-07-20 21:28:09 +10:00
TsjipTsjip
a71f304797 Reword some criminal records text (#28597)
* Update criminal-records.ftl

* Update criminal-records.ftl

* Update criminal-records.ftl

(cherry picked from commit ec5a3b0fd2c56749e0addddacc90caf6ff002078)
2025-07-20 21:26:56 +10:00
Brandon Hu
972176ee18 fix: Include the officer name in all criminal records status changes (#28332)
(cherry picked from commit a315f90abcb27d901d5f27e2fb274eebc15fe3ee)
2025-07-20 21:26:55 +10:00
chavonadelal
f8e6604939 Localization of steal targets (#30153)
* Localization of steal targets

* Correction of localization of theft objects

* The second correction of the localization of theft targets

* Update steal-target-groups.ftl

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Revision of the localization method

* Choosing a simple option for localization

* Fix TechnologyDisk name

* Corrections based on feedback received

* correction of declension

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

(cherry picked from commit ccc5f61584b4017c315cb3df1178eb8a4e391194)
2025-07-20 21:26:32 +10:00
Truoizys
1721b491ad Fixed cartridges installing more than once (#29187)
* fixed cartridges installing more than once

* replaced prototypes with CartridgeComponent

* relocated checks from InstallProgram to InstallCartridge

(cherry picked from commit fc40cd79fb1e4a9890b6b7eba3ab707ddbd35bf6)
2025-07-20 21:04:23 +10:00
Brandon Hu
58cd32f162 fix(contraband): Make contraband work with chameleon items (#30986)
* formatting

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
(cherry picked from commit 20bb9ede110efcb6c8c2d804f0ec038d3dd0f831)
2025-07-20 21:04:22 +10:00
lzk
d9fa8203be No meta implanters + other (#31045)
* No meta implanters + other

* Update implanters.yml

(cherry picked from commit 1e9e616a01f5f514e841147fba7aac7801f061d2)
2025-07-20 21:04:21 +10:00
lzk
7373294ec8 Fix wagging action name and desc (#34089)
(cherry picked from commit d92ed7570377798f27b254edd3aa3e451ee18f32)
2025-07-20 21:04:20 +10:00
lzk
5f745e7add add StartDelay bool to actions (#33026)
* add StartDelay bool to actions

* forgot summary

(cherry picked from commit dc3a2f6d28c50abaab5453fd1aabe79e1b2ff859)
2025-07-20 21:04:19 +10:00
SkaldetSkaeg
15b7fda3b9 Block emotes for sleeping (#32779)
* Block emotes

* typing issue

* Update
2025-07-20 21:04:19 +10:00
keronshb
bfa9660a62 Adds real-time charge & disabled action information to Actions (#31821)
(cherry picked from commit 7168959929b87dd392c5cbc3d29bdb9bd315c060)
2025-07-20 21:04:18 +10:00
DrSmugleaf
52f29da870 Make ActionsSystem.UpdateAction public (#30056)
(cherry picked from commit 78f3ffc2a45a4b74449478cd9dde4f319610b0df)
2025-07-20 21:04:17 +10:00
slarticodefast
cd2f531e00 Make storage implant closable using the action again (#31381)
(cherry picked from commit 8f4ee7ac9612ce550f12b4f0857e0088602b6174)
2025-07-20 21:04:16 +10:00
ShadowCommander
c2c9954477 Add a component that inserts the held item when no interaction happens on the stored item (#29823)
* Insert when held item has no interaction with stored item

* Decouple inserting on failure

* Add component that stores the used entity when no interaction happened

* Add prediction

(cherry picked from commit 2f77d0d4f380ab50c4b66dd2349949c0da184809)
2025-07-20 21:04:15 +10:00
Killerqu00
1559a482c5 Remove rest of Geras files (#30912)
remove remaining geras stuff

(cherry picked from commit 65521696c83ad695244726a8d1a04fe93653db24)
2025-07-20 21:04:14 +10:00
Brandon Hu
036d484ce6 tweak(geras): Add a confirmation popup for gera transformation (#29215)
* tweak(geras): Add a confirmation popup for gera transformation

* remove abstract parent

(cherry picked from commit 4a9bd17a86be792955e88847d8c6e589e00a469b)
2025-07-20 21:04:13 +10:00
Whisper
255a41e536 all toggle light actions have a 1 second use delay (#29833)
(cherry picked from commit 8dde49db9547dabfb2231739393d3dfcf2cc41d4)
2025-07-20 21:04:12 +10:00
August Sun
6f05493cbc The Goliath Hardsuit (#34721)
* Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate

* Added hardsuit sprites, corrected some crafting YAML

* fixed crafting recipe, adjusted resource requirements

* Added durathread material req

---------

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

(cherry picked from commit 4085fe70e899d691cd37618b3174ded5c956d6c6)
2025-07-20 21:03:53 +10:00
Killerqu00
2e81bebb20 craftable pet carrier (#34431)
* craftable pet carrier

* epic integration test fail

* Update Resources/Prototypes/Recipes/Crafting/improvised.yml

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

* Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

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

* Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

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

* Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml

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

* extra tab begone

* epic linter fail

* how did linter not see this???

---------

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

(cherry picked from commit 786d4d555783b271d26f637244145e72261107f5)
2025-07-20 20:44:18 +10:00
august-sun
a226866dd8 Makes the rolling pin craftable (#32285)
* Makes the rolling pin craftable

* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml

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

---------

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

(cherry picked from commit b2dad9ff90d515bf04e823e8991e0ef66cf5c967)
2025-07-20 20:44:17 +10:00
Shaddap1
cd6180be23 Goliath rebalance (#31492)
Update asteroid.yml

(cherry picked from commit 1c8992ffbe1dc596ef377e52c3ec13d8d5ab4d5c)
2025-07-20 20:44:16 +10:00
pathetic meowmeow
c1e826fa1b Give the chef access to cloth boxes (#34403)
* Give the chef access to fiber bags

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
(cherry picked from commit 85da2351c811f794709e89b9b3947b095f353d03)
2025-07-20 20:44:16 +10:00
ArtisticRoomba
5cda1f5d4c New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)
* A looooooooot of new cotton foods for the moffs

* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)

* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png

* update requested sprites

* change requested sprites

* address part of sloth's review, awaiting response

* address second half of review, fix magical food nutriment mitosis bug

(cherry picked from commit e07609b3b3109604b664ec62d6712334ec2fbc97)
2025-07-20 20:44:15 +10:00
goet
e55cd8e11c Spaceshroom grilling (#31872)
* make spaceshroom cookable on grill

* remove microwave recipe

(cherry picked from commit db69ae67fe6689f890a5054cabfb4e0ee82c029c)
2025-07-20 20:44:13 +10:00
SpaceLizard
e180c2f987 Food Container Size Increase (#33842)
* Stuff

* hehe

* moar.

(cherry picked from commit ef45c1666797d9dad539198adb1dc6176edee824)
2025-07-20 20:44:12 +10:00
MissKay1994
78697bc5a9 Lizards now metabolize chocolate (#32147)
* Eat the chocolate

* Update toxins.yml

* fully delete threshold lines

* Update snacks.yml

* Fix tags

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

---------

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

(cherry picked from commit 4abb6a7dd1c9b66734893fb4c01721239c71d231)
2025-07-20 20:44:11 +10:00
Token
2f8cb5faa8 Pax now refresh instead of stacking pacified forever (#30778)
Pax refreshes instead of stacking pacified forever

(cherry picked from commit ad71d8cb2f05bfee5a762dc3c90ad1ac76ac7562)
2025-07-20 20:44:09 +10:00
CheddaCheez
d6e88cc98b Add missing nacho recipes (#33637)
* Nacho recipes, nutrition, and trash

In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos.

In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one.

* Volumes, nutritional tweaks, and flavor

In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me.

Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead.

In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo.

(cherry picked from commit e50c98c6188c9e23df5227e2828fc27df74108fa)
2025-07-20 20:44:08 +10:00
LevitatingTree
37e7d911fc Add meat tag to Five Alarm Burger (#33848)
* Add meat tag to Five Alarm Burger

* Revert "Add meat tag to Five Alarm Burger"

This reverts commit e483b5effe63a8cbdcce81eeddc622f5555ae240.

* Re-add tag, but in notepad

* Move tag down to follow hierarchy

---------

Co-authored-by: LevitatingTree <None>
(cherry picked from commit b46f487503b15e79a2f1c324a5aad2b431a7c822)
2025-07-20 20:44:07 +10:00
lzk
3ba26d5fae Fix top bun desc (#31019)
FIX

(cherry picked from commit bc5bc37346b84f12e9f734be3f0f5d36ca750777)
2025-07-20 20:44:05 +10:00
SolStar
efe5cf048b Add a guaranteed cotton pizza to pizza crates (#33997)
* add guaranteed cotton pizza to pizza crates

* saner parenting

* Use clearer suffix on cotton pizza box

(cherry picked from commit bfb256f0bacbef19c957ff0426e8f1aa4bf2a88a)
2025-07-20 20:44:04 +10:00
Hannah Giovanna Dawson
f51134df41 [Christmas] Y'all want a Smite Cranberry? (#33922)
* Add a festive lemon-lime soda variant: cranberry!

* Gave lemon-lime a brand name

* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.

* Extend the Christmas anomaly with extra jolliness

* Minor spelling mistake. Jollyness will not be denied.

* Removed redundant delay from meta file

(cherry picked from commit c33d3350bd99eeaeee1f32342ad1dfb98221b716)
2025-07-20 20:44:03 +10:00
drakewill-CRL
efa4d384ae Botany Rework Part 1: Mutations (#31163)
Instead of each mutation being a flag that gets checked at some unique point in BotanySystem somewhere, they're now EntityEffects that get applied when the mutation occurs and when produce is harvested. One new list was added to SeedData so that multiple other fields could be removed.

All the non-stat-change mutations that have been rolled are added to the Mutations list, and get applied to the plant when the mutation occurs or when a seed with the mutation is planted. Produce get mutations applied at harvest if they apply to the produce, and carry all of the plant's mutations over as a seed. This gets rid of the one-off checks for things like Slippery, Bioluminescent, Sentient, etc.

The base odds of a mutation applying should be equal to the odds of the original mutation check. It pretended to have 1 bit flip (on averge) per mutation power, and odds of each mutation was the odds of one of its bit being flipped (1 /275 * bits). The 'thermometer code' applied for numbers will be replaced with simple random rolls, as both average out to the middle value. The new checks are much easier to understand and don't obfuscate the actual changes of something happening behind 3 layers of math. The biggest player-facing change is that Potency will be able to get over 65 significantly more often than it did in the previous system, but it will be just as common to get low values as high ones.

Mutation definitions have been moved to a .yml file. These include the odds per tick per mutagen strength of that mutation applying that tick, the effect applied, if it applies to the plant and/or its produce. This makes mutations simpler to add and edit.

This PR is limited specifically to the mutation logic. Improving other aspects of the system will be done in other PRs per the design document. Mutations was chosen first because its got the largest amount of one-off checks scattered all over that could be consolidated. Once this is merged, mutations could be contributed to the codebase with minimal extra work for later botany refactor PRs.

(cherry picked from commit 1dec19cc052dd22c73cc25dc92b3d0a918ef13fd)
2025-07-20 20:44:00 +10:00
Ed
f5a01206dc Christmas anomaly (#33889)
* santa anomaly

* Update anomaly.yml

* injection

* Update anomaly.yml

* Update Resources/Locale/en-US/anomaly/inner_anomaly.ftl

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* Update Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/meta.json

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

* Update Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/meta.json

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

---------

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

(cherry picked from commit 36c676741fede7f3cd17009855646af02f1a7057)
2025-07-20 20:44:00 +10:00
August Sun
fdec86584c Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass (#33223)
* First round of anomaly core functionalities added

* Added sliceTime to anom meat mass and cooked version

* Adds SmokeOnUse component, system and shared system, adds new functions to inert electrical anom core

* Added more functions

* Final touches to branch

* Cleaning up some of the metadata for sprites and component definitions

* PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml

* Lol jk these goddamn tests why me

* Quick updates based on feedback

* more changes to improve

* additional fixes and edits

* Changed tech core functionality

* added magboot functionality to grav core

* fixed issue with bluespace core sizing

* Reverting changes per request

* extra file to be deleted

* File cleanup

* Update chemicals.ftl

* Update cores.yml

* Update cores.yml

* Update meta.json

* Update chemicals.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml

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

* Update meal_recipes.yml

* Update cores.yml

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
(cherry picked from commit bd2d0ee5e593606da094804f5822cf740a1f1084)
2025-07-20 20:43:59 +10:00
RumiTiger
bb00928e62 Muffins (#29318)
* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

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

* Update dinnerware.yml

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

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

(cherry picked from commit 6ce80d914d34807683fcf0118a2c86024ade7eef)
2025-07-20 20:43:58 +10:00
Plykiya
70fe8b47c8 Remove flares and shotgun flares from lathe options (#32563)
Remove flares and shotgun flares from lathe recipes

(cherry picked from commit ea19a159f88f1997fc06e0faa85b676f38e508c2)
2025-07-20 20:43:57 +10:00
deltanedas
7b4c2d022e enable ejecting in biogenerator UI (#32854)
* enable ejecting in biogenerator UI

* allow inserting too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 18c8a803ffa8cd761e5838792c6f06d5536e5724)
2025-07-20 20:43:56 +10:00
TakoDragon
2139f6a0f3 Red circuit floor (#32557)
* red circuit added

* index colour begone

(cherry picked from commit 542817807dbcf2b482623b776811a2c9eee0d0cb)
2025-07-20 20:43:56 +10:00
NotSoDamn
474b38d0ad No weather on concrete tiles (#30952)
* concrete weather

* miss

(cherry picked from commit 381e0d6f93575a40f51db6c7f7b63f088f52e3ac)
2025-07-20 20:43:55 +10:00
lzk
58484b8e2a craftable freezers (#32277)
* Craftable freezers

* oh i forgot that

(cherry picked from commit 87932bce57cd9ef0a37db76c75eeeefe27b1b79d)
2025-07-20 20:43:54 +10:00
slarticodefast
435c80f98f fix missing circuitboard recipes (#32092)
* fix missing circuitboard recipes

* and another one

(cherry picked from commit 1d997d6e46785042ab984ae0454e97ea664176fd)
2025-07-20 20:43:54 +10:00
saga3152
4545ed3585 Crafting pizza boxes. (#29680)
* We can now craft pizza boxes

* Fixing errors

(cherry picked from commit a5ec01792b113caac2590fce5058e85d0dc302de)
2025-07-20 20:43:53 +10:00
deltanedas
e7ceadd283 make flare recipe roundstart instead of blueprint (#32303)
* make flare recipe roundstart instead of blueprint

* migrate it

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 9b9853439c28e466bee4ee595fab4427938bc14b)
2025-07-20 20:43:52 +10:00
ArtisticRoomba
04b01bfb86 Adds salvage magnet board to the circuit imprinter (#31996)
* Adds salvage magnet board to lathe as default recipe, changes board sprite to supply sprite

* Adds the salvage magnet board to the QM's locker, science cannot be trusted and never should be

* my body is a machine that turns commits pushed to the wrong branch into machinations on git

---------

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

(cherry picked from commit b306afbf566ddf990bbb69eb4cdd3092822a9a50)
2025-07-20 20:43:51 +10:00
deltanedas
9caaf2f073 clean up electronics lathe recipes (#31524)
* clean up electronics lathe recipes

* result

* make door and firelock cheap

* engin

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 3f6846b8b294649467215bd35e7bf72f8b1b9ce0)
2025-07-20 20:43:50 +10:00