Merge pull request #4577 from CHOMPStation2/upstream-merge-13365

[MIRROR] Adds pride pins to vending machines (Looty Inc.)
This commit is contained in:
Nadyr
2022-07-20 20:37:56 -04:00
committed by GitHub
+18 -2
View File
@@ -635,7 +635,15 @@
/obj/item/clothing/mask/bandana/gold = 5,
/obj/item/clothing/mask/bandana/green = 5,
/obj/item/clothing/mask/bandana/red = 5,
/obj/item/clothing/mask/surgical = 5)
/obj/item/clothing/mask/surgical = 5,
/obj/item/clothing/accessory/pride/bi = 5,
/obj/item/clothing/accessory/pride/trans = 5,
/obj/item/clothing/accessory/pride/ace = 5,
/obj/item/clothing/accessory/pride/enby = 5,
/obj/item/clothing/accessory/pride/pan = 5,
/obj/item/clothing/accessory/pride/lesbian = 5,
/obj/item/clothing/accessory/pride/intersex = 5,
/obj/item/clothing/accessory/pride/vore = 5)
prices = list(/obj/item/clothing/accessory = 50,
/obj/item/clothing/accessory/armband/med/color = 50,
/obj/item/clothing/accessory/asymmetric = 50,
@@ -752,7 +760,15 @@
/obj/item/clothing/mask/bandana/gold = 50,
/obj/item/clothing/mask/bandana/green = 50,
/obj/item/clothing/mask/bandana/red = 50,
/obj/item/clothing/mask/surgical = 50)
/obj/item/clothing/mask/surgical = 50,
/obj/item/clothing/accessory/pride/bi = 50,
/obj/item/clothing/accessory/pride/trans = 50,
/obj/item/clothing/accessory/pride/ace = 50,
/obj/item/clothing/accessory/pride/enby = 50,
/obj/item/clothing/accessory/pride/pan = 50,
/obj/item/clothing/accessory/pride/lesbian = 50,
/obj/item/clothing/accessory/pride/intersex = 50,
/obj/item/clothing/accessory/pride/vore = 50)
premium = list(/obj/item/weapon/bedsheet/rainbow = 1)
contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1,
/obj/item/clothing/accessory/collar/collarplanet_earth = 5)