From 4b42443dea5ee9ae454c50bca7791e22b11ab432 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 16:04:35 -0400 Subject: [PATCH 01/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 30 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 7276039443..6cf901fe38 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -42,9 +42,9 @@ new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000), - new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000), - new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500), - new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000), + new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000), + new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500), + new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000), new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), @@ -66,7 +66,9 @@ new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), - new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000) + new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), + new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 15000), + new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 20000) 8000) ) /datum/data/mining_equipment @@ -313,13 +315,31 @@ /obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents() new /obj/item/pickaxe/mini(src) new /obj/item/clothing/glasses/meson(src) - new /obj/item/t_scanner/adv_mining_scanner/lesser(src) + new /obj/item/t_scanner/adv_mining_scanner(src) new /obj/item/storage/bag/ore(src) new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/encryptionkey/headset_cargo(src) new /obj/item/clothing/mask/gas/explorer(src) new /obj/item/card/mining_access_card(src) +/obj/item/storage/backpack/duffelbag/mining_cloner + new /obj/item/pickaxe/mini(src) + new /obj/item/clothing/under/rank/miner/lavaland(src) + new /obj/item/clothing/shoes/workboots/mining(src) + new /obj/item/clothing/gloves/color/black(src) + new /obj/item/kitchen/knife/combat/survival(src) + new /obj/item/storage/firstaid/regular(src) + new /obj/item/reagent_containers/hypospray/medipen/survival(src) + new /obj/item/storage/bag/ore/holding(src) + new /obj/item/extinguisher/mini(src) + new /obj/item/gun/energy/kinetic_accelerator(src) + new /obj/item/clothing/glasses/meson/night(src) + new /obj/item/t_scanner/adv_mining_scanner/lesser(src) + new /obj/item/extinguisher/mini(src) + new /obj/item/clothing/suit/hooded/explorer(src) + new /obj/item/encryptionkey/headset_cargo(src) + new /obj/item/clothing/mask/gas/explorer(src) + new /obj/item/card/id/miningd(src) //CITADEL ADDITIONS BELOW From e2497cdcf515dc196a87b09aa4222ea8f30299d9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 16:07:27 -0400 Subject: [PATCH 02/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 6cf901fe38..217e206c3b 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -315,7 +315,7 @@ /obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents() new /obj/item/pickaxe/mini(src) new /obj/item/clothing/glasses/meson(src) - new /obj/item/t_scanner/adv_mining_scanner(src) + new /obj/item/t_scanner/adv_mining_scanner/lesser(src) new /obj/item/storage/bag/ore(src) new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/encryptionkey/headset_cargo(src) @@ -334,7 +334,7 @@ new /obj/item/extinguisher/mini(src) new /obj/item/gun/energy/kinetic_accelerator(src) new /obj/item/clothing/glasses/meson/night(src) - new /obj/item/t_scanner/adv_mining_scanner/lesser(src) + new /obj/item/t_scanner/adv_mining_scanner(src) new /obj/item/extinguisher/mini(src) new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/encryptionkey/headset_cargo(src) From 94a905f4207049d0caa0d56a6564771198cdab78 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 16:15:30 -0400 Subject: [PATCH 03/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 217e206c3b..aa87822eb6 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -68,7 +68,7 @@ new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 15000), - new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 20000) 8000) + new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 25000) 8000) ) /datum/data/mining_equipment @@ -322,8 +322,11 @@ new /obj/item/clothing/mask/gas/explorer(src) new /obj/item/card/mining_access_card(src) -/obj/item/storage/backpack/duffelbag/mining_cloner +/obj/item/storage/backpack/duffelbag/mining_cloned + name = "mining replacement kit" + desc = "A large bag that has advance tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even as a new Id!" new /obj/item/pickaxe/mini(src) + new /obj/item/implanter/tracking/gps(src) new /obj/item/clothing/under/rank/miner/lavaland(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/clothing/gloves/color/black(src) From 5d34c7ef6e58d7cfaaf54e4f3806d37f5f2d8cd6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 16:34:18 -0400 Subject: [PATCH 04/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index aa87822eb6..e2f4106e49 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -68,7 +68,7 @@ new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 15000), - new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 25000) 8000) + new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 20000) ) /datum/data/mining_equipment From c5dfc6f8cfca0af8a736b35ebadfe043155c1c67 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 17:14:16 -0400 Subject: [PATCH 05/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index e2f4106e49..339cd10d74 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -67,8 +67,9 @@ new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), - new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 15000), - new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 20000) + new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 12000, + new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 15000) + ) /datum/data/mining_equipment @@ -322,29 +323,28 @@ new /obj/item/clothing/mask/gas/explorer(src) new /obj/item/card/mining_access_card(src) +//CITADEL ADDITIONS BELOW + /obj/item/storage/backpack/duffelbag/mining_cloned name = "mining replacement kit" desc = "A large bag that has advance tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even as a new Id!" + +/obj/item/storage/backpack/duffelbag/mining_cloned/PopulateContents() new /obj/item/pickaxe/mini(src) - new /obj/item/implanter/tracking/gps(src) new /obj/item/clothing/under/rank/miner/lavaland(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/clothing/gloves/color/black(src) + new /obj/item/implanter/tracking/gps(src) new /obj/item/kitchen/knife/combat/survival(src) new /obj/item/storage/firstaid/regular(src) new /obj/item/reagent_containers/hypospray/medipen/survival(src) - new /obj/item/storage/bag/ore/holding(src) - new /obj/item/extinguisher/mini(src) - new /obj/item/gun/energy/kinetic_accelerator(src) - new /obj/item/clothing/glasses/meson/night(src) new /obj/item/t_scanner/adv_mining_scanner(src) - new /obj/item/extinguisher/mini(src) new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/encryptionkey/headset_cargo(src) new /obj/item/clothing/mask/gas/explorer(src) new /obj/item/card/id/miningd(src) - -//CITADEL ADDITIONS BELOW + new /obj/item/storage/bag/ore(src) + new/obj/item/clothing/glasses/meson/prescription(src) /obj/machinery/mineral/equipment_vendor/proc/RedeemSVoucher(obj/item/suit_voucher/voucher, mob/redeemer) var/items = list("Exo-suit", "SEVA suit") From ddc8bfbfb7578a2fc92ca9a2e808f05561c6070f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 17:33:23 -0400 Subject: [PATCH 06/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 339cd10d74..df0782142e 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -24,6 +24,7 @@ new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), + new /datum/data/mining_equipment("Larger Ore Bag", /obj/item/storage/bag/ore/large, 500), new /datum/data/mining_equipment("500 Point Transfer Card", /obj/item/card/mining_point_card/mp500, 500), new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600), new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), @@ -344,7 +345,7 @@ new /obj/item/clothing/mask/gas/explorer(src) new /obj/item/card/id/miningd(src) new /obj/item/storage/bag/ore(src) - new/obj/item/clothing/glasses/meson/prescription(src) + new /obj/item/clothing/glasses/meson/prescription(src) /obj/machinery/mineral/equipment_vendor/proc/RedeemSVoucher(obj/item/suit_voucher/voucher, mob/redeemer) var/items = list("Exo-suit", "SEVA suit") From d0b3b6688206bd7dfb63bef46a301ccc7397a441 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 17:39:39 -0400 Subject: [PATCH 07/11] Update bags.dm --- code/game/objects/items/storage/bags.dm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index aa0c504bb4..b83c245b23 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -162,6 +162,26 @@ /obj/item/storage/bag/ore/cyborg name = "cyborg mining satchel" +/obj/item/storage/bag/ore/cyborg/ComponentInitialize() + . = ..() + GET_COMPONENT(STR, /datum/component/storage/concrete/stack) + STR.allow_quick_empty = TRUE + STR.can_hold = typecacheof(list(/obj/item/stack/ore)) + STR.max_w_class = INFINITY + STR.max_combined_stack_amount = 150 + +/obj/item/storage/bag/ore/large + name = "large mining satchel" + desc = "This bag can hold three times the ore in many small pockets. Shocking folding and compact for its volume." + +/obj/item/storage/bag/ore/large/ComponentInitialize() + . = ..() + GET_COMPONENT(STR, /datum/component/storage/concrete/stack) + STR.allow_quick_empty = TRUE + STR.can_hold = typecacheof(list(/obj/item/stack/ore)) + STR.max_w_class = INFINITY + STR.max_combined_stack_amount = 150 + /obj/item/storage/bag/ore/holding //miners, your messiah has arrived name = "mining satchel of holding" desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures." From d1d53717611a9bfff704642f8911976bc5d3d8c6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 17:58:40 -0400 Subject: [PATCH 08/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index df0782142e..eeaf7e7f5f 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -68,7 +68,7 @@ new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000), new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), - new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 12000, + new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 12000), new /datum/data/mining_equipment("Spare Suit Voucher", /obj/item/suit_voucher, 15000) ) From 6c69ebcd77a943a19274738f9ca243f5890f369e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 21 Mar 2019 19:45:32 -0400 Subject: [PATCH 09/11] Update machine_vending.dm --- code/modules/mining/machine_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index eeaf7e7f5f..5fa7b9d571 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -343,7 +343,7 @@ new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/encryptionkey/headset_cargo(src) new /obj/item/clothing/mask/gas/explorer(src) - new /obj/item/card/id/miningd(src) + new /obj/item/card/id/mining(src) new /obj/item/storage/bag/ore(src) new /obj/item/clothing/glasses/meson/prescription(src) From 400f9555761cb649752e9cbfd375a8c2089dda78 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 24 Mar 2019 11:21:38 -0400 Subject: [PATCH 10/11] Update bags.dm --- code/game/objects/items/storage/bags.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index b83c245b23..1ad3391fa7 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -167,19 +167,19 @@ GET_COMPONENT(STR, /datum/component/storage/concrete/stack) STR.allow_quick_empty = TRUE STR.can_hold = typecacheof(list(/obj/item/stack/ore)) - STR.max_w_class = INFINITY + STR.max_w_class = WEIGHT_CLASS_HUGE STR.max_combined_stack_amount = 150 /obj/item/storage/bag/ore/large name = "large mining satchel" - desc = "This bag can hold three times the ore in many small pockets. Shocking folding and compact for its volume." + desc = "This bag can hold three times the ore in many small pockets. Shockingly foldable and compact for its volume." /obj/item/storage/bag/ore/large/ComponentInitialize() . = ..() GET_COMPONENT(STR, /datum/component/storage/concrete/stack) STR.allow_quick_empty = TRUE STR.can_hold = typecacheof(list(/obj/item/stack/ore)) - STR.max_w_class = INFINITY + STR.max_w_class = WEIGHT_CLASS_HUGE STR.max_combined_stack_amount = 150 /obj/item/storage/bag/ore/holding //miners, your messiah has arrived From 0baa3a1e29d0b8c0f1e503b9b5e206f96920f53e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 2 Apr 2019 01:27:05 -0400 Subject: [PATCH 11/11] Update bags.dm --- code/game/objects/items/storage/bags.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 1ad3391fa7..b86f7a692b 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -1,5 +1,5 @@ /* - * These absorb the functionality of the plant bag, ore satchel, etc. + * These absorb the functionality of the plant bag, ore satchel, etc * They use the use_to_pickup, quick_gather, and quick_empty functions * that were already defined in weapon/storage, but which had been * re-implemented in other classes.