From ca0a3ad6128fd40efdfb7bf3321ebac233a506bc Mon Sep 17 00:00:00 2001
From: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Date: Thu, 5 May 2022 14:14:44 +0100
Subject: [PATCH] Ports TauCeti's briefcases! (#13328)

* wew

* Update briefcases.dm

* Update mutant_cure.dm

* Update research2.dmm
---
 _maps/RandomZLevels/research2.dmm             |   2 +-
 .../modules/inflatables/code/inflatable.dm    |   4 +-
 .../more_briefcases/code/briefcases.dm        |  47 ++++++++++++++++++
 .../more_briefcases/icons/briefcases.dmi      | Bin 0 -> 1404 bytes
 .../modules/more_briefcases/readme.md         |   3 ++
 .../modules/mutants/code/mutant_cure.dm       |   8 ++-
 tgstation.dme                                 |   1 +
 7 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 modular_skyrat/modules/more_briefcases/code/briefcases.dm
 create mode 100644 modular_skyrat/modules/more_briefcases/icons/briefcases.dmi
 create mode 100644 modular_skyrat/modules/more_briefcases/readme.md

diff --git a/_maps/RandomZLevels/research2.dmm b/_maps/RandomZLevels/research2.dmm
index 816967896a1..a7ca7de5310 100644
--- a/_maps/RandomZLevels/research2.dmm
+++ b/_maps/RandomZLevels/research2.dmm
@@ -2087,7 +2087,7 @@
 	dir = 4
 	},
 /obj/structure/table/glass,
