From a54a7912cbdbd86b66b040c62c2a85d9e07c5436 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 20 Feb 2020 23:25:45 -0800 Subject: [PATCH] Merge pull request #6714 from Heroman3003/verbrename Renames Make All Areas (Un)Powered secret --- .../admin/secrets/fun_secrets/make_all_areas_powered.dm | 7 ------- .../admin/secrets/fun_secrets/make_all_areas_unpowered.dm | 7 ------- .../admin/secrets/fun_secrets/power_failure_begin.dm | 7 +++++++ .../modules/admin/secrets/fun_secrets/power_failure_end.dm | 7 +++++++ vorestation.dme | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 code/modules/admin/secrets/fun_secrets/make_all_areas_powered.dm delete mode 100644 code/modules/admin/secrets/fun_secrets/make_all_areas_unpowered.dm create mode 100644 code/modules/admin/secrets/fun_secrets/power_failure_begin.dm create mode 100644 code/modules/admin/secrets/fun_secrets/power_failure_end.dm diff --git a/code/modules/admin/secrets/fun_secrets/make_all_areas_powered.dm b/code/modules/admin/secrets/fun_secrets/make_all_areas_powered.dm deleted file mode 100644 index 3309190028..0000000000 --- a/code/modules/admin/secrets/fun_secrets/make_all_areas_powered.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/admin_secret_item/fun_secret/make_all_areas_powered - name = "Make All Areas Powered" - -/datum/admin_secret_item/fun_secret/make_all_areas_powered/execute(var/mob/user) - . = ..() - if(.) - power_restore() diff --git a/code/modules/admin/secrets/fun_secrets/make_all_areas_unpowered.dm b/code/modules/admin/secrets/fun_secrets/make_all_areas_unpowered.dm deleted file mode 100644 index a840006a23..0000000000 --- a/code/modules/admin/secrets/fun_secrets/make_all_areas_unpowered.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/admin_secret_item/fun_secret/make_all_areas_unpowered - name = "Make All Areas Unpowered" - -/datum/admin_secret_item/fun_secret/make_all_areas_unpowered/execute(var/mob/user) - . = ..() - if(.) - power_failure() diff --git a/code/modules/admin/secrets/fun_secrets/power_failure_begin.dm b/code/modules/admin/secrets/fun_secrets/power_failure_begin.dm new file mode 100644 index 0000000000..a5d424bcbe --- /dev/null +++ b/code/modules/admin/secrets/fun_secrets/power_failure_begin.dm @@ -0,0 +1,7 @@ +/datum/admin_secret_item/fun_secret/power_failure_begin + name = "Power Failure Begin" + +/datum/admin_secret_item/fun_secret/power_failure_begin/execute(var/mob/user) + . = ..() + if(.) + power_failure() diff --git a/code/modules/admin/secrets/fun_secrets/power_failure_end.dm b/code/modules/admin/secrets/fun_secrets/power_failure_end.dm new file mode 100644 index 0000000000..1830928e42 --- /dev/null +++ b/code/modules/admin/secrets/fun_secrets/power_failure_end.dm @@ -0,0 +1,7 @@ +/datum/admin_secret_item/fun_secret/power_failure_end + name = "Power Failure End" + +/datum/admin_secret_item/fun_secret/power_failure_end/execute(var/mob/user) + . = ..() + if(.) + power_restore() diff --git a/vorestation.dme b/vorestation.dme index 6f54a1715a..06497c5ca3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1483,11 +1483,11 @@ #include "code\modules\admin\secrets\fun_secrets\break_some_lights.dm" #include "code\modules\admin\secrets\fun_secrets\fix_all_lights.dm" #include "code\modules\admin\secrets\fun_secrets\ghost_mode.dm" -#include "code\modules\admin\secrets\fun_secrets\make_all_areas_powered.dm" -#include "code\modules\admin\secrets\fun_secrets\make_all_areas_unpowered.dm" #include "code\modules\admin\secrets\fun_secrets\only_one.dm" #include "code\modules\admin\secrets\fun_secrets\paintball_mode.dm" #include "code\modules\admin\secrets\fun_secrets\power_all_smes.dm" +#include "code\modules\admin\secrets\fun_secrets\power_failure_begin.dm" +#include "code\modules\admin\secrets\fun_secrets\power_failure_end.dm" #include "code\modules\admin\secrets\fun_secrets\remove_all_clothing.dm" #include "code\modules\admin\secrets\fun_secrets\remove_internal_clothing.dm" #include "code\modules\admin\secrets\fun_secrets\send_strike_team.dm"