From aa944e7e3e42010fe8b41d2acf09346dfa9dd53f Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Wed, 30 Jun 2021 16:42:57 -0400 Subject: [PATCH 1/3] First pass at giving free miners some mech/borg access --- code/__DEFINES/access.dm | 2 ++ code/game/mecha/working/ripley.dm | 2 +- code/game/objects/items/robot/robot_upgrades.dm | 9 +++++++++ .../research/designs/mechfabricator_designs.dm | 11 ++++++++++- yogstation/code/datums/ruins/free_miners.dm | 9 +++++++-- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index f946a3301abc..0d5496280633 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -85,6 +85,7 @@ #define ACCESS_TCOM_ADMIN 70 #define ACCESS_FREEMINER 71 #define ACCESS_FREEMINER_CAPTAIN 72 +#define ACCESS_FREEMINER_ENGINEER 73 //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. @@ -144,3 +145,4 @@ #define ACCESS_MECH_SECURITY 302 #define ACCESS_MECH_SCIENCE 303 #define ACCESS_MECH_ENGINE 304 +#define ACCESS_MECH_FREEMINER 310 diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 41728ab0b47e..e91ef04e687a 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -13,7 +13,7 @@ armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 20, "fire" = 100, "acid" = 100) max_equip = 6 wreckage = /obj/structure/mecha_wreckage/ripley - internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING) + internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING, ACCESS_MECH_FREEMINER) var/list/cargo = new var/cargo_capacity = 15 var/hides = 0 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 6c788537ac08..3648b9fed9a5 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -70,6 +70,15 @@ R.revive() +/obj/item/borg/upgrade/freeminer + name = "cyborg free miner firmware hack" + desc = "Used to override the default firmware of a cyborg with the freeminer version." + icon_state = "cyborg_upgrade2" + one_use = TRUE + +/obj/item/borg/upgrade/freeminer/action(mob/living/silicon/robot/R, user = usr) + R.req_access = list(ACCESS_FREEMINER_ENGINEER) + /obj/item/borg/upgrade/vtec name = "cyborg VTEC module" desc = "Used to kick in a cyborg's VTEC systems, increasing their speed." diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index b19fa91faf1c..765c88dd9b83 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -597,6 +597,15 @@ construction_time = 120 category = list("Cyborg Upgrade Modules") +/datum/design/borg_upgrade_freeminer + name = "Cyborg Upgrade (Freeminer Firmware Board)" + id = "borg_upgrade_restart" + build_type = MECHFAB + build_path = /obj/item/borg/upgrade/freeminer + materials = list(/datum/material/iron = 20000 , /datum/material/glass = 5000) + construction_time = 120 + category = list("Cyborg Upgrade Modules") + /datum/design/borg_upgrade_vtec name = "Cyborg Upgrade (VTEC Module)" id = "borg_upgrade_vtec" @@ -824,4 +833,4 @@ materials = list(/datum/material/iron = 750, /datum/material/glass = 750) construction_time = 100 build_path = /obj/item/assembly/flash/handheld - category = list("Misc") \ No newline at end of file + category = list("Misc") diff --git a/yogstation/code/datums/ruins/free_miners.dm b/yogstation/code/datums/ruins/free_miners.dm index 5af4cd9d3021..2c8655a6e22f 100644 --- a/yogstation/code/datums/ruins/free_miners.dm +++ b/yogstation/code/datums/ruins/free_miners.dm @@ -93,6 +93,7 @@ r_pocket = null gloves = /obj/item/clothing/gloves/color/yellow belt = /obj/item/storage/belt/utility/full + id = /obj/item/card/id/freeminer/engi /obj/effect/mob_spawn/human/free_miner/captain name = "Free Miner Captain" @@ -117,11 +118,15 @@ /obj/item/card/id/freeminer name = "Free Miner Crewman ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER) + access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER) + +/obj/item/card/id/freeminer/engi + name = "Free Miner Engineer ID" + access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER) /obj/item/card/id/freeminer/captain name = "Free Miner Ship Pilot ID" - access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_FREEMINER_CAPTAIN) + access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER, ACCESS_FREEMINER_CAPTAIN) /obj/item/storage/box/ids/free_miners name = "box of spare IDs" From f752ef450895ff9da6deb285f552de3894f139f7 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Wed, 30 Jun 2021 17:57:33 -0400 Subject: [PATCH 2/3] Fixed some things, removed the firmware hack from the exosuit fab and put it on the free miner ship --- _maps/shuttles/whiteship_miner.dmm | 1 + code/game/objects/items/robot/robot_upgrades.dm | 2 +- code/modules/research/designs/mechfabricator_designs.dm | 9 --------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/_maps/shuttles/whiteship_miner.dmm b/_maps/shuttles/whiteship_miner.dmm index 665bd327b576..cb48632032b7 100644 --- a/_maps/shuttles/whiteship_miner.dmm +++ b/_maps/shuttles/whiteship_miner.dmm @@ -347,6 +347,7 @@ amount = 10 }, /obj/item/mecha_parts/mecha_equipment/ripleyupgrade, +/obj/item/borg/upgrade/freeminer, /turf/open/floor/mineral/titanium/white, /area/shuttle/abandoned) "bd" = ( diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 3648b9fed9a5..607c3a5fd051 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -71,7 +71,7 @@ R.revive() /obj/item/borg/upgrade/freeminer - name = "cyborg free miner firmware hack" + name = "free miner cyborg firmware hack" desc = "Used to override the default firmware of a cyborg with the freeminer version." icon_state = "cyborg_upgrade2" one_use = TRUE diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 765c88dd9b83..c6d19c39ccf6 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -597,15 +597,6 @@ construction_time = 120 category = list("Cyborg Upgrade Modules") -/datum/design/borg_upgrade_freeminer - name = "Cyborg Upgrade (Freeminer Firmware Board)" - id = "borg_upgrade_restart" - build_type = MECHFAB - build_path = /obj/item/borg/upgrade/freeminer - materials = list(/datum/material/iron = 20000 , /datum/material/glass = 5000) - construction_time = 120 - category = list("Cyborg Upgrade Modules") - /datum/design/borg_upgrade_vtec name = "Cyborg Upgrade (VTEC Module)" id = "borg_upgrade_vtec" From d5386d754afe2134d93f9f7bd8f5698d70ad06b5 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Wed, 30 Jun 2021 18:12:16 -0400 Subject: [PATCH 3/3] Removed newline from file I ended up not wanting to change --- code/modules/research/designs/mechfabricator_designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index c6d19c39ccf6..b19fa91faf1c 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -824,4 +824,4 @@ materials = list(/datum/material/iron = 750, /datum/material/glass = 750) construction_time = 100 build_path = /obj/item/assembly/flash/handheld - category = list("Misc") + category = list("Misc") \ No newline at end of file