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 00000000000..04cb97de607 Binary files /dev/null and b/modular_skyrat/modules/more_briefcases/icons/briefcases.dmi differ 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"