Commit Graph

34126 Commits

Author SHA1 Message Date
slarticodefast
534553dddf Turn some implants into triggers (#39364)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-06 12:52:11 -07:00
Nemanja
9872a28d7f Miscellaneous Body Decoupling (#38958) 2025-08-06 15:01:20 -04:00
slarticodefast
2e0b11ea51 fix repeated scale visuals removal/ensuring (#39432) 2025-08-06 20:54:50 +02:00
iaada
08cab003c2 cardboard modifier set 2025-08-06 13:07:19 -05:00
iaada
0bd8ad43ab fixed conflicts 2025-08-06 12:52:18 -05:00
iaada
48dcf8a474 Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
#	Resources/Locale/en-US/nutrition/components/drink-component.ftl
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
2025-08-06 12:45:41 -05:00
PJBot
ffccef2358 Automatic changelog update 2025-08-06 17:24:13 +00:00
slarticodefast
fdf39dbffb add scale:multiplyvector toolshed command (#39424) 2025-08-06 19:23:05 +02:00
PJBot
96dcfa9b94 Automatic changelog update 2025-08-06 16:59:14 +00:00
Tao
4821bff941 Fun with cardboard! (#37363)
* learning???

* made card walls work, then made game unlaunchable (:

* Still broken, added notes that I thought of while in bed

* wall, door, table and chair are now bare min functional, yay

* learnt why not to web edit...

* added floors, walls and floors fully complete

* added swords, shields, armour, helmets and arrows

* added funny sound and cleanup small issues

* cleanup

* cleanup

* credited myself

* card to cardboard

* fixed licence issue and meta thingy

* adjusted arrow stam-damage

* made card carpets more regular

* simplified sprite, reduced stam damage

* formatting fixes

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-08-06 12:58:07 -04:00
Princess Cheeseballs
91854e0776 Debody Food and Drink Systems, Combine Food and Drink into One System. (#39031)
* Shelve

* 22 file diff

* What if it was just better

* Hold that thought

* Near final Commit, then YAML hell

* 95% done with cs

* Working Commit

* Final Commit (Before reviews tear it apart and kill me)

* Add a really stupid comment.

* KILL

* EXPLODE TEST FAILS WITH MY MIND

* I hate it here

* TACTICAL NUCLEAR STRIKE

* Wait what the fuck was I doing?

* Comments

* Me when I'm stupid

* Food doesn't need solutions

* API improvements with some API weirdness

* Move non-API out of API

* Better comment

* Fixes and spelling mistakes

* Final fixes

* Final fixes for real...

* Kill food and drink localization files because I hate them.

* Water droplet fix

* Utensil fixes

* Fix verb priority (It should've been 2)

* A few minor localization fixes

* merge conflict and stuff

* MERGE CONFLICT NUCLEAR WAR!!!

* Cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-06 12:53:38 -04:00
iaada
26509b879b lint after losing a LocId in the merge 2025-08-06 11:43:47 -05:00
iaada
765db2e065 Merge remote-tracking branch 'upstream/master' into up/drinks-yml
# Conflicts:
#	Resources/Locale/en-US/nutrition/components/drink-component.ftl
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
2025-08-06 11:17:41 -05:00
PJBot
02382045ab Automatic changelog update 2025-08-06 16:12:26 +00:00
āda
49c4aab489 Move solution examine subscription from DrinkComponent to ExaminableSolutionComponent (#39362)
* initial it works

* clean it up

* yml

* datafield the LocIds

* move from the other branch

* no max vol on puddles and anoms

* closed

* Changes inspired by #39008

* small bug and more color range

* puddle changes and more examinable solutions

* lint

* small change

* requested changes

* un-delete

* tiny comment

* 1 less loc id in this world

* request and last second change

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-08-06 09:11:19 -07:00
slarticodefast
8ef212a338 convert dwarfs to use ScaleVisualsComponent (#39422) 2025-08-06 17:50:48 +02:00
PJBot
52a886e70e Automatic changelog update 2025-08-06 15:10:58 +00:00
Myra
8c181eb51a Update RT to 266.0.0 (#39421) 2025-08-06 17:09:51 +02:00
slarticodefast
c4016b97c5 fix DoAfter DistanceThreshold (#39276) 2025-08-06 16:35:31 +02:00
Kyle Tyo
ca18576625 Predict base and damage examines of cartridge ammo. (#39401)
* commit

* requested changes +
2025-08-06 16:29:57 +02:00
Kyle Tyo
3996b35606 Predict EMP Examine (#39419)
* another one bites the dust

* Update Content.Shared/Emp/SharedEmpSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-06 16:25:24 +02:00
PJB3005
e4839d6417 Update RT to 266.0.0 2025-08-06 16:17:15 +02:00
PJBot
d16e13e13c Automatic changelog update 2025-08-06 13:01:40 +00:00
ScarKy0
3d0a506f6d MessyDrinker for dogs (#38852) 2025-08-06 15:00:32 +02:00
slarticodefast
71f21d96f7 Move scale command to content and turn it into a toolshed command (#39349)
* scale command

* fix namespaces
2025-08-06 14:33:21 +02:00
Red
5181219f89 Status effects disable light occluding (1-line PR) (#39418)
Update StatusEffectsSystem.cs
2025-08-06 13:02:14 +02:00
K-Dynamic
e122e02c86 Adds infinite debug power APC, substation, SMES (#39317)
* make debug power infinite

* demarcate infinite and empty debug power

* fix duplicate ID

* change infinite suffix to autorecharge
2025-08-05 22:16:37 -07:00
iaada
5d6c020e2a couple more changes 2025-08-05 23:35:57 -05:00
slarticodefast
99336a33fb Predict PickRandom verb (#39326)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-05 19:29:13 -07:00
Serylis of Five
983cebb69d Update attributions for lightning audiofiles (#39395) 2025-08-05 19:01:14 -07:00
PGray
92d6e79040 Remove redundant return statement in InventoryUIController (#39381) 2025-08-05 18:49:30 -07:00
Perry Fraser
053c5f64a0 feat: properly perform predicted porta pottys (fix toilet prediction) (#39394) 2025-08-05 18:34:41 -07:00
slarticodefast
63b2979e73 Predict cryopods (#39385)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-05 17:09:50 -07:00
Perry Fraser
2a4f36422b fix: properly respect AllowRepeatedMorphs (#39411)
* fix: properly respect AllowRepeatedMorphs

* feat: add IgnoreAllowRepeatedMorphs
2025-08-06 02:02:52 +02:00
PJBot
87b0ec090f Automatic changelog update 2025-08-05 23:16:25 +00:00
Luxeator
4a466c5dbe Add guard to unbuckling to help it to not act upon terminating entities (#39410)
* Add guard to unbuckling to help it to not act upon terminating entities

* Refactor guard for unbuckling

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

* Revert "Refactor guard for unbuckling"

This reverts commit bf975fbd6f5cfac45324a3d5d74e592ad17ad291.

---------

Co-authored-by: Luxeator <Luxeator>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-06 01:15:16 +02:00
iaada
af3af9a141 update for #39362 and #39363 2025-08-05 18:14:09 -05:00
Kyle Tyo
7de5002123 Predict Nav Beacon Examine (#39408)
* commit

* Update Content.Shared/Pinpointer/SharedNavMapSystem.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-05 23:20:43 +02:00
Kyle Tyo
5df467c9c6 Reduced SalvageStructureComponent to atoms. (#39400)
* commit

* whoopsie daisy

* Update SpawnSalvageMissionJob.cs

* Update SpawnSalvageMissionJob.cs

* cleanup
2025-08-05 21:10:17 +02:00
Kyle Tyo
d4c025567a Predict warp point location examines. (#39402)
commit
2025-08-05 20:26:41 +02:00
ScarKy0
47bddb70b1 Merge Stable into Master (#39404) 2025-08-05 19:56:24 +02:00
ScarKy0
d6ce710d6d Merge branch 'master' into hotfix-branch-blame-errant 2025-08-05 19:31:01 +02:00
Southbridge
970ce38d65 Fixed Issues with Screens and Station Maps (#39393) 2025-08-05 18:27:28 +02:00
Ser11y
d7f8614c35 localization support to air alarms, wire panels and more (#39307)
* Add localization to the air alarms, wire panels, network configurator list menu and loadout window

* delete unused

* redo gas localization, delete unused

* removed the extra key

* Moved and renamed air-alarm-ui-thresholds-gas-name

* Moved localization to the XAML

* Use existing strings for gas names

* it just works

* Rename _atmosphereSystem in ScrubberControl.xaml.cs

_atmosphereSystem -> atmosphereSystem

* Rename _atmosphereSystem in SensorInfo.xaml.cs

_atmosphereSystem -> atmosphereSystem
2025-08-05 17:13:04 +02:00
lzk
36967f3e7d remove space from Sleeping Carp.png (#39369)
* Rename Sleeping Carp.png to SleepingCarp.png

* Update meta.json
2025-08-05 14:00:23 +02:00
Marlyn
a2c9612e29 Removes ItemToggle from Cryo Pods to prevent a latent event ordering bug (#39197)
Removes ItemToggle component from the cryo pod as it was useless and risked a latent verb order bug
2025-08-05 13:50:16 +02:00
PJBot
75748153a1 Automatic changelog update 2025-08-05 03:27:09 +00:00
Perry Fraser
96d25402c7 fix: hide timer trigger's cycle time verb if DelayOptions is empty (#39388)
fix: hide cycle time verb if DelayOptions is empty
2025-08-05 05:26:02 +02:00
Minemoder5000
1599a6b271 Fix ATS Anchor (#39389) 2025-08-04 20:14:57 -07:00
PJBot
ff97512a6d Automatic changelog update 2025-08-05 00:35:17 +00:00