From 20ba92d39c2312269bdeb24de05f744bdcb9c7a2 Mon Sep 17 00:00:00 2001 From: Szyszkrzyneczka <52501307+Szyszkrzyneczka@users.noreply.github.com> Date: Sat, 16 Nov 2019 18:38:02 +0100 Subject: [PATCH 1/3] construction bag now gets more love, can be bought from engi-vend or made with cloth --- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 ++- code/modules/vending/engivend.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index aa6020ab06f9..e946c9957e19 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -285,6 +285,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("mining satchel", /obj/item/storage/bag/ore, 4), \ new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \ new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \ + new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4), \ null, \ new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \ new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1), \ @@ -330,7 +331,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ /obj/item/stack/sheet/cloth/five amount = 5 - + /obj/item/stack/sheet/wool name = "wool" desc = "A bundle of wool ready to be spun on the loom." diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index e070608127ab..a33e20988a96 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -15,7 +15,8 @@ /obj/item/electronics/apc = 10, /obj/item/electronics/airalarm = 10, /obj/item/electronics/firealarm = 10, - /obj/item/electronics/firelock = 10) + /obj/item/electronics/firelock = 10, + /obj/item/storage/bag/construction = 9) contraband = list(/obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3, /obj/item/storage/box/smart_metal_foam = 1) From 50b9a26d6a833cca32126053ef632bd2c61f6238 Mon Sep 17 00:00:00 2001 From: Szyszkrzyneczka <52501307+Szyszkrzyneczka@users.noreply.github.com> Date: Sat, 16 Nov 2019 18:45:14 +0100 Subject: [PATCH 2/3] fixes Jcat's OCD bags are now in tens intead of nines --- code/modules/vending/engivend.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index a33e20988a96..b9acce1ddbed 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -16,7 +16,7 @@ /obj/item/electronics/airalarm = 10, /obj/item/electronics/firealarm = 10, /obj/item/electronics/firelock = 10, - /obj/item/storage/bag/construction = 9) + /obj/item/storage/bag/construction = 10) contraband = list(/obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3, /obj/item/storage/box/smart_metal_foam = 1) From 08ed652ca60ca3ae13793e23e14365036422bfd3 Mon Sep 17 00:00:00 2001 From: Szyszkrzyneczka <52501307+Szyszkrzyneczka@users.noreply.github.com> Date: Sat, 16 Nov 2019 18:54:39 +0100 Subject: [PATCH 3/3] people were arguing, one "lets go with 4" the other one went with "lets go with 10" so i went with 6 --- code/modules/vending/engivend.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index b9acce1ddbed..d2b6b583fa54 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -16,7 +16,7 @@ /obj/item/electronics/airalarm = 10, /obj/item/electronics/firealarm = 10, /obj/item/electronics/firelock = 10, - /obj/item/storage/bag/construction = 10) + /obj/item/storage/bag/construction = 6) contraband = list(/obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3, /obj/item/storage/box/smart_metal_foam = 1)