Ed 955145a9a5 Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream ...

# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml

2024-11-06 16:53:24 +03:00

..

Consumable

Muffins (#29318)

2024-10-31 22:06:46 -04:00

Decoration

Wooden objects and structures resprite (#436)

2024-09-17 13:06:34 +03:00

Devices

Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786)

2024-10-30 14:12:49 +11:00

Economy/cash.rsi

Plates & Cash gridinv visuals (#24075)

2024-01-14 11:44:17 -05:00

Fun

[#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)

2024-10-31 19:46:19 +01:00

Magic/magicactions.rsi

Infinity books (#25840)

2024-04-01 14:00:10 -07:00

Materials

add space carp and sharkminnow teeth (#31070)

2024-08-18 21:04:59 -06:00

Misc

Syndicate business card (#32162)

2024-09-30 22:44:44 +02:00

Power

Portable Recharger: Arsenal T3 (#26655)

2024-04-28 13:19:33 +10:00

Specific

[#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)

2024-10-31 19:46:19 +01:00

Storage

A kit to help new botanists discover chemistry (#31738)

2024-09-05 18:43:00 +02:00

Tanks

Resprite the equipped gas canister suit slots (#30809)

2024-08-09 20:32:55 +10:00

Tiles

Red circuit floor (#32557)

2024-10-01 23:35:48 -06:00

Tools

In-hand apprasial tool sprite (#32849)

2024-10-23 10:51:49 +11:00

Vehicles

ATV resprite (#25885)

2024-03-07 08:36:00 +03:00

Weapons

Combat and survival knife storage/inhand sprites (#33111)

2024-11-02 14:55:15 -05:00