From bb2e8a2773bb14a08bcc05a7650abec8bf66f48c Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sun, 26 Feb 2012 22:10:37 +0000 Subject: [PATCH] A more long-term fix for the exosuit fabricator. Derped around with a few paths. Removed stupid debug messages from the TCS interpreter. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3201 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/mecha/equipment/tools/tools.dm | 2 +- code/game/mecha/mech_fabricator.dm | 8 ++++-- code/game/mecha/mecha.dm | 4 +-- code/game/mecha/mecha_control_console.dm | 28 +++++++++---------- code/game/mecha/medical/medical.dm | 2 +- code/game/mecha/working/working.dm | 2 +- .../scripting/Implementations/Telecomms.dm | 8 ------ 7 files changed, 24 insertions(+), 30 deletions(-) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index ec3a478cf8..6655dbdd2e 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -526,7 +526,7 @@ proc/dynhitby(atom/movable/A) if(!action_checks(A)) return chassis.dynhitby(A) - if(prob(chassis.deflect_chance*deflect_coeff) || istype(A, /mob/living) || istype(A, /obj/item/mecha_tracking)) + if(prob(chassis.deflect_chance*deflect_coeff) || istype(A, /mob/living) || istype(A, /obj/item/mecha_parts/mecha_tracking)) chassis.occupant_message("\blue The [A] bounces off the armor.") chassis.visible_message("The [A] bounces off the [chassis] armor") chassis.log_append_to_last("Armor saved.") diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index e359d9532a..80ea9a50cc 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -111,7 +111,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/honker ), - "Misc"=list(/obj/item/mecha_tracking) + "Misc"=list(/obj/item/mecha_parts/mecha_tracking) ) New() ..() @@ -288,14 +288,14 @@ return output proc/remove_resources(var/obj/item/mecha_parts/part) - if(istype(part, /obj/item)) + if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts)) for(var/resource in part.construction_cost) if(resource in src.resources) src.resources[resource] -= get_resource_cost_w_coeff(part,resource) return proc/check_resources(var/obj/item/mecha_parts/part) - if(istype(part, /obj/item)) + if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts)) for(var/resource in part.construction_cost) if(resource in src.resources) if(src.resources[resource] < get_resource_cost_w_coeff(part,resource)) @@ -655,3 +655,5 @@ return result + + diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 981aa187f9..3db104bc11 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -491,7 +491,7 @@ return /obj/mecha/proc/dynhitby(atom/movable/A) - if(istype(A, /obj/item/mecha_tracking)) + if(istype(A, /obj/item/mecha_parts/mecha_tracking)) A.forceMove(src) src.visible_message("The [A] fastens firmly to [src].") return @@ -756,7 +756,7 @@ user << "The [src.name] is at full integrity" return - else if(istype(W, /obj/item/mecha_tracking)) + else if(istype(W, /obj/item/mecha_parts/mecha_tracking)) user.drop_from_slot(W) W.forceMove(src) user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index a83a648dbc..d95f2b2d98 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -21,7 +21,7 @@ var/dat = "[src.name]" if(screen == 0) dat += "

Tracking beacons data

" - for(var/obj/item/mecha_tracking/TR in world) + for(var/obj/item/mecha_parts/mecha_tracking/TR in world) var/answer = TR.get_mecha_info() if(answer) dat += {"
[answer]
@@ -45,17 +45,17 @@ return var/datum/topic_input/filter = new /datum/topic_input(href,href_list) if(href_list["send_message"]) - var/obj/item/mecha_tracking/MT = filter.getObj("send_message") + var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message") var/message = strip_html_simple(input(usr,"Input message","Transmit message") as text) var/obj/mecha/M = MT.in_mecha() if(trim(message) && M) M.occupant_message(message) return if(href_list["shock"]) - var/obj/item/mecha_tracking/MT = filter.getObj("shock") + var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock") MT.shock() if(href_list["get_log"]) - var/obj/item/mecha_tracking/MT = filter.getObj("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"]) @@ -65,14 +65,14 @@ -/obj/item/mecha_tracking +/obj/item/mecha_parts/mecha_tracking name = "Exosuit tracking beacon" desc = "Device used to transmit exosuit data." icon = 'device.dmi' icon_state = "motion2" origin_tech = "programming=2;magnets=2" - var/construction_time = 50 - var/list/construction_cost = list("metal"=500) + construction_time = 50 + construction_cost = list("metal"=500) proc/get_mecha_info() if(!in_mecha()) @@ -121,12 +121,12 @@ /obj/item/weapon/storage/mechatrackingbox New() - new /obj/item/mecha_tracking(src) - new /obj/item/mecha_tracking(src) - new /obj/item/mecha_tracking(src) - new /obj/item/mecha_tracking(src) - new /obj/item/mecha_tracking(src) - new /obj/item/mecha_tracking(src) - new /obj/item/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) ..() return diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm index 851c613f8a..d9b203bec7 100644 --- a/code/game/mecha/medical/medical.dm +++ b/code/game/mecha/medical/medical.dm @@ -1,6 +1,6 @@ /obj/mecha/medical/New() ..() - new /obj/item/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) return diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index 3a4fa3231b..7a59b6190e 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -3,7 +3,7 @@ /obj/mecha/working/New() ..() - new /obj/item/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) return /* diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index fac5a52f29..4ff6c19ac8 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -175,14 +175,6 @@ signal.data["job"] = html_encode(interpreter.GetVar("$job")) signal.data["reject"] = !(interpreter.GetVar("$pass")) // set reject to the opposite of $pass - world << "message: [interpreter.GetVar("$content")]" - world << "freq: [interpreter.GetVar("$freq")]" - world << "name: [setname]" - world << "job: [interpreter.GetVar("$job")]" - world << "pass: [interpreter.GetVar("$pass")]" - - - /* -- Actual language proc code -- */ datum/signal