Merge pull request #38580 from Hyacinth-OR/pinkscarf

Adds a pink scarf
This commit is contained in:
Jordan Brown
2018-06-19 10:49:27 -04:00
committed by letterjay
parent 5f20c052c0
commit 1ee84bb7d2
2 changed files with 10 additions and 4 deletions
+3 -2
View File
@@ -35,6 +35,7 @@
/obj/item/clothing/neck/tie/red = 1,
/obj/item/clothing/neck/tie/black = 1,
/obj/item/clothing/neck/tie/horrible = 1,
/obj/item/clothing/neck/scarf/pink = 1,
/obj/item/clothing/neck/scarf/red = 1,
/obj/item/clothing/neck/scarf/green = 1,
/obj/item/clothing/neck/scarf/darkblue = 1,
@@ -118,5 +119,5 @@
/obj/item/vending_refill/clothing
machine_name = "ClothesMate"
icon_state = "refill_clothes"
charges = list(37, 4, 4)// of 111 standard, 12 contraband, 10 premium(?)
init_charges = list(37, 4, 4)
charges = list(38, 4, 4)// of 112 standard, 12 contraband, 10 premium(?)
init_charges = list(38, 4, 4)