From 571da888da4a63f236a588d6758a0c1be6eba027 Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 19 Jul 2022 16:12:33 -0400 Subject: [PATCH 1/2] Merge pull request #13365 from Runa-Dacino/pride_pin Adds pride pins to vending machines (Looty Inc.) --- code/modules/economy/vending_machines_vr.dm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 53bc3b71ad..200bb63d86 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -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)