Commit Graph

31546 Commits

Author SHA1 Message Date
Princess Cheeseballs
251cfbd8be Puddle Code Slipping Cleanup (#35845)
* Init Commit

* windows yelling at me to update commit

* working commit, need prediciton and more dehardcoding

* Project 0 warnings

* Working Commit (Near Final)

* ryder got confused commit

* I love Merge Conflicts :)

* Working commit, no prediction

* Forgot the yaml changes

* Comments and typos

* Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default

* Fixed an incorrect divisor

* bit of cleanup

* Prediciton fixed, and puddles now affect all entities

* FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS

* Really big I forgor moment

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Even bigger I forgor moment

* four more merge conflicts to fix four more oopsies

* fixed actual divide by zero moment and also im very dumb

* Fix all test fails

* code cleanup

* Webedit whitespace

* Code cleaup

* whitespace webedit

* whitespace webedit

* whitespace webedit

* whitespace removal

* Comments and cleanup

* Re-Added 20 warnings as per Ork's request

* Cleanups

* Spacing fix

* bugfixes and cleanup

* Small bugfix

* Actually dirty the slipComp for real

* Added Friction field to Reagent Prototype per design discussion

* Sliding system is kill
2025-04-20 17:27:12 -04:00
PJBot
c2857c5247 Automatic changelog update 2025-04-20 21:18:18 +00:00
Banedon
aeb53a302b Santa hat with a foldable beard (#36510)
* Added foldable component to santa hat

* Modified sprites, modified YAML. YAML is cursed

* Changed santa hat description to mention the beard fold

* Removed HideLayerClothing since it doesnt work

* Changed the prefix from "beard" to "nobeard" to match with the fold/unfold verb

* Credits for sprite changes

---------

Co-authored-by: Lanedon <matth.galvez@gmail>
2025-04-20 17:17:12 -04:00
PJBot
3f2b161277 Automatic changelog update 2025-04-20 21:16:40 +00:00
UBlueberry
1220b8c4c7 Adds beanies to the WinterDrobe! (#32946)
* sprites

* messing with the ymls

* new sprites

* that's a lotta yaml

* make the sprites gooder

* color adjustment

* to the winterdrobe with you

* layering fix
2025-04-20 17:15:34 -04:00
PJBot
1fadb31f47 Automatic changelog update 2025-04-20 21:10:07 +00:00
Booblesnoot42
b7dfd60517 Resprite main altars (#35685)
* resprite main altars

* updated meta.json
2025-04-20 17:09:00 -04:00
PJBot
5fa93d6974 Automatic changelog update 2025-04-20 21:02:56 +00:00
Ed
f6a29e24a2 Markings overhaul (#35938)
* markings displacement setup

* ok i got it!

* fix map updating

* remove trackingLayers

* markings clean up and modernizize

* marking disabling displacements

* markings restriction

* dehihienize

* dehihiniezize 2

* aa

* nice
2025-04-20 17:01:50 -04:00
PJBot
f3a33fefc2 Automatic changelog update 2025-04-20 20:56:49 +00:00
RedBookcase
aea474d4a9 Pirate Gear Tweaks. (#35986)
* Tweaked pirate gear to be in-line with similar items.

* Added attribution for flashlight sprites, made hardsuits Major Contraband

* Added empty versions of the pirate revolver and flintlock.

* Test fail fix hopefully?

* Test fail fix hopefully V2.0

* Test fail fix hopefully V3.0

* Test fail fix hopefully V4.0

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-20 16:55:42 -04:00
Prole
58fb282023 The Beverage Jug Can Now Look Open (#36070)
* GenJug-Changes

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

* Guh

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

* Support For the Rest

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

* New Sprites

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

* Newest Sprites

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

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
2025-04-20 16:36:22 -04:00
lzk
63350853f0 change MV cable outline (#36751)
* change MV cable outline

* zamn
2025-04-20 16:30:37 -04:00
YoungThug
d8ea0a39fe Wizard Figure Voiceline Fix #36771 (#36779)
DA WIZARDgit add -A
2025-04-20 16:30:04 -04:00
Tayrtahn
bd40cb9fa5 Restore LimitedChargesComponent.MaxCharges default value to 3 (#36778) 2025-04-20 12:20:57 -07:00
PJBot
314ced1bf9 Automatic changelog update 2025-04-20 19:09:47 +00:00
Tayrtahn
ca33d6bb70 Add marker components for admin shenanigans (#36776) 2025-04-20 21:08:41 +02:00
Tayrtahn
1bad0980ee Use non-generic TryComp in StationSpawningSystem (#36769)
Use non-generic TryComp in StationSpawningSystem
2025-04-21 01:00:33 +10:00
PJBot
ae41b6547e Automatic changelog update 2025-04-20 14:09:09 +00:00
K-Dynamic
d11a10d5ea Nonlethal throwables crate (#35808) 2025-04-20 07:08:02 -07:00
PJBot
17cdb4393f Automatic changelog update 2025-04-20 14:07:21 +00:00
Hyper B
cd6130ce22 Fire protection for ERT engineering hardsuit (#34949) 2025-04-20 07:06:14 -07:00
Kyle Tyo
a711912cba Unused dependency cleanup. (#36760)
* take 2! fight!!!

* final touches

* reeeeeee
2025-04-20 15:56:39 +02:00
PJBot
0d0ac82484 Automatic changelog update 2025-04-20 13:56:30 +00:00
ScarKy0
2d94045995 Decrease amount of mail, increase profits (#36767)
init
2025-04-20 15:55:23 +02:00
Kyle Tyo
f77f000b93 Replace GetEntitiesInTile with EntityLookupSystem equivalent (#36756)
* commit GET!!

* minor cleanup
2025-04-20 22:57:53 +10:00
PJBot
d35c9ac17c Automatic changelog update 2025-04-20 12:20:18 +00:00
Hyper B
09f3d7f5eb Departmental shelves whitelist expansion (Attempt №3) (#34292)
* Expand-Shelves-Whitelist

Made departmental shelves hold a wider variety of items.

* Accidentally included "Packet" twice
2025-04-20 14:19:11 +02:00
PJBot
006f1aea3b Automatic changelog update 2025-04-20 12:04:52 +00:00
TakoDragon
056b25d01a Salvage Airlock (#36375)
* Salvage

* atmos a

* more muted colours

* Mapping Related to AI

* Fixed small naming inconsistency

* Revert "Fixed small naming inconsistency"

This reverts commit 985e1fd46a09e521c11dc345f470228e7907fbb9.

* Revert "Mapping Related to AI"

This reverts commit 5d5ae4feb819396c5c2a7413399ab5ce34f8683b.

* Revert "atmos a"

This reverts commit 529831e2584df27fa102ee1c970948fa3b6bab56.

* indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-20 14:03:46 +02:00
Pgriha
097aff5e58 Heterochromia for Moth (#36061)
* 1

* Fix local

* formatting

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-20 14:03:37 +02:00
PJBot
2bd3f6ce20 Automatic changelog update 2025-04-20 12:02:14 +00:00
Alice4267
a8b954fb0c Fix glass duplication with beakers (#34441)
Update chemistry.yml

Fixing glass dupe.
2025-04-20 14:01:08 +02:00
PJBot
c063f98f22 Automatic changelog update 2025-04-20 11:54:49 +00:00
PJBot
3f8e3f70b0 Automatic changelog update 2025-04-20 11:53:43 +00:00
RedBookcase
05d79667bb Makes more items recyclable. (#35800)
* Makes more items recyclable.

* Added newlines

* Fixed material issues which were NOT MY FAULT

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-20 13:53:37 +02:00
PJBot
6622dcafb5 Automatic changelog update 2025-04-20 11:52:37 +00:00
Pgriha
8be4abc3fc Fix head markings under some helmets (#36074)
* 1

* 2
2025-04-20 13:52:31 +02:00
Nox
f4e7601dc9 Descriptions for .35 auto (#36085)
* Initial commit.

* added SMG descriptions

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

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

* Updated descriptions to incorporate Roomba's feedback.

* Slightly changed Viper description

* Minor formatting change

* Updated Atreides description

* Fixed a minor convention mistake in magazines

* Slightly changed the Viper's description to not reveal its manufacturer.

* Updated Drozd description.

* Rerun test

* Updated descriptions in accordance with Roomba's suggestions!

* Updated Viper description!

* Shit I forgot to remove the cartridge length, did it now!

* More smart changes by Roomba

* Tests gaslighting me

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

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

* Updated WT550 description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-20 13:51:27 +02:00
Nox
9d4c97701d Fix some SMG magazines fitting 35 rounds (#34782)
All SMG magazines are now 30 round, rather than half being 35 round.
2025-04-20 13:33:31 +02:00
PJBot
d46c54bde0 Automatic changelog update 2025-04-20 09:33:09 +00:00
Helm
edc57cab16 Fix soup (#34633)
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
2025-04-20 11:32:02 +02:00
Spessmann
1c3bdd5ba5 Small ruin fixes (#36763) 2025-04-20 01:54:01 -07:00
PJBot
79a76e418c Automatic changelog update 2025-04-20 07:01:40 +00:00
Cass
39bf2469ad Plurality pin addition (now not on master branch) (#36744) 2025-04-20 00:00:33 -07:00
PJBot
0768f1f33f Automatic changelog update 2025-04-20 06:02:34 +00:00
ArtisticRoomba
8d8398e60d kill filing cabinet heisentests (#36757) 2025-04-20 02:01:28 -04:00
PJBot
99364dc4de Automatic changelog update 2025-04-20 05:59:48 +00:00
chromiumboy
6bebde9959 Bugfix to sync emergency broadcast cooldowns on holopad UIs (#34115)
* Initial commit

* Bug fix

* Included check for gaining power

* Addressed reviews
2025-04-20 15:58:41 +10:00
PJBot
d5252d9808 Automatic changelog update 2025-04-20 05:58:08 +00:00