Commit Graph

10097 Commits

Author SHA1 Message Date
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
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
ā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
ScarKy0
3d0a506f6d MessyDrinker for dogs (#38852) 2025-08-06 15:00:32 +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
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
iaada
af3af9a141 update for #39362 and #39363 2025-08-05 18:14:09 -05: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
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
Mora
32ef32d5a0 Add Offset Canes + Trinket Canes Group (#39272)
* Added offset cane

* Added offset cane colors

* Added canes to the trinkets menu

* added color to names instead of suffix

* removes some stripes from the mime cane icon

* update file organization

* standard -> standard.rsi, stop making commits at nearly 3 in the morning.

* updated comment to be more explicit in what doesnt work

* Cane refactor :godo:

* git makes me very upset sometimes (fixed cane yaml)

* wooden->wood

* apparently this didnt push

* Standardize comments

* Removed comment

* Removed comment

* Adds red accents to mime cane

* Indent fixes
2025-08-04 19:39:40 -04:00
Samuka-C
53e64c3a24 Xenoborgs part 4 (#36935)
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: WarPigeon <DaedalusTheGamer@gmail.com>
Co-authored-by: Kowlin <git@wyvern.blue>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-08-04 15:18:55 +02:00
slarticodefast
61d13ce40d Stable to master (#39352) 2025-08-03 23:55:31 +02:00
Vasilis The Pikachu
978c51e73d Revert "Added utility belt function to scrap armor (#39233)"
This reverts commit 7852b52f85.

Revert suggested due to the utility toolbelt may be considered too overpowered and passed

<https://youtu.be/8RmeZKz-i_w?t=2548>

@ToastEnjoyer
2025-08-03 22:03:43 +02:00
Vasilis The Pikachu
2a72e30e0e Revert "Added Kill Tome (Death Note). (#39011)"
This reverts commit d0c104e4b0.

Revert suggested due to code issues and passed the voting.

@ScarKy0 has interest in fixing it

@xsainteer

<https://youtu.be/8RmeZKz-i_w?t=2151>
2025-08-03 22:03:43 +02:00
slarticodefast
2c40a950f7 Trigger Refactor (#39034) 2025-08-03 21:20:37 +02:00
qwerltaz
777e89ab3e Make wallmount screen, telescreen, and signal timer destructible (#39340)
* make wallmount screen destructible

* louder

* fix indent

* fix indent
2025-08-03 12:12:02 -05:00
Tiniest Shark
bf6581972d Hardsuit helmet text fix + CBurn Vox Fix (#39345)
* text fix and vox helm fix

* oop one line
2025-08-03 12:58:34 +02:00
ThatGuyUSA
bd3d5cff19 Advanced Clowning Module (#35797)
* pAIs can now accept keys, but can't talk in said channels

* added dummy module

* added adv clown module alongside projector

* holopeel & projector sprite added, it's destroyable too

* added experimental pie cannon

* exp pie thrower throws pies, added tool icon, added bananium horn

* removed the weird pAI changes, my bad!

* okay NOW the pAI stuff is all gone

* added icon, recipe, renamed tech for unlocking

* removed bananium horn

* Added in-hand sprites, credited to TiniestShark. Changed holopeel projector description to let the user know it recharges over time.
2025-08-02 22:19:17 -04:00
Hannah Giovanna Dawson
b86b0c7fe8 Berry Delight (#38881)
* Berry delight

* Uncook the YAML

* Move stuff in meal_recipes

* BERRY DELIGHT IS INEVITABLE
2025-08-02 14:35:09 -04:00
slarticodefast
fbed76e067 Staging to master (#39328) 2025-08-01 23:59:37 +02:00
Princess Cheeseballs
6ffec751ee Flesh Stun Fix (#39324) 2025-08-02 00:44:55 +03:00
Arcane-Waffle
a942ce2193 Renames slugcat jelly-donuts to scurret jelly-donuts (#39308)
* renames slugcat jelly-donuts to scurret jelly-donuts

* renames slugcat jelly-donuts to scurret jelly-donuts

* renames slugcat jelly-donuts to scurret jelly-donuts

* missing end of file new line

---------

Co-authored-by: Arcane-Waffle <FR_Waffle@proton.me>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-01 13:58:32 +02:00
iaada
6cdf16e1fd pre-plan for more sounds 2025-07-31 17:38:39 -05:00
Spanky
31773e64f4 Adds Wizard's Den (Replaces Wizard Shuttle) (#37701) 2025-07-30 21:08:05 -07:00
Disp-Dev
9b0a171743 New recipe: Cotton Cakes (#39222)
* add moth edible cotton cakes

* oh fuck i accidentally changed the sln file

* inhand sprite fix

---------

Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>
2025-07-30 18:51:21 -04:00
iaada
e58103bac6 more solution status 2025-07-29 18:03:03 -05:00
iaada
c473ee6667 hard life being so indecisive 2025-07-29 15:15:24 -05:00
iaada
2c54d3bfc4 InjectComp 2025-07-29 14:42:49 -05:00
iaada
21aa6c664a consistent use of ExaminableSolution 2025-07-29 14:02:02 -05:00
Admiral-Obvious-001
0606ed5851 Retry of Advanced Chem Tweaks (#38811)
* Changed Head Branch Due To Broken Merge

* Changed Head Branch Due To Broken Merge

* Readds the removal of bic/advanced mix.

* TFW Breaking changes break changes

* TFW Breaking changes break changes
2025-07-29 14:52:42 -04:00
iaada
2573d86303 add a todo 2025-07-29 00:08:47 -05:00
iaada
8b6da7190b quality passes will continue until i'm satisfied 2025-07-28 23:34:53 -05:00
Mora
4a7576a7a6 Several Vox Sprite Displacement and Layering Fixes (#39219)
* Vox displacement map fixes

* Adds neck displacement map and changes sprite layering to prevent the tank from rendering on top of a Vox's facial hair strangely
2025-07-28 17:28:15 -04:00
Super
b0825c102c Added a network configurator to the Warden's locker. (#39254)
the days of wardloosing are OVER
2025-07-28 12:09:17 -04:00
eoineoineoin
e2d96f1f49 Make BoozeDispenserEmpty actually empty (#39067)
* Make BoozeDispenserEmpty actually empty

* Make SodaDispenserEmpty actually empty

* Remove whitespace
2025-07-28 15:27:21 +02:00
lzk
8b104d30d5 allow janibelt to hold golden plunger (#39213) 2025-07-28 14:59:40 +02:00
Pieter-Jan Briers
5f52a3ae17 [Mald PR] Plushie sound 1984 (#39250)
* Make melee sounds respect their audio params

* Make food sounds respect audio params

* Plushie sound 1984

Most plushies have been made quieter (by varying degrees depending on how obnoxious the original sound was)

Made plushies 3x slower to use (squeak every 3 seconds / hit somebody every 3 seconds)
2025-07-28 03:11:21 -04:00
iaada
ae2de02f0e another pass 2025-07-28 01:06:18 -05:00
iaada
9a09a9fbfa Another quality pass. More descriptive name for base types and give everything a material base. 2025-07-27 19:03:30 -05:00
iaada
d0a57fa214 lint errors 2025-07-27 14:27:02 -05:00
iaada
4d3e3c7a4f rename the bases, more destruction 2025-07-27 14:14:47 -05:00
ToastEnjoyer
7852b52f85 Added utility belt function to scrap armor (#39233) 2025-07-26 23:17:00 -07:00