cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

A more long-term fix for the exosuit fabricator. Derped around with a few paths.

Browse Source 
Removed stupid debug messages from the TCS interpreter.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3201 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2012-02-26 22:10:37 +00:00
parent bc34998fc4
commit bb2e8a2773
7 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/mecha/equipment/tools/tools.dm
View File

@@ -526,7 +526,7 @@
proc/dynhitby(atom/movable/A) proc/dynhitby(atom/movable/A)
if(!action_checks(A)) if(!action_checks(A))
return chassis.dynhitby(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.occupant_message("\blue The [A] bounces off the armor.")
chassis.visible_message("The [A] bounces off the [chassis] armor") chassis.visible_message("The [A] bounces off the [chassis] armor")
chassis.log_append_to_last("Armor saved.") chassis.log_append_to_last("Armor saved.")

8
code/game/mecha/mech_fabricator.dm
View File

@@ -111,7 +111,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/honker /obj/item/mecha_parts/mecha_equipment/weapon/honker
), ),
"Misc"=list(/obj/item/mecha_tracking) "Misc"=list(/obj/item/mecha_parts/mecha_tracking)
) )
New() New()
..() ..()
@@ -288,14 +288,14 @@
return output return output
proc/remove_resources(var/obj/item/mecha_parts/part) 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) for(var/resource in part.construction_cost)
if(resource in src.resources) if(resource in src.resources)
src.resources[resource] -= get_resource_cost_w_coeff(part,resource) src.resources[resource] -= get_resource_cost_w_coeff(part,resource)
return return
proc/check_resources(var/obj/item/mecha_parts/part) 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) for(var/resource in part.construction_cost)
if(resource in src.resources) if(resource in src.resources)
if(src.resources[resource] < get_resource_cost_w_coeff(part,resource)) if(src.resources[resource] < get_resource_cost_w_coeff(part,resource))
@@ -655,3 +655,5 @@
return result return result

4
code/game/mecha/mecha.dm
View File

@@ -491,7 +491,7 @@
return return
/obj/mecha/proc/dynhitby(atom/movable/A) /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) A.forceMove(src)
src.visible_message("The [A] fastens firmly to [src].") src.visible_message("The [A] fastens firmly to [src].")
return return
@@ -756,7 +756,7 @@
user << "The [src.name] is at full integrity" user << "The [src.name] is at full integrity"
return return
else if(istype(W, /obj/item/mecha_tracking)) else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
user.drop_from_slot(W) user.drop_from_slot(W)
W.forceMove(src) W.forceMove(src)
user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]")

28
code/game/mecha/mecha_control_console.dm
View File

@@ -21,7 +21,7 @@
var/dat = "<html><head><title>[src.name]</title><style>h3 {margin: 0px; padding: 0px;}</style></head><body>" var/dat = "<html><head><title>[src.name]</title><style>h3 {margin: 0px; padding: 0px;}</style></head><body>"
if(screen == 0) if(screen == 0)
dat += "<h3>Tracking beacons data</h3>" dat += "<h3>Tracking beacons data</h3>"
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() var/answer = TR.get_mecha_info()
if(answer) if(answer)
dat += {"<hr>[answer]<br/> dat += {"<hr>[answer]<br/>
@@ -45,17 +45,17 @@
return return
var/datum/topic_input/filter = new /datum/topic_input(href,href_list) var/datum/topic_input/filter = new /datum/topic_input(href,href_list)
if(href_list["send_message"]) 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/message = strip_html_simple(input(usr,"Input message","Transmit message") as text)
var/obj/mecha/M = MT.in_mecha() var/obj/mecha/M = MT.in_mecha()
if(trim(message) && M) if(trim(message) && M)
M.occupant_message(message) M.occupant_message(message)
return return
if(href_list["shock"]) 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() MT.shock()
if(href_list["get_log"]) 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() stored_data = MT.get_mecha_log()
screen = 1 screen = 1
if(href_list["return"]) if(href_list["return"])
@@ -65,14 +65,14 @@
/obj/item/mecha_tracking /obj/item/mecha_parts/mecha_tracking
name = "Exosuit tracking beacon" name = "Exosuit tracking beacon"
desc = "Device used to transmit exosuit data." desc = "Device used to transmit exosuit data."
icon = 'device.dmi' icon = 'device.dmi'
icon_state = "motion2" icon_state = "motion2"
origin_tech = "programming=2;magnets=2" origin_tech = "programming=2;magnets=2"
var/construction_time = 50 construction_time = 50
var/list/construction_cost = list("metal"=500) construction_cost = list("metal"=500)
proc/get_mecha_info() proc/get_mecha_info()
if(!in_mecha()) if(!in_mecha())
@@ -121,12 +121,12 @@
/obj/item/weapon/storage/mechatrackingbox /obj/item/weapon/storage/mechatrackingbox
New() New()
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
..() ..()
return return

2
code/game/mecha/medical/medical.dm
View File

@@ -1,6 +1,6 @@
/obj/mecha/medical/New() /obj/mecha/medical/New()
..() ..()
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
return return

2
code/game/mecha/working/working.dm
View File

@@ -3,7 +3,7 @@
/obj/mecha/working/New() /obj/mecha/working/New()
..() ..()
new /obj/item/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src)
return return
/* /*

8
code/modules/scripting/Implementations/Telecomms.dm
View File

@@ -175,14 +175,6 @@
signal.data["job"] = html_encode(interpreter.GetVar("$job")) signal.data["job"] = html_encode(interpreter.GetVar("$job"))
signal.data["reject"] = !(interpreter.GetVar("$pass")) // set reject to the opposite of $pass 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 -- */ /* -- Actual language proc code -- */
datum/signal datum/signal