-/obj/item/storage/briefcase/hnz,
+/obj/item/storage/briefcase/virology/hnz,
 /turf/open/floor/iron/white,
 /area/awaymission/research/interior/cryo)
 "gz" = (
diff --git a/modular_skyrat/modules/inflatables/code/inflatable.dm b/modular_skyrat/modules/inflatables/code/inflatable.dm
index 1d62426f424..2b5f00d7e0a 100644
--- a/modular_skyrat/modules/inflatables/code/inflatable.dm
+++ b/modular_skyrat/modules/inflatables/code/inflatable.dm
@@ -238,10 +238,10 @@
 	fixedtype = /obj/item/inflatable/door
 
 /obj/item/storage/inflatable
-	icon = 'modular_skyrat/modules/inflatables/icons/inflatable.dmi'
+	icon = 'modular_skyrat/modules/more_briefcases/icons/briefcases.dmi'
 	name = "inflatable barrier box"
 	desc = "Contains inflatable walls and doors."
-	icon_state = "inf"
+	icon_state = "briefcase_inflate"
 	w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/inflatable/ComponentInitialize()
diff --git a/modular_skyrat/modules/more_briefcases/code/briefcases.dm b/modular_skyrat/modules/more_briefcases/code/briefcases.dm
new file mode 100644
index 00000000000..614629f2690
--- /dev/null
+++ b/modular_skyrat/modules/more_briefcases/code/briefcases.dm
@@ -0,0 +1,47 @@
+/obj/item/storage/briefcase
+	icon = 'modular_skyrat/modules/more_briefcases/icons/briefcases.dmi'
+	inhand_icon_state = "briefcase"
+
+/obj/item/storage/briefcase/lawyer
+	icon_state = "briefcase_black"
+	inhand_icon_state = "sec-case"
+
+/obj/item/storage/briefcase/central_command
+	name = "nanotrasen briefcase"
+	icon_state = "briefcase_cc"
+	inhand_icon_state = "sec-case"
+
+/obj/item/storage/briefcase/medical
+	name = "medical briefcase"
+	icon_state = "briefcase_med"
+	inhand_icon_state = "lockbox"
+
+/obj/item/storage/briefcase/virology
+	name = "virology briefcase"
+	icon_state = "briefcase_vir"
+	inhand_icon_state = "lockbox"
+
+/obj/item/storage/briefcase/engineering
+	name = "engineering briefcase"
+	icon_state = "briefcase_eng"
+
+/obj/item/storage/secure/briefcase
+	icon = 'modular_skyrat/modules/more_briefcases/icons/briefcases.dmi'
+	inhand_icon_state = "sec-case"
+	icon_state = "briefcase_secure_black"
+
+/obj/item/storage/secure/briefcase/attack_self(mob/user)
+	. = ..()
+	update_appearance()
+
+/obj/item/storage/secure/briefcase/update_overlays()
+	. = ..()
+	if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
+		. += "briefcase_locked"
+	else
+		. += "briefcase_open"
+
+/obj/item/storage/secure/briefcase/white
+	name = "white secure briefcase"
+	icon_state = "briefcase_secure_white"
+	inhand_icon_state = "lockbox"
diff --git a/modular_skyrat/modules/more_briefcases/icons/briefcases.dmi b/modular_skyrat/modules/more_briefcases/icons/briefcases.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..04cb97de607b042262d46287c2abc42e27b3786d
GIT binary patch
literal 1404
zcmV-?1%vvDP)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu0002bP)t-s#l^)r
z9VR6yF(qb=NF^|`g;XsuJk-?Eb9Rhit=wWXG>1((U0q~aT4Iosn8wJ|E|k#|5fdH`
z0`IjH7ZnydJV0V)cVtTkSS>q-Mn*Y4Om=pEfrOa+{QMyj7hGR(kdvo7YKKgSts^Ec
zT9&&CLka+V0AXco@5>bcW&x(Fti+QJer*+BB`Gj6Hc(Yu$gVA-iyfykJAWxJZ*+Uj
z&(J?XMs|CDoQ4|e(Nbq@Z&ynVA|N#DUI0fu4aLR9uClT$FFG?ZI;J8hd9yGNFDQ!u
z0004WQchC<K<3zH00022dQ@0+L}hbha%pgMX>V=-0C=30lFbUkAP|Jl`V^AfOaHFD
zl!TH)^9sf28kZO?YLnNmG`*D`_BJzo1Iw_rxVE>h7tOun3&e!Mi;Fn#_MEM#vn}Ry
z<jew&Hg6_nnW4yPhzLf>1Qll*V=CE!GZW<uoBkyqgOh3^@JbQj88m@jFcN6=#+8uJ
z06!Aw1nL#(`+RGwMbd39sEIUIc!K|j*P`v4&j-B$Jj1bWM3ipu000A{Nkl<ZXo2mR
zi&ok|5Qe#Ru}WDHB;HEE2ofz2s--rf$D;55Or6<mlHFt=#v+{7{m5bYnM3B^AuO3K
z6buG~A*L8X$4e1!i<cwPu?kZBBq<81#u-woN=icJiSHog&yuo`TK-+6xEIWSuPCJA
zfYpF6rFt;GdI@EXCE~T^@g0to_k;QGmxWXvG!B~0<^g0r0B}IrP~xq6z21T|w*VYa
z=7=A*Vcu=X+y-z!d8k#uvaDSNlv)L#q%{SU?Dg>-4io1JDAfua9TObI@sm@6lh?=3
zz7m`%20E3>aYX}UCyuumJ7pRmTUtDg61Te&8;D-(20FTdPSQXkM=NEZrLn|7@BF;?
zZU!6$+JJ5ME-rdu4c2YIajI3P>fiy8272cgKv;wI8-Uz_hpib<EYJpe_!act*FfNb
zHo!Svgq**lfrw?lf@uD_fkvg$&<)@_N}REVZUEoW;@UzemO^zY4wK?47`|4Q;zEO9
zo$*70g27-g7z_qOihcwgw_@IO{#E-2qG9h3B>hzXeu-Ga5KHJBxy5bVs{I4evi99z
z{%$|nzh7P<*0r4fwIy`y;9I~bMCv$y#{L2H?=bH+WXAp-2b9W9+j!D!HYbpHg5ZdH
z92@Ya$mn~(NGLBhkhOmR6@ZDW{X0sn0x<6@71T-vJTZ)J#QbkYLV0Qh*vkEb%>MoM
z2gNO6!1Fx9K-T_2)V;cHx9hs;?sfK)VwN=Eg(MAR?H_~&+yS?3K5!`mvm~m4yI&M{
zc@5a^0BT?lWC;=md>zfe{Zw*~L_#wlcP+>bjKBcoAGn<3vz<0D^oM?Y_`{)YKn&CA
z4KkG~VZc$gF-QZDybFyRJaLyWFhmQ($bi4Z09*mIfuLh`=5yx(9;5+0Y&#g28wd~G
zfLM5<3Ir;z0S>wC0bB-Mo2L!<NtPH86<A?_Y~STY2wy$^6TrnlT!dFi@>W1DKk-VW
z8VLG#?z(sp!c($;&sql_r{d>7)rZF@-bnrgnZAFJ*}soT1Mz=B;gLc)LDv33CS!_R
zXD}EH27|%yPY~a%Y(BT>_gUD#v%Ky9-{*fqSUs43oe8-~2jdCkoj_)6|9``Pa+9}Q
zmru~HJt?5vWCh6n|2F$`YlFP+pJjjUe>4zpKWy5-Vgbh@+=tkL0f|4K`w#F~YT)^K
z^{HN7-fCch1=ywmS%Ikg-_lnQu0$X0XGr${8*RT$`)@FOVEzDU{z~aS0SU(d0000<
KMNUMnLSTZm(1aZT

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/more_briefcases/readme.md b/modular_skyrat/modules/more_briefcases/readme.md
new file mode 100644
index 00000000000..a2011c2d55a
--- /dev/null
+++ b/modular_skyrat/modules/more_briefcases/readme.md
@@ -0,0 +1,3 @@
+## Credits
+Gandalf2k15 - Porting
+TauCeti - Original sprites(https://github.com/TauCetiStation/TauCetiClassic/pull/8966)
diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm
index 5839361ae15..f1f03ab2123 100644
--- a/modular_skyrat/modules/mutants/code/mutant_cure.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm
@@ -352,15 +352,13 @@
 	list_reagents = list(/datum/reagent/hnz = 1)
 
 
-/obj/item/storage/briefcase/hnz
-	name = "HNZ-1 biocontainer"
+/obj/item/storage/briefcase/virology/hnz
+	name = "\improper HNZ-1 Biocontainer"
 	desc = "An airtight biosealed box containing the highly reactive substance, HNZ1. Authorised personnel only."
-	icon = 'modular_skyrat/modules/mutants/icons/extractor.dmi'
-	icon_state = "tvirus_box"
 	w_class = WEIGHT_CLASS_SMALL
 	max_integrity = 500
 
-/obj/item/storage/briefcase/hnz/PopulateContents()
+/obj/item/storage/briefcase/virology/hnz/PopulateContents()
 	new /obj/item/reagent_containers/glass/bottle/hnz/one(src)
 	new /obj/item/reagent_containers/glass/bottle/hnz/one(src)
 	new /obj/item/circuitboard/machine/rna_recombinator(src)
diff --git a/tgstation.dme b/tgstation.dme
index c62c703f708..a9ec96154ae 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5494,6 +5494,7 @@
 #include "modular_skyrat\modules\modular_weapons\code\recipes.dm"
 #include "modular_skyrat\modules\modular_weapons\code\revolver.dm"
 #include "modular_skyrat\modules\modular_weapons\code\rifle.dm"
+#include "modular_skyrat\modules\more_briefcases\code\briefcases.dm"
 #include "modular_skyrat\modules\morefermentplants\code\ambrosia.dm"
 #include "modular_skyrat\modules\morefermentplants\code\banana.dm"
 #include "modular_skyrat\modules\morefermentplants\code\beans.dm"