From d080e02917f7ff782159d2d4718f994198d57638 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 26 Jan 2018 03:47:31 -0600 Subject: [PATCH 1/4] Restricts Supply Console to Quatermaster access Stops the clown from ordering corgis probably. --- code/modules/cargo/console.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index a41106a49d..936c40d151 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -9,6 +9,7 @@ cannot transport live organisms, classified nuclear weaponry or \ homing beacons." var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible." + req_access = list(ACCESS_QM) light_color = "#E2853D"//orange From e4f7f76a4abbc48004440bd71ba16b3dfd4a381d Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 26 Jan 2018 06:53:11 -0600 Subject: [PATCH 2/4] Update console.dm --- code/modules/cargo/console.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index 936c40d151..a3117d1424 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -9,7 +9,7 @@ cannot transport live organisms, classified nuclear weaponry or \ homing beacons." var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible." - req_access = list(ACCESS_QM) + req_access = list(ACCESS_CARGO) light_color = "#E2853D"//orange From 2b29e36cddaffb23574ce77a9b3705da5a6b4b4f Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 26 Jan 2018 09:06:17 -0600 Subject: [PATCH 3/4] Actually fix access issues. --- code/modules/cargo/console.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index a3117d1424..bd5e1cc079 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -19,6 +19,7 @@ icon_screen = "request" circuit = /obj/item/circuitboard/computer/cargo/request requestonly = TRUE + req_access = list() /obj/machinery/computer/cargo/Initialize() . = ..() @@ -34,6 +35,7 @@ emagged = TRUE contraband = TRUE + req_access = list() // This also permamently sets this on the circuit board var/obj/item/circuitboard/computer/cargo/board = circuit @@ -101,6 +103,9 @@ /obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui) if(..()) return + if(!allowed(usr)) + to_chat(usr, "Access denied.") + return if(action != "add" && requestonly) return switch(action) From d1a07c4d3e20febb35f802d0fc74bab454f58520 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 26 Jan 2018 09:28:36 -0600 Subject: [PATCH 4/4] Appeases Bhijn. Booty call requested. --- code/modules/cargo/console.dm | 6 ------ modular_citadel/code/modules/cargo/console.dm | 15 +++++++++++++++ tgstation.dme | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 modular_citadel/code/modules/cargo/console.dm diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index bd5e1cc079..a41106a49d 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -9,7 +9,6 @@ cannot transport live organisms, classified nuclear weaponry or \ homing beacons." var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible." - req_access = list(ACCESS_CARGO) light_color = "#E2853D"//orange @@ -19,7 +18,6 @@ icon_screen = "request" circuit = /obj/item/circuitboard/computer/cargo/request requestonly = TRUE - req_access = list() /obj/machinery/computer/cargo/Initialize() . = ..() @@ -35,7 +33,6 @@ emagged = TRUE contraband = TRUE - req_access = list() // This also permamently sets this on the circuit board var/obj/item/circuitboard/computer/cargo/board = circuit @@ -103,9 +100,6 @@ /obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui) if(..()) return - if(!allowed(usr)) - to_chat(usr, "Access denied.") - return if(action != "add" && requestonly) return switch(action) diff --git a/modular_citadel/code/modules/cargo/console.dm b/modular_citadel/code/modules/cargo/console.dm new file mode 100644 index 0000000000..490f72d1d1 --- /dev/null +++ b/modular_citadel/code/modules/cargo/console.dm @@ -0,0 +1,15 @@ +/obj/machinery/computer/cargo + req_access = list(ACCESS_CARGO) + +/obj/machinery/computer/cargo/request + req_access = list() + +/obj/machinery/computer/cargo/emag_act(mob/user) + req_access = list() + . = ..() + +/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui) + if(!allowed(usr)) + to_chat(usr, "Access denied.") + return + . = ..() \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 8cacdb79b4..cb4e8a3f93 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2507,6 +2507,7 @@ #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm" #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm" #include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm" +#include "modular_citadel\code\modules\cargo\console.dm" #include "modular_citadel\code\modules\client\preferences.dm" #include "modular_citadel\code\modules\client\preferences_savefile.dm" #include "modular_citadel\code\modules\client\loadout\_donator.dm"