From 6e3aa81fefd9c5e08c7fdfc296083577a8c7cb3e Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 14 Mar 2014 00:36:41 +0100 Subject: [PATCH 1/6] Optimized atmos control computer. Atmos control computer UI now only sorts actual air alarms, instead of all machines. --- code/WorkInProgress/Mini/atmos_control.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm index 3eed620ee9d..275b038277e 100644 --- a/code/WorkInProgress/Mini/atmos_control.dm +++ b/code/WorkInProgress/Mini/atmos_control.dm @@ -58,7 +58,10 @@ data["alarm"] = "\ref[current]" var/list/alarms=list() - for(var/obj/machinery/alarm/alarm in sortAtom(machines)) + var/list/alarm_list=list() + for(var/obj/machinery/alarm/alarm in machines) + alarm_list+=alarm + for(var/obj/machinery/alarm/alarm in sortAtom(alarm_list)) if(!is_in_filter(alarm.alarm_area.type)) continue // NO ACCESS 4 U From 905d911275b8eafbcebaeface86d1683a9bd25ee Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 19 Mar 2014 00:21:58 -0400 Subject: [PATCH 2/6] Fix Jukebox stopping radio --- code/modules/client/preferences_toggles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 91babc9f7c3..45bf1f8aae5 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -195,7 +195,7 @@ set category = "Preferences" set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)" - prefs.toggles ^= SOUND_STREAMING + prefs.sound ^= SOUND_STREAMING prefs.save_preferences() usr << "You will [(prefs.toggles & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media." // Restart. From c833dd60b4e0599dbafc71c8d2c01e922c972b88 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 19 Mar 2014 00:40:24 -0400 Subject: [PATCH 3/6] Fixed custom item descriptions --- code/modules/customitems/item_spawning.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index e061afc1019..38d59f9c183 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -42,7 +42,7 @@ */ // Grab the info we want. - var/DBQuery/query = dbcon.NewQuery("SELECT cuiPath, cuiPropAdjust, cuiJobMask FROM CustomUserItems WHERE cuiCKey='[M.ckey]' AND (cuiRealName='[M.real_name]' OR cuiRealName='*')") + var/DBQuery/query = dbcon.NewQuery("SELECT cuiPath, cuiPropAdjust, cuiJobMask, cuiDescription FROM CustomUserItems WHERE cuiCKey='[M.ckey]' AND (cuiRealName='[M.real_name]' OR cuiRealName='*')") query.Execute() while(query.NextRow()) @@ -63,6 +63,7 @@ var/obj/item/Item = new path() + var/description = query.item[4] testing("Adding new custom item [query.item[1]] to [key_name_admin(M)]...") if(istype(Item,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/I = Item @@ -94,6 +95,8 @@ testing("Added to [S]!") M << "\blue Your [Item.name] has been added to your [S.name]." break + if(description) + Item.desc = description //skip: if (ok == 0) // Finally, since everything else failed, place it on the ground From b20d5d49d72c0985b4870e64e025cb1ebf895279 Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 20 Mar 2014 16:31:08 +0100 Subject: [PATCH 4/6] Added command alert for mass hallucination event --- code/modules/events/tgevents/mass_hallucination.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/events/tgevents/mass_hallucination.dm b/code/modules/events/tgevents/mass_hallucination.dm index 357cd6fcdc4..79dc8b13ce2 100644 --- a/code/modules/events/tgevents/mass_hallucination.dm +++ b/code/modules/events/tgevents/mass_hallucination.dm @@ -1,3 +1,5 @@ /datum/event/mass_hallucination/start() for(var/mob/living/carbon/C in living_mob_list) C.hallucination += rand(20, 50) +/datum/event/mass_hallucination/announce() + command_alert("It seems that [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage") \ No newline at end of file From 167a7f3546316592e2b8a715558fcc45be6f679f Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 20 Mar 2014 16:35:51 +0100 Subject: [PATCH 5/6] Revert "Added command alert for mass hallucination event" This reverts commit b20d5d49d72c0985b4870e64e025cb1ebf895279. --- code/modules/events/tgevents/mass_hallucination.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/events/tgevents/mass_hallucination.dm b/code/modules/events/tgevents/mass_hallucination.dm index 79dc8b13ce2..357cd6fcdc4 100644 --- a/code/modules/events/tgevents/mass_hallucination.dm +++ b/code/modules/events/tgevents/mass_hallucination.dm @@ -1,5 +1,3 @@ /datum/event/mass_hallucination/start() for(var/mob/living/carbon/C in living_mob_list) C.hallucination += rand(20, 50) -/datum/event/mass_hallucination/announce() - command_alert("It seems that [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage") \ No newline at end of file From f3b2f7d8f5f128a5166ce4084f8477be91f60a5b Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 20 Mar 2014 16:38:02 +0100 Subject: [PATCH 6/6] Added command alert for mass hallucination event --- code/modules/events/tgevents/mass_hallucination.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/events/tgevents/mass_hallucination.dm b/code/modules/events/tgevents/mass_hallucination.dm index 357cd6fcdc4..7d05822c46f 100644 --- a/code/modules/events/tgevents/mass_hallucination.dm +++ b/code/modules/events/tgevents/mass_hallucination.dm @@ -1,3 +1,5 @@ /datum/event/mass_hallucination/start() for(var/mob/living/carbon/C in living_mob_list) C.hallucination += rand(20, 50) +/datum/event/mass_hallucination/announce() + command_alert("It seems that station "[station_name()]" is passing through a minor radiation field, this may cause some hallucination, but no further damage") \ No newline at end of file