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

..

6pack.rsi

…

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

Infinity books (#25840)

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

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

Added Candy Bowls for Waiting Lines (#18341)

2023-08-06 13:10:46 +10:00

cc-clipboard.rsi

Added CentCom clipboard, folder and added a normal green folder. (#22693)

2023-12-20 16:29:35 -07:00

cd.rsi

Assorted device and core inhands (#38162)

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

chopstick.rsi

Added Chopsticks (#27298)

2024-04-26 22:39:32 +10:00

clipboard.rsi

Adds clipboards to bureaucracy crate and replaces incorrectly credited sprites (#20736)

2023-10-04 23:24:29 -04:00

coins.rsi

Salvage Spawners (#31020)

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

desk_bell.rsi

desk bell from SS13 (tgstation) (#14870)

2023-03-27 10:29:09 -04:00

diskcases.rsi

Coordinates Disks & Shuttle FTL Travel (#23240)

2024-04-01 15:50:00 +11:00

eggspider.rsi

[mob] Space Spider (#15744)

2023-04-26 00:51:40 -06:00

ensnare.rsi

Ensnaring Component and Bola Update (#9968)

2022-08-25 00:50:31 +10:00

fire_extinguisher_mini.rsi

Emergency toolbox fill rework (#29202)

2024-06-19 14:13:27 -04:00

fire_extinguisher.rsi

Use new validate-rsis for workflow (#12997)

2022-12-20 06:31:17 +01:00

flare.rsi

Remove trailing commas from RSIs. (#12865)

2022-12-04 22:47:23 +01:00

fleshkudzu.rsi

Meat kudzu (from anomoly) more killable, telegraphs better (#16107)

2023-05-06 15:08:50 +10:00

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

Fixing some prototypes modifying components on init (#12385)

2022-11-06 02:28:44 +11:00

guardian_info.rsi

…

handcuffs.rsi

…

Handy_Flags

Decorative Flags (also handheld flags) (#19670)

2023-12-04 17:27:02 +11:00

ice_crust.rsi

Ice anomaly spawns ice underneath it (#21227)

2023-11-05 19:41:42 -07:00

id_cards.rsi

Quartermaster job and ID icon change (#39259)

2025-07-29 10:34:47 +03:00

inflatable_door.rsi

…

inflatable_wall.rsi

…

killsign.rsi

…

kudzu.rsi

…

kudzuflower.rsi

The glowing forest anomaly (#24351)

2024-01-20 17:31:12 -08:00

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

Adds the Improvised Shotgun (#18025)

2023-07-18 15:10:07 -06:00

module.rsi

init

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

monkeycube.rsi

Dehydrated cube box overhaul (#23685)

2024-01-07 23:27:40 -07:00

moproach_shoes.rsi

Moproaches (#38700)

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

nukedisk.rsi

Disk """resprite""" (#29277)

2024-06-22 23:06:17 +10:00

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

potatoai_chip.rsi

Potato battery update + potato AI (#21142)

2023-10-26 00:52:49 +11:00

proximity_sensor.rsi

some robotics inhands (#33676)

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

qm_clipboard.rsi

The Quartermaster's Requisition Digi-board (#21023)

2023-10-22 00:34:06 -07:00

reagent_fillings.rsi

…

rifle_stock.rsi

Adds the Improvised Shotgun (#18025)

2023-07-18 15:10:07 -06:00

sample_tubes.rsi

Salvage Spawners (#31020)

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

skub.rsi

…

spaceshroom.rsi

Add Spaceshrooms (#17092)

2023-08-02 00:10:48 +10:00

stamps.rsi

Wizard Stamp (#35552)

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

stock_parts.rsi

Disk """resprite""" (#29277)

2024-06-22 23:06:17 +10:00

torch.rsi

…

utensils.rsi

Changed utensil sprites to appear smaller. (#34277)

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

zipties.rsi

…