From 578a020c8bb4d7c07ff385abb8fc58bbb7aa7947 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 30 Jul 2013 12:15:12 +0300 Subject: [PATCH 1/7] Fix for #3392. --- code/defines/obj.dm | 12 ++++++++++-- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 661f4c43b3..a4ef521d9d 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -51,7 +51,7 @@ //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). var/locked[] = list() - proc/get_manifest(monochrome) + proc/get_manifest(monochrome, OOC) var/list/heads = new() var/list/sec = new() var/list/eng = new() @@ -80,7 +80,15 @@ var/name = t.fields["name"] var/rank = t.fields["rank"] var/real_rank = t.fields["real_rank"] - isactive[name] = t.fields["p_stat"] + if(OOC) + var/active = 0 + for(var/mob/M in player_list) + if(M.real_name == name && M.client && M.client.inactivity <= 10 * 60 * 10) + active = 1 + break + isactive[name] = active ? "Active" : "Inactive" + else + isactive[name] = t.fields["p_stat"] //world << "[name]: [rank]" diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 48704fd821..2e8c5c3521 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -407,7 +407,7 @@ proc/ViewManifest() var/dat = "" dat += "

Crew Manifest

" - dat += data_core.get_manifest() + dat += data_core.get_manifest(OOC = 1) src << browse(dat, "window=manifest;size=370x420;can_close=1") From 24bc26fd13ece9dea97444960ba6be24a09a94cf Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 30 Jul 2013 19:13:42 +0300 Subject: [PATCH 2/7] Fix for table/computer cross-detection. --- code/game/machinery/OpTable.dm | 1 + code/game/machinery/computer/Operating.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 69519c585d..7078d9df90 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -18,6 +18,7 @@ for(dir in list(NORTH,EAST,SOUTH,WEST)) computer = locate(/obj/machinery/computer/operating, get_step(src, dir)) if (computer) + computer.table = src break // spawn(100) //Wont the MC just call this process() before and at the 10 second mark anyway? // process() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 2022dc79da..36d4c6ea70 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -13,7 +13,8 @@ ..() for(dir in list(NORTH,EAST,SOUTH,WEST)) table = locate(/obj/machinery/optable, get_step(src, dir)) - if (!isnull(table)) + if (table) + table.computer = src break /obj/machinery/computer/operating/attack_ai(mob/user) From 9bbf43407f4ea94b5240d0775ef182620d849d38 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 30 Jul 2013 20:06:37 +0100 Subject: [PATCH 3/7] Fixes Gravitational Catapult not detaching. --- code/game/mecha/equipment/tools/tools.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 9ff9c68a5c..c877084339 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -484,6 +484,7 @@ return "[..()] [mode==1?"([locked||"Nothing"])":null] \[S|P\]" Topic(href, href_list) + ..() if(href_list["mode"]) mode = text2num(href_list["mode"]) send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) From d591c1ef75f786ce3aeafc03c02e95c6a8905db1 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 30 Jul 2013 20:26:08 +0100 Subject: [PATCH 4/7] Hotfix for EFTPOS and ATM machines not connecting to databases. --- code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm | 2 +- code/WorkInProgress/Mini/ATM.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm b/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm index f3160a3f8a..7a00499be4 100644 --- a/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm +++ b/code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm @@ -70,7 +70,7 @@ D.name = "small parcel - 'EFTPOS access code'" /obj/item/device/eftpos/proc/reconnect_database() - for(var/obj/machinery/account_database/DB in machines) + for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines' if(DB.z == src.z) linked_db = DB break diff --git a/code/WorkInProgress/Mini/ATM.dm b/code/WorkInProgress/Mini/ATM.dm index a7c0544591..97b056a2ca 100644 --- a/code/WorkInProgress/Mini/ATM.dm +++ b/code/WorkInProgress/Mini/ATM.dm @@ -70,7 +70,7 @@ log transactions break /obj/machinery/atm/proc/reconnect_database() - for(var/obj/machinery/account_database/DB in machines) + for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines' if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated ) linked_db = DB break From 02f7e34f66fe1250d7a252b1bfab7edaec43364d Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 30 Jul 2013 20:43:02 +0100 Subject: [PATCH 5/7] Changelog. --- html/changelog.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index 83de3037b7..9071ddb549 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,14 @@ 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 though. Thanks. --> +
+

July 30th, 2013

+

Erthilo updated:

+
    +
  • EFTPOS and ATM machines should now connect to databases.
    • +
  • Gravitational Catapults can now be removed from mechs.
    • +
+

03.07.2013

Segrain updated:

From 89ffc921686fff0b7f639a74ac6a54811e307d10 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 30 Jul 2013 22:36:42 +0100 Subject: [PATCH 6/7] Fixes text errors in ghost manifest runes and newscasters with apostrophes. --- code/game/gamemodes/cult/runes.dm | 2 +- code/game/machinery/newscaster.dm | 2 +- html/changelog.html | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 9366cd0052..e73cfeb942 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -389,7 +389,7 @@ var/list/sacrificed = list() var/chose_name = 0 for(var/obj/item/weapon/paper/P in this_rune.loc) if(P.info) - D.real_name = copytext(P.info, 1, MAX_NAME_LEN) + D.real_name = copytext(P.info, findtext(P.info,">")+1, findtext(P.info,"<",2) ) chose_name = 1 break if(!chose_name) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index b199c79c20..af52a4e756 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -435,7 +435,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.set_machine(src) if(href_list["set_channel_name"]) - src.channel_name = strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) + src.channel_name = sanitizeSQL(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", ""))) while (findtext(src.channel_name," ") == 1) src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) src.updateUsrDialog() diff --git a/html/changelog.html b/html/changelog.html index 9071ddb549..f30f115d4d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -63,6 +63,8 @@ should be listed in the changelog upon commit though. Thanks. -->
  • EFTPOS and ATM machines should now connect to databases.
  • Gravitational Catapults can now be removed from mechs.
    • +
  • Ghost manifest rune paper naming now works correctly.
    • +
  • Fix for newscaster special characters. Still not recommended.
From 80212508044b1e35a1096183529766e6153d6892 Mon Sep 17 00:00:00 2001 From: Segrain Date: Wed, 31 Jul 2013 10:32:19 +0300 Subject: [PATCH 7/7] Type mismatch fix. --- code/game/response_team.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 400ad63c7e..e342615122 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -260,7 +260,7 @@ proc/trigger_armed_response_team(var/force = 0) //Adding Camera Network var/obj/machinery/camera/camera = new /obj/machinery/camera(src) //Gives all the commandos internals cameras. - camera.network = "CREED" + camera.network = list("CREED") camera.c_tag = real_name