NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-12 20:01:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Objects/Specific/Chemistry
History
Exact
Morb0 a312df977d Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
#	Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
#	Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
#	Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
2024-08-29 08:24:44 +03:00
..
beaker.rsi Add inhand fill visuals (#24495) 2024-01-28 20:38:06 -05:00
beaker_bluespace.rsi [Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#28719) 2024-08-09 22:02:26 +10:00
beaker_cryostasis.rsi Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
beaker_large.rsi Add inhand fill visuals (#24495) 2024-01-28 20:38:06 -05:00
bottle.rsi Chemistry bottle resprite (#2118) 2024-06-11 13:06:19 +12:00
chem_bag.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-29 08:24:44 +03:00
chemg.rsi Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
dropper.rsi Add inhand fill visuals (#24495) 2024-01-28 20:38:06 -05:00
effects.rsi Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
fillings.rsi Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
jug.rsi Add inhand fill visuals (#24495) 2024-01-28 20:38:06 -05:00
large_grenade.rsi Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
pills.rsi Medkit Fill Change (#19362) 2023-09-20 17:50:19 +10:00
pills_canister.rsi Adds pills type selection and pills canister (#5539) 2021-11-26 23:44:36 -07:00
syringe.rsi Add inhand fill visuals (#24495) 2024-01-28 20:38:06 -05:00
vial.rsi Add inhand fill visuals (#24495) 2024-01-28 20:38:06 -05:00