iaada 29dda7949f Merge remote-tracking branch 'upstream/master' into up/drinks-yml ...

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml

2025-09-05 17:07:09 -05:00

..

6pack.rsi

Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814)

2025-09-03 15:21:00 -04:00

arabianlamp.rsi

add an arabian lamp. (#27270)

2024-07-21 01:24:28 -06:00

bedsheets.rsi

Added missing details from worn capes to head of department beadsheets (#34396)

2025-01-15 16:15:56 +01:00

books.rsi

…

brbsign.rsi

Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)

2025-04-08 23:27:07 +02:00

broken_bottle.rsi

Revert "trash drinks gets trashed (fixed)"

2025-07-25 19:24:13 -05:00

buffering.rsi

…

bureaucracy.rsi

Make departmental orders consoles print slips (#36944)

2025-05-06 15:04:18 -04:00

cablecuffs.rsi

…

candles.rsi

Multiple items in loadouts (#33193)

2024-12-24 01:24:19 +01:00

candy_bowl.rsi

…

cc-clipboard.rsi

…

cd.rsi

Assorted device and core inhands (#38162)

2025-06-09 00:40:14 -07:00

chopstick.rsi

…

clipboard.rsi

…

coins.rsi

Salvage Spawners (#31020)

2024-08-15 13:26:02 -06:00

desk_bell.rsi

…

diskcases.rsi

…

eggspider.rsi

…

ensnare.rsi

…

fire_extinguisher_mini.rsi

…

fire_extinguisher.rsi

…

flare.rsi

…

fleshkudzu.rsi

…

flies.rsi

…

folders.rsi

Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108)

2025-04-22 23:31:42 -07:00

glowstick.rsi

…

guardian_info.rsi

…

handcuffs.rsi

…

Handy_Flags

…

ice_crust.rsi

…

id_cards.rsi

Recolor Mime and Musician job icons (#39775)

2025-08-21 23:56:46 -04:00

inflatable_door.rsi

…

inflatable_wall.rsi

…

killsign.rsi

…

kudzu.rsi

…

kudzuflower.rsi

…

landmine.rsi

Light Up Landmines (#38092)

2025-06-06 19:01:14 -04:00

Lights

Toy/Plushie Inhands and Wearables (#38514)

2025-06-26 18:07:29 -07:00

meteor.rsi

New fun meteors (#37327)

2025-05-20 23:04:27 +10:00

modular_receiver.rsi

…

module.rsi

init

2025-02-17 13:23:57 +01:00

monkeycube.rsi

…

moproach_shoes.rsi

Moproaches (#38700)

2025-07-14 22:47:47 -04:00

nukedisk.rsi

…

ParcelWrap

Adds Parcel Wrap (#34471)

2025-04-26 19:24:25 -04:00

pens.rsi

Wizard's Magical Pen (#35623)

2025-03-03 16:54:43 +01:00

plastic_clipboard.rsi

Clipboards added to autolathe (and other folder changes) (#37705)

2025-08-27 09:07:32 +02:00

potatoai_chip.rsi

…

proximity_sensor.rsi

some robotics inhands (#33676)

2025-03-19 21:43:00 -04:00

qm_clipboard.rsi

…

reagent_fillings.rsi

…

rifle_stock.rsi

…

sample_tubes.rsi

Salvage Spawners (#31020)

2024-08-15 13:26:02 -06:00

skub.rsi

…

spaceshroom.rsi

…

stamps.rsi

Wizard Stamp (#35552)

2025-02-27 11:26:30 +03:00

stock_parts.rsi

…

torch.rsi

…

utensils.rsi

Changed utensil sprites to appear smaller. (#34277)

2025-02-05 14:08:53 +01:00

zipties.rsi

…