Morb0 2621e6c099 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/ninja.rsi/meta.json # Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json # Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json		2024-04-18 12:04:58 +03:00
..
Drinks	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00
Food	Add fill levels to bowls (#25639)	2024-02-29 16:41:14 -05:00
Smokeables	Ports a fuckton of vox clothing from Paradise and /vg/station (#27021)	2024-04-18 16:43:42 +10:00
TrashDrinks	Add open/closed/fill states and sprites (#24600)	2024-02-04 12:13:47 -08:00