From b41e92dc01b54ce5e631d8e5b7a27482e350634c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 27 Jun 2013 07:01:42 -0700 Subject: [PATCH 1/2] Fixes #2870 --- code/game/machinery/recharger.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index d50cc775ca..094d3af123 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -127,4 +127,10 @@ obj/machinery/recharger/wallcharger/process() icon_state = "wrecharger1" use_power(150) else - icon_state = "wrecharger2" \ No newline at end of file + icon_state = "wrecharger2" + +obj/machinery/recharger/wallcharger/update_icon() + if(charging) + icon_state = "wrecharger1" + else + icon_state = "wrecharger0" \ No newline at end of file From 6d46297757b887b7c07ef3c86850563c1ad842d8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 27 Jun 2013 07:17:55 -0700 Subject: [PATCH 2/2] Fixes #2947 --- code/modules/admin/topic.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 292327ca27..5e7a2493bd 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1690,6 +1690,12 @@ log_admin("[key_name(usr)] toggled gravity off.", 1) message_admins("\blue [key_name_admin(usr)] toggled gravity off.", 1) command_alert("Feedback surge detected in mass-distributions systems. Artifical gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.") + if("wave") + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","Meteor") + log_admin("[key_name(usr)] spawned a meteor wave", 1) + message_admins("\blue [key_name_admin(usr)] spawned a meteor wave.", 1) + new /datum/event/meteor_wave if("power") feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","P")