[MIRROR] Adds new UI for secure stuff

code/game/objects/items/weapons/storage/secure.dm

@@ -28,12 +28,12 @@
 	max_storage_space = ITEMSIZE_SMALL * 7
 	use_sound = 'sound/items/storage/briefcase.ogg'
 
-	examine(mob/user)
+/obj/item/weapon/storage/secure/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)
+/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()
@@ -56,6 +56,7 @@
 				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
@@ -73,35 +74,38 @@
 	..()
 
 
-	MouseDrop(over_object, src_location, over_location)
+/obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location)
 	if (locked)
 		src.add_fingerprint(usr)
 		return
 	..()
 
 
-	attack_self(mob/user as mob)
+/obj/item/weapon/storage/secure/attack_self(mob/user as mob)
-		user.set_machine(src)
+	tgui_interact(user)
-		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)
+/obj/item/weapon/storage/secure/tgui_interact(mob/user, datum/tgui/ui = null)
-		..()
+	ui = SStgui.try_update_ui(user, src, ui)	
-		if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
+	if(!ui)
-			return
+		ui = new(user, src, "SecureSafe", name)
-		if (href_list["type"])
+		ui.open()
-			if (href_list["type"] == "E")
+		
+/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
@@ -113,20 +117,17 @@
 				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))
+	. = TRUE
-				if ((M.client && M.machine == src))
-					src.attack_self(M)
-				return
 	return
 
 /obj/item/weapon/storage/secure/emag_act(var/remaining_charges, var/mob/user, var/feedback)
@@ -156,7 +157,7 @@
 	w_class = ITEMSIZE_LARGE
 	max_storage_space = ITEMSIZE_COST_NORMAL * 4
 
-	attack_hand(mob/user as mob)
+/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))
@@ -194,4 +195,4 @@
 	)
 
 /obj/item/weapon/storage/secure/safe/attack_hand(mob/user as mob)
-	return attack_self(user)
+	tgui_interact(user)

tgui/packages/tgui/interfaces/SecureSafe.js

@@ -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>
+  );
+};