Merge branch 'master' into no_bluespace_fun

This commit is contained in:
alberyk
2022-01-29 20:56:43 -03:00
20 changed files with 104 additions and 252 deletions
-1
View File
@@ -94,7 +94,6 @@ They sell generic supplies and ask for generic supplies.
/obj/item/storage/bag/ore = TRADER_THIS_TYPE,
/obj/item/storage/toolbox = TRADER_ALL,
/obj/item/storage/wallet = TRADER_THIS_TYPE,
/obj/item/storage/wallet/fluff = TRADER_BLACKLIST_ALL, // Custom items
/obj/item/storage/photo_album = TRADER_THIS_TYPE,
/obj/item/clothing/glasses = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/glasses/threedglasses/fluff = TRADER_BLACKLIST_ALL, // Custom items