From 175d4b565576f35b18c00106d2243e1dfb76784d Mon Sep 17 00:00:00 2001 From: panurgomatic Date: Sun, 25 Dec 2011 19:50:23 +0000 Subject: [PATCH] - Fixed wrong paths for mech circuit boards - Added Odysseus circuit boards to designs. - Tweaked Odysseus parts construction costs. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2814 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/supplypacks.dm | 16 ++++++++++++++-- code/game/mecha/mecha_parts.dm | 10 +++++----- code/modules/research/designs.dm | 18 ++++++++++++++++++ html/changelog.html | 9 +++++++++ 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index eb75d02121..6ad7b775dd 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -363,13 +363,25 @@ /datum/supply_packs/mecha_ripley name = "Circuit Crate (\"Ripley\" APLU)" contains = list("/obj/item/weapon/book/manual/ripley_build_and_repair", - "/obj/item/mecha_parts/circuitboard/ripley/peripherals", //TEMPORARY due to lack of circuitboard printer - "/obj/item/mecha_parts/circuitboard/ripley/main") //TEMPORARY due to lack of circuitboard printer + "/obj/item/weapon/circuitboard/mecha/ripley/peripherals", //TEMPORARY due to lack of circuitboard printer + "/obj/item/weapon/circuitboard/mecha/ripley/main") //TEMPORARY due to lack of circuitboard printer cost = 40 containertype = "/obj/structure/closet/crate/secure" containername = "APLU \"Ripley\" Circuit Crate" access = access_robotics +/datum/supply_packs/mecha_odysseus + name = "Circuit Crate (\"Odysseus\")" + contains = list( + "/obj/item/weapon/circuitboard/mecha/odysseus/peripherals", //TEMPORARY due to lack of circuitboard printer + "/obj/item/weapon/circuitboard/mecha/odysseus/main" //TEMPORARY due to lack of circuitboard printer + ) + cost = 40 + containertype = "/obj/structure/closet/crate/secure" + containername = "\"Odysseus\" Circuit Crate" + access = access_robotics + + /datum/supply_packs/robotics name = "Robotics Assembly Crate" contains = list("/obj/item/device/assembly/prox_sensor", diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index bdf76b9678..a29156ab3d 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -346,7 +346,7 @@ icon_state = "ripley_harness" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" construction_time = 200 - construction_cost = list("metal"=30000,"glass"=10000) + construction_cost = list("metal"=25000,"glass"=10000) /obj/item/mecha_parts/part/odysseus_left_arm name="Odysseus Left Arm" @@ -354,7 +354,7 @@ icon_state = "ripley_l_arm" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=20000) + construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/odysseus_right_arm name="Odysseus Right Arm" @@ -362,7 +362,7 @@ icon_state = "ripley_r_arm" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=20000) + construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/odysseus_left_leg name="Odysseus Left Leg" @@ -370,7 +370,7 @@ icon_state = "ripley_l_leg" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=2500) + construction_cost = list("metal"=20000) /obj/item/mecha_parts/part/odysseus_right_leg name="Odysseus Right Leg" @@ -378,7 +378,7 @@ icon_state = "ripley_r_leg" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=2500) + construction_cost = list("metal"=20000) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 79ee086b99..0babc79fcc 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -522,6 +522,24 @@ datum materials = list("$glass" = 2000, "acid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/ripley/peripherals" + odysseus_main + name = "Circuit Design (\"Odysseus\" Central Control module)" + desc = "Allows for the construction of a \"Odysseus\" Central Control module." + id = "odysseus_main" + req_tech = list("programming" = 3,"biotech" = 2) + build_type = IMPRINTER + materials = list("$glass" = 2000, "acid" = 20) + build_path = "/obj/item/weapon/circuitboard/mecha/odysseus/main" + + odysseus_peri + name = "Circuit Design (\"Odysseus\" Peripherals Control module)" + desc = "Allows for the construction of a \"Odysseus\" Peripheral Control module." + id = "odysseus_peri" + req_tech = list("programming" = 3,"biotech" = 2) + build_type = IMPRINTER + materials = list("$glass" = 2000, "acid" = 20) + build_path = "/obj/item/weapon/circuitboard/mecha/odysseus/peripherals" + gygax_main name = "Circuit Design (\"Gygax\" Central Control module)" desc = "Allows for the construction of a \"Gygax\" Central Control module." diff --git a/html/changelog.html b/html/changelog.html index f08bcd0a13..1757a31a51 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -54,7 +54,16 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> +25 December 2011 +
    +
  • ConstantA updated: +
      +
    • Circuit boards for Odysseus mech can be ordered by QM
      • +
    • Designs for them were added to R&D
      • +
    +
    • +