From d7a2f14298e21e711b007901e294438f8a69fed5 Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sat, 17 Sep 2022 03:46:24 -0700 Subject: [PATCH 1/3] fixes and ka --- code/game/objects/items/robot/robot_items.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 19 +++++++++++++++++++ code/modules/mining/machine_vending.dm | 3 ++- .../mob/living/silicon/robot/robot_modules.dm | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 2cc65ab261..ced18286d9 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -1011,7 +1011,7 @@ playsound(loc, 'sound/effects/bin_close.ogg', 50, 0) return ..() -/obj/item/card/id/miningborg +/obj/item/card/id/mining/miningborg name = "mining point card" desc = "A robotic ID strip used for claiming and transferring mining points. Must be held in an active slot to transfer points." access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 4dea7472c7..8a6cf468fc 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -216,6 +216,25 @@ as performing this in action() will cause the upgrade to end up in the borg inst for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type) L.projectile_type = initial(L.projectile_type) +/obj/item/borg/upgrade/premiumka + name = "mining cyborg premium KA" + desc = "A premium kinetic accelerator replacement for the mining module's standard kinetic accelerator." + icon_state = "cyborg_upgrade3" + require_module = 1 + module_type = list(/obj/item/robot_module/miner) + +/obj/item/borg/upgrade/premiumka/action(mob/living/silicon/robot/R, user = usr) + . = ..() + if(.) + for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA in R.module) + for(var/obj/item/borg/upgrade/modkit/M in KA.modkits) + M.uninstall(src) + R.module.remove_module(KA, TRUE) + + var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA = new /obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg(R.module) + R.module.basic_modules += PKA + R.module.add_module(PKA, FALSE, TRUE) + /obj/item/borg/upgrade/tboh name = "janitor cyborg trash bag of holding" desc = "A trash bag of holding replacement for the janiborg's standard trash bag." diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 530dad03db..b36cef6938 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -77,6 +77,7 @@ new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), new /datum/data/mining_equipment("Premium Kinetic Melee Kit", /obj/item/storage/backpack/duffelbag/mining/glaivekit, 2250), new /datum/data/mining_equipment("Survival Dagger", /obj/item/kitchen/knife/combat/survival/knuckledagger, 550), + new /datum/data/mining_equipment("Premium KA borg Upgrade", /obj/item/borg/upgrade/premiumka, 8000) ) /datum/data/mining_equipment @@ -131,7 +132,7 @@ . = list() var/mob/living/carbon/human/H var/obj/item/card/id/C - if(ishuman(user)) + if(ishuman(user) || iscyborg(user)) H = user C = H.get_idcard(TRUE) if(C) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index d7c6dfe479..c8d2dd3429 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -928,7 +928,7 @@ /obj/item/stack/marker_beacon, /obj/item/destTagger, /obj/item/stack/packageWrap, - /obj/item/card/id/miningborg) + /obj/item/card/id/mining/miningborg) emag_modules = list(/obj/item/borg/stun) ratvar_modules = list( /obj/item/clockwork/slab/cyborg/miner, From 22d22447d2934a14a777695cd388269894e3740c Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sat, 17 Sep 2022 06:36:49 -0700 Subject: [PATCH 2/3] removes the premium KA --- code/game/objects/items/robot/robot_items.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 20 ------------------- code/modules/mining/machine_vending.dm | 3 +-- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index ced18286d9..2cc65ab261 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -1011,7 +1011,7 @@ playsound(loc, 'sound/effects/bin_close.ogg', 50, 0) return ..() -/obj/item/card/id/mining/miningborg +/obj/item/card/id/miningborg name = "mining point card" desc = "A robotic ID strip used for claiming and transferring mining points. Must be held in an active slot to transfer points." access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 8a6cf468fc..020b40b8d9 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -215,26 +215,6 @@ as performing this in action() will cause the upgrade to end up in the borg inst C.icon_state = initial(icon_state) for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type) L.projectile_type = initial(L.projectile_type) - -/obj/item/borg/upgrade/premiumka - name = "mining cyborg premium KA" - desc = "A premium kinetic accelerator replacement for the mining module's standard kinetic accelerator." - icon_state = "cyborg_upgrade3" - require_module = 1 - module_type = list(/obj/item/robot_module/miner) - -/obj/item/borg/upgrade/premiumka/action(mob/living/silicon/robot/R, user = usr) - . = ..() - if(.) - for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA in R.module) - for(var/obj/item/borg/upgrade/modkit/M in KA.modkits) - M.uninstall(src) - R.module.remove_module(KA, TRUE) - - var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA = new /obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg(R.module) - R.module.basic_modules += PKA - R.module.add_module(PKA, FALSE, TRUE) - /obj/item/borg/upgrade/tboh name = "janitor cyborg trash bag of holding" desc = "A trash bag of holding replacement for the janiborg's standard trash bag." diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index b36cef6938..bf99884d74 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -76,8 +76,7 @@ new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining/cloned, 3000), new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000), new /datum/data/mining_equipment("Premium Kinetic Melee Kit", /obj/item/storage/backpack/duffelbag/mining/glaivekit, 2250), - new /datum/data/mining_equipment("Survival Dagger", /obj/item/kitchen/knife/combat/survival/knuckledagger, 550), - new /datum/data/mining_equipment("Premium KA borg Upgrade", /obj/item/borg/upgrade/premiumka, 8000) + new /datum/data/mining_equipment("Survival Dagger", /obj/item/kitchen/knife/combat/survival/knuckledagger, 550) ) /datum/data/mining_equipment From c886e2fd242cca4292fab2471c3268d9160ee280 Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Sat, 17 Sep 2022 06:38:19 -0700 Subject: [PATCH 3/3] forgot this --- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index c8d2dd3429..d7c6dfe479 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -928,7 +928,7 @@ /obj/item/stack/marker_beacon, /obj/item/destTagger, /obj/item/stack/packageWrap, - /obj/item/card/id/mining/miningborg) + /obj/item/card/id/miningborg) emag_modules = list(/obj/item/borg/stun) ratvar_modules = list( /obj/item/clockwork/slab/cyborg/miner,