From 46ce41fbc8b127c4a33dd678435834c7017b4cd4 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 4 Sep 2015 18:04:34 -0400 Subject: [PATCH] unused var axing --- code/game/mecha/equipment/mecha_equipment.dm | 2 - .../mecha/equipment/tools/medical_tools.dm | 3 - code/game/mecha/equipment/tools/tools.dm | 13 +-- code/game/mecha/equipment/weapons/weapons.dm | 9 -- code/game/mecha/mecha_control_console.dm | 18 ++-- code/game/mecha/mecha_parts.dm | 85 +------------------ code/game/objects/items/robot/robot_parts.dm | 16 ---- .../objects/items/robot/robot_upgrades.dm | 8 -- .../game/objects/items/weapons/power_cells.dm | 5 -- code/game/vehicles/spacepods/parts.dm | 1 - code/modules/mob/living/carbon/brain/MMI.dm | 4 - .../mob/living/carbon/brain/posibrain.dm | 2 - .../mob/living/silicon/robot/component.dm | 6 +- 13 files changed, 13 insertions(+), 159 deletions(-) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 33bbb110766..4f53bd5a796 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -8,8 +8,6 @@ icon_state = "mecha_equip" force = 5 origin_tech = "materials=2" - construction_time = 100 - construction_cost = list("metal"=10000) var/equip_cooldown = 0 var/equip_ready = 1 var/energy_drain = 0 diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index bc7100347c5..a32e32c1075 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -6,7 +6,6 @@ origin_tech = "programming=2;biotech=3" energy_drain = 20 range = MELEE - construction_cost = list("metal"=5000,"glass"=10000) reliability = 1000 equip_cooldown = 20 var/mob/living/carbon/occupant = null @@ -396,8 +395,6 @@ range = MELEE|RANGED equip_cooldown = 10 origin_tech = "materials=3;biotech=4;magnets=4;programming=3" - construction_time = 200 - construction_cost = list("metal"=3000,"glass"=2000) New() ..() diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index d9a7b7a2044..783513c62ac 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -138,7 +138,6 @@ desc = "This is an upgraded version of the drill that'll pierce the heavens! (Can be attached to: Combat and Engineering Exosuits)" icon_state = "mecha_diamond_drill" origin_tech = "materials=4;engineering=3" - construction_cost = list("metal"=10000,"diamond"=6500) equip_cooldown = 20 force = 15 @@ -279,11 +278,9 @@ equip_cooldown = 10 energy_drain = 250 range = MELEE|RANGED - construction_time = 1200 - construction_cost = list("metal"=30000,"plasma"=25000,"silver"=20000,"gold"=20000) var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock. var/canRwall = 0 - + New() rcd_list += src ..() @@ -524,7 +521,6 @@ equip_cooldown = 10 energy_drain = 50 range = 0 - construction_cost = list("metal"=20000,"silver"=5000) var/deflect_coeff = 1.15 var/damage_coeff = 0.8 @@ -575,7 +571,6 @@ equip_cooldown = 10 energy_drain = 50 range = 0 - construction_cost = list("metal"=20000,"gold"=5000) var/deflect_coeff = 1.15 var/damage_coeff = 0.8 @@ -647,7 +642,6 @@ equip_cooldown = 20 energy_drain = 100 range = 0 - construction_cost = list("metal"=10000,"gold"=1000,"silver"=2000,"glass"=5000) var/health_boost = 2 var/datum/global_iterator/pr_repair_droid var/icon/droid_overlay @@ -736,7 +730,6 @@ equip_cooldown = 10 energy_drain = 0 range = 0 - construction_cost = list("metal"=10000,"gold"=2000,"silver"=3000,"glass"=2000) var/datum/global_iterator/pr_energy_relay var/coeff = 100 var/list/use_channels = list(EQUIP,ENVIRON,LIGHT) @@ -848,7 +841,6 @@ equip_cooldown = 10 energy_drain = 0 range = MELEE - construction_cost = list("metal"=10000,"silver"=500,"glass"=1000) var/datum/global_iterator/pr_mech_generator var/coeff = 100 var/obj/item/stack/sheet/fuel @@ -985,7 +977,6 @@ desc = "Generates power using uranium. Pollutes the environment." icon_state = "tesla" origin_tech = "powerstorage=3;engineering=3" - construction_cost = list("metal"=10000,"silver"=500,"glass"=1000) max_fuel = 50000 fuel_per_cycle_idle = 10 fuel_per_cycle_active = 30 @@ -1108,4 +1099,4 @@ scanning = 1 mineral_scan_pulse(occupant,get_turf(loc)) spawn(equip_cooldown) - scanning = 0 + scanning = 0 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 18d5a433990..2e3b0d4fba8 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -66,7 +66,6 @@ energy_drain = 120 projectile = /obj/item/projectile/ion fire_sound = 'sound/weapons/Laser.ogg' - construction_cost = list("silver" = 6000, "metal" = 20000, "uranium" = 2000) /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse equip_cooldown = 30 @@ -119,8 +118,6 @@ energy_drain = 200 equip_cooldown = 150 range = MELEE|RANGED - construction_time = 500 - construction_cost = list("metal"=20000,"bananium"=10000) can_attach(obj/mecha/combat/honker/M as obj) if(..()) @@ -346,7 +343,6 @@ equip_cooldown = 60 var/missile_speed = 2 var/missile_range = 30 - construction_cost = list("silver" = 8000, "metal" = 22000, "gold" = 6000) action(target) if(!action_checks(target)) return @@ -409,7 +405,6 @@ projectile = /obj/item/weapon/grenade/flashbang/clusterbang projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher. equip_cooldown = 90 - construction_cost = list("metal"=20000,"gold"=10000,"uranium"=10000) //now as expensive as a Honkblast. size=1 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/get_equip_info()//Limited version of the clusterbang launcher that can't reload @@ -427,8 +422,6 @@ missile_speed = 1.5 projectile_energy_cost = 100 equip_cooldown = 20 - construction_time = 300 - construction_cost = list("metal"=20000,"bananium"=5000) can_attach(obj/mecha/combat/honker/M as obj) if(..()) @@ -457,8 +450,6 @@ missile_speed = 1.5 projectile_energy_cost = 100 equip_cooldown = 10 - construction_time = 300 - construction_cost = list("metal"=20000,"bananium"=5000) can_attach(obj/mecha/combat/honker/M as obj) if(..()) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index ce44f2e59b1..f85a1586d26 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -15,7 +15,7 @@ /obj/machinery/computer/mecha/attack_hand(var/mob/user as mob) ui_interact(user) - + /obj/machinery/computer/mecha/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data["screen"] = screen @@ -40,7 +40,7 @@ /obj/machinery/computer/mecha/Topic(href, href_list) if(..()) return 1 - + var/datum/topic_input/filter = new /datum/topic_input(href,href_list) if(href_list["send_message"]) var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message") @@ -50,19 +50,19 @@ var/obj/mecha/M = MT.in_mecha() if(M) M.occupant_message(message) - + if(href_list["shock"]) var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock") MT.shock() - + if(href_list["get_log"]) var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log") stored_data = MT.get_mecha_log() screen = 1 - + if(href_list["return"]) screen = 0 - + nanomanager.update_uis(src) return @@ -72,8 +72,6 @@ icon = 'icons/obj/device.dmi' icon_state = "motion2" origin_tech = "programming=2;magnets=2" - construction_time = 50 - construction_cost = list("metal"=500) /obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info() if(!in_mecha()) @@ -91,7 +89,7 @@ answer["cell"] = 0 answer["integrity"] = M.health/initial(M.health)*100 answer["airtank"] = M.return_pressure() - answer["pilot"] = "[M.occupant||"None"]" + answer["pilot"] = "[M.occupant||"None"]" var/area/area = get_area(M) answer["location"] = "[sanitize(area.name)||"Unknown"]" answer["equipment"] = "[M.selected||"None"]" @@ -99,7 +97,7 @@ var/obj/mecha/working/ripley/RM = M answer["hascargo"] = 1 answer["cargo"] = RM.cargo.len/RM.cargo_capacity*100 - + return answer /obj/item/mecha_parts/mecha_tracking/emp_act() diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 6237bcfd523..17876058ab9 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -9,15 +9,12 @@ w_class = 6 flags = CONDUCT origin_tech = "programming=2;materials=2" - var/construction_time = 100 - var/list/construction_cost = list("metal"=20000,"glass"=5000) /obj/item/mecha_parts/chassis name="Mecha Chassis" icon_state = "backbone" var/datum/construction/construct - construction_cost = list("metal"=20000) flags = CONDUCT attackby(obj/item/W as obj, mob/user as mob, params) @@ -42,46 +39,35 @@ desc="A torso part of Ripley APLU. Contains power unit, processing core and life support systems." icon_state = "ripley_harness" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" - construction_time = 200 - construction_cost = list("metal"=20000,"glass"=7500) /obj/item/mecha_parts/part/ripley_left_arm name="Ripley Left Arm" desc="A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools." icon_state = "ripley_l_arm" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 150 - construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/ripley_right_arm name="Ripley Right Arm" desc="A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools." icon_state = "ripley_r_arm" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 150 - construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/ripley_left_leg name="Ripley Left Leg" desc="A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_l_leg" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 150 - construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/ripley_right_leg name="Ripley Right Leg" desc="A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_r_leg" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 150 - construction_cost = list("metal"=15000) ///////// Gygax /obj/item/mecha_parts/chassis/gygax name = "Gygax Chassis" - construction_cost = list("metal"=20000) New() ..() @@ -92,60 +78,45 @@ desc="A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot." icon_state = "gygax_harness" origin_tech = "programming=2;materials=2;biotech=3;engineering=3" - construction_time = 300 - construction_cost = list("metal"=20000,"glass"=10000,"diamond"=2000) /obj/item/mecha_parts/part/gygax_head name="Gygax Head" desc="A Gygax head. Houses advanced surveilance and targeting sensors." icon_state = "gygax_head" origin_tech = "programming=2;materials=2;magnets=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=10000,"glass"=5000, "diamond"=2000) /obj/item/mecha_parts/part/gygax_left_arm name="Gygax Left Arm" desc="A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_l_arm" origin_tech = "programming=2;materials=2;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000, "diamond"=1000) /obj/item/mecha_parts/part/gygax_right_arm name="Gygax Right Arm" desc="A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_r_arm" origin_tech = "programming=2;materials=2;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000, "diamond"=1000) /obj/item/mecha_parts/part/gygax_left_leg name="Gygax Left Leg" icon_state = "gygax_l_leg" origin_tech = "programming=2;materials=2;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000, "diamond"=2000) /obj/item/mecha_parts/part/gygax_right_leg name="Gygax Right Leg" icon_state = "gygax_r_leg" origin_tech = "programming=2;materials=2;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000, "diamond"=2000) /obj/item/mecha_parts/part/gygax_armour name="Gygax Armour Plates" icon_state = "gygax_armour" origin_tech = "materials=6;combat=4;engineering=5" - construction_time = 600 - construction_cost = list("metal"=25000,"diamond"=10000) //////////// Durand /obj/item/mecha_parts/chassis/durand name = "Durand Chassis" - construction_cost = list("metal"=25000) New() ..() @@ -155,50 +126,36 @@ name="Durand Torso" icon_state = "durand_harness" origin_tech = "programming=2;materials=3;biotech=3;engineering=3" - construction_time = 300 - construction_cost = list("metal"=25000,"glass"=10000,"silver"=10000) /obj/item/mecha_parts/part/durand_head name="Durand Head" icon_state = "durand_head" origin_tech = "programming=2;materials=3;magnets=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=10000,"glass"=15000,"silver"=2000) /obj/item/mecha_parts/part/durand_left_arm name="Durand Left Arm" icon_state = "durand_l_arm" origin_tech = "programming=2;materials=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=10000,"silver"=4000) /obj/item/mecha_parts/part/durand_right_arm name="Durand Right Arm" icon_state = "durand_r_arm" origin_tech = "programming=2;materials=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=10000,"silver"=4000) /obj/item/mecha_parts/part/durand_left_leg name="Durand Left Leg" icon_state = "durand_l_leg" origin_tech = "programming=2;materials=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000,"silver"=4000) /obj/item/mecha_parts/part/durand_right_leg name="Durand Right Leg" icon_state = "durand_r_leg" origin_tech = "programming=2;materials=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000,"silver"=4000) /obj/item/mecha_parts/part/durand_armor name="Durand Armour Plates" icon_state = "durand_armor" origin_tech = "materials=5;combat=4;engineering=5" - construction_time = 600 - construction_cost = list("metal"=50000,"uranium"=30000) @@ -244,38 +201,26 @@ /obj/item/mecha_parts/part/honker_torso name="H.O.N.K Torso" icon_state = "honker_harness" - construction_time = 300 - construction_cost = list("metal"=20000,"glass"=10000,"bananium"=10000) /obj/item/mecha_parts/part/honker_head name="H.O.N.K Head" icon_state = "honker_head" - construction_time = 200 - construction_cost = list("metal"=10000,"glass"=5000,"bananium"=5000) /obj/item/mecha_parts/part/honker_left_arm name="H.O.N.K Left Arm" icon_state = "honker_l_arm" - construction_time = 200 - construction_cost = list("metal"=15000,"bananium"=5000) /obj/item/mecha_parts/part/honker_right_arm name="H.O.N.K Right Arm" icon_state = "honker_r_arm" - construction_time = 200 - construction_cost = list("metal"=15000,"bananium"=5000) /obj/item/mecha_parts/part/honker_left_leg name="H.O.N.K Left Leg" icon_state = "honker_l_leg" - construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) /obj/item/mecha_parts/part/honker_right_leg name="H.O.N.K Right Leg" icon_state = "honker_r_leg" - construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) ////////// Phazon @@ -291,51 +236,37 @@ /obj/item/mecha_parts/part/phazon_torso name="Phazon Torso" icon_state = "phazon_harness" - construction_time = 300 - construction_cost = list("metal"=35000,"glass"=10000,"plasma"=20000) origin_tech = "programming=5;materials=6;bluespace=5;powerstorage=5" /obj/item/mecha_parts/part/phazon_head name="Phazon Head" icon_state = "phazon_head" - construction_time = 200 - construction_cost = list("metal"=15000,"glass"=5000,"plasma"=10000) origin_tech = "programming=4;materials=5;magnets=5" /obj/item/mecha_parts/part/phazon_left_arm name="Phazon Left Arm" icon_state = "phazon_l_arm" - construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=2;magnets=2" /obj/item/mecha_parts/part/phazon_right_arm name="Phazon Right Arm" icon_state = "phazon_r_arm" - construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=2;magnets=2" /obj/item/mecha_parts/part/phazon_left_leg name="Phazon Left Leg" icon_state = "phazon_l_leg" - construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_right_leg name="Phazon Right Leg" icon_state = "phazon_r_leg" - construction_time = 200 - construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_armor name="Phazon armor" desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties." icon_state = "phazon_armor" - construction_time = 300 - construction_cost = list("metal"=45000,"plasma"=30000) origin_tech = "materials=6;bluespace=5;magnets=5" ///////// Odysseus @@ -349,8 +280,6 @@ /obj/item/mecha_parts/part/odysseus_head name="Odysseus Head" icon_state = "odysseus_head" - construction_time = 100 - construction_cost = list("metal"=6000,"glass"=10000) origin_tech = "programming=3;materials=2" /obj/item/mecha_parts/part/odysseus_torso @@ -358,47 +287,35 @@ desc="A torso part of Odysseus. Contains power unit, processing core and life support systems." icon_state = "odysseus_torso" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" - construction_time = 180 - construction_cost = list("metal"=12000) /obj/item/mecha_parts/part/odysseus_left_arm name="Odysseus Left Arm" desc="An Odysseus left arm. Data and power sockets are compatible with most exosuit tools." icon_state = "odysseus_l_arm" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 120 - construction_cost = list("metal"=6000) /obj/item/mecha_parts/part/odysseus_right_arm name="Odysseus Right Arm" desc="An Odysseus right arm. Data and power sockets are compatible with most exosuit tools." icon_state = "odysseus_r_arm" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 120 - construction_cost = list("metal"=6000) /obj/item/mecha_parts/part/odysseus_left_leg name="Odysseus Left Leg" desc="An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "odysseus_l_leg" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 130 - construction_cost = list("metal"=7000) /obj/item/mecha_parts/part/odysseus_right_leg name="Odysseus Right Leg" desc="A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "odysseus_r_leg" origin_tech = "programming=2;materials=2;engineering=2" - construction_time = 130 - construction_cost = list("metal"=7000) /*/obj/item/mecha_parts/part/odysseus_armour name="Odysseus Carapace" icon_state = "odysseus_armour" - origin_tech = "materials=3;engineering=3" - construction_time = 200 - construction_cost = list("metal"=15000)*/ + origin_tech = "materials=3;engineering=3")*/ ///////// Circuitboards diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 79cbe026503..01a087f959c 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -5,8 +5,6 @@ icon_state = "blank" flags = CONDUCT slot_flags = SLOT_BELT - var/construction_time = 100 - var/list/construction_cost = list("metal"=20000,"glass"=5000) var/list/part = null var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics. var/model_info @@ -30,8 +28,6 @@ name = "left arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "l_arm" - construction_time = 200 - construction_cost = list("metal"=10000) part = list("l_arm","l_hand") model_info = 1 @@ -39,8 +35,6 @@ name = "right arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "r_arm" - construction_time = 200 - construction_cost = list("metal"=10000) part = list("r_arm","r_hand") model_info = 1 @@ -48,8 +42,6 @@ name = "left leg" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "l_leg" - construction_time = 200 - construction_cost = list("metal"=10000) part = list("l_leg","l_foot") model_info = 1 @@ -57,8 +49,6 @@ name = "right leg" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "r_leg" - construction_time = 200 - construction_cost = list("metal"=10000) part = list("r_leg","r_foot") model_info = 1 @@ -67,8 +57,6 @@ desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell." icon_state = "chest" part = list("groin","chest") - construction_time = 350 - construction_cost = list("metal"=40000) var/wires = 0.0 var/obj/item/weapon/stock_parts/cell/cell = null @@ -77,8 +65,6 @@ desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals." icon_state = "head" part = list("head") - construction_time = 350 - construction_cost = list("metal"=5000) var/obj/item/device/flash/flash1 = null var/obj/item/device/flash/flash2 = null @@ -86,8 +72,6 @@ name = "endoskeleton" desc = "A complex metal backbone with standard limb sockets and pseudomuscle anchors." icon_state = "robo_suit" - construction_time = 500 - construction_cost = list("metal"=15000) var/obj/item/robot_parts/l_arm/l_arm = null var/obj/item/robot_parts/r_arm/r_arm = null var/obj/item/robot_parts/l_leg/l_leg = null diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 048d85e5495..a97ee46ea63 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -6,8 +6,6 @@ desc = "Protected by FRM." icon = 'icons/obj/module.dmi' icon_state = "cyborg_upgrade" - var/construction_time = 120 - var/construction_cost = list("metal"=10000) var/locked = 0 var/require_module = 0 var/installed = 0 @@ -50,7 +48,6 @@ name = "robot reclassification board" desc = "Used to rename a cyborg." icon_state = "cyborg_upgrade1" - construction_cost = list("metal"=35000) var/heldname = "default name" /obj/item/borg/upgrade/rename/attack_self(mob/user as mob) @@ -68,7 +65,6 @@ /obj/item/borg/upgrade/restart name = "robot emergency restart module" desc = "Used to force a restart of a disabled-but-repaired robot, bringing it back online." - construction_cost = list("metal"=60000 , "glass"=5000) icon_state = "cyborg_upgrade1" @@ -92,7 +88,6 @@ /obj/item/borg/upgrade/vtec name = "robotic VTEC Module" desc = "Used to kick in a robot's VTEC systems, increasing their speed." - construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 5000) icon_state = "cyborg_upgrade2" require_module = 1 @@ -109,7 +104,6 @@ /obj/item/borg/upgrade/disablercooler name = "robotic Rapid Disabler Cooling Module" desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate." - construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 2000, "diamond" = 500) icon_state = "cyborg_upgrade3" require_module = 1 @@ -144,7 +138,6 @@ /obj/item/borg/upgrade/jetpack name = "mining robot jetpack" desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." - construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000) icon_state = "cyborg_upgrade3" require_module = 1 @@ -211,7 +204,6 @@ /obj/item/borg/upgrade/syndicate/ name = "Illegal Equipment Module" desc = "Unlocks the hidden, deadlier functions of a robot" - construction_cost = list("metal"=10000,"glass"=15000,"diamond" = 10000) icon_state = "cyborg_upgrade3" require_module = 1 diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 0eb8fdfe3de..e60b78df8d0 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -16,8 +16,6 @@ materials = list(MAT_METAL=700, MAT_GLASS=50) var/rigged = 0 // true if rigged to explode var/minor_fault = 0 //If not 100% reliable, it will build up faults. - var/construction_cost = list("metal"=750,"glass"=75) - var/construction_time=100 suicide_act(mob/user) viewers(user) << "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." @@ -65,7 +63,6 @@ maxcharge = 20000 materials = list(MAT_GLASS=70) rating = 4 - construction_cost = list("metal"=750,"glass"=100) /obj/item/weapon/stock_parts/cell/super/empty/New() ..() @@ -78,7 +75,6 @@ maxcharge = 30000 rating = 5 materials = list(MAT_GLASS=80) - construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200) /obj/item/weapon/stock_parts/cell/hyper/empty/New() ..() @@ -91,7 +87,6 @@ maxcharge = 40000 materials = list(MAT_GLASS=80) rating = 6 - construction_cost = list("metal"=800,"gold"=300,"silver"=300,"glass"=160,"diamond"=160) /obj/item/weapon/stock_parts/cell/bluespace/empty/New() ..() diff --git a/code/game/vehicles/spacepods/parts.dm b/code/game/vehicles/spacepods/parts.dm index 19210fc2b9a..1ab02b84654 100644 --- a/code/game/vehicles/spacepods/parts.dm +++ b/code/game/vehicles/spacepods/parts.dm @@ -5,7 +5,6 @@ /obj/item/pod_parts/core name="Space Pod Core" icon_state = "core" - construction_cost = list("iron"=5000,"uranium"=1000,"plasma"=5000) flags = CONDUCT origin_tech = "programming=2;materials=3;bluespace=2;engineering=3" diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 5e6a471834d..d354671f565 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -8,10 +8,6 @@ w_class = 3 origin_tech = "biotech=3" - var/list/construction_cost = list("metal"=1000,"glass"=500) - var/construction_time = 75 - //these vars are so the mecha fabricator doesn't shit itself anymore. --NEO - req_access = list(access_robotics) //Revised. Brainmob is now contained directly within object of transfer. MMI in this case. diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 15e71c98abc..92a2ebcd053 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -6,8 +6,6 @@ w_class = 3 origin_tech = "engineering=4;materials=4;bluespace=2;programming=4" - construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10) - construction_time = 75 var/searching = 0 var/askDelay = 10 * 60 * 1 //var/mob/living/carbon/brain/brainmob = null diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index ae09c2287a8..d0469bc42dc 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -135,8 +135,6 @@ /obj/item/robot_parts/robot_component icon = 'icons/obj/robot_component.dmi' icon_state = "working" - construction_time = 200 - construction_cost = list("metal"=5000) var/brute = 0 var/burn = 0 @@ -190,7 +188,7 @@ user << "Key: Suffocation/Toxin/Burns/Brute" user << "Body Temperature: ???" return - + var/scan_type if(istype(M, /mob/living/silicon/robot)) scan_type = "robot" @@ -253,5 +251,5 @@ user << "[capitalize(O.name)]: [O.damage]" if(!organ_found) user << "No prosthetics located." - + src.add_fingerprint(user)