From 9e90e09597510d2c4e2a28c57594fdf203d3b773 Mon Sep 17 00:00:00 2001
From: Qustinnus <Floydje123@hotmail.com>
Date: Thu, 23 Jan 2020 00:56:22 +0100
Subject: [PATCH] Adds a new BEPIS design; The Mauna Mug (#48599)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🆑 Kryson & Qustinnus
add: New BEPIS design; a self heating mug
/🆑

A self-heating mug that you can get from BEPIS designs. the better the cell thats in it, the higher the max temp and the faster the temp goes up.
---
 code/modules/power/cell.dm                    |    4 +
 .../reagents/reagent_containers/maunamug.dm   |  112 ++
 code/modules/research/designs/misc_designs.dm | 1075 +++++++++--------
 code/modules/research/techweb/all_nodes.dm    |    8 +
 icons/obj/mauna_mug.dmi                       |  Bin 0 -> 645 bytes
 icons/obj/reagentfillings.dmi                 |  Bin 4941 -> 4987 bytes
 tgstation.dme                                 |    1 +
 7 files changed, 668 insertions(+), 532 deletions(-)
 create mode 100644 code/modules/reagents/reagent_containers/maunamug.dm
 create mode 100644 icons/obj/mauna_mug.dmi

diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 6014d057fb6..271942a9906 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -247,6 +247,7 @@
 	icon_state = "h+cell"
 	maxcharge = 15000
 	chargerate = 2250
+	rating = 2
 
 /obj/item/stock_parts/cell/high/empty/Initialize()
 	. = ..()
@@ -259,6 +260,7 @@
 	maxcharge = 20000
 	custom_materials = list(/datum/material/glass=300)
 	chargerate = 2000
+	rating = 3
 
 /obj/item/stock_parts/cell/super/empty/Initialize()
 	. = ..()
@@ -271,6 +273,7 @@
 	maxcharge = 30000
 	custom_materials = list(/datum/material/glass=400)
 	chargerate = 3000
+	rating = 4
 
 /obj/item/stock_parts/cell/hyper/empty/Initialize()
 	. = ..()
@@ -284,6 +287,7 @@
 	maxcharge = 40000
 	custom_materials = list(/datum/material/glass=600)
 	chargerate = 4000
+	rating = 5
 
 /obj/item/stock_parts/cell/bluespace/empty/Initialize()
 	. = ..()
diff --git a/code/modules/reagents/reagent_containers/maunamug.dm b/code/modules/reagents/reagent_containers/maunamug.dm
new file mode 100644
index 00000000000..a436b2014d4
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/maunamug.dm
@@ -0,0 +1,112 @@
+/obj/item/reagent_containers/glass/maunamug
+	name = "mauna mug"
+	desc = "A drink served in a classy mug. Now with built-in heating!"
+	icon = 'icons/obj/mauna_mug.dmi'
+	icon_state = "maunamug"
+	spillable = TRUE
+	reagent_flags = OPENCONTAINER
+	fill_icon_state = "maunafilling"
+	fill_icon_thresholds = list(25)
+	var/obj/item/stock_parts/cell/cell
+	var/open = FALSE
+	var/on = FALSE
+
+/obj/item/reagent_containers/glass/maunamug/Initialize(mapload, vol)
+	. = ..()
+	cell = new /obj/item/stock_parts/cell(src)
+
+/obj/item/reagent_containers/glass/maunamug/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>The status display reads: Current temperature: <b>[reagents.chem_temp]K</b> Current Charge:[cell ? "[cell.charge / cell.maxcharge * 100]%" : "No cell found"].</span>"
+	if(open)
+		. += "<span class='notice'The battery case is open.</span>"
+
+/obj/item/reagent_containers/glass/maunamug/process()
+	..()
+	if(on && (!cell || cell.charge <= 0)) //Check if we ran out of power
+		change_power_status(FALSE)
+		return FALSE
+	cell.use(10) //Basic cell goes for like 200 seconds, bluespace for 8000
+	if(!reagents.total_volume)
+		return FALSE
+	var/max_temp = min(500 + (500 * (0.2 * cell.rating)), 1000) // 373 to 1000
+	reagents.adjust_thermal_energy(0.8 * cell.maxcharge * reagents.total_volume, max_temp = max_temp) // 4 kelvin every tick on a basic cell. 160k on bluespace
+	reagents.handle_reactions()
+	update_icon()
+	if(reagents.chem_temp >= max_temp)
+		change_power_status(FALSE)
+		audible_message("<span class='notice'>The Mauna Mug lets out a happy beep and turns off!</span>")
+		playsound(src, 'sound/machines/chime.ogg', 50)
+
+/obj/item/reagent_containers/glass/maunamug/Destroy()
+	if(cell)
+		QDEL_NULL(cell)
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
+
+/obj/item/reagent_containers/glass/maunamug/attack_self(mob/user)
+	if(on)
+		change_power_status(FALSE)
+	else
+		if(!cell || cell.charge <= 0)
+			return FALSE //No power, so don't turn on
+		change_power_status(TRUE)
+
+/obj/item/reagent_containers/glass/maunamug/proc/change_power_status(status)
+	on = status
+	if(on)
+		START_PROCESSING(SSobj, src)
+	else
+		STOP_PROCESSING(SSobj, src)
+	update_icon()
+
+/obj/item/reagent_containers/glass/maunamug/screwdriver_act(mob/living/user, obj/item/I)
+	. = ..()
+	open = !open
+	to_chat(user, "<span class='notice'>You screw the battery case on [src] [open ? "open" : "closed"] .</span>")
+	update_icon()
+
+/obj/item/reagent_containers/glass/maunamug/attackby(obj/item/I, mob/user, params)
+	add_fingerprint(user)
+	if(!istype(I, /obj/item/stock_parts/cell))
+		return ..()
+	if(!open)
+		to_chat(user, "<span class='warning'>The battery case must be open to insert a power cell!</span>")
+		return FALSE
+	if(cell)
+		to_chat(user, "<span class='warning'>There is already a power cell inside!</span>")
+		return FALSE
+	else if(!user.transferItemToLoc(I, src))
+		return
+	cell = I
+	user.visible_message("<span class='notice'>[user] inserts a power cell into [src].</span>", "<span class='notice'>You insert the power cell into [src].</span>")
+	update_icon()
+
+/obj/item/reagent_containers/glass/maunamug/attack_hand(mob/living/user)
+	if(cell && open)
+		cell.update_icon()
+		user.put_in_hands(cell)
+		cell = null
+		to_chat(user, "<span class='notice'>You remove the power cell from [src].</span>")
+		on = FALSE
+		update_icon()
+		return TRUE
+	return ..()
+
+/obj/item/reagent_containers/glass/maunamug/update_icon()
+	..()
+	if(open)
+		if(cell)
+			icon_state = "maunamug_bat"
+		else
+			icon_state = "maunamug_no_bat"
+	else if(on)
+		icon_state = "maunamug_on"
+	else
+		icon_state = "maunamug"
+	if(reagents.total_volume && reagents.chem_temp >= 400)
+		var/intensity = (reagents.chem_temp - 400) * 1 / 600 //Get the opacity of the incandescent overlay. Ranging from 400 to 1000
+		var/mutable_appearance/mug_glow = mutable_appearance(icon, "maunamug_incand")
+		mug_glow.alpha = 255 * intensity
+		add_overlay(mug_glow)
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index c236a9973c2..aadf1ef584d 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -1,532 +1,543 @@
-
-/////////////////////////////////////////
-/////////////////HUDs////////////////////
-/////////////////////////////////////////
-
-/datum/design/health_hud
-	name = "Health Scanner HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
-	id = "health_hud"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/hud/health
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/health_hud_night
-	name = "Night Vision Health Scanner HUD"
-	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
-	id = "health_hud_night"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/silver = 350)
-	build_path = /obj/item/clothing/glasses/hud/health/night
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/datum/design/security_hud
-	name = "Security HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
-	id = "security_hud"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/hud/security
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/security_hud_night
-	name = "Night Vision Security HUD"
-	desc = "A heads-up display which provides id data and vision in complete darkness."
-	id = "security_hud_night"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/gold = 350)
-	build_path = /obj/item/clothing/glasses/hud/security/night
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/diagnostic_hud
-	name = "Diagnostic HUD"
-	desc = "A HUD used to analyze and determine faults within robotic machinery."
-	id = "diagnostic_hud"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/hud/diagnostic
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/diagnostic_hud_night
-	name = "Night Vision Diagnostic HUD"
-	desc = "Upgraded version of the diagnostic HUD designed to function during a power failure."
-	id = "diagnostic_hud_night"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/plasma = 300)
-	build_path = /obj/item/clothing/glasses/hud/diagnostic/night
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/////////////////////////////////////////
-//////////////////Misc///////////////////
-/////////////////////////////////////////
-
-/datum/design/welding_goggles
-	name = "Welding Goggles"
-	desc = "Protects the eyes from bright flashes; approved by the mad scientist association."
-	id = "welding_goggles"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/welding
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/welding_mask
-	name = "Welding Gas Mask"
-	desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
-	id = "weldingmask"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000)
-	build_path = /obj/item/clothing/mask/gas/welding
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/bright_helmet
-	name = "Workplace-Ready Firefighter Helmet"
-	desc = "By applying state of the art lighting technology to a fire helmet with industry standard photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards."
-	id = "bright_helmet"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500)
-	build_path = /obj/item/clothing/head/hardhat/red/upgraded
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/portaseeder
-	name = "Portable Seed Extractor"
-	desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
-	id = "portaseeder"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 1000, /datum/material/glass = 400)
-	build_path = /obj/item/storage/bag/plants/portaseeder
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/air_horn
-	name = "Air Horn"
-	desc = "Damn son, where'd you find this?"
-	id = "air_horn"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 4000, /datum/material/bananium = 1000)
-	build_path = /obj/item/bikehorn/airhorn
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ALL			//HONK!
-
-/datum/design/mesons
-	name = "Optical Meson Scanners"
-	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
-	id = "mesons"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/meson
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/engine_goggles
-	name = "Engineering Scanner Goggles"
-	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes."
-	id = "engine_goggles"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/plasma = 100)
-	build_path = /obj/item/clothing/glasses/meson/engine
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/tray_goggles
-	name = "Optical T-Ray Scanners"
-	desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
-	id = "tray_goggles"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/meson/engine/tray
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/nvgmesons
-	name = "Night Vision Optical Meson Scanners"
-	desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
-	id = "nvgmesons"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000)
-	build_path = /obj/item/clothing/glasses/meson/night
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/night_vision_goggles
-	name = "Night Vision Goggles"
-	desc = "Goggles that let you see through darkness unhindered."
-	id = "night_visision_goggles"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000)
-	build_path = /obj/item/clothing/glasses/night
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/magboots
-	name = "Magnetic Boots"
-	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
-	id = "magboots"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 4500, /datum/material/silver = 1500, /datum/material/gold = 2500)
-	build_path = /obj/item/clothing/shoes/magboots
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/forcefield_projector
-	name = "Forcefield Projector"
-	desc = "A device which can project temporary forcefields to seal off an area."
-	id = "forcefield_projector"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2500, /datum/material/glass = 1000)
-	build_path = /obj/item/forcefield_projector
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/sci_goggles
-	name = "Science Goggles"
-	desc = "Goggles fitted with a portable analyzer capable of determining the research worth of an item or components of a machine."
-	id = "scigoggles"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
-	build_path = /obj/item/clothing/glasses/science
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/diskplantgene
-	name = "Plant Data Disk"
-	desc = "A disk for storing plant genetic data."
-	id = "diskplantgene"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron=200, /datum/material/glass = 100)
-	build_path = /obj/item/disk/plantgene
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/roastingstick
-	name = "Advanced Roasting Stick"
-	desc = "A roasting stick for cooking sausages in exotic ovens."
-	id = "roastingstick"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250)
-	build_path = /obj/item/melee/roastingstick
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/locator
-	name = "Bluespace Locator"
-	desc = "Used to track portable teleportation beacons and targets with embedded tracking implants."
-	id = "locator"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/silver = 500)
-	build_path = /obj/item/locator
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/quantum_keycard
-	name = "Quantum Keycard"
-	desc = "Allows for the construction of a quantum keycard."
-	id = "quantum_keycard"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/glass = 500, /datum/material/iron = 500, /datum/material/silver = 500, /datum/material/bluespace = 1000)
-	build_path = /obj/item/quantum_keycard
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/anomaly_neutralizer
-	name = "Anomaly Neutralizer"
-	desc = "An advanced tool capable of instantly neutralizing anomalies, designed to capture the fleeting aberrations created by the engine."
-	id = "anomaly_neutralizer"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2000, /datum/material/gold = 2000, /datum/material/plasma = 5000, /datum/material/uranium = 2000)
-	build_path = /obj/item/anomaly_neutralizer
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/donksoft_refill
-	name = "Donksoft Toy Vendor Refill"
-	desc = "A refill canister for Donksoft Toy Vendors."
-	id = "donksoft_refill"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 25000, /datum/material/glass = 15000, /datum/material/plasma = 20000, /datum/material/gold = 10000, /datum/material/silver = 10000)
-	build_path = /obj/item/vending_refill/donksoft
-	category = list("Equipment")
-
-/datum/design/oxygen_tank
-	name = "Oxygen Tank"
-	desc = "An empty oxygen tank."
-	id = "oxygen_tank"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2000)
-	build_path = /obj/item/tank/internals/oxygen/empty
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/plasma_tank
-	name = "Plasma Tank"
-	desc = "An empty oxygen tank."
-	id = "plasma_tank"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2000)
-	build_path = /obj/item/tank/internals/plasma/empty
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/id
-	name = "Identification Card"
-	desc = "A card used to provide ID and determine access across the station."
-	id = "idcard"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron=200, /datum/material/glass = 100)
-	build_path = /obj/item/card/id
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/eng_gloves
-	name = "Tinkers Gloves"
-	desc = "Overdesigned engineering gloves that have automated construction subroutines dialed in, allowing for faster construction while worn."
-	id = "eng_gloves"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000)
-	build_path = /obj/item/clothing/gloves/color/latex/engineering
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/lavarods
-	name = "Lava-Resistant Metal Rods"
-	id = "lava_rods"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000)
-	build_path = /obj/item/stack/rods/lava
-	category = list("initial", "Stock Parts")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
-/////////////////////////////////////////
-////////////Janitor Designs//////////////
-/////////////////////////////////////////
-
-/datum/design/advmop
-	name = "Advanced Mop"
-	desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
-	id = "advmop"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2500, /datum/material/glass = 200)
-	build_path = /obj/item/mop/advanced
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/blutrash
-	name = "Trashbag of Holding"
-	desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage."
-	id = "blutrash"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/gold = 1500, /datum/material/uranium = 250, /datum/material/plasma = 1500)
-	build_path = /obj/item/storage/bag/trash/bluespace
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/buffer
-	name = "Floor Buffer Upgrade"
-	desc = "A floor buffer that can be attached to vehicular janicarts."
-	id = "buffer"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 3000, /datum/material/glass = 200)
-	build_path = /obj/item/janiupgrade
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/spraybottle
-	name = "Spray Bottle"
-	desc = "A spray bottle, with an unscrewable top."
-	id = "spraybottle"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 3000, /datum/material/glass = 200)
-	build_path = /obj/item/reagent_containers/spray
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/beartrap
-	name = "Bear Trap"
-	desc = "A trap used to catch space bears and other legged creatures."
-	id = "beartrap"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 5000, /datum/material/titanium = 1000)
-	build_path = /obj/item/restraints/legcuffs/beartrap
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/////////////////////////////////////////
-/////////////Holobarriers////////////////
-/////////////////////////////////////////
-
-/datum/design/holosign
-	name = "Holographic Sign Projector"
-	desc = "A holograpic projector used to project various warning signs."
-	id = "holosign"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000)
-	build_path = /obj/item/holosign_creator
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-/datum/design/holobarrier_jani
-	name = "Custodial Holobarrier Projector"
-	desc = "A holograpic projector used to project hard light wet floor barriers."
-	id = "holobarrier_jani"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000, /datum/material/silver = 1000)
-	build_path = /obj/item/holosign_creator/janibarrier
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-
-
-/datum/design/holosignsec
-	name = "Security Holobarrier Projector"
-	desc = "A holographic projector that creates holographic security barriers."
-	id = "holosignsec"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000)
-	build_path = /obj/item/holosign_creator/security
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/holosignengi
-	name = "Engineering Holobarrier Projector"
-	desc = "A holographic projector that creates holographic engineering barriers."
-	id = "holosignengi"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000)
-	build_path = /obj/item/holosign_creator/engineering
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/holosignatmos
-	name = "ATMOS Holofan Projector"
-	desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric conditions."
-	id = "holosignatmos"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000)
-	build_path = /obj/item/holosign_creator/atmos
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/holobarrier_med
-	name = "PENLITE Holobarrier Projector"
-	desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases."
-	build_type = PROTOLATHE
-	build_path = /obj/item/holosign_creator/medical
-	materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 100) //a hint of silver since it can troll 2 antags (bad viros and sentient disease)
-	id = "holobarrier_med"
-	category = list("Medical Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
-/////////////////////////////////////////
-////////////////Armour///////////////////
-/////////////////////////////////////////
-
-/datum/design/reactive_armour
-	name = "Reactive Armour Shell"
-	desc = "An experimental suit of armour capable of utilizing an implanted anomaly core to protect the user."
-	id = "reactive_armour"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 10000, /datum/material/diamond = 5000, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold = 5000)
-	build_path = /obj/item/reactive_armour_shell
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/knight_armour
-	name = "Knight Armour"
-	desc = "A royal knight's favorite garments. Can be trimmed by any friendly person."
-	id = "knight_armour"
-	build_type = AUTOLATHE
-	materials = list(MAT_CATEGORY_RIGID = 10000)
-	build_path = /obj/item/clothing/suit/armor/riot/knight/greyscale
-	category = list("Imported")
-
-/datum/design/knight_helmet
-	name = "Knight Helmet"
-	desc = "A royal knight's favorite hat. If you hold it upside down it's actually a bucket."
-	id = "knight_helmet"
-	build_type = AUTOLATHE
-	materials = list(MAT_CATEGORY_RIGID = 5000)
-	build_path = /obj/item/clothing/head/helmet/knight/greyscale
-	category = list("Imported")
-
-
-
-/////////////////////////////////////////
-/////////////Security////////////////////
-/////////////////////////////////////////
-
-/datum/design/seclite
-	name = "Seclite"
-	desc = "A robust flashlight used by security."
-	id = "seclite"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 2500)
-	build_path = /obj/item/flashlight/seclite
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/detective_scanner
-	name = "Forensic Scanner"
-	desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
-	id = "detective_scanner"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 2500, /datum/material/silver = 2000)
-	build_path = /obj/item/detective_scanner
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/pepperspray
-	name = "Pepper Spray"
-	desc = "Manufactured by UhangInc, used to blind and down an opponent quickly. Printed pepper sprays do not contain reagents."
-	id = "pepperspray"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000)
-	build_path = /obj/item/reagent_containers/spray/pepper/empty
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/bola_energy
-	name = "Energy Bola"
-	desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests."
-	id = "bola_energy"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/silver = 500, /datum/material/plasma = 500, /datum/material/titanium = 500)
-	build_path = /obj/item/restraints/legcuffs/bola/energy
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/zipties
-	name = "Zipties"
-	desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
-	id = "zipties"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/plastic = 250)
-	build_path = /obj/item/restraints/handcuffs/cable/zipties
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/evidencebag
-	name = "Evidence Bag"
-	desc = "An empty evidence bag."
-	id = "evidencebag"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/plastic = 100)
-	build_path = /obj/item/evidencebag
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/plumbing_rcd
-	name = "Plumbing Constructor"
-	id = "plumbing_rcd"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000)
-	build_path = /obj/item/construction/plumbing
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/////////////////////////////////////////
+/////////////////HUDs////////////////////
+/////////////////////////////////////////
+
+/datum/design/health_hud
+	name = "Health Scanner HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
+	id = "health_hud"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/hud/health
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/datum/design/health_hud_night
+	name = "Night Vision Health Scanner HUD"
+	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+	id = "health_hud_night"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/silver = 350)
+	build_path = /obj/item/clothing/glasses/hud/health/night
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/datum/design/security_hud
+	name = "Security HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+	id = "security_hud"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/hud/security
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/security_hud_night
+	name = "Night Vision Security HUD"
+	desc = "A heads-up display which provides id data and vision in complete darkness."
+	id = "security_hud_night"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/gold = 350)
+	build_path = /obj/item/clothing/glasses/hud/security/night
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/diagnostic_hud
+	name = "Diagnostic HUD"
+	desc = "A HUD used to analyze and determine faults within robotic machinery."
+	id = "diagnostic_hud"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/hud/diagnostic
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/diagnostic_hud_night
+	name = "Night Vision Diagnostic HUD"
+	desc = "Upgraded version of the diagnostic HUD designed to function during a power failure."
+	id = "diagnostic_hud_night"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/plasma = 300)
+	build_path = /obj/item/clothing/glasses/hud/diagnostic/night
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/////////////////////////////////////////
+//////////////////Misc///////////////////
+/////////////////////////////////////////
+
+/datum/design/welding_goggles
+	name = "Welding Goggles"
+	desc = "Protects the eyes from bright flashes; approved by the mad scientist association."
+	id = "welding_goggles"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/welding
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/welding_mask
+	name = "Welding Gas Mask"
+	desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
+	id = "weldingmask"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000)
+	build_path = /obj/item/clothing/mask/gas/welding
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/bright_helmet
+	name = "Workplace-Ready Firefighter Helmet"
+	desc = "By applying state of the art lighting technology to a fire helmet with industry standard photo-chemical hardening methods, this hardhat will protect you from robust workplace hazards."
+	id = "bright_helmet"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500)
+	build_path = /obj/item/clothing/head/hardhat/red/upgraded
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/mauna_mug
+	name = "Mauna Mug"
+	desc = "This awesome mug will ensure your coffee never stays cold!"
+	id = "mauna_mug"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 1000, /datum/material/glass = 100)
+	build_path = /obj/item/reagent_containers/glass/maunamug
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ALL
+
+/datum/design/portaseeder
+	name = "Portable Seed Extractor"
+	desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
+	id = "portaseeder"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 1000, /datum/material/glass = 400)
+	build_path = /obj/item/storage/bag/plants/portaseeder
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/air_horn
+	name = "Air Horn"
+	desc = "Damn son, where'd you find this?"
+	id = "air_horn"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 4000, /datum/material/bananium = 1000)
+	build_path = /obj/item/bikehorn/airhorn
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ALL			//HONK!
+
+/datum/design/mesons
+	name = "Optical Meson Scanners"
+	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
+	id = "mesons"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/meson
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/engine_goggles
+	name = "Engineering Scanner Goggles"
+	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes."
+	id = "engine_goggles"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/plasma = 100)
+	build_path = /obj/item/clothing/glasses/meson/engine
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/tray_goggles
+	name = "Optical T-Ray Scanners"
+	desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
+	id = "tray_goggles"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/meson/engine/tray
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/nvgmesons
+	name = "Night Vision Optical Meson Scanners"
+	desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
+	id = "nvgmesons"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000)
+	build_path = /obj/item/clothing/glasses/meson/night
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/night_vision_goggles
+	name = "Night Vision Goggles"
+	desc = "Goggles that let you see through darkness unhindered."
+	id = "night_visision_goggles"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000)
+	build_path = /obj/item/clothing/glasses/night
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/magboots
+	name = "Magnetic Boots"
+	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
+	id = "magboots"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 4500, /datum/material/silver = 1500, /datum/material/gold = 2500)
+	build_path = /obj/item/clothing/shoes/magboots
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/forcefield_projector
+	name = "Forcefield Projector"
+	desc = "A device which can project temporary forcefields to seal off an area."
+	id = "forcefield_projector"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2500, /datum/material/glass = 1000)
+	build_path = /obj/item/forcefield_projector
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/sci_goggles
+	name = "Science Goggles"
+	desc = "Goggles fitted with a portable analyzer capable of determining the research worth of an item or components of a machine."
+	id = "scigoggles"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+	build_path = /obj/item/clothing/glasses/science
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/diskplantgene
+	name = "Plant Data Disk"
+	desc = "A disk for storing plant genetic data."
+	id = "diskplantgene"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron=200, /datum/material/glass = 100)
+	build_path = /obj/item/disk/plantgene
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/roastingstick
+	name = "Advanced Roasting Stick"
+	desc = "A roasting stick for cooking sausages in exotic ovens."
+	id = "roastingstick"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250)
+	build_path = /obj/item/melee/roastingstick
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/locator
+	name = "Bluespace Locator"
+	desc = "Used to track portable teleportation beacons and targets with embedded tracking implants."
+	id = "locator"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/silver = 500)
+	build_path = /obj/item/locator
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/quantum_keycard
+	name = "Quantum Keycard"
+	desc = "Allows for the construction of a quantum keycard."
+	id = "quantum_keycard"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/glass = 500, /datum/material/iron = 500, /datum/material/silver = 500, /datum/material/bluespace = 1000)
+	build_path = /obj/item/quantum_keycard
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/anomaly_neutralizer
+	name = "Anomaly Neutralizer"
+	desc = "An advanced tool capable of instantly neutralizing anomalies, designed to capture the fleeting aberrations created by the engine."
+	id = "anomaly_neutralizer"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2000, /datum/material/gold = 2000, /datum/material/plasma = 5000, /datum/material/uranium = 2000)
+	build_path = /obj/item/anomaly_neutralizer
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/donksoft_refill
+	name = "Donksoft Toy Vendor Refill"
+	desc = "A refill canister for Donksoft Toy Vendors."
+	id = "donksoft_refill"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 25000, /datum/material/glass = 15000, /datum/material/plasma = 20000, /datum/material/gold = 10000, /datum/material/silver = 10000)
+	build_path = /obj/item/vending_refill/donksoft
+	category = list("Equipment")
+
+/datum/design/oxygen_tank
+	name = "Oxygen Tank"
+	desc = "An empty oxygen tank."
+	id = "oxygen_tank"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2000)
+	build_path = /obj/item/tank/internals/oxygen/empty
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/plasma_tank
+	name = "Plasma Tank"
+	desc = "An empty oxygen tank."
+	id = "plasma_tank"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2000)
+	build_path = /obj/item/tank/internals/plasma/empty
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/id
+	name = "Identification Card"
+	desc = "A card used to provide ID and determine access across the station."
+	id = "idcard"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron=200, /datum/material/glass = 100)
+	build_path = /obj/item/card/id
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/eng_gloves
+	name = "Tinkers Gloves"
+	desc = "Overdesigned engineering gloves that have automated construction subroutines dialed in, allowing for faster construction while worn."
+	id = "eng_gloves"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000)
+	build_path = /obj/item/clothing/gloves/color/latex/engineering
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/lavarods
+	name = "Lava-Resistant Metal Rods"
+	id = "lava_rods"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000)
+	build_path = /obj/item/stack/rods/lava
+	category = list("initial", "Stock Parts")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+
+/////////////////////////////////////////
+////////////Janitor Designs//////////////
+/////////////////////////////////////////
+
+/datum/design/advmop
+	name = "Advanced Mop"
+	desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
+	id = "advmop"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2500, /datum/material/glass = 200)
+	build_path = /obj/item/mop/advanced
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/blutrash
+	name = "Trashbag of Holding"
+	desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage."
+	id = "blutrash"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/gold = 1500, /datum/material/uranium = 250, /datum/material/plasma = 1500)
+	build_path = /obj/item/storage/bag/trash/bluespace
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/buffer
+	name = "Floor Buffer Upgrade"
+	desc = "A floor buffer that can be attached to vehicular janicarts."
+	id = "buffer"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 3000, /datum/material/glass = 200)
+	build_path = /obj/item/janiupgrade
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/spraybottle
+	name = "Spray Bottle"
+	desc = "A spray bottle, with an unscrewable top."
+	id = "spraybottle"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 3000, /datum/material/glass = 200)
+	build_path = /obj/item/reagent_containers/spray
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/beartrap
+	name = "Bear Trap"
+	desc = "A trap used to catch space bears and other legged creatures."
+	id = "beartrap"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 5000, /datum/material/titanium = 1000)
+	build_path = /obj/item/restraints/legcuffs/beartrap
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/////////////////////////////////////////
+/////////////Holobarriers////////////////
+/////////////////////////////////////////
+
+/datum/design/holosign
+	name = "Holographic Sign Projector"
+	desc = "A holograpic projector used to project various warning signs."
+	id = "holosign"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000)
+	build_path = /obj/item/holosign_creator
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/holobarrier_jani
+	name = "Custodial Holobarrier Projector"
+	desc = "A holograpic projector used to project hard light wet floor barriers."
+	id = "holobarrier_jani"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000, /datum/material/silver = 1000)
+	build_path = /obj/item/holosign_creator/janibarrier
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+
+/datum/design/holosignsec
+	name = "Security Holobarrier Projector"
+	desc = "A holographic projector that creates holographic security barriers."
+	id = "holosignsec"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000)
+	build_path = /obj/item/holosign_creator/security
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/holosignengi
+	name = "Engineering Holobarrier Projector"
+	desc = "A holographic projector that creates holographic engineering barriers."
+	id = "holosignengi"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000)
+	build_path = /obj/item/holosign_creator/engineering
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/holosignatmos
+	name = "ATMOS Holofan Projector"
+	desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric conditions."
+	id = "holosignatmos"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000)
+	build_path = /obj/item/holosign_creator/atmos
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/holobarrier_med
+	name = "PENLITE Holobarrier Projector"
+	desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases."
+	build_type = PROTOLATHE
+	build_path = /obj/item/holosign_creator/medical
+	materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 100) //a hint of silver since it can troll 2 antags (bad viros and sentient disease)
+	id = "holobarrier_med"
+	category = list("Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
+/////////////////////////////////////////
+////////////////Armour///////////////////
+/////////////////////////////////////////
+
+/datum/design/reactive_armour
+	name = "Reactive Armour Shell"
+	desc = "An experimental suit of armour capable of utilizing an implanted anomaly core to protect the user."
+	id = "reactive_armour"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 10000, /datum/material/diamond = 5000, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold = 5000)
+	build_path = /obj/item/reactive_armour_shell
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/knight_armour
+	name = "Knight Armour"
+	desc = "A royal knight's favorite garments. Can be trimmed by any friendly person."
+	id = "knight_armour"
+	build_type = AUTOLATHE
+	materials = list(MAT_CATEGORY_RIGID = 10000)
+	build_path = /obj/item/clothing/suit/armor/riot/knight/greyscale
+	category = list("Imported")
+
+/datum/design/knight_helmet
+	name = "Knight Helmet"
+	desc = "A royal knight's favorite hat. If you hold it upside down it's actually a bucket."
+	id = "knight_helmet"
+	build_type = AUTOLATHE
+	materials = list(MAT_CATEGORY_RIGID = 5000)
+	build_path = /obj/item/clothing/head/helmet/knight/greyscale
+	category = list("Imported")
+
+
+
+/////////////////////////////////////////
+/////////////Security////////////////////
+/////////////////////////////////////////
+
+/datum/design/seclite
+	name = "Seclite"
+	desc = "A robust flashlight used by security."
+	id = "seclite"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2500)
+	build_path = /obj/item/flashlight/seclite
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/detective_scanner
+	name = "Forensic Scanner"
+	desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
+	id = "detective_scanner"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 2500, /datum/material/silver = 2000)
+	build_path = /obj/item/detective_scanner
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/pepperspray
+	name = "Pepper Spray"
+	desc = "Manufactured by UhangInc, used to blind and down an opponent quickly. Printed pepper sprays do not contain reagents."
+	id = "pepperspray"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000)
+	build_path = /obj/item/reagent_containers/spray/pepper/empty
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/bola_energy
+	name = "Energy Bola"
+	desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests."
+	id = "bola_energy"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/silver = 500, /datum/material/plasma = 500, /datum/material/titanium = 500)
+	build_path = /obj/item/restraints/legcuffs/bola/energy
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/zipties
+	name = "Zipties"
+	desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
+	id = "zipties"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/plastic = 250)
+	build_path = /obj/item/restraints/handcuffs/cable/zipties
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/evidencebag
+	name = "Evidence Bag"
+	desc = "An empty evidence bag."
+	id = "evidencebag"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/plastic = 100)
+	build_path = /obj/item/evidencebag
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/plumbing_rcd
+	name = "Plumbing Constructor"
+	id = "plumbing_rcd"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000)
+	build_path = /obj/item/construction/plumbing
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 787dd76dbd9..d6e908a8131 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -1076,6 +1076,13 @@
 	hidden = TRUE
 	experimental = TRUE
 
+/datum/techweb_node/Mauna_Mug
+	id = "mauna_mug"
+	display_name = "Mauna Mug"
+	description = "A bored scientist was thinking to himself for very long...and then realized his coffee got cold! He made this invention to solve this extreme problem."
+	prereq_ids = list("base")
+	design_ids = list("mauna_mug")
+
 /datum/techweb_node/spec_eng
 	id = "spec_eng"
 	display_name = "Specialized Engineering"
@@ -1093,6 +1100,7 @@
 	description = "It is said that security in the Australicus sector is tight, so we took some pointers from their equipment. Thankfully, our sector lacks any signs of these, 'dropbears'."
 	prereq_ids = list("base")
 	design_ids = list("pin_explorer", "stun_boomerang")
+
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 2500
 	hidden = TRUE
diff --git a/icons/obj/mauna_mug.dmi b/icons/obj/mauna_mug.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..fd576072fd1cce4e519fac4605ee56c6e6ac553c
GIT binary patch
literal 645
zcmV;00($+4P)<h;3K|Lk000e1NJLTq003YB002M;0{{R3(&~ad0001WP)t-sz`(%w
z_weuS<j=>g-`U8Ig>AE{i<ysf=Hk_+oq%6fN--l7Y-3qQH6&$OPh?wBR!&4rJ~CKM
zJ{TP#At*LDDH>+$65hTGR7pBKE*w%<T!M*@z`(%&Z%O@cN#|)u@@z=ET}9MnM#5i3
z_iahbVny;eI0Q{ZVgLXD0d!JMQvg8b*k%9#0Ec>1Sad{Xb7OL8aCB*JZU6vyoKseC
za&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6zf
zu{19+w=_LIFF!shu|$cBGbOXA7${@N#hF%=n41b=W2z@bG4ZD6=Mk?qGcP$YF9nx+
zWd&D17jTdO05=U&x^$}gMgRZ-D@jB_R9J=WmdkE~Fc3v2wo4!_NmJ5CsQd_l{{JU-
z9HMpu9^?^K7jw7gXf8-zTmXqg^0(P+lu~PQt&K7B2Ae+=Ix2Gpm!mKm^9Oi53fm$I
zdRpOfC`UtW0VWMDhf>8ypehv18XSev=%T9dD^}sZ!Zc=c*xiN4l{oC4ZbChKfXPwV
zAD)kO;sB2WyzHCiRKGI#;q92<Xq=iR&EM1f<9tqWfVOQ}oJ{*k6cAh@kw_$xC874c
zwaz)tePZ8R??VXr4b;B3m(ItE>;`Jz+soL%DM;>nEVy>Dz-Lxa`@SC=+!Y|Nf!g=I
zi;u_+SP(J`()+%5eem5d;9q3jC-?nNLEiZV`~F^#d!OF-a4X2ZzhK{UgZus~z3<r#
f<i3|kB>ytsm8co{_um~=00000NkvXXu0mjf$n+rV

literal 0
HcmV?d00001

diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 44c25dff043c1eac1690bb515b27cd1bb305de66..e8d5e31d0c9fbf6dee8969f2de8e60c97f8c8b84 100644
GIT binary patch
delta 4366
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
CN5_W%

delta 4323
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
Bt?~c>

diff --git a/tgstation.dme b/tgstation.dme
index af14ebac9e4..93e92c65500 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2644,6 +2644,7 @@
 #include "code\modules\reagents\reagent_containers\dropper.dm"
 #include "code\modules\reagents\reagent_containers\glass.dm"
 #include "code\modules\reagents\reagent_containers\hypospray.dm"
+#include "code\modules\reagents\reagent_containers\maunamug.dm"
 #include "code\modules\reagents\reagent_containers\medigel.dm"
 #include "code\modules\reagents\reagent_containers\patch.dm"
 #include "code\modules\reagents\reagent_containers\pill.dm"