CatStation/Resources/Textures/Objects/Misc
Morb0 0d83362ad1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json
2023-08-06 10:20:29 +03:00
..
6pack.rsi
authorbooks.rsi a librarian's paradise (new books) (#15585) 2023-05-06 12:10:09 +10:00
bedsheets.rsi [Brigmedic] Something like a "big update" (#15496) 2023-04-26 00:48:44 -06:00
books.rsi New tabletop RPG rulebook (#1008) 2023-04-27 14:28:41 -07:00
brbsign.rsi BRB sign retexture (#429) 2022-09-27 15:00:11 -07:00
buffering.rsi Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456) 2022-05-27 00:41:18 -07:00
bureaucracy.rsi Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-02 15:13:51 +03:00
cablecuffs.rsi
candy_bowl.rsi Added Candy Bowls for Waiting Lines (#18341) 2023-08-06 13:10:46 +10:00
desk_bell.rsi desk bell from SS13 (tgstation) (#14870) 2023-03-27 10:29:09 -04: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.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 Miasma improvements (#9022) 2022-06-24 01:20:52 -07:00
glowstick.rsi Fixing some prototypes modifying components on init (#12385) 2022-11-06 02:28:44 +11:00
guardian_info.rsi Guardians (Holoparasites) (#5140) 2021-12-29 14:58:48 +11:00
handcuffs.rsi
id_cards.rsi Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-07-28 01:02:37 +03:00
inflatable_door.rsi Add inflatable door (#6393) 2022-02-08 14:54:14 -07:00
inflatable_wall.rsi
killsign.rsi Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456) 2022-05-27 00:41:18 -07:00
kudzu.rsi
Lights Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-10 07:03:24 +03:00
modular_receiver.rsi Adds the Improvised Shotgun (#18025) 2023-07-18 15:10:07 -06:00
module.rsi whoops (#16728) 2023-05-22 23:59:37 -06:00
monkeycube.rsi
nukedisk.rsi Data Disk Update (#16240) 2023-05-08 22:28:37 +10:00
proximity_sensor.rsi Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
reagent_fillings.rsi Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
rifle_stock.rsi Adds the Improvised Shotgun (#18025) 2023-07-18 15:10:07 -06:00
skub.rsi
spaceshroom.rsi Add Spaceshrooms (#17092) 2023-08-02 00:10:48 +10:00
spiderweb.rsi Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
stock_parts.rsi Revert stock part timings 2023-06-19 21:21:24 +03:00
torch.rsi
uglymine.rsi Kick mines (real) (#8056) 2022-05-18 14:07:35 +10:00
utensils.rsi
zipties.rsi