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

Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh

Browse Source
This commit is contained in:
CameronWoof
2020-07-17 17:22:43 -07:00
parent a493ecdc4a 94c6ec9963
commit 431c52b7e2
991 changed files with 34766 additions and 40991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/_vending.dm
+1 -1
View File
@@ -667,7 +667,7 @@ GLOBAL_LIST_EMPTY(vending_products)
if(!ui)
var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/vending)
assets.send(user)
ui = new(user, src, ui_key, "vending", name, 450, 600, master_ui, state)
ui = new(user, src, ui_key, "Vending", ui_key, 450, 600, master_ui, state)
ui.open()
/obj/machinery/vending/ui_static_data(mob/user)
code/modules/vending/clothesmate.dm
+2 -1
View File
@@ -150,7 +150,8 @@
/obj/item/clothing/under/costume/qipao/red = 3,
/obj/item/clothing/under/costume/cheongsam = 3,
/obj/item/clothing/under/costume/cheongsam/white = 3,
/obj/item/clothing/under/costume/cheongsam/red = 3)
/obj/item/clothing/under/costume/cheongsam/red = 3,
/obj/item/storage/backpack/snail = 3)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,