diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index f8fe430961..62f8cef5dc 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -263,28 +263,28 @@ credit_cost = 10000 // can_be_bought = FALSE -/datum/map_template/shuttle/emergency/arena - suffix = "arena" - name = "The Arena" - description = "The crew must pass through an otherworldy arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle." - admin_notes = "RIP AND TEAR." - credit_cost = 10000 - /// Whether the arena z-level has been created - var/arena_loaded = FALSE +// /datum/map_template/shuttle/emergency/arena +// suffix = "arena" +// name = "The Arena" +// description = "The crew must pass through an otherworldy arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle." +// admin_notes = "RIP AND TEAR." +// credit_cost = 10000 +// /// Whether the arena z-level has been created +// var/arena_loaded = FALSE -/datum/map_template/shuttle/emergency/arena/prerequisites_met() - return SSshuttle.shuttle_purchase_requirements_met["bubblegum"] +// /datum/map_template/shuttle/emergency/arena/prerequisites_met() +// return SSshuttle.shuttle_purchase_requirements_met["bubblegum"] -/datum/map_template/shuttle/emergency/arena/post_load(obj/docking_port/mobile/M) - . = ..() - if(!arena_loaded) - arena_loaded = TRUE - var/datum/map_template/arena/arena_template = new() - arena_template.load_new_z() +// /datum/map_template/shuttle/emergency/arena/post_load(obj/docking_port/mobile/M) +// . = ..() +// if(!arena_loaded) +// arena_loaded = TRUE +// var/datum/map_template/arena/arena_template = new() +// arena_template.load_new_z() -/datum/map_template/arena - name = "The Arena" - mappath = "_maps/templates/the_arena.dmm" +// /datum/map_template/arena +// name = "The Arena" +// mappath = "_maps/templates/the_arena.dmm" /datum/map_template/shuttle/emergency/birdboat suffix = "birdboat" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 6157aa1207..f22ceb6a2d 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -84,6 +84,8 @@ GLOBAL_PROTECT(admin_verbs_admin) /client/proc/respawn_character, /client/proc/admin_cmd_respawn_return_to_lobby, //CIT /client/proc/admin_cmd_remove_ghost_respawn_timer, //CIT + /client/proc/addbunkerbypass, //CIT + /client/proc/revokebunkerbypass, //CIT /datum/admins/proc/open_borgopanel ) GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/DB_ban_panel, /client/proc/stickybanpanel)) @@ -138,8 +140,6 @@ GLOBAL_PROTECT(admin_verbs_server) /client/proc/forcerandomrotate, /client/proc/adminchangemap, /client/proc/panicbunker, - /client/proc/addbunkerbypass, //CIT - /client/proc/revokebunkerbypass, //CIT // /client/proc/toggle_interviews, /client/proc/toggle_hub, /client/proc/toggle_cdn diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 1c1e749ee9..9c3e0ef64a 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -271,12 +271,12 @@ var/pressure = air_contents.return_pressure() if(pressure > 300) to_chat(user, "The pressure gauge on \the [src] indicates a high pressure inside... maybe you want to reconsider?") - message_admins("[src] deconstructed by [ADMIN_LOOKUPFLW(user)]") - log_game("[src] deconstructed by [key_name(user)]") to_chat(user, "You begin cutting \the [src] apart...") if(I.use_tool(src, user, 3 SECONDS, volume=50)) to_chat(user, "You cut \the [src] apart.") deconstruct(TRUE) + message_admins("[src] deconstructed by [ADMIN_LOOKUPFLW(user)]") + log_game("[src] deconstructed by [key_name(user)]") return TRUE diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 140004723b..f97ef17364 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -309,7 +309,7 @@ if(!powered()) toggle_drying(TRUE) -/obj/machinery/smartfridge/drying_rack/load(/obj/item/dried_object) //For updating the filled overlay +/obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay . = ..() update_icon() diff --git a/tgui/packages/tgui/interfaces/Secrets.js b/tgui/packages/tgui/interfaces/Secrets.js index 038757b841..b77bed1af6 100644 --- a/tgui/packages/tgui/interfaces/Secrets.js +++ b/tgui/packages/tgui/interfaces/Secrets.js @@ -131,7 +131,7 @@ const HelpfulTab = (props, context) => { icon="robot" lineHeight={lineHeightNormal} fluid - content="List laws" + content="List law changes" onClick={() => act("list_lawchanges")} />