Skip to content

Commit

Permalink
Adds new UI for secure stuff (#8117)
Browse files Browse the repository at this point in the history
* Adds new UI for secure stuff

* Updoot bundle
  • Loading branch information
Shadow-Quill committed Jun 6, 2021
1 parent c331cd5 commit 7add1a7
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 93 deletions.
181 changes: 91 additions & 90 deletions code/game/objects/items/weapons/storage/secure.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,80 +28,84 @@
max_storage_space = ITEMSIZE_SMALL * 7
use_sound = 'sound/items/storage/briefcase.ogg'

examine(mob/user)
. = ..()
if(Adjacent(user))
. += "The service panel is [src.open ? "open" : "closed"]."

attackby(obj/item/weapon/W as obj, mob/user as mob)
if(locked)
if (istype(W, /obj/item/weapon/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]"))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src.loc)
spark_system.start()
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, "sparks", 50, 1)
return

if (W.is_screwdriver())
if (do_after(user, 20 * W.toolspeed))
src.open =! src.open
playsound(src, W.usesound, 50, 1)
user.show_message(text("<span class='notice'>You [] the service panel.</span>", (src.open ? "open" : "close")))
return
if (istype(W, /obj/item/device/multitool) && (src.open == 1)&& (!src.l_hacking))
user.show_message("<span class='notice'>Now attempting to reset internal memory, please hold.</span>", 1)
src.l_hacking = 1
if (do_after(usr, 100))
if (prob(40))
src.l_setshort = 1
src.l_set = 0
user.show_message("<span class='notice'>Internal memory reset. Please give it a few seconds to reinitialize.</span>", 1)
sleep(80)
src.l_setshort = 0
src.l_hacking = 0
else
user.show_message("<span class='warning'>Unable to reset internal memory.</span>", 1)
src.l_hacking = 0
else src.l_hacking = 0
return
//At this point you have exhausted all the special things to do when locked
// ... but it's still locked.
/obj/item/weapon/storage/secure/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "The service panel is [src.open ? "open" : "closed"]."

/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(locked)
if (istype(W, /obj/item/weapon/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]"))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src.loc)
spark_system.start()
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, "sparks", 50, 1)
return

// -> storage/attackby() what with handle insertion, etc
..()


MouseDrop(over_object, src_location, over_location)
if (locked)
src.add_fingerprint(usr)
if (W.is_screwdriver())
if (do_after(user, 20 * W.toolspeed))
src.open =! src.open
playsound(src, W.usesound, 50, 1)
user.show_message(text("<span class='notice'>You [] the service panel.</span>", (src.open ? "open" : "close")))
return
..()
if (istype(W, /obj/item/device/multitool) && (src.open == 1)&& (!src.l_hacking))
user.show_message("<span class='notice'>Now attempting to reset internal memory, please hold.</span>", 1)
src.l_hacking = 1
if (do_after(usr, 100))
if (prob(40))
src.l_setshort = 1
src.l_set = 0
src.code = ""
user.show_message("<span class='notice'>Internal memory reset. Please give it a few seconds to reinitialize.</span>", 1)
sleep(80)
src.l_setshort = 0
src.l_hacking = 0
else
user.show_message("<span class='warning'>Unable to reset internal memory.</span>", 1)
src.l_hacking = 0
else src.l_hacking = 0
return
//At this point you have exhausted all the special things to do when locked
// ... but it's still locked.
return

// -> storage/attackby() what with handle insertion, etc
..()

attack_self(mob/user as mob)
user.set_machine(src)
var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
var/message = "Code"
if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
if (src.emagged)
dat += text("<p>\n<font color=red><b>LOCKING SYSTEM ERROR - 1701</b></font>")
if (src.l_setshort)
dat += text("<p>\n<font color=red><b>ALERT: MEMORY SYSTEM ERROR - 6040 201</b></font>")
message = text("[]", src.code)
if (!src.locked)
message = "*****"
dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
user << browse(dat, "window=caselock;size=300x280")

Topic(href, href_list)
..()
if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
return
if (href_list["type"])
if (href_list["type"] == "E")

/obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location)
if (locked)
src.add_fingerprint(usr)
return
..()


/obj/item/weapon/storage/secure/attack_self(mob/user as mob)
tgui_interact(user)

/obj/item/weapon/storage/secure/tgui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "SecureSafe", name)
ui.open()

/obj/item/weapon/storage/secure/tgui_data(mob/user)
var/list/data = list()
data["locked"] = locked
data["code"] = code
data["emagged"] = emagged
data["l_setshort"] = l_setshort
data["l_set"] = l_set
return data

/obj/item/weapon/storage/secure/tgui_act(action, params)
if(..())
return TRUE
switch (action)
if("type")
var/digit = params["digit"]
if(digit == "E")
if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
src.l_code = src.code
src.l_set = 1
Expand All @@ -113,21 +117,18 @@
else
src.code = "ERROR"
else
if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
if ((digit == "R") && (src.emagged == 0) && (!src.l_setshort))
src.locked = 1
src.overlays = null
src.code = null
src.close(usr)
else
src.code += text("[]", href_list["type"])
src.code += text("[]", digit)
if (length(src.code) > 5)
src.code = "ERROR"
src.add_fingerprint(usr)
for(var/mob/M in viewers(1, src.loc))
if ((M.client && M.machine == src))
src.attack_self(M)
return
return
src.add_fingerprint(usr)
. = TRUE
return

/obj/item/weapon/storage/secure/emag_act(var/remaining_charges, var/mob/user, var/feedback)
if(!emagged)
Expand Down Expand Up @@ -156,18 +157,18 @@
w_class = ITEMSIZE_LARGE
max_storage_space = ITEMSIZE_COST_NORMAL * 4

attack_hand(mob/user as mob)
if ((src.loc == user) && (src.locked == 1))
to_chat(user, "<span class='warning'>[src] is locked and cannot be opened!</span>")
else if ((src.loc == user) && (!src.locked))
src.open(usr)
else
..()
for(var/mob/M in range(1))
if (M.s_active == src)
src.close(M)
src.add_fingerprint(user)
return
/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user as mob)
if ((src.loc == user) && (src.locked == 1))
to_chat(user, "<span class='warning'>[src] is locked and cannot be opened!</span>")
else if ((src.loc == user) && (!src.locked))
src.open(usr)
else
..()
for(var/mob/M in range(1))
if (M.s_active == src)
src.close(M)
src.add_fingerprint(user)
return

// -----------------------------
// Secure Safe
Expand All @@ -194,4 +195,4 @@
)

/obj/item/weapon/storage/secure/safe/attack_hand(mob/user as mob)
return attack_self(user)
tgui_interact(user)
106 changes: 106 additions & 0 deletions tgui/packages/tgui/interfaces/SecureSafe.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import { useBackend } from '../backend';
import { Box, Button, Flex, Grid, NoticeBox, Section } from '../components';
import { Window } from '../layouts';

const NukeKeypad = (props, context) => {
const { act, data } = useBackend(context);
const keypadKeys = [
['1', '4', '7', 'R'],
['2', '5', '8', '0'],
['3', '6', '9', 'E'],
];
const {
locked,
l_setshort,
code,
emagged,
} = data;
return (
<Box width="185px">
<Grid width="1px">
{keypadKeys.map(keyColumn => (
<Grid.Column key={keyColumn[0]}>
{keyColumn.map(key => (
<Button
fluid
bold
key={key}
mb="6px"
content={key}
textAlign="center"
fontSize="40px"
height="50px"
lineHeight={1.25}
disabled={!!emagged || !!l_setshort && (1)
|| key!=="R" && (!locked) || code==="ERROR" && key!=="R" && (1)}
onClick={() => act('type', { digit: key })} />
))}
</Grid.Column>
))}
</Grid>
</Box>
);
};

export const SecureSafe = (props, context) => {
const { act, data } = useBackend(context);
const {
code,
l_setshort,
l_set,
emagged,
locked,
} = data;

let new_code = !(!!l_set || !!l_setshort);

return (
<Window
width={250}
height={380}>
<Window.Content>
<Box m="6px">
{new_code && (
<NoticeBox
textAlign="center"
info={1}>
ENTER NEW 5-DIGIT PASSCODE.
</NoticeBox>
)}
{!!emagged && (
<NoticeBox
textAlign="center"
danger={1}>
LOCKING SYSTEM ERROR - 1701
</NoticeBox>
)}
{!!l_setshort && (
<NoticeBox
textAlign="center"
danger={1}>
ALERT: MEMORY SYSTEM ERROR - 6040 201
</NoticeBox>
)}
<Section
height="60px">
<Box
textAlign="center"
position="center"
fontSize="35px">
{code && (code) || (
<Box textColor={locked ? "red" : "green"}>
{locked ? "LOCKED" : "UNLOCKED"}
</Box>)}
</Box>
</Section>
<Flex ml="3px">
<Flex.Item>
<NukeKeypad />
</Flex.Item>
<Flex.Item ml="6px" width="129px" />
</Flex>
</Box>
</Window.Content>
</Window>
);
};
6 changes: 3 additions & 3 deletions tgui/packages/tgui/public/tgui.bundle.js

Large diffs are not rendered by default.

0 comments on commit 7add1a7

Please sign in to comment.