diff --git a/code/WorkInProgress/message_server.dm b/code/WorkInProgress/message_server.dm index 015e125b04..452d43a5fe 100644 --- a/code/WorkInProgress/message_server.dm +++ b/code/WorkInProgress/message_server.dm @@ -63,3 +63,27 @@ /obj/machinery/message_server/attack_hand(user as mob) user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays." + + +/obj/machinery/blackbox_recorder + icon = 'stationobjs.dmi' + icon_state = "blackbox" + name = "Blackbox Recorder" + density = 1 + anchored = 1.0 + use_power = 1 + idle_power_usage = 10 + active_power_usage = 100 + var/messages = list() + var/messages_admin = list() + + var/msg_common = list() + var/msg_science = list() + var/msg_command = list() + var/msg_medical = list() + var/msg_engineering = list() + var/msg_security = list() + var/msg_deathsquad = list() + var/msg_syndicate = list() + var/msg_mining = list() + var/msg_cargo = list() \ No newline at end of file diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm index 69befdfd4d..923101347d 100644 --- a/code/game/objects/radio/radio.dm +++ b/code/game/objects/radio/radio.dm @@ -221,6 +221,40 @@ Speaker: [li part_a = "" var/quotedmsg = M.say_quote(message) + + //This following recording is intended for research and feedback in the use of department radio channels. It was added on 30.3.2011 by errorage. + + var/part_blackbox_b = " \[[freq_text]\] " // Tweaked for security headsets -- TLE + var/blackbox_msg = "[part_a][M.name][part_blackbox_b][quotedmsg][part_c]" + //var/blackbox_admin_msg = "[part_a][M.name] (Real name: [M.real_name])[part_blackbox_b][quotedmsg][part_c]" + for (var/obj/machinery/blackbox_recorder/BR in world) + //BR.messages_admin += blackbox_admin_msg + switch(display_freq) + if(1459) + BR.msg_common += blackbox_msg + if(1351) + BR.msg_science += blackbox_msg + if(1353) + BR.msg_command += blackbox_msg + if(1355) + BR.msg_medical += blackbox_msg + if(1357) + BR.msg_engineering += blackbox_msg + if(1359) + BR.msg_security += blackbox_msg + if(1441) + BR.msg_deathsquad += blackbox_msg + if(1213) + BR.msg_syndicate += blackbox_msg + if(1349) + BR.msg_mining += blackbox_msg + if(1347) + BR.msg_cargo += blackbox_msg + else + BR.messages += blackbox_msg + + //End of research and feedback code. + if (length(heard_masked)) var/rendered = "[part_a][M.name][part_b][quotedmsg][part_c]" diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 19ac273631..6ffb732370 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/maps/tgstation.2.0.5.dmm b/maps/tgstation.2.0.5.dmm index 8c312ef059..3e802d2d60 100644 --- a/maps/tgstation.2.0.5.dmm +++ b/maps/tgstation.2.0.5.dmm @@ -1120,7 +1120,7 @@ "avB" = (/obj/table{icon_state = "tabledir"; dir = 2},/obj/item/device/t_scanner,/turf/simulated/floor,/area/storage/primary) "avC" = (/obj/table{icon_state = "tabledir"; dir = 2},/obj/item/device/igniter{pixel_x = -8; pixel_y = -4},/obj/item/device/igniter,/obj/item/weapon/screwdriver{pixel_y = 16},/obj/machinery/camera{c_tag = "Assistant Storage"},/turf/simulated/floor,/area/storage/primary) "avD" = (/obj/table{icon_state = "tabledir"; dir = 2},/obj/item/device/radio/signaler,/obj/item/device/radio/signaler,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/storage/primary) -"avE" = (/obj/table{icon_state = "tabledir"; dir = 2},/obj/item/device/multitool,/obj/machinery/cell_charger,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/storage/primary) +"avE" = (/obj/table{icon_state = "tabledir"; dir = 2},/obj/machinery/cell_charger,/obj/item/device/multitool,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/storage/primary) "avF" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/storage/primary) "avG" = (/obj/machinery/power/apc{dir = 1; name = "Storage APC"; pixel_x = -1; pixel_y = 26},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/storage/primary) "avH" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/requests_console{department = "Assistant Storage"; departmentType = 0; pixel_y = 30},/turf/simulated/floor,/area/storage/primary) @@ -3592,7 +3592,7 @@ "brd" = (/obj/machinery/atmospherics/pipe/simple{dir = 9},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bre" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/crew_quarters/bar) "brf" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Bar Storage"; req_access_txt = "25"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) -"brg" = (/obj/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/maintenance/maintcentral) +"brg" = (/obj/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "brh" = (/obj/machinery/scan_consolenew,/obj/cable{icon_state = "0-2"; d2 = 2},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bri" = (/obj/machinery/scan_consolenew,/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "brj" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Genetics APC"; pixel_x = -25},/obj/item/weapon/book/manual/medical_cloning,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) @@ -4007,7 +4007,7 @@ "bzc" = (/obj/window/reinforced{dir = 8},/obj/table{icon_state = "tabledir"; dir = 10},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) "bzd" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; level = 2},/obj/table{dir = 2; icon_state = "tabledir"},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) "bze" = (/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; on = 1},/turf/simulated/wall/r_wall,/area/toxins/server) -"bzf" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; initialize_directions = 12},/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) +"bzf" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; initialize_directions = 12},/obj/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/blackbox_recorder,/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) "bzg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/camera{c_tag = "Server Room"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "dark"; name = "server floor"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) "bzh" = (/obj/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/message_server,/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server) "bzi" = (/turf/simulated/wall/r_wall,/area/toxins/server)