shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into hardsync-1.5

Browse Source
This commit is contained in:
Letter N
2021-02-23 11:01:42 +08:00
parent 2be4c76add d1475285b3
commit 5304029dd9
223 changed files with 1145 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/clothesmate.dm
+2 -2
View File
@@ -21,7 +21,7 @@
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
/obj/item/clothing/neck/cancloak = 4,
/obj/item/clothing/neck/cancloak/polychromic = 4,
/obj/item/clothing/suit/bomber = 5,
/obj/item/clothing/under/suit/turtle/teal = 3,
/obj/item/clothing/under/suit/turtle/grey = 3,
@@ -68,7 +68,7 @@
/obj/item/clothing/under/pants/black = 4,
/obj/item/clothing/under/pants/tan = 4,
/obj/item/clothing/under/pants/track = 3,
/obj/item/clothing/under/pants/polypants = 4,
/obj/item/clothing/under/pants/polypants/polychromic = 4,
/obj/item/clothing/accessory/suitjacket = 2,
/obj/item/clothing/accessory/suitjacket/charcoal = 2,
/obj/item/clothing/accessory/suitjacket/navy = 2,
code/modules/vending/kinkmate.dm
+3
View File
@@ -31,6 +31,8 @@
/obj/item/autosurgeon/testicles = 3,
/obj/item/storage/pill_bottle/penis_enlargement = 5,
/obj/item/storage/pill_bottle/breast_enlargement = 5,
/obj/item/reagent_containers/glass/bottle/crocin = 5,
/obj/item/reagent_containers/glass/bottle/camphor = 5,
/obj/item/storage/daki = 4
)
contraband = list(
@@ -46,6 +48,7 @@
)
premium = list(
/obj/item/clothing/accessory/skullcodpiece/fake = 3,
/obj/item/reagent_containers/glass/bottle/hexacrocin = 10,
/obj/item/clothing/under/pants/chaps = 5
)
refill_canister = /obj/item/vending_refill/kink