Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7907

2026-08-28 22:48:38 +01:00 · 2021-03-11 15:39:06 -05:00
parent e0a61cc1d6 f75b0bc9d5
commit efe06bf946
543 changed files with 452288 additions and 110370 deletions
@@ -1,6 +1,6 @@
 name: Autochangelog
 on: 
-    pull_request:
+    pull_request_target:
        types: closed
        branches:
            - master
@@ -15,6 +15,10 @@ jobs:
        if: github.event.pull_request.merged == true
        steps:
          - uses: /actions/checkout@v2
+            with:
+                ref: master
+          - name: Update repository to master
+            run: git pull "origin" master
          - name: Ensure +x on CI directory
            run: |
                chmod -R +x ./tools/ci
@@ -41,7 +41,7 @@ jobs:
        run: |
          sudo dpkg --add-architecture i386
          sudo apt update || true
-          sudo apt install libc6:i386 libgcc1:i386 libstdc++6:i386 libssl1.0.0:i386 g++-7 g++-7-multilib gcc-multilib zlib1g:i386
+          sudo apt install libc6:i386 libgcc1:i386 libstdc++6:i386 libssl1.0.0:i386 zlib1g:i386
          ldd librust_g.so
      - name: Unit Tests
        run: |
@@ -96,15 +96,6 @@
 			"You hear a ratchet.")
 		deconstruct()

-/obj/machinery/atmospherics/omni/can_unwrench()
-	var/int_pressure = 0
-	for(var/datum/omni_port/P in ports)
-		int_pressure += P.air.return_pressure()
-	var/datum/gas_mixture/env_air = loc.return_air()
-	if((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		return 0
-	return 1
-
 /obj/machinery/atmospherics/omni/attack_hand(user as mob)
 	if(..())
 		return
@@ -61,4 +61,8 @@
 #define INFECTION_LEVEL_ONE   100
 #define INFECTION_LEVEL_TWO   500
 #define INFECTION_LEVEL_THREE 1000
-#define INFECTION_LEVEL_MAX   1500
+#define INFECTION_LEVEL_MAX   1500
+
+#define MODULAR_BODYPART_INVALID    0 // Cannot be detached or reattached.
+#define MODULAR_BODYPART_PROSTHETIC 1 // Can be detached or reattached freely.
+#define MODULAR_BODYPART_CYBERNETIC 2 // Can be detached or reattached to compatible parent organs.
@@ -159,6 +159,14 @@
 #define MAT_CHITIN			"chitin"
 #define MAT_CLOTH			"cloth"
 #define MAT_SYNCLOTH		"syncloth"
+#define MAT_COPPER			"copper"
+#define MAT_QUARTZ			"quartz"
+#define MAT_TIN				"tin"
+#define MAT_VOPAL			"void opal"
+#define MAT_ALUMINIUM		"aluminium"
+#define MAT_BRONZE			"bronze"
+#define MAT_PAINITE			"painite"
+#define MAT_BOROSILICATE	"borosilicate glass"

 #define SHARD_SHARD "shard"
 #define SHARD_SHRAPNEL "shrapnel"
@@ -24,6 +24,30 @@
 #define EMP_TOX_DMG	0x80	// EMPs inflict toxin damage
 #define EMP_OXY_DMG	0x100	// EMPs inflict oxy damage

+// Species allergens
+#define MEAT		0x1	// Skrell won't like this.
+#define FISH		0x2	// Seperate for completion's sake. Still bad for skrell.
+#define FRUIT		0x4	// An apple a day only keeps the doctor away if they're allergic.
+#define VEGETABLE	0x8	// Taters 'n' carrots. Potato allergy is a thing, apparently.
+#define GRAINS		0x10	// Wheat, oats, etc.
+#define BEANS		0x20	// The musical fruit! Includes soy.
+#define SEEDS		0x40	// Hope you don't have a nut allergy.
+#define DAIRY		0x80	// Lactose intolerance, ho! Also bad for skrell.
+#define FUNGI		0x100	// Delicious shrooms.
+#define COFFEE		0x200	// Mostly here for tajara.
+#define GENERIC		0x400	// Catchall for stuff that doesn't fall into the groups above. You shouldn't be allergic to this type, ever.
+#define SUGARS		0x800	// For unathi-like reactions
+#define EGGS      0x1000 // For Skrell eggs allergy
+
+// Allergen reactions
+#define AG_TOX_DMG	0x1	// the classic 
+#define AG_OXY_DMG	0x2	// intense airway reactions
+#define AG_EMOTE	0x4	// general emote reactions based on affect type
+#define AG_PAIN		0x8	// short-lived hurt
+#define AG_WEAKEN	0x10	// too weak to move, oof
+#define AG_BLURRY	0x20	// blurred vision!
+#define AG_SLEEPY	0x40	// fatigue/exhaustion
+
 // Species spawn flags
 #define SPECIES_IS_WHITELISTED    0x1    // Must be whitelisted to play.
 #define SPECIES_IS_RESTRICTED     0x2    // Is not a core/normally playable species. (castes, mutantraces)
@@ -1 +1,2 @@
-var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
+var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
+var/datum/gear_tweak/implant_location/gear_tweak_implant_location = new()
@@ -43,6 +43,11 @@ var/global/list/facial_hair_styles_male_list = list()
 var/global/list/facial_hair_styles_female_list = list()
 var/global/list/skin_styles_female_list = list()		//unused
 var/global/list/body_marking_styles_list = list()		//stores /datum/sprite_accessory/marking indexed by name
+var/global/list/ear_styles_list = list()	// Stores /datum/sprite_accessory/ears indexed by type
+var/global/list/tail_styles_list = list()	// Stores /datum/sprite_accessory/tail indexed by type
+var/global/list/wing_styles_list = list()	// Stores /datum/sprite_accessory/wing indexed by type
+
+GLOBAL_LIST(custom_species_bases)
 	//Underwear
 var/datum/category_collection/underwear/global_underwear = new()

@@ -94,13 +99,13 @@ var/global/list/string_slot_flags = list(
 	"holster" = SLOT_HOLSTER
 )

-/proc/get_mannequin(var/ckey)
-	if(!mannequins_)
-		mannequins_ = new()
- 	. = mannequins_[ckey]
-	if(!.)
-		. = new/mob/living/carbon/human/dummy/mannequin()
-		mannequins_[ckey] = .
+GLOBAL_LIST_EMPTY(mannequins)
+/proc/get_mannequin(var/ckey = "NULL")
+	var/mob/living/carbon/human/dummy/mannequin/M = GLOB.mannequins[ckey]
+	if(!istype(M))
+		GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null)
+		M = GLOB.mannequins[ckey]
+	return M

 //////////////////////////
 /////Initial Building/////
@@ -214,6 +219,23 @@ var/global/list/string_slot_flags = list(
 		var/decl/closet_appearance/app = new T()
 		GLOB.closet_appearances[T] = app

+	paths = typesof(/datum/sprite_accessory/ears) - /datum/sprite_accessory/ears
+	for(var/path in paths)
+		var/obj/item/clothing/head/instance = new path()
+		ear_styles_list[path] = instance
+
+	// Custom Tails
+	paths = typesof(/datum/sprite_accessory/tail) - /datum/sprite_accessory/tail - /datum/sprite_accessory/tail/taur
+	for(var/path in paths)
+		var/datum/sprite_accessory/tail/instance = new path()
+		tail_styles_list[path] = instance
+
+	// Custom Wings
+	paths = typesof(/datum/sprite_accessory/wing) - /datum/sprite_accessory/wing
+	for(var/path in paths)
+		var/datum/sprite_accessory/wing/instance = new path()
+		wing_styles_list[path] = instance
+
 	// VOREStation Add - Vore Modes!
 	paths = typesof(/datum/digest_mode)
 	for(var/T in paths)
@@ -221,6 +243,41 @@ var/global/list/string_slot_flags = list(
 		GLOB.digest_modes[DM.id] = DM
 	// VOREStation Add End

+/*
+	// Custom species traits
+	paths = typesof(/datum/trait) - /datum/trait
+	for(var/path in paths)
+		var/datum/trait/instance = new path()
+		if(!instance.name)
+			continue //A prototype or something
+		var/cost = instance.cost
+		traits_costs[path] = cost
+		all_traits[path] = instance
+		switch(cost)
+			if(-INFINITY to -0.1)
+				negative_traits[path] = instance
+			if(0)
+				neutral_traits[path] = instance
+			if(0.1 to INFINITY)
+				positive_traits[path] = instance
+*/
+
+	// Custom species icon bases
+	var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //VOREStation Edit
+	var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID) //VOREStation Edit
+	for(var/species_name in GLOB.playable_species)
+		if(species_name in blacklisted_icons)
+			continue
+		var/datum/species/S = GLOB.all_species[species_name]
+		if(S.spawn_flags & SPECIES_IS_WHITELISTED)
+			continue
+		GLOB.custom_species_bases += species_name
+	for(var/species_name in whitelisted_icons)
+		GLOB.custom_species_bases += species_name
+
+	return 1 // Hooks must return 1
+
+
 	return 1

 /* // Uncomment to debug chemical reaction list.
@@ -2,10 +2,7 @@
 * VOREStation global lists
 */

-var/global/list/ear_styles_list = list()	// Stores /datum/sprite_accessory/ears indexed by type
 var/global/list/hair_accesories_list= list()// Stores /datum/sprite_accessory/hair_accessory indexed by type
-var/global/list/tail_styles_list = list()	// Stores /datum/sprite_accessory/tail indexed by type
-var/global/list/wing_styles_list = list()	// Stores /datum/sprite_accessory/wing indexed by type
 var/global/list/negative_traits = list()	// Negative custom species traits, indexed by path
 var/global/list/neutral_traits = list()		// Neutral custom species traits, indexed by path
 var/global/list/everyone_traits = list()	// Neutral traits available to all species, indexed by path
@@ -16,8 +13,6 @@ var/global/list/active_ghost_pods = list()

 var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference")	//TFF 5/8/19 - Suit Sensors global list

-var/global/list/custom_species_bases = list() // Species that can be used for a Custom Species icon base
-
 //stores numeric player size options indexed by name
 var/global/list/player_sizes_list = list(
 		"Macro" 	= RESIZE_HUGE,
@@ -481,24 +476,6 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
 /hook/startup/proc/init_vore_datum_ref_lists()
 	var/paths

-	// Custom Ears
-	paths = typesof(/datum/sprite_accessory/ears) - /datum/sprite_accessory/ears
-	for(var/path in paths)
-		var/obj/item/clothing/head/instance = new path()
-		ear_styles_list[path] = instance
-
-	// Custom Tails
-	paths = typesof(/datum/sprite_accessory/tail) - /datum/sprite_accessory/tail - /datum/sprite_accessory/tail/taur
-	for(var/path in paths)
-		var/datum/sprite_accessory/tail/instance = new path()
-		tail_styles_list[path] = instance
-
-	// Custom Wings
-	paths = typesof(/datum/sprite_accessory/wing) - /datum/sprite_accessory/wing
-	for(var/path in paths)
-		var/datum/sprite_accessory/wing/instance = new path()
-		wing_styles_list[path] = instance
-
 	// Custom Hair Accessories
 	paths = typesof(/datum/sprite_accessory/hair_accessory) - /datum/sprite_accessory/hair_accessory
 	for(var/path in paths)
@@ -524,17 +501,22 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
 			if(0.1 to INFINITY)
 				positive_traits[path] = instance

-	// Custom species icon bases
-	var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //Just ones that won't work well.
-	var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID) //Include these anyway
-	for(var/species_name in GLOB.playable_species)
-		if(species_name in blacklisted_icons)
-			continue
-		var/datum/species/S = GLOB.all_species[species_name]
-		if(S.spawn_flags & SPECIES_IS_WHITELISTED)
-			continue
-		custom_species_bases += species_name
-	for(var/species_name in whitelisted_icons)
-		custom_species_bases += species_name
+	// Weaver recipe stuff
+	paths = typesof(/datum/weaver_recipe/structure) - /datum/weaver_recipe/structure
+	for(var/path in paths)
+		var/datum/weaver_recipe/instance = new path()
+		if(!instance.title)
+			continue //A prototype or something
+		weavable_structures[instance.title] = instance
+
+	paths = typesof(/datum/weaver_recipe/item) - /datum/weaver_recipe/item
+	for(var/path in paths)
+		var/datum/weaver_recipe/instance = new path()
+		if(!instance.title)
+			continue //A prototype or something
+		weavable_items[instance.title] = instance

 	return 1 // Hooks must return 1
+
+var/global/list/weavable_structures = list()
+var/global/list/weavable_items = list()
@@ -1284,6 +1284,10 @@ var/list/WALLITEMS = list(
 			colour += temp_col
 	return colour

+/proc/color_square(red, green, blue, hex)
+	var/color = hex ? hex : "#[num2hex(red, 2)][num2hex(green, 2)][num2hex(blue, 2)]"
+	return "<span style='font-face: fixedsys; font-size: 14px; background-color: [color]; color: [color]'>___</span>"
+
 var/mob/dview/dview_mob = new

 //Version of view() which ignores darkness, because BYOND doesn't have it.
@@ -10,3 +10,7 @@
 		viewX = text2num(viewrangelist[1])
 		viewY = text2num(viewrangelist[2])
 	return list(viewX, viewY)
+
+// Used to get `atom/O as obj|mob|turf in view()` to match against strings containing apostrophes immediately after substrings that match to other objects. Somehow. - Ater
+/proc/_validate_atom(atom/A)
+	return view()
@@ -37,4 +37,7 @@

 #define random_id(key,min_id,max_id) uniqueness_repository.Generate(/datum/uniqueness_generator/id_random, key, min_id, max_id)

-#define ARGS_DEBUG log_debug("[__FILE__] - [__LINE__]") ; for(var/arg in args) { log_debug("\t[log_info_line(arg)]") }
+#define ARGS_DEBUG log_debug("[__FILE__] - [__LINE__]") ; for(var/arg in args) { log_debug("\t[log_info_line(arg)]") }
+
+#define isitem(A)		istype(A, /obj/item)
+#define isTaurTail(A)	istype(A, /datum/sprite_accessory/tail/taur)
@@ -1,3 +1 @@
 #define isbelly(A)		istype(A, /obj/belly)
-#define isitem(A)		istype(A, /obj/item)
-#define isTaurTail(A)	istype(A, /datum/sprite_accessory/tail/taur)
@@ -60,6 +60,8 @@

 	// Cyborgs have no range-checking unless there is item use
 	if(!W)
+		if(bolt && !bolt.malfunction && A.loc != module)
+			return
 		A.add_hiddenprint(src)
 		A.attack_robot(src)
 		return
@@ -120,35 +122,56 @@
 /atom/proc/BorgCtrlShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden
 	CtrlShiftClick(user)

-/obj/machinery/door/airlock/BorgCtrlShiftClick(mob/user)
+/obj/machinery/door/airlock/BorgCtrlShiftClick(var/mob/living/silicon/robot/user)
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AICtrlShiftClick(user)

 /atom/proc/BorgShiftClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden
 	ShiftClick(user)

-/obj/machinery/door/airlock/BorgShiftClick(mob/user)  // Opens and closes doors! Forwards to AI code.
+/obj/machinery/door/airlock/BorgShiftClick(var/mob/living/silicon/robot/user)  // Opens and closes doors! Forwards to AI code.
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AIShiftClick(user)

 /atom/proc/BorgCtrlClick(var/mob/living/silicon/robot/user) //forward to human click if not overriden
 	CtrlClick(user)

-/obj/machinery/door/airlock/BorgCtrlClick(mob/user) // Bolts doors. Forwards to AI code.
+/obj/machinery/door/airlock/BorgCtrlClick(var/mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AICtrlClick(user)

-/obj/machinery/power/apc/BorgCtrlClick(mob/user) // turns off/on APCs. Forwards to AI code.
+/obj/machinery/power/apc/BorgCtrlClick(var/mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AICtrlClick(user)

-/obj/machinery/turretid/BorgCtrlClick(mob/user) //turret control on/off. Forwards to AI code.
+/obj/machinery/turretid/BorgCtrlClick(var/mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AICtrlClick(user)

 /atom/proc/BorgAltClick(var/mob/living/silicon/robot/user)
 	AltClick(user)
 	return

-/obj/machinery/door/airlock/BorgAltClick(mob/user) // Eletrifies doors. Forwards to AI code.
+/obj/machinery/door/airlock/BorgAltClick(var/mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AIAltClick(user)

-/obj/machinery/turretid/BorgAltClick(mob/user) //turret lethal on/off. Forwards to AI code.
+/obj/machinery/turretid/BorgAltClick(var/mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
+	if(user.bolt && !user.bolt.malfunction)
+		return
+
 	AIAltClick(user)

 /*
@@ -5,7 +5,6 @@ SUBSYSTEM_DEF(overlays)
 	priority = FIRE_PRIORITY_OVERLAYS
 	init_order = INIT_ORDER_OVERLAY

-	var/initialized = FALSE
 	var/list/queue						// Queue of atoms needing overlay compiling (TODO-VERIFY!)
 	var/list/stats
 	var/list/overlay_icon_state_caches	// Cache thing
@@ -22,7 +21,6 @@ var/global/image/appearance_bro = new() // Temporarily super-global because of B
 	stats = list()

 /datum/controller/subsystem/overlays/Initialize()
-	initialized = TRUE
 	fire(mc_check = FALSE)
 	..()

@@ -22,6 +22,7 @@ PROCESSING_SUBSYSTEM_DEF(chemistry)
 /datum/controller/subsystem/processing/chemistry/Initialize()
 	initialize_chemical_reactions()
 	initialize_chemical_reagents()
+	..()

 //Chemical Reactions - Initialises all /datum/chemical_reaction into a list
 // It is filtered into multiple lists within a list.
@@ -183,11 +183,6 @@ var/global/datum/controller/subsystem/ticker/ticker
 	if(adm["total"] == 0)
 		send2adminirc("A round has started with no admins online.")

-/*	supply_controller.process() 		//Start the supply shuttle regenerating points -- TLE // handled in scheduler
-	master_controller.process()		//Start master_controller.process()
-	lighting_controller.process()	//Start processing DynamicAreaLighting updates
-	*/
-
 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)

@@ -326,6 +326,15 @@
 	category = list("Arms and Ammunition")
 	hidden = 1*/

+/*
+ * High Caliber
+ */
+
+/datum/category_item/autolathe/arms/rifle_145
+	name = "14.5mm round (sabot)"
+	path = /obj/item/ammo_casing/a145/highvel
+	hidden = 1
+
 ///////////////////////////////
 /*Ammo clips and Speedloaders*/
 ///////////////////////////////
@@ -1,6 +1,13 @@
 /datum/category_item/autolathe/New()
 	..()
-	var/obj/item/I = new path()
+	var/obj/item/I
+	if(path)
+		I = new path()
+
+	if(!I)	// Something has gone horribly wrong, or right.
+		log_debug("[name] created an Autolathe design without an assigned path. This is expected for only the Material Sheet generation.")
+		return
+
 	if(I.matter && !resources)
 		resources = list()
 		for(var/material in I.matter)
@@ -57,6 +64,42 @@
 	name = "Tools"
 	category_item_type = /datum/category_item/autolathe/tools

+/datum/category_group/autolathe/materials
+	name = "Materials"
+	category_item_type = /datum/category_item/autolathe/materials
+
+/datum/category_group/autolathe/materials/New()
+	..()
+
+	for(var/Name in name_to_material)
+		var/datum/material/M = name_to_material[Name]
+
+		if(!M.stack_type)	// Shouldn't happen, but might. Never know.
+			continue
+
+		if(istype(M, /datum/material/alienalloy))
+			continue
+
+		var/obj/item/stack/material/Mat = new M.stack_type()
+
+		if(Mat.name in items_by_name)
+			qdel(Mat)
+			continue
+
+		var/datum/category_item/autolathe/materials/WorkDat = new(src)
+
+		WorkDat.name = "[Mat.name]"
+		WorkDat.resources = Mat.matter.Copy()
+		WorkDat.is_stack = TRUE
+		WorkDat.no_scale = TRUE
+		WorkDat.max_stack = Mat.max_amount
+		WorkDat.path = M.stack_type
+
+		qdel(Mat)
+
+		items |= WorkDat
+		items_by_name[WorkDat.name] = WorkDat
+
 /*******************
 * Category entries *
 *******************/
@@ -4,4 +4,24 @@

 /datum/category_item/autolathe/engineering/id_restorer
 	name = "ID restoration console electronics"
-	path =/obj/item/weapon/circuitboard/id_restorer
+	path =/obj/item/weapon/circuitboard/id_restorer
+
+/datum/category_item/autolathe/engineering/oven
+	name = "oven electronics"
+	path =/obj/item/weapon/circuitboard/oven
+
+/datum/category_item/autolathe/engineering/fryer
+	name = "fryer electronics"
+	path =/obj/item/weapon/circuitboard/fryer
+
+/datum/category_item/autolathe/engineering/grill
+	name = "grill electronics"
+	path =/obj/item/weapon/circuitboard/grill
+
+/datum/category_item/autolathe/engineering/cerealmaker
+	name = "cereal maker electronics"
+	path =/obj/item/weapon/circuitboard/cerealmaker
+
+/datum/category_item/autolathe/engineering/candymachine
+	name = "candy machine electronics"
+	path =/obj/item/weapon/circuitboard/candymachine
@@ -85,44 +85,6 @@
 	name = "welding mask"
 	path =/obj/item/clothing/head/welding

-/datum/category_item/autolathe/general/metal
-	name = "steel sheets"
-	path =/obj/item/stack/material/steel
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/glass
-	name = "glass sheets"
-	path =/obj/item/stack/material/glass
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/rglass
-	name = "reinforced glass sheets"
-	path =/obj/item/stack/material/glass/reinforced
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/rods
-	name = "metal rods"
-	path =/obj/item/stack/rods
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/plasteel
-	name = "plasteel sheets"
-	path =/obj/item/stack/material/plasteel
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-	resources = list(MAT_PLASTEEL = 2000)
-
-/datum/category_item/autolathe/general/plastic
-	name = "plastic sheets"
-	path =/obj/item/stack/material/plastic
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-	resources = list(MAT_PLASTIC = 2000)
-
 //TFF 24/12/19 - Let people print more spray bottles if needed.
 /datum/category_item/autolathe/general/spraybottle
 	name = "spray bottle"
@@ -0,0 +1,38 @@
+
+/datum/category_item/autolathe/materials/metal
+	name = "steel sheets"
+	path =/obj/item/stack/material/steel
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/glass
+	name = "glass sheets"
+	path =/obj/item/stack/material/glass
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/rglass
+	name = "reinforced glass sheets"
+	path =/obj/item/stack/material/glass/reinforced
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/rods
+	name = "metal rods"
+	path =/obj/item/stack/rods
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/plasteel
+	name = "plasteel sheets"
+	path =/obj/item/stack/material/plasteel
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+	resources = list(MAT_PLASTEEL = 2000)
+
+/datum/category_item/autolathe/materials/plastic
+	name = "plastic sheets"
+	path =/obj/item/stack/material/plastic
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+	resources = list(MAT_PLASTIC = 2000)
@@ -513,8 +513,9 @@

 //HUMAN
 /mob/living/carbon/human/mind_initialize()
-	..()
-	if(!mind.assigned_role)	mind.assigned_role = USELESS_JOB	//defualt //VOREStation Edit - Visitor not Assistant
+	. = ..()
+	if(!mind.assigned_role)
+		mind.assigned_role = USELESS_JOB	//defualt //VOREStation Edit - Visitor not Assistant

 //slime
 /mob/living/simple_mob/slime/mind_initialize()
@@ -35,6 +35,7 @@ GLOBAL_LIST(active_department_goals)
 				cat_goals -= G

 				GLOB.active_department_goals[category] |= G
+	return 1

 /hook/roundend/proc/checkDepartmentGoals()
 	for(var/category in GLOB.active_department_goals)
@@ -50,6 +51,7 @@ GLOBAL_LIST(active_department_goals)
 				var/success = G.check_completion()
 				to_world("<span class='filter_system'>[success ? "<span class='notice'>[G.name]</span>" : "<span class='warning'>[G.name]</span>"]</span>")
 				to_world("<span class='filter_system'>[G.goal_text]</span>")
+	return 1

 /datum/goal
 	var/name = "goal"
@@ -32,7 +32,7 @@ GLOBAL_VAR_INIT(mech_destroyed_roundstat, 0)
 	else if(GLOB.mech_destroyed_roundstat > 1)
 		valid_stats_list.Add("[GLOB.mech_destroyed_roundstat] mechs were destroyed this shift. What did you do?")
 	else if(GLOB.seed_planted_shift_roundstat > 20)
-		valid_stats_list.Add("[GLOB.seed_planted_shift_roundstat] were planted according to our sensors this shift.")
+		valid_stats_list.Add("[GLOB.seed_planted_shift_roundstat] seeds were planted according to our sensors this shift.")

 	if(GLOB.rocks_drilled_roundstat > 80)
 		valid_stats_list.Add("Our strong miners pulverized a whole [GLOB.rocks_drilled_roundstat] piles of pathetic rubble.")
@@ -35,6 +35,13 @@
 	containertype = /obj/structure/closet/crate/grayson
 	containername = "Plastic sheets crate"

+/datum/supply_pack/materials/copper50
+	name = "50 copper ingots"
+	contains = list(/obj/fiftyspawner/copper)
+	cost = 60
+	containertype = /obj/structure/closet/crate/grayson
+	containername = "Copper ingots crate"
+
 /datum/supply_pack/materials/cardboard_sheets
 	contains = list(/obj/fiftyspawner/cardboard)
 	name = "50 cardboard sheets"
@@ -20,7 +20,7 @@
 			/obj/item/clothing/suit/straight_jacket,
 			/obj/item/weapon/handcuffs/legcuffs/fuzzy,
 			/obj/item/weapon/melee/fluff/holochain/mass,
-			/obj/item/weapon/material/twohanded/fluff/riding_crop,
+			/obj/item/weapon/material/twohanded/riding_crop,
 			/obj/item/clothing/under/fluff/latexmaid
 			)
 	containertype = /obj/structure/closet/crate
@@ -189,6 +189,17 @@
 	containername = "Jumper kit crate"
 	access = access_robotics

+/datum/supply_pack/robotics/restrainingbolt
+	name = "Restraining bolt crate"
+	contains = list(
+			/obj/item/weapon/implanter = 1,
+			/obj/item/weapon/implantcase/restrainingbolt = 2
+			)
+	cost = 40
+	containertype = /obj/structure/closet/crate/secure/cybersolutions
+	containername = "Restraining bolt crate"
+	access = access_robotics
+
 /datum/supply_pack/robotics/bike
 	name = "Spacebike Crate"
 	contains = list()
@@ -281,10 +281,7 @@
 	name = "Armor - Riot plates"
 	contains = list(
 			/obj/item/clothing/head/helmet/riot,
-			/obj/item/clothing/suit/armor/pcarrier,
-			/obj/item/clothing/accessory/armor/armorplate/riot,
-			/obj/item/clothing/accessory/armor/armguards/riot,
-			/obj/item/clothing/accessory/armor/legguards/riot
+			/obj/item/clothing/suit/armor/pcarrier/riot/full
 			)
 	cost = 40
 	containertype = /obj/structure/closet/crate/secure/lawson
@@ -308,10 +305,7 @@
 	name = "Armor - Ablative plates"
 	contains = list(
 			/obj/item/clothing/head/helmet/laserproof,
-			/obj/item/clothing/suit/armor/pcarrier,
-			/obj/item/clothing/accessory/armor/armorplate/laserproof,
-			/obj/item/clothing/accessory/armor/armguards/laserproof,
-			/obj/item/clothing/accessory/armor/legguards/laserproof
+			/obj/item/clothing/suit/armor/pcarrier/laserproof/full
 			)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure/lawson
@@ -336,10 +330,7 @@
 	name = "Armor - Ballistic plates"
 	contains = list(
 			/obj/item/clothing/head/helmet/bulletproof,
-			/obj/item/clothing/suit/armor/pcarrier,
-			/obj/item/clothing/accessory/armor/armorplate/bulletproof,
-			/obj/item/clothing/accessory/armor/armguards/bulletproof,
-			/obj/item/clothing/accessory/armor/legguards/bulletproof
+			/obj/item/clothing/suit/armor/pcarrier/bulletproof/full
 			)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure/heph
@@ -186,4 +186,14 @@

 /datum/category_item/underwear/undershirt/pinkblack_tshirt
 	name = "Pink and Black T-Shirt"
-	icon_state = "pinkblack_tshirt"
+	icon_state = "pinkblack_tshirt"
+
+/datum/category_item/underwear/undershirt/turtle
+	name = "Turtleneck"
+	icon_state = "turtleneck"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/sleevelessturtle
+	name = "Turtleneck, Sleeveless"
+	icon_state = "sleevelessturtle"
+	has_color = TRUE
@@ -54,10 +54,8 @@

 /area/Initialize()
 	. = ..()
-
 	luminosity = !(dynamic_lighting)
 	icon_state = ""
-
 	return INITIALIZE_HINT_LATELOAD // Areas tradiationally are initialized AFTER other atoms.

 /area/LateInitialize()
@@ -68,7 +66,6 @@
 	power_change()		// all machines set to current power level, also updates lighting icon
 	if(no_spoilers)
 		set_spoiler_obfuscation(TRUE)
-	return INITIALIZE_HINT_LATELOAD

 // Changes the area of T to A. Do not do this manually.
 // Area is expected to be a non-null instance.
@@ -627,7 +627,7 @@
 			speech_bubble_hearers += M.client

 	if(length(speech_bubble_hearers))
-		var/image/I = image('icons/mob/talk.dmi', src, "[bubble_icon][say_test(message)]", FLY_LAYER)
+		var/image/I = generate_speech_bubble(src, "[bubble_icon][say_test(message)]", FLY_LAYER)
 		I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
 		INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_hearers, 30)

@@ -134,7 +134,7 @@
 				for(var/i in loc)
 					var/atom/movable/thing = i
 					// We don't call parent so we are calling this for byond
-					thing.Crossed(src)
+					thing.Crossed(src, oldloc)

 			// We're a multi-tile object (multiple locs)
 			else if(. && newloc)
@@ -303,6 +303,8 @@
 				if(AM == src)
 					continue
 				AM.Uncrossed(src)
+				if(loc != destination) // Uncrossed() triggered a separate movement
+					return

 			// Information about turf and z-levels for source and dest collected
 			var/turf/oldturf = get_turf(oldloc)
@@ -327,6 +329,8 @@
 				if(AM == src)
 					continue
 				AM.Crossed(src, oldloc)
+				if(loc != destination) // Crossed triggered a separate movement
+					return

 			// Call our thingy to inform everyone we moved
 			Moved(oldloc, NONE, TRUE)
@@ -462,6 +466,8 @@
 		minor_dir = dx
 		minor_dist = dist_x

+	range = min(dist_x + dist_y, range)
+
 	while(src && target && src.throwing && istype(src.loc, /turf) \
 		  && ((abs(target.x - src.x)+abs(target.y - src.y) > 0 && dist_travelled < range) \
 		  	   || (a && a.has_gravity == 0) \
@@ -118,6 +118,10 @@ var/global/list/datum/dna/gene/dna_genes[0]
 	var/base_species = "Human"
 	var/list/species_traits = list()
 	var/blood_color = "#A10808"
+	var/custom_say
+	var/custom_ask
+	var/custom_whisper
+	var/custom_exclaim
 	// VOREStation

 	// New stuff
@@ -139,6 +143,10 @@ var/global/list/datum/dna/gene/dna_genes[0]
 	new_dna.custom_species=custom_species //VOREStaton Edit
 	new_dna.species_traits=species_traits.Copy() //VOREStation Edit
 	new_dna.blood_color=blood_color //VOREStation Edit
+	new_dna.custom_say=custom_say //VOREStaton Edit
+	new_dna.custom_ask=custom_ask //VOREStaton Edit
+	new_dna.custom_whisper=custom_whisper //VOREStaton Edit
+	new_dna.custom_exclaim=custom_exclaim //VOREStaton Edit
 	for(var/b=1;b<=DNA_SE_LENGTH;b++)
 		new_dna.SE[b]=SE[b]
 		if(b<=DNA_UI_LENGTH)
@@ -205,6 +213,10 @@ var/global/list/datum/dna/gene/dna_genes[0]
 	src.base_species = character.species.base_species
 	src.blood_color = character.species.blood_color
 	src.species_traits = character.species.traits.Copy()
+	src.custom_say = character.custom_say
+	src.custom_ask = character.custom_ask
+	src.custom_whisper = character.custom_whisper
+	src.custom_exclaim = character.custom_exclaim

 	// +1 to account for the none-of-the-above possibility
 	SetUIValueRange(DNA_UI_EAR_STYLE,	ear_style + 1,     ear_styles_list.len  + 1,  1)
@@ -237,6 +237,10 @@

 		// Technically custom_species is not part of the UI, but this place avoids merge problems.
 		H.custom_species = dna.custom_species
+		H.custom_say = dna.custom_say
+		H.custom_ask = dna.custom_ask
+		H.custom_whisper = dna.custom_whisper
+		H.custom_exclaim = dna.custom_exclaim
 		H.species.blood_color = dna.blood_color
 		var/datum/species/S = H.species
 		S.produceCopy(dna.base_species,dna.species_traits,src)
@@ -34,7 +34,7 @@
 	var/last_activation = 0

 /obj/structure/cult/pylon/Initialize()
-	..()
+	. = ..()
 	START_PROCESSING(SSobj, src)

 /obj/structure/cult/pylon/attack_hand(mob/M as mob)
@@ -26,13 +26,13 @@
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
+			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
+			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway)

 /datum/alt_title/deputy_manager
 	title = "Deputy Manager"
@@ -6,12 +6,12 @@
 	access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
 			            access_heads, access_construction,
-			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload)
+			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)

 	minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
 			            access_heads, access_construction,
-			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload)
+			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
 	alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager)

 /datum/alt_title/head_engineer
@@ -1,8 +1,3 @@
-var/const/PATHFINDER 		=(1<<11)
-var/const/EXPLORER 			=(1<<12)
-var/const/PILOT 			=(1<<13)
-var/const/SAR 				=(1<<14)
-
 /obj/item/weapon/card/id/medical/sar
 	assignment = "Field Medic"
 	rank = "Field Medic"
@@ -64,13 +59,13 @@ var/const/SAR 				=(1<<14)
 /datum/job/pilot
 	title = "Pilot"
 	flag = PILOT
-	departments = list(DEPARTMENT_PLANET)
-	department_flag = MEDSCI
+	departments = list(DEPARTMENT_CIVILIAN)
+	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 4
-	spawn_positions = 4
-	supervisors = "the Pathfinder and the Head of Personnel"
-	selection_color = "#999440"
+	total_positions = 5
+	spawn_positions = 5
+	supervisors = "the Head of Personnel"
+	selection_color = "#515151"
 	economic_modifier = 5
 	minimal_player_age = 3
 	pto_type = PTO_EXPLORATION
@@ -5,11 +5,11 @@

 	access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
-			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels)
+			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)

 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
-			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels)
+			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
 	alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, "Healthcare Manager" = /datum/alt_title/healthcare_manager)

 /datum/alt_title/chief_physician
@@ -10,7 +10,7 @@
 	minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
 			            access_tox_storage, access_teleporter,
 			            access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
-			            access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany)
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network, access_xenobotany)
 	alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager,
 						"Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist)

@@ -6,11 +6,11 @@
 	access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
 						access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 						access_construction,
-						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks)
+						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
 	minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
 						access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 						access_construction,
-						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks)
+						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
 	alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief, "Security Manager" = /datum/alt_title/security_manager)

 /datum/alt_title/security_manager
@@ -415,7 +415,7 @@ var/global/datum/controller/occupations/job_master

 					// Implants get special treatment
 					if(G.slot == "implant")
-						var/obj/item/weapon/implant/I = G.spawn_item(H)
+						var/obj/item/weapon/implant/I = G.spawn_item(H, H.client.prefs.gear[G.display_name])
 						I.invisibility = 100
 						I.implant_loadout(H)
 						continue
@@ -514,11 +514,12 @@ var/global/datum/controller/occupations/job_master
 			var/obj/item/organ/external/l_foot = H.get_organ("l_foot")
 			var/obj/item/organ/external/r_foot = H.get_organ("r_foot")
 			var/obj/item/weapon/storage/S = locate() in H.contents
-			var/obj/item/wheelchair/R = null
+			var/obj/item/wheelchair/R
 			if(S)
 				R = locate() in S.contents
 			if(!l_foot || !r_foot || R)
-				var/obj/structure/bed/chair/wheelchair/W = new /obj/structure/bed/chair/wheelchair(H.loc)
+				var/wheelchair_type = R?.unfolded_type || /obj/structure/bed/chair/wheelchair
+				var/obj/structure/bed/chair/wheelchair/W = new wheelchair_type(H.loc)
 				W.buckle_mob(H)
 				H.update_canmove()
 				W.set_dir(H.dir)
@@ -26,7 +26,10 @@ var/const/PSYCHIATRIST		=(1<<7)
 var/const/ROBOTICIST		=(1<<8)
 var/const/XENOBIOLOGIST		=(1<<9)
 var/const/PARAMEDIC			=(1<<10)
-var/const/XENOBOTANIST		=(1<<15) //VOREStation Add
+var/const/PATHFINDER 		=(1<<11) //VOREStation Add
+var/const/EXPLORER 			=(1<<12) //VOREStation Add
+var/const/SAR 				=(1<<13) //VOREStation Add
+var/const/XENOBOTANIST		=(1<<14) //VOREStation Add

 var/const/CIVILIAN			=(1<<2)

@@ -43,9 +46,10 @@ var/const/LAWYER			=(1<<9)
 var/const/CHAPLAIN			=(1<<10)
 var/const/ASSISTANT			=(1<<11)
 var/const/BRIDGE			=(1<<12)
-var/const/CLOWN				=(1<<13) //VOREStation Add
-var/const/MIME				=(1<<14) //VOREStation Add
-var/const/ENTERTAINER		=(1<<15) //VOREStation Add
+var/const/PILOT 			=(1<<13) //VOREStation Add
+var/const/CLOWN				=(1<<14) //VOREStation Add
+var/const/MIME				=(1<<15) //VOREStation Add
+var/const/ENTERTAINER		=(1<<16) //VOREStation Add

 //VOREStation Add
 var/const/TALON				=(1<<3)
@@ -529,5 +529,5 @@
 	stasis_level = 100 //Just one setting

 /obj/machinery/sleeper/survival_pod/Initialize()
-	..()
+	. = ..()
 	RefreshParts(1)
@@ -14,7 +14,6 @@
 	active_power_usage = 10000	//10 kW. It's a big all-body scanner.
 	light_color = "#00FF00"
 	var/obj/machinery/body_scanconsole/console
-	var/known_implants = list(/obj/item/weapon/implant/health, /obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/language, /obj/item/weapon/implant/language/eal, /obj/item/weapon/implant/backup, /obj/item/device/nif) //VOREStation Add - Backup Implant, NIF
 	var/printing_text = null

 /obj/machinery/bodyscanner/Initialize()
@@ -255,12 +254,11 @@
 			organData["broken"] = E.min_broken_damage

 			var/implantData[0]
-			for(var/obj/I in E.implants)
+			for(var/obj/thing in E.implants)
 				var/implantSubData[0]
-				implantSubData["name"] = I.name
-				if(is_type_in_list(I, known_implants))
-					implantSubData["known"] = 1
-
+				var/obj/item/weapon/implant/I = thing
+				implantSubData["name"] =  I.name
+				implantSubData["known"] = istype(I) && I.known_implant
 				implantData.Add(list(implantSubData))

 			organData["implants"] = implantData
@@ -464,8 +462,9 @@
 					infected = "Gangrene Detected:"

 			var/unknown_body = 0
-			for(var/I in e.implants)
-				if(is_type_in_list(I,known_implants))
+			for(var/thing in e.implants)
+				var/obj/item/weapon/implant/I = thing
+				if(istype(I) && I.known_implant)
 					imp += "[I] implanted:"
 				else
 					unknown_body++
@@ -36,6 +36,14 @@
 	if(!autolathe_recipes)
 		autolathe_recipes = new()
 	wires = new(src)
+
+	for(var/Name in name_to_material)
+		if(Name in stored_material)
+			continue
+
+		stored_material[Name] = 0
+		storage_capacity[Name] = 0
+
 	default_apply_parts()
 	RefreshParts()

@@ -270,6 +278,15 @@

 			//Create the desired item.
 			var/obj/item/I = new making.path(src.loc)
+
+			if(LAZYLEN(I.matter))	// Sadly we must obey the laws of equivalent exchange.
+				I.matter.Cut()
+			else
+				I.matter = list()
+
+			for(var/material in making.resources)	// Handle the datum's autoscaling for waste, so we're properly wasting material, but not so much if we have efficiency.
+				I.matter[material] = round(making.resources[material] / (making.no_scale ? 1 : 1.25)) * (making.no_scale ? 1 : mat_efficiency)
+
 			flick("[initial(icon_state)]_finish", src)
 			if(multiplier > 1)
 				if(istype(I, /obj/item/stack))
@@ -277,7 +294,16 @@
 					S.amount = multiplier
 				else
 					for(multiplier; multiplier > 1; --multiplier) // Create multiple items if it's not a stack.
-						new making.path(src.loc)
+						I = new making.path(src.loc)
+						// We've already deducted the cost of multiple items. Process the matter the same.
+						if(LAZYLEN(I.matter))
+							I.matter.Cut()
+
+						else
+							I.matter = list()
+
+						for(var/material in making.resources)
+							I.matter[material] = round(making.resources[material] / (making.no_scale ? 1 : 1.25)) * (making.no_scale ? 1 : mat_efficiency)
 			return TRUE
 	return FALSE

@@ -303,10 +329,9 @@
 	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
 		man_rating += M.rating

-	storage_capacity[DEFAULT_WALL_MATERIAL] = mb_rating  * 25000
-	storage_capacity[MAT_PLASTIC] = mb_rating * 20000
-	storage_capacity[MAT_PLASTEEL] = mb_rating * 16250
-	storage_capacity["glass"] = mb_rating  * 12500
+	for(var/mat_name in storage_capacity)
+		storage_capacity[mat_name] = mb_rating * 25000
+
 	build_time = 50 / man_rating
 	mat_efficiency = 1.1 - man_rating * 0.1// Normally, price is 1.25 the amount of material, so this shouldn't go higher than 0.6. Maximum rating of parts is 5
 	update_tgui_static_data(usr)
@@ -465,6 +465,7 @@

 /obj/item/weapon/implant/health
 	name = "health implant"
+	known_implant = TRUE
 	var/healthstring = ""

 /obj/item/weapon/implant/health/proc/sensehealth()
@@ -1,9 +1,8 @@
-/obj/machinery/computer/arcade/
+/obj/machinery/computer/arcade
 	name = "random arcade"
 	desc = "random arcade machine"
-	icon_state = "arcade"
+	icon_state = "arcade1"
 	icon_keyboard = null
-	icon_screen = "invaders"
 	clicksound = null	//Gets too spammy and makes no sense for arcade to have the console keyboard noise anyway
 	var/list/prizes = list(	/obj/item/weapon/storage/box/snappops					= 2,
 							/obj/item/toy/blink										= 2,
@@ -25,15 +24,15 @@
 							/obj/item/toy/stickhorse								= 2
 							)

-/obj/machinery/computer/arcade/New()
-	..()
+/obj/machinery/computer/arcade/Initialize()
+	. = ..()
 	// If it's a generic arcade machine, pick a random arcade
 	// circuit board for it and make the new machine
 	if(!circuit)
 		var/choice = pick(subtypesof(/obj/item/weapon/circuitboard/arcade) - /obj/item/weapon/circuitboard/arcade/clawmachine)
 		var/obj/item/weapon/circuitboard/CB = new choice()
 		new CB.build_path(loc, CB)
-		qdel(src)
+		return INITIALIZE_HINT_QDEL

 /obj/machinery/computer/arcade/proc/prizevend()
 	if(!(contents-circuit).len)
@@ -77,9 +76,10 @@
 ///////////////////

 /obj/machinery/computer/arcade/battle
-	name = "arcade machine"
-	desc = "Does not support Pinball."
-	icon_state = "arcade"
+	name = "Battler"
+	desc = "Fight through what space has to offer!"
+	icon_state = "arcade2"
+	icon_screen = "battler"
 	circuit = /obj/item/weapon/circuitboard/arcade/battle
 	var/enemy_name = "Space Villian"
 	var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc
@@ -310,7 +310,8 @@
 /obj/machinery/computer/arcade/orion_trail
 	name = "The Orion Trail"
 	desc = "Learn how our ancestors got to Orion, and have fun in the process!"
-	icon_state = "arcade"
+	icon_state = "arcade1"
+	icon_screen = "orion"
 	circuit = /obj/item/weapon/circuitboard/arcade/orion_trail
 	var/busy = 0 //prevent clickspam that allowed people to ~speedrun~ the game.
 	var/engine = 0
@@ -26,7 +26,7 @@
 	light_color = "#315ab4"

 /obj/machinery/computer/cloning/Initialize()
-	..()
+	. = ..()
 	pods = list()
 	records = list()
 	set_scan_temp("Scanner ready.", "good")
@@ -29,7 +29,7 @@


 /obj/machinery/computer/med_data/Initialize()
-	..()
+	. = ..()
 	field_edit_questions = list(
 		// General
 		"sex" = "Please select new sex:",
@@ -335,7 +335,7 @@
 	name = "Monitor Decryption Key"

 /obj/item/weapon/paper/monitorkey/Initialize()
-	..() //Late init
+	..()
 	return INITIALIZE_HINT_LATELOAD

 /obj/item/weapon/paper/monitorkey/LateInitialize()
@@ -13,7 +13,7 @@
 	var/title = "Mass Driver Controls"

 /obj/machinery/computer/pod/Initialize()
-	..() //Not returning parent because lateload
+	..()
 	return INITIALIZE_HINT_LATELOAD

 /obj/machinery/computer/pod/LateInitialize()
@@ -15,6 +15,9 @@
 	var/stop = 0.0
 	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed

+/obj/machinery/computer/prisoner/attack_ai(var/mob/user as mob)
+	return src.attack_hand(user)
+
 /obj/machinery/computer/prisoner/attack_hand(mob/user)
 	if(..())
 		return
@@ -28,7 +31,7 @@

 /obj/machinery/computer/prisoner/tgui_data(mob/user)
 	var/list/data = list()
-	
+
 	data["locked"] = !screen
 	data["chemImplants"] = list()
 	data["trackImplants"] = list()
@@ -65,24 +68,22 @@

 	return data

+
 /obj/machinery/computer/prisoner/tgui_act(action, list/params)
 	if(..())
 		return TRUE
-
 	switch(action)
 		if("inject")
 			var/obj/item/weapon/implant/I = locate(params["imp"])
 			if(I)
 				I.activate(clamp(params["val"], 0, 10))
 			. = TRUE
-
 		if("lock")
 			if(allowed(usr))
 				screen = !screen
 			else
 				to_chat(usr, "Unauthorized Access.")
 			. = TRUE
-
 		if("warn")
 			var/warning = sanitize(input(usr, "Message:", "Enter your message here!", ""))
 			if(!warning)
@@ -91,5 +92,4 @@
 			if(I && I.imp_in)
 				to_chat(I.imp_in, "<span class='notice'>You hear a voice in your head saying: '[warning]'</span>")
 			. = TRUE
-
 	add_fingerprint(usr)
@@ -25,7 +25,7 @@
 	var/static/list/field_edit_choices

 /obj/machinery/computer/secure_data/Initialize()
-	..()
+	. = ..()
 	field_edit_questions = list(
 		// General
 		"name" = "Please enter new name:",
@@ -389,11 +389,11 @@

 					if(field == "age")
 						answer = text2num(answer)
-					
+
 					if(field == "rank")
 						if(answer in joblist)
 							active1.fields["real_rank"] = answer
-					
+
 					if(field == "criminal")
 						for(var/mob/living/carbon/human/H in player_list)
 							BITSET(H.hud_updateflag, WANTED_HUD)
@@ -30,7 +30,7 @@
 	var/static/list/field_edit_choices

 /obj/machinery/computer/skills/Initialize()
-	..()
+	. = ..()
 	field_edit_questions = list(
 		// General
 		"name" = "Please input new name:",
@@ -862,14 +862,14 @@ About the new airlock wires panel:

 /obj/machinery/door/airlock/tgui_data(mob/user)
 	var/list/data = list()
-	
+
 	var/list/power = list()
 	power["main"] = main_power_lost_until > 0 ? 0 : 2
 	power["main_timeleft"] = round(main_power_lost_until > 0 ? max(main_power_lost_until - world.time,	0) / 10 : main_power_lost_until, 1)
 	power["backup"] = backup_power_lost_until > 0 ? 0 : 2
 	power["backup_timeleft"] = round(backup_power_lost_until > 0 ? max(backup_power_lost_until - world.time, 0) / 10 : backup_power_lost_until, 1)
 	data["power"] = power
-	
+
 	data["shock"] = (electrified_until == 0) ? 2 : 0
 	data["shock_timeleft"] = round(electrified_until > 0 ? max(electrified_until - world.time, 	0) / 10 : electrified_until, 1)
 	data["id_scanner"] = !aiDisabledIdScanner
@@ -8,8 +8,6 @@
 #define PRESET_MEDIUM 5 MINUTES
 #define PRESET_LONG 10 MINUTES

-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // Brig Door control displays.
 //  Description: This is a controls the timer for the brig doors, displays the timer on itself and
@@ -25,22 +23,21 @@
 	layer = ABOVE_WINDOW_LAYER
 	desc = "A remote control for a door."
 	req_access = list(access_brig)
-	anchored = 1.0		// can't pick it up
-	density = 0			// can walk through it.
-	var/id = null		// id of door it controls.
-
+	anchored = 1.0    		// can't pick it up
+	density = 0       		// can walk through it.
+	var/id = null     		// id of door it controls.
 	var/activation_time = 0
 	var/timer_duration = 0

 	var/timing = FALSE		// boolean, true/1 timer is on, false/0 means it's not timing
 	var/list/obj/machinery/targets = list()

+
 	maptext_height = 26
 	maptext_width = 32

 /obj/machinery/door_timer/Initialize()
 	..()
-	//Doors need to go first, and can't rely on init order, so come back to me.
 	return INITIALIZE_HINT_LATELOAD

 /obj/machinery/door_timer/LateInitialize()
@@ -72,12 +69,12 @@
 /obj/machinery/door_timer/process()
 	if(stat & (NOPOWER|BROKEN))
 		return
-
 	if(timing)
 		if(world.time - activation_time >= timer_duration)
 			timer_end() // open doors, reset timer, clear status screen
 		update_icon()

+
 // has the door power situation changed, if so update icon.
 /obj/machinery/door_timer/power_change()
 	..()
@@ -108,7 +105,7 @@
 		C.icon_state = "closed_locked"
 	return 1

-// Opens and unlocks doors, power check
+/// Opens and unlocks doors, power check
 /obj/machinery/door_timer/proc/timer_end(forced = FALSE)
 	if(stat & (NOPOWER|BROKEN))
 		return 0
@@ -145,6 +142,9 @@
 	if(timer_duration && activation_time && timing) // Setting it while active will reset the activation time
 		activation_time = world.time

+/obj/machinery/door_timer/attack_ai(mob/user)
+	return src.attack_hand(user)
+
 /obj/machinery/door_timer/attack_hand(mob/user)
 	if(..())
 		return TRUE
@@ -4,6 +4,7 @@

 /datum/feed_message
 	var/author =""
+	var/title
 	var/body =""
 	var/message_type ="Story"
 	var/datum/feed_channel/parent_channel
@@ -58,9 +59,6 @@
 	var/list/datum/feed_channel/network_channels = list()
 	var/datum/feed_message/wanted_issue

-/datum/feed_network/New()
-	CreateFeedChannel("Station Announcements", "SS13", 1, 1, "New Station Announcement Available")
-
 /datum/feed_network/proc/CreateFeedChannel(var/channel_name, var/author, var/locked, var/adminChannel = 0, var/announcement_message)
 	var/datum/feed_channel/newChannel = new /datum/feed_channel
 	newChannel.channel_name = channel_name
@@ -73,12 +71,16 @@
 		newChannel.announcement = "Breaking news from [channel_name]!"
 	network_channels += newChannel

-/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/message_type = "")
+/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/message_type = "", var/title)
 	var/datum/feed_message/newMsg = new /datum/feed_message
 	newMsg.author = author
 	newMsg.body = msg
 	newMsg.time_stamp = "[stationtime2text()]"
 	newMsg.is_admin_message = adminMessage
+	if(title)
+		newMsg.title = title
+	else
+		newMsg.title = "News Update"
 	newMsg.post_time = round_duration_in_ds // Should be almost universally unique
 	if(message_type)
 		newMsg.message_type = message_type
@@ -147,6 +149,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
 		// 1 = there has
 	var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster
 	var/msg = "";                //Feed message
+	var/title = "";				// Feed title
 	var/datum/news_photo/photo_data = null
 	var/channel_name = ""; //the feed channel which will be receiving the feed, or being created
 	var/c_locked=0;        //Will our new channel be locked to public submissions?
@@ -164,7 +167,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
 	securityCaster = 1

 /obj/machinery/newscaster/Initialize()
-	..() //Not returning . because lateload below
+	..()
 	allCasters += src
 	unit_no = ++unit_no_cur
 	paper_remaining = 15
@@ -371,7 +374,6 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
 /obj/machinery/newscaster/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
 	if(..())
 		return TRUE
-
 	switch(action)
 		if("cleartemp")
 			temp = null
@@ -434,6 +436,10 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
 			msg = sanitize(input(usr, "Write your Feed story", "Network Channel Handler", "") as message|null)
 			return TRUE

+		if("set_new_title")
+			title = sanitize(input(usr, "Enter your Feed title", "Network Channel Handler", "") as message|null)
+			return TRUE
+
 		if("set_attachment")
 			AttachPhoto(usr)
 			return TRUE
@@ -449,10 +455,13 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
 			if(channel_name == "")
 				set_temp("Error: Could not submit feed message to network: No feed channel selected.", "danger", FALSE)
 				return TRUE
+			if(title == "")
+				set_temp("Error: Invalid Title.", "danger", FALSE)
+				return TRUE

 			var/image = photo_data ? photo_data.photo : null
 			feedback_inc("newscaster_stories",1)
-			news_network.SubmitArticle(msg, our_user, channel_name, image, 0)
+			news_network.SubmitArticle(msg, our_user, channel_name, image, 0, "", title)
 			set_temp("Feed message created successfully.", "success", FALSE)
 			return TRUE

@@ -629,153 +638,6 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)

 		photo_data = new(selection, 1)

-//########################################################################################################################
-//###################################### NEWSPAPER! ######################################################################
-//########################################################################################################################
-
-/obj/item/weapon/newspaper
-	name = "newspaper"
-	desc = "An issue of The Griffon, the newspaper circulating aboard most stations."
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "newspaper"
-	w_class = ITEMSIZE_SMALL	//Let's make it fit in trashbags!
-	attack_verb = list("bapped")
-	var/screen = 0
-	var/pages = 0
-	var/curr_page = 0
-	var/list/datum/feed_channel/news_content = list()
-	var/datum/feed_message/important_message = null
-	var/scribble=""
-	var/scribble_page = null
-	drop_sound = 'sound/items/drop/wrapper.ogg'
-	pickup_sound = 'sound/items/pickup/wrapper.ogg'
-
-obj/item/weapon/newspaper/attack_self(mob/user)
-	if(ishuman(user))
-		var/mob/living/carbon/human/human_user = user
-		var/dat
-		pages = 0
-		switch(screen)
-			if(0) //Cover
-				dat+="<DIV ALIGN='center'><B><FONT SIZE=6>The Griffon</FONT></B></div>"
-				dat+="<DIV ALIGN='center'><FONT SIZE=2>[using_map.company_name]-standard newspaper, for use on [using_map.company_name]© Space Facilities</FONT></div><HR>"
-				if(isemptylist(news_content))
-					if(important_message)
-						dat+="Contents:<BR><ul><B><FONT COLOR='red'>**</FONT>Important Security Announcement<FONT COLOR='red'>**</FONT></B> <FONT SIZE=2>\[page [pages+2]\]</FONT><BR></ul>"
-					else
-						dat+="<I>Other than the title, the rest of the newspaper is unprinted...</I>"
-				else
-					dat+="Contents:<BR><ul>"
-					for(var/datum/feed_channel/NP in news_content)
-						pages++
-					if(important_message)
-						dat+="<B><FONT COLOR='red'>**</FONT>Important Security Announcement<FONT COLOR='red'>**</FONT></B> <FONT SIZE=2>\[page [pages+2]\]</FONT><BR>"
-					var/temp_page=0
-					for(var/datum/feed_channel/NP in news_content)
-						temp_page++
-						dat+="<B>[NP.channel_name]</B> <FONT SIZE=2>\[page [temp_page+1]\]</FONT><BR>"
-					dat+="</ul>"
-				if(scribble_page==curr_page)
-					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[scribble]\"</I>"
-				dat+= "<HR><DIV STYLE='float:right;'><A href='?src=\ref[src];next_page=1'>Next Page</A></DIV> <div style='float:left;'><A href='?src=\ref[human_user];mach_close=newspaper_main'>Done reading</A></DIV>"
-			if(1) // X channel pages inbetween.
-				for(var/datum/feed_channel/NP in news_content)
-					pages++ //Let's get it right again.
-				var/datum/feed_channel/C = news_content[curr_page]
-				dat+="<FONT SIZE=4><B>[C.channel_name]</B></FONT><FONT SIZE=1> \[created by: <FONT COLOR='maroon'>[C.author]</FONT>\]</FONT><BR><BR>"
-				if(C.censored)
-					dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a <B><FONT COLOR='red'>D-Notice</B></FONT>. Its contents were not transferred to the newspaper at the time of printing."
-				else
-					if(isemptylist(C.messages))
-						dat+="No Feed stories stem from this channel..."
-					else
-						dat+="<ul>"
-						var/i = 0
-						for(var/datum/feed_message/MESSAGE in C.messages)
-							i++
-							dat+="-[MESSAGE.body] <BR>"
-							if(MESSAGE.img)
-								user << browse_rsc(MESSAGE.img, "tmp_photo[i].png")
-								dat+="<img src='tmp_photo[i].png' width = '180'><BR>"
-							dat+="<FONT SIZE=1>\[[MESSAGE.message_type] by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR><BR>"
-						dat+="</ul>"
-				if(scribble_page==curr_page)
-					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[scribble]\"</I>"
-				dat+= "<BR><HR><DIV STYLE='float:left;'><A href='?src=\ref[src];prev_page=1'>Previous Page</A></DIV> <DIV STYLE='float:right;'><A href='?src=\ref[src];next_page=1'>Next Page</A></DIV>"
-			if(2) //Last page
-				for(var/datum/feed_channel/NP in news_content)
-					pages++
-				if(important_message!=null)
-					dat+="<DIV STYLE='float:center;'><FONT SIZE=4><B>Wanted Issue:</B></FONT></DIV><BR><BR>"
-					dat+="<B>Criminal name</B>: <FONT COLOR='maroon'>[important_message.author]</FONT><BR>"
-					dat+="<B>Description</B>: [important_message.body]<BR>"
-					dat+="<B>Photo:</B>: "
-					if(important_message.img)
-						user << browse_rsc(important_message.img, "tmp_photow.png")
-						dat+="<BR><img src='tmp_photow.png' width = '180'>"
-					else
-						dat+="None"
-				else
-					dat+="<I>Apart from some uninteresting Classified ads, there's nothing on this page...</I>"
-				if(scribble_page==curr_page)
-					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[scribble]\"</I>"
-				dat+= "<HR><DIV STYLE='float:left;'><A href='?src=\ref[src];prev_page=1'>Previous Page</A></DIV>"
-			else
-				dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
-
-		dat+="<BR><HR><div align='center'>[curr_page+1]</div>"
-		human_user << browse(dat, "window=newspaper_main;size=300x400")
-		onclose(human_user, "newspaper_main")
-	else
-		to_chat(user, "The paper is full of intelligible symbols!")
-
-obj/item/weapon/newspaper/Topic(href, href_list)
-	var/mob/living/U = usr
-	..()
-	if((src in U.contents) || (istype(loc, /turf) && in_range(src, U)))
-		U.set_machine(src)
-		if(href_list["next_page"])
-			if(curr_page == pages+1)
-				return //Don't need that at all, but anyway.
-			if(curr_page == pages) //We're at the middle, get to the end
-				screen = 2
-			else
-				if(curr_page == 0) //We're at the start, get to the middle
-					screen = 1
-			curr_page++
-			playsound(src, "pageturn", 50, 1)
-
-		else if(href_list["prev_page"])
-			if(curr_page == 0)
-				return
-			if(curr_page == 1)
-				screen = 0
-
-			else
-				if(curr_page == pages+1) //we're at the end, let's go back to the middle.
-					screen = 1
-			curr_page--
-			playsound(src, "pageturn", 50, 1)
-
-		if(istype(src.loc, /mob))
-			attack_self(src.loc)
-
-obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user)
-	if(istype(W, /obj/item/weapon/pen))
-		if(scribble_page == curr_page)
-			to_chat(user, "<FONT COLOR='blue'>There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?</FONT>")
-		else
-			var/s = sanitize(input(user, "Write something", "Newspaper", ""))
-			s = sanitize(s)
-			if(!s)
-				return
-			if(!in_range(src, usr) && src.loc != usr)
-				return
-			scribble_page = curr_page
-			scribble = s
-			attack_self(user)
-		return
-
 ////////////////////////////////////helper procs
 /obj/machinery/newscaster/proc/tgui_user_name(mob/user)
 	if(ishuman(user))
@@ -32,7 +32,7 @@
 			sleep(2)
 			go_out()
 			sleep(2)
-			del(src)
+			qdel(src)

 /obj/machinery/transportpod/relaymove(mob/user as mob)
 	if(user.stat)
@@ -0,0 +1,8 @@
+/obj/mecha/combat/fighter
+	starting_components = list(
+		/obj/item/mecha_parts/component/hull/lightweight,
+		/obj/item/mecha_parts/component/actuator,
+		/obj/item/mecha_parts/component/armor,
+		/obj/item/mecha_parts/component/gas,
+		/obj/item/mecha_parts/component/electrical
+		)
@@ -31,7 +31,7 @@
 	thrusters_possible = 1

 /obj/mecha/combat/gorilla/Initialize()
-	..()
+	. = ..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) // This thing basically cannot function without an external power supply.
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/cannon(src)
@@ -40,7 +40,7 @@
 	switch_dmg_type_possible = TRUE

 /obj/mecha/combat/phazon/equipped/Initialize()
-	..()
+	. = ..()
 	starting_equipment = list(
 		/obj/item/mecha_parts/mecha_equipment/tool/rcd,
 		/obj/item/mecha_parts/mecha_equipment/gravcatapult
@@ -43,7 +43,7 @@
 			. += "<span class='warning'><b>It is completely destroyed.</b></span>"

 /obj/item/mecha_parts/component/Initialize()
-	..()
+	. = ..()
 	integrity = max_integrity

 	if(start_damaged)
@@ -14,7 +14,7 @@
 	var/obj/item/weapon/inflatable_dispenser/my_deployer = null

 /obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables/Initialize()
-	..()
+	. = ..()
 	my_deployer = my_tool

 /obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables/Topic(href, href_list)
@@ -318,7 +318,7 @@
 	equip_type = EQUIP_HULL

 /obj/item/mecha_parts/mecha_equipment/crisis_drone/Initialize()
-	..()
+	. = ..()
 	drone_overlay = new(src.icon, icon_state = droid_state)

 /obj/item/mecha_parts/mecha_equipment/crisis_drone/Destroy()
@@ -83,6 +83,14 @@

 /obj/machinery/mecha_part_fabricator/Initialize()
 	. = ..()
+
+// Go through all materials, and add them to the possible storage, but hide them unless we contain them.
+	for(var/Name in name_to_material)
+		if(Name in materials)
+			continue
+
+		materials[Name] = 0
+
 	default_apply_parts()
 	files = new /datum/research(src) //Setup the research data holder.

@@ -198,7 +198,7 @@
 	var/weapons_only_cycle = FALSE	//So combat mechs don't switch to their equipment at times.

 /obj/mecha/Initialize()
-	..()
+	. = ..()

 	for(var/path in starting_components)
 		var/obj/item/mecha_parts/component/C = new path(src)
@@ -127,7 +127,7 @@
 			C.images += holder
 */
 /obj/mecha/medical/odysseus/loaded/Initialize()
-	..()
+	. = ..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/sleeper
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/tool/sleeper
@@ -117,7 +117,7 @@
 	name = "\improper PC-20 \"Lance\" light laser cannon"
 	id = "micro_laser_heavy"
 	req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
-	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, "diamond" = 2000)
+	materials = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 1000, MAT_COPPER = 1000, "diamond" = 1000)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/microheavy

 /datum/design/item/mecha/weapon/grenade_launcher/micro
@@ -191,5 +191,5 @@
 	desc = "A portable medical system used to treat external injuries from afar."
 	id = "mech_medigun"
 	req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_BIO = 6)
-	materials = list(DEFAULT_WALL_MATERIAL = 8000, "gold" = 2000, "silver" = 1750, "diamond" = 1500, "phoron" = 4000)
+	materials = list(DEFAULT_WALL_MATERIAL = 8000, MAT_COPPER = 4000, "gold" = 2000, "silver" = 1750, "diamond" = 1500)
 	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun
@@ -70,7 +70,7 @@
 	max_special_equip = 1

 /obj/mecha/working/ripley/deathripley/Initialize()
-	..()
+	. = ..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp/safety
 	ME.attach(src)
 	return
@@ -80,7 +80,7 @@
 	name = "APLU \"Miner\""

 /obj/mecha/working/ripley/mining/Initialize()
-	..()
+	. = ..()
 	//Attach drill
 	if(prob(25)) //Possible diamond drill... Feeling lucky?
 		var/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/D = new /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
@@ -40,10 +40,7 @@
 			return TRUE

 /atom/movable/proc/has_buckled_mobs()
-	if(!buckled_mobs)
-		return FALSE
-	if(buckled_mobs.len)
-		return TRUE
+	return LAZYLEN(buckled_mobs)

 /atom/movable/Destroy()
 	unbuckle_all_mobs()
@@ -11,7 +11,7 @@
 	create_reagents(100)

 /obj/effect/decal/cleanable/chemcoating/Initialize()
-	..()
+	. = ..()
 	var/turf/T = get_turf(src)
 	if(T)
 		for(var/obj/O in get_turf(src))
@@ -1,10 +1,10 @@
 /obj/effect/decal/warning_stripes
 	icon = 'icons/effects/warning_stripes.dmi'

-/obj/effect/decal/warning_stripes/New()
+/obj/effect/decal/warning_stripes/Initialize()
 	. = ..()
 	var/turf/T=get_turf(src)
 	var/image/I=image(icon, icon_state = icon_state, dir = dir)
 	I.color=color
 	T.overlays += I
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
@@ -10,32 +10,37 @@
 	var/obj/item/weapon/mine/mineitemtype = /obj/item/weapon/mine
 	var/panel_open = 0
 	var/datum/wires/mines/wires = null
-	register_as_dangerous_object = TRUE
-
 	var/camo_net = FALSE	// Will the mine 'cloak' on deployment?

 	// The trap item will be triggered in some manner when detonating. Default only checks for grenades.
 	var/obj/item/trap = null

-/obj/effect/mine/New()
+/obj/effect/mine/Initialize()
 	icon_state = "uglyminearmed"
 	wires = new(src)
-
+	. = ..()
 	if(ispath(trap))
 		trap = new trap(src)
-
-/obj/effect/mine/Initialize()
-	..()
-
+	register_dangerous_to_step()
 	if(camo_net)
 		alpha = 50

 /obj/effect/mine/Destroy()
+	unregister_dangerous_to_step()
 	if(trap)
 		QDEL_NULL(trap)
 	qdel_null(wires)
 	return ..()

+/obj/effect/mine/Moved(atom/oldloc)
+	. = ..()
+	if(.)
+		var/turf/old_turf = get_turf(oldloc)
+		var/turf/new_turf = get_turf(src)
+		if(old_turf != new_turf)
+			old_turf.unregister_dangerous_object(src)
+			new_turf.register_dangerous_object(src)
+
 /obj/effect/mine/proc/explode(var/mob/living/M)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
 	triggered = 1
@@ -17,7 +17,7 @@
 	..()

 /obj/effect/temporary_effect/eruption/Initialize()
-	..()
+	. = ..()
 	flick("[icon_state]_create",src)

 /obj/effect/temporary_effect/eruption/Destroy()
@@ -159,7 +159,6 @@

 /obj/effect/spawner/newbomb/Initialize(newloc)
 	..(newloc)
-
 	var/obj/item/device/transfer_valve/V = new(src.loc)
 	var/obj/item/weapon/tank/phoron/PT = new(V)
 	var/obj/item/weapon/tank/oxygen/OT = new(V)
@@ -183,19 +182,14 @@
 	OT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
 	OT.air_contents.update_values()

-
 	var/obj/item/device/assembly/S = new assembly_type(V)
-
-
 	V.attached_device = S

 	S.holder = V
 	S.toggle_secure()

 	V.update_icon()
-
-	qdel(src)
-
+	return INITIALIZE_HINT_QDEL


 ///////////////////////
@@ -786,7 +786,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	drop_sound = 'sound/items/drop/device.ogg'

 //Worn icon generation for on-mob sprites
-/obj/item/proc/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null) //VOREStation edit - add 'clip mask' argument.
+/obj/item/proc/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
 	//Get the required information about the base icon
 	var/icon/icon2use = get_worn_icon_file(body_type = body_type, slot_name = slot_name, default_icon = default_icon, inhands = inhands)
 	var/state2use = get_worn_icon_state(slot_name = slot_name)
@@ -816,6 +816,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	if(istype(clip_mask)) //VOREStation Edit - For taur bodies/tails clipping off parts of uniforms and suits.
 		standing.filters += filter(type = "alpha", icon = clip_mask)

+	if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits.
+		standing.filters += filter(type = "alpha", icon = clip_mask)
+
 	//Apply any special features
 	if(!inhands)
 		apply_blood(standing)			//Some items show blood when bloodied
@@ -26,7 +26,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	show_messages = 1

 	origin_tech = list(TECH_ENGINEERING = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2, TECH_DATA = 2)
-	matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
+	matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10, MAT_COPPER = 10)

 	var/video_range = 3
 	var/obj/machinery/camera/communicator/video_source	// Their camera
@@ -131,7 +131,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()

 	for(var/mob/living/voice/voice in contents)
 		. += "<span class='notice'>On the screen, you can see a image feed of [voice].</span>"
-		
+
 		if(voice && voice.key)
 			switch(voice.stat)
 				if(CONSCIOUS)
@@ -33,7 +33,7 @@
 	var/cell_type = /obj/item/weapon/cell/device

 /obj/item/device/flash/Initialize()
-	..()
+	. = ..()
 	power_supply = new cell_type(src)

 /obj/item/device/flash/attackby(var/obj/item/W, var/mob/user)
@@ -9,24 +9,119 @@ var/list/GPS_list = list()
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 2, TECH_MAGNET = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 500)
+
 	var/gps_tag = "GEN0"
 	var/emped = FALSE
-	var/updating = TRUE			// Lets users lock the UI so they don't have to deal with constantly shifting signals
 	var/tracking = FALSE		// Will not show other signals or emit its own signal if false.
 	var/long_range = FALSE		// If true, can see farther, depending on get_map_levels().
 	var/local_mode = FALSE		// If true, only GPS signals of the same Z level are shown.
 	var/hide_signal = FALSE		// If true, signal is not visible to other GPS devices.
 	var/can_hide_signal = FALSE	// If it can toggle the above var.

+	var/mob/holder
+	var/is_in_processing_list = FALSE
+	var/list/tracking_devices
+	var/list/showing_tracked_names
+	var/obj/compass_holder/compass
+
 /obj/item/device/gps/Initialize()
 	. = ..()
+	compass = new(src)
 	GPS_list += src
 	name = "global positioning system ([gps_tag])"
+	update_holder()
 	update_icon()

+/obj/item/device/gps/proc/check_visible_to_holder()
+	. = (holder && (holder.get_active_hand() == src || holder.get_inactive_hand() == src))
+
+/obj/item/device/gps/proc/update_holder()
+
+	if(holder && loc != holder)
+		GLOB.moved_event.unregister(holder, src)
+		GLOB.dir_set_event.unregister(holder, src)
+		holder.client?.screen -= compass
+		holder = null
+
+	if(istype(loc, /mob))
+		holder = loc
+		GLOB.moved_event.register(holder, src, .proc/update_compass)
+		GLOB.dir_set_event.register(holder, src, .proc/update_compass)
+
+	if(holder && tracking)
+		if(!is_in_processing_list)
+			START_PROCESSING(SSobj, src)
+			is_in_processing_list = TRUE
+		if(holder.client)
+			if(check_visible_to_holder())
+				holder.client.screen |= compass
+			else
+				holder.client.screen -= compass
+	else
+		STOP_PROCESSING(SSobj, src)
+		is_in_processing_list = FALSE
+		if(holder?.client)
+			holder.client.screen -= compass
+
+/obj/item/device/gps/pickup()
+	. = ..()
+	update_holder()
+
+/obj/item/device/gps/equipped()
+	. = ..()
+	update_holder()
+
+/obj/item/device/gps/dropped()
+	. = ..()
+	update_holder()
+
+/obj/item/device/gps/process()
+	if(!tracking)
+		is_in_processing_list = FALSE
+		return PROCESS_KILL
+	update_holder()
+	if(holder)
+		update_compass(TRUE)
+
 /obj/item/device/gps/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	is_in_processing_list = FALSE
 	GPS_list -= src
-	return ..()
+	. = ..()
+	update_holder()
+	QDEL_NULL(compass)
+
+/obj/item/device/gps/proc/can_track(var/obj/item/device/gps/other, var/reachable_z_levels)
+	if(!other.tracking || other.emped || other.hide_signal)
+		return FALSE
+	var/turf/origin = get_turf(src)
+	var/turf/target = get_turf(other)
+	if(!istype(origin) || !istype(target))
+		return FALSE
+	if(origin.z == target.z)
+		return TRUE
+	if(local_mode)
+		return FALSE
+	reachable_z_levels = reachable_z_levels || using_map.get_map_levels(origin.z, long_range)
+	return (target.z in reachable_z_levels)
+
+/obj/item/device/gps/proc/update_compass(var/update_compass_icon)
+	compass.hide_waypoints(FALSE)
+	for(var/thing in tracking_devices)
+		var/obj/item/device/gps/gps = locate(thing)
+		if(!istype(gps) || QDELETED(gps))
+			LAZYREMOVE(tracking_devices, thing)
+			LAZYREMOVE(showing_tracked_names, thing)
+			continue
+		var/turf/gps_turf = get_turf(gps)
+		var/gps_tag = LAZYACCESS(showing_tracked_names, thing) ? gps.gps_tag : null
+		if(istype(gps_turf))
+			compass.set_waypoint("\ref[gps]", gps_tag, gps_turf.x, gps_turf.y, gps_turf.z, LAZYACCESS(tracking_devices, "\ref[gps]"))
+		else
+			compass.set_waypoint("\ref[gps]", gps_tag, 0, 0, 0, LAZYACCESS(tracking_devices, "\ref[gps]"))
+		if(can_track(gps))
+			compass.show_waypoint("\ref[gps]")
+	compass.rebuild_overlay_lists(update_compass_icon)

 /obj/item/device/gps/AltClick(mob/user)
 	toggletracking(user)
@@ -37,14 +132,25 @@ var/list/GPS_list = list()
 	if(emped)
 		to_chat(user, "It's busted!")
 		return
+	
+	toggle_tracking()
 	if(tracking)
 		to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.")
-		tracking = FALSE
-		update_icon()
 	else
 		to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
-		tracking = TRUE
-		update_icon()
+
+/obj/item/device/gps/proc/toggle_tracking()
+	tracking = !tracking
+	if(tracking)
+		if(!is_in_processing_list)
+			is_in_processing_list = TRUE
+			START_PROCESSING(SSobj, src)
+	else
+		is_in_processing_list = FALSE
+		STOP_PROCESSING(SSobj, src)
+	update_compass()
+	update_holder()
+	update_icon()

 /obj/item/device/gps/emp_act(severity)
 	if(emped) // Without a fancy callback system, this will have to do.
@@ -67,11 +173,7 @@ var/list/GPS_list = list()
 		add_overlay("working")

 /obj/item/device/gps/attack_self(mob/user)
-	tgui_interact(user)
-
-/obj/item/device/gps/examine(mob/user)
-	. = ..()
-	. += display()
+	display(user)

 // Compiles all the data not available directly from the GPS
 // Like the positions and directions to all other GPS units
@@ -90,15 +192,8 @@ var/list/GPS_list = list()
 	dat["z_level_detection"] = using_map.get_map_levels(curr.z, long_range)
 	
 	for(var/obj/item/device/gps/G in GPS_list - src)
-		if(!G.tracking || G.emped || G.hide_signal)
-			continue

-		var/turf/T = get_turf(G)
-		if(!T)
-			continue
-		if(local_mode && curr.z != T.z)
-			continue
-		if(!(T.z in dat["z_level_detection"]))
+		if(!can_track(G, dat["z_level_detection"]))
 			continue

 		var/gps_data[0]
@@ -108,6 +203,7 @@ var/list/GPS_list = list()
 		var/area/A = get_area(G)
 		gps_data["area_name"] = A.get_name()

+		var/turf/T = get_turf(G)
 		gps_data["z_name"] = using_map.get_zlevel_name(T.z)
 		gps_data["direction"] = get_adir(curr, T)
 		gps_data["degrees"] = round(Get_Angle(curr,T))
@@ -122,37 +218,102 @@ var/list/GPS_list = list()

 	return dat

-/obj/item/device/gps/proc/display()
-	if(!tracking)
-		. = "The device is off. Alt-click it to turn it on."
-		return
+/obj/item/device/gps/proc/display(mob/user)
+
 	if(emped)
-		. = "It's busted!"
+		to_chat(user, "It's busted!")
 		return

 	var/list/dat = list()
 	var/list/gps_data = display_list()

-	dat += "Current location: [gps_data["my_area_name"]] <b>([gps_data["curr_x"]], [gps_data["curr_y"]], [gps_data["curr_z_name"]])</b>"
-	dat += "[hide_signal ? "Tagged" : "Broadcasting"] as '[gps_tag]'. <a href='?src=\ref[src];tag=1'>\[Change Tag\]</a> \
-	<a href='?src=\ref[src];range=1'>\[Toggle Scan Range\]</a> \
-	[can_hide_signal ? "<a href='?src=\ref[src];hide=1'>\[Toggle Signal Visibility\]</a>":""]"
-
-	if(gps_data["gps_list"].len)
-		dat += "Detected signals;"
-		for(var/gps in gps_data["gps_list"])
-			if(istype(gps_data["ref"], /obj/item/device/gps/internal/poi))
-				dat += "    [gps["gps_tag"]]: [gps["area_name"]] - [gps["local"] ? "[gps["direction"]] Dist: [round(gps["distance"], 10)]m" : "in \the [gps["z_name"]]"]"
-			else
-				dat += "    [gps["gps_tag"]]: [gps["area_name"]], ([gps["x"]], [gps["y"]]) - [gps["local"] ? "[gps["direction"]] Dist: [gps["distX"] ? "[abs(round(gps["distX"], 1))]m [(gps["distX"] > 0) ? "E" : "W"], " : ""][gps["distY"] ? "[abs(round(gps["distY"], 1))]m [(gps["distY"] > 0) ? "N" : "S"]" : ""]" : "in \the [gps["z_name"]]"]"
+	dat += "<table width = '100%'>"
+	if(!tracking)
+		dat += "<tr><td colspan = 6></td><a href='?src=\ref[src];toggle_power=1'>\[Switch On]\]</a></tr>"
 	else
-		dat += "No other signals detected."
+		dat += "<tr><td colspan = 6></td><a href='?src=\ref[src];toggle_power=1'>\[Switch Off]\]</a></tr>"
+		dat += "<tr><td colspan = 2><b>Current location</b></td><td colspan = 2>[gps_data["my_area_name"]]</td><td colspan = 2><b>([gps_data["curr_x"]], [gps_data["curr_y"]], [gps_data["curr_z_name"]])</b></td></tr>"
+		dat += "<tr><td colspan = 4>[hide_signal ? "Tagged" : "Broadcasting"] as '[gps_tag]'.</td>"
+		dat += "<td><a href='?src=\ref[src];tag=1'>\[Change Tag\]</a><a href='?src=\ref[src];range=1'>\[Toggle Scan Range\]</a>[can_hide_signal ? "<a href='?src=\ref[src];hide=1'>\[Toggle Signal Visibility\]</a>":""]</td></tr>"

-	. = dat
+		if(gps_data["gps_list"].len)
+			dat += "<tr><td colspan = 6><b>Detected signals</b></td></tr>"
+			for(var/gps in gps_data["gps_list"])
+				dat += "<tr>"
+				var/gps_ref = "\ref[gps["ref"]]"
+				dat += "<td>[gps["gps_tag"]]</td><td>[gps["area_name"]]</td>"
+				
+				if(istype(gps_data["ref"], /obj/item/device/gps/internal/poi))
+					dat += "<td>[gps["local"] ? "[gps["direction"]] Dist: [round(gps["distance"], 10)]m" : "in \the [gps["z_name"]]"]</td>"
+				else
+					dat += "<td>([gps["x"]], [gps["y"]], [gps["z_name"]])</td>"
+
+				if(gps["local"])
+					dat += "<td>[gps["distance"]]m</td>"
+					dat += "<td>[gps["degrees"]]° ([gps["direction"]])</td>"
+				else
+					dat += "<td colspan = 2>Non-local signal.</td>"
+
+				if(LAZYACCESS(tracking_devices, gps_ref))
+					dat += "<td><a href='?src=\ref[src];stop_track=[gps_ref]'>\[Stop Tracking\]</a> <a href='?src=\ref[src];track_color=[gps_ref]'>\[Colour [color_square(hex = LAZYACCESS(tracking_devices, gps_ref))]\]</a> <a href='?src=\ref[src];track_label=[gps_ref]'>Show/Hide Label</a></td>"
+				else
+					dat += "<td><a href='?src=\ref[src];start_track=[gps_ref]'>\[Start Tracking\]</a></td>"
+				dat += "</tr>"
+		else
+			dat += "<tr><td colspan = 5>No other signals detected.</td></tr>"
+	dat += "</table>"
+
+	var/datum/browser/popup = new(user, "gps_\ref[src]", "Global Positioning System", 700, 1000)
+	popup.set_content(dat.Join(null))
+	popup.open()

 /obj/item/device/gps/Topic(var/href, var/list/href_list)
 	if(..())
-		return 1
+		return TRUE
+
+	if(href_list["toggle_power"])
+		toggle_tracking()
+		. = TRUE
+
+	if(href_list["track_label"])
+		var/gps_ref = href_list["track_label"]
+		var/obj/item/device/gps/gps = locate(gps_ref)
+		if(istype(gps) && !QDELETED(gps) && !LAZYACCESS(showing_tracked_names, gps_ref))
+			LAZYSET(showing_tracked_names, gps_ref, TRUE)
+		else
+			LAZYREMOVE(showing_tracked_names, gps_ref)
+		to_chat(usr, SPAN_NOTICE("\The [src] is [LAZYACCESS(showing_tracked_names, gps_ref) ? "now showing" : "no longer showing"] labels for [gps.gps_tag]."))
+
+	if(href_list["stop_track"])
+		var/gps_ref = href_list["stop_track"]
+		var/obj/item/device/gps/gps = locate(gps_ref)
+		compass.clear_waypoint(gps_ref)
+		LAZYREMOVE(tracking_devices, gps_ref)
+		LAZYREMOVE(showing_tracked_names, gps_ref)
+		if(istype(gps) && !QDELETED(gps))
+			to_chat(usr, SPAN_NOTICE("\The [src] is no longer tracking [gps.gps_tag]."))
+		update_compass()
+		. = TRUE
+
+	if(href_list["start_track"])
+		var/gps_ref = href_list["start_track"]
+		var/obj/item/device/gps/gps = locate(gps_ref)
+		if(istype(gps) && !QDELETED(gps))
+			LAZYSET(tracking_devices, gps_ref, "#00ffff")
+			LAZYSET(showing_tracked_names, gps_ref, TRUE)
+			to_chat(usr, SPAN_NOTICE("\The [src] is now tracking [gps.gps_tag]."))
+			update_compass()
+			. = TRUE
+
+	if(href_list["track_color"])
+		var/obj/item/device/gps/gps = locate(href_list["track_color"])
+		if(istype(gps) && !QDELETED(gps))
+			var/new_colour = input("Enter a new tracking color.", "GPS Waypoint Color") as color|null
+			if(new_colour && istype(gps) && !QDELETED(gps) && holder == usr && !usr.incapacitated())
+				to_chat(usr, SPAN_NOTICE("You adjust the colour \the [src] is using to highlight [gps.gps_tag]."))
+				LAZYSET(tracking_devices, href_list["track_color"], new_colour)
+				update_compass()
+				. = TRUE

 	if(href_list["tag"])
 		var/a = input("Please enter desired tag.", name, gps_tag) as text
@@ -161,95 +322,22 @@ var/list/GPS_list = list()
 			gps_tag = a
 			name = "global positioning system ([gps_tag])"
 			to_chat(usr, "You set your GPS's tag to '[gps_tag]'.")
+			. = TRUE

 	if(href_list["range"])
 		local_mode = !local_mode
 		to_chat(usr, "You set the signal receiver to [local_mode ? "'NARROW'" : "'BROAD'"].")
+		. = TRUE

 	if(href_list["hide"])
 		if(!can_hide_signal)
 			return
 		hide_signal = !hide_signal
 		to_chat(usr, "You set the device to [hide_signal ? "not " : ""]broadcast a signal while scanning for other signals.")
+		. = TRUE

-/obj/item/device/gps/tgui_interact(mob/user, datum/tgui/ui)
-	if(emped)
-		to_chat(user, "<span class='hear'>[src] fizzles weakly.</span>")
-		return
-	ui = SStgui.try_update_ui(user, src, ui)
-	if(!ui)
-		ui = new(user, src, "Gps", name)
-		ui.open()
-	ui.set_autoupdate(updating)
-
-/obj/item/device/gps/tgui_data(mob/user)
-	var/list/data = list()
-	data["power"] = tracking
-	data["tag"] = gps_tag
-	data["updating"] = updating
-	data["globalmode"] = !local_mode
-	if(!tracking || emped) //Do not bother scanning if the GPS is off or EMPed
-		return data
-
-	var/turf/curr = get_turf(src)
-	data["currentArea"] = "[get_area_name(curr, TRUE)]"
-	data["currentCoords"] = list(curr.x, curr.y, curr.z)
-	data["currentCoordsText"] = "[curr.x], [curr.y], [using_map.get_zlevel_name(curr.z)]"
-
-	data["zLevelDetection"] = using_map.get_map_levels(curr.z, long_range)
-
-	var/list/signals = list()
-	data["signals"] = list()
-
-	for(var/obj/item/device/gps/G in GPS_list - src)
-		if(!G.tracking || G.emped || G.hide_signal)
-			continue
-		
-		var/turf/T = get_turf(G)
-		if(!T)
-			continue
-		if(local_mode && curr.z != T.z)
-			continue
-		if(!(T.z in data["zLevelDetection"]))
-			continue
-
-		var/list/signal = list()
-		signal["entrytag"] = G.gps_tag //Name or 'tag' of the GPS
-		signal["coords"] = list(T.x, T.y, T.z)
-		signal["coordsText"] = "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]"
-		if(T.z == curr.z) //Distance/Direction calculations for same z-level only
-			signal["dist"] = max(get_dist(curr, T), 0) //Distance between the src and remote GPS turfs
-			signal["degrees"] = round(Get_Angle(curr, T)) //0-360 degree directional bearing, for more precision.
-		signals += list(signal) //Add this signal to the list of signals
-	data["signals"] = signals
-	return data
-
-/obj/item/device/gps/tgui_act(action, params)
-	if(..())
-		return TRUE
-
-	switch(action)
-		if("rename")
-			var/a = stripped_input(usr, "Please enter desired tag.", name, gps_tag, 20)
-
-			if(!a)
-				return
-
-			gps_tag = a
-			name = "global positioning system ([gps_tag])"
-			. = TRUE
-
-		if("power")
-			toggletracking(usr)
-			. = TRUE
-
-		if("updating")
-			updating = !updating
-			. = TRUE
-
-		if("globalmode")
-			local_mode = !local_mode
-			. = TRUE
+	if(. && loc == usr)
+		display(usr)

 /obj/item/device/gps/on // Defaults to off to avoid polluting the signal list with a bunch of GPSes without owners. If you need to spawn active ones, use these.
 	tracking = TRUE
@@ -373,26 +461,43 @@ var/list/GPS_list = list()
 	can_hide_signal = TRUE

 /obj/item/device/gps/syndie/display(mob/user)
-	if(!tracking)
-		. = "The device is off. Alt-click it to turn it on."
-		return
+
 	if(emped)
-		. = "It's busted!"
+		to_chat(user, "It's busted!")
 		return

 	var/list/dat = list()
 	var/list/gps_data = display_list()

-	dat += "Current location: [gps_data["my_area_name"]] <b>([gps_data["curr_x"]], [gps_data["curr_y"]], [gps_data["curr_z_name"]])</b>"
-	dat += "[hide_signal ? "Tagged" : "Broadcasting"] as '[gps_tag]'. <a href='?src=\ref[src];tag=1'>\[Change Tag\]</a> \
-	<a href='?src=\ref[src];range=1'>\[Toggle Scan Range\]</a> \
-	[can_hide_signal ? "<a href='?src=\ref[src];hide=1'>\[Toggle Signal Visibility\]</a>":""]"
-
-	if(gps_data["gps_list"].len)
-		dat += "Detected signals;"
-		for(var/gps in gps_data["gps_list"])
-			dat += "     [gps["gps_tag"]]: [gps["area_name"]] ([gps["x"]], [gps["y"]], [gps["z_name"]]) [gps["local"] ? "Dist: [gps["distance"]]m Dir: [gps["degrees"]]° ([gps["direction"]])" :""]"
+	dat += "<table width = '100%'>"
+	if(!tracking)
+		dat += "<tr><td colspan = 6></td><a href='?src=\ref[src];toggle_power=1'>\[Switch On]\]</a></tr>"
 	else
-		dat += "No other signals detected."
+		dat += "<tr><td colspan = 6></td><a href='?src=\ref[src];toggle_power=1'>\[Switch Off]\]</a></tr>"
+		dat += "<tr><td colspan = 2><b>Current location</b></td><td colspan = 2>[gps_data["my_area_name"]]</td><td colspan = 2><b>([gps_data["curr_x"]], [gps_data["curr_y"]], [gps_data["curr_z_name"]])</b></td></tr>"
+		dat += "<tr><td colspan = 4>[hide_signal ? "Tagged" : "Broadcasting"] as '[gps_tag]'.</td>"
+		dat += "<td><a href='?src=\ref[src];tag=1'>\[Change Tag\]</a><a href='?src=\ref[src];range=1'>\[Toggle Scan Range\]</a>[can_hide_signal ? "<a href='?src=\ref[src];hide=1'>\[Toggle Signal Visibility\]</a>":""]</td></tr>"

-	. = dat
+		if(gps_data["gps_list"].len)
+			dat += "<tr><td colspan = 6><b>Detected signals</b></td></tr>"
+			for(var/gps in gps_data["gps_list"])
+				dat += "<tr>"
+				var/gps_ref = "\ref[gps["ref"]]"
+				dat += "<td>[gps["gps_tag"]]</td><td>[gps["area_name"]] ([gps["x"]], [gps["y"]], [gps["z_name"]])</td>"
+				if(gps["local"])
+					dat += "<td>[gps["distance"]]m</td>"
+					dat += "<td>[gps["degrees"]]° ([gps["direction"]])</td>"
+				else
+					dat += "<td colspan = 2>Non-local signal.</td>"
+				if(LAZYACCESS(tracking_devices, gps_ref))
+					dat += "<td><a href='?src=\ref[src];stop_track=[gps_ref]'>\[Stop Tracking\]</a> <a href='?src=\ref[src];track_color=[gps_ref]'>\[Colour [color_square(hex = LAZYACCESS(tracking_devices, gps_ref))]\]</a> <a href='?src=\ref[src];track_label=[gps_ref]'>Show/Hide Label</a></td>"
+				else
+					dat += "<td><a href='?src=\ref[src];start_track=[gps_ref]'>\[Start Tracking\]</a></td>"
+				dat += "</tr>"
+		else
+			dat += "<tr><td colspan = 6>No other signals detected.</td></tr>"
+	dat += "</table>"
+
+	var/datum/browser/popup = new(user, "gps_\ref[src]", "Global Positioning System", 700, 1000)
+	popup.set_content(dat.Join(null))
+	popup.open()
@@ -6,7 +6,7 @@
 	item_state = "pen"
 	var/pointer_icon_state
 	slot_flags = SLOT_BELT
-	matter = list("glass" = 500,"metal" = 500)
+	matter = list("glass" = 500,"metal" = 500, MAT_COPPER = 10)
 	w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter.
 	origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1)
 	var/turf/pointer_loc
@@ -17,7 +17,7 @@
 	drop_sound = 'sound/items/drop/multitool.ogg'
 	pickup_sound = 'sound/items/pickup/multitool.ogg'

-	matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
+	matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20, MAT_COPPER = 10)

 	var/mode_index = 1
 	var/toolmode = MULTITOOL_MODE_STANDARD
@@ -11,7 +11,7 @@
 	slot_flags = SLOT_BACK
 	w_class = ITEMSIZE_HUGE

-	matter = list(DEFAULT_WALL_MATERIAL = 10000,"glass" = 2500)
+	matter = list(DEFAULT_WALL_MATERIAL = 10000,"glass" = 2500, MAT_COPPER = 1550)

 	var/code = 2

@@ -84,7 +84,6 @@
 	desc = "A headset used by pilots, has access to the explorer channel."
 	icon_state = "pilot_headset"
 	adhoc_fallback = TRUE
-	ks2type = /obj/item/device/encryptionkey/pilot

 /obj/item/device/radio/headset/pilot/alt
 	name = "pilot's bowman headset"
@@ -120,7 +119,7 @@
 	desc = "A headset used by volunteers to expedition teams, has access to the exploration channel."
 	icon_state = "pilot_headset"
 	adhoc_fallback = TRUE
-	ks2type = /obj/item/device/encryptionkey/pilot
+	ks2type = /obj/item/device/encryptionkey/explorer

 /obj/item/device/radio/headset/talon
 	name = "talon headset"
@@ -61,7 +61,7 @@ var/global/list/default_medbay_channels = list(
 	var/bs_tx_preload_id
 	var/bs_rx_preload_id

-	matter = list("glass" = 25,DEFAULT_WALL_MATERIAL = 75)
+	matter = list("glass" = 25, DEFAULT_WALL_MATERIAL = 75, MAT_COPPER = 15)
 	var/const/FREQ_LISTENING = 1
 	var/list/internal_channels

@@ -21,7 +21,7 @@ HALOGEN COUNTER	- Radcount on mobs
 	w_class = ITEMSIZE_SMALL
 	throw_speed = 5
 	throw_range = 10
-	matter = list(DEFAULT_WALL_MATERIAL = 200)
+	matter = list(DEFAULT_WALL_MATERIAL = 200, MAT_COPPER = 25)
 	origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 1)
 	var/mode = 1;
 	var/advscan = 0
@@ -7,15 +7,12 @@
 	var/obj/item/stack/type_to_spawn = null

 /obj/fiftyspawner/Initialize()
-	..() //We're not returning . because we're going to ask to be deleted.
-	
+	..()
 	var/turf/T = get_turf(src)
-	var/obj/item/stack/M = new type_to_spawn(T)
+	var/obj/structure/closet/C = locate() in T
+	var/obj/item/stack/M = new type_to_spawn(C || T)
 	M.amount = M.max_amount //some stuff spawns with 60, we're still calling it fifty
 	M.update_icon() // Some stacks have different sprites depending on how full they are.
-	var/obj/structure/closet/C = locate() in T
-	if(C)
-		C.contents += M
 	return INITIALIZE_HINT_QDEL //Bye!

 /obj/fiftyspawner/rods
@@ -14,6 +14,8 @@
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")

+	color = "#666666"
+
 /obj/item/stack/rods/cyborg
 	name = "metal rod synthesizer"
 	desc = "A device that makes metal rods."
@@ -24,8 +26,8 @@
 	stacktype = /obj/item/stack/rods
 	no_variants = TRUE

-/obj/item/stack/rods/New()
-	..()
+/obj/item/stack/rods/Initialize()
+	. = ..()
 	recipes = rods_recipes
 	update_icon()

@@ -32,19 +32,15 @@

 	bag_material = MAT_SYNCLOTH

-/obj/item/stack/sandbags/New(var/newloc, var/amt, var/bag_mat)
-	..()
+/obj/item/stack/sandbags/Initialize(var/ml, var/amt, var/bag_mat)
+	. = ..(ml, amt)
 	recipes = sandbag_recipes
 	update_icon()
-
 	if(bag_mat)
 		bag_material = bag_mat
-
 	var/datum/material/M = get_material_by_name("[bag_material]")
 	if(!M)
-		qdel(src)
-		return
-
+		return INITIALIZE_HINT_QDEL
 	color = M.icon_colour

 /obj/item/stack/sandbags/update_icon()
@@ -136,17 +132,13 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \

 	var/bag_material = "cloth"

-/obj/item/stack/emptysandbag/New(var/newloc, var/amt, var/bag_mat)
-	..(newloc, amt)
-
+/obj/item/stack/emptysandbag/Initialize(var/ml, var/amt, var/bag_mat)
+	. = ..(ml, amt)
 	if(bag_mat)
 		bag_material = bag_mat
-
 	var/datum/material/M = get_material_by_name("[bag_material]")
 	if(!M)
-		qdel(src)
-		return
-
+		return INITIALIZE_HINT_QDEL
 	color = M.icon_colour

 /obj/item/stack/emptysandbag/attack_self(var/mob/user)
@@ -29,14 +29,13 @@
 	var/pass_color = FALSE // Will the item pass its own color var to the created item? Dyed cloth, wood, etc.
 	var/strict_color_stacking = FALSE // Will the stack merge with other stacks that are different colors? (Dyed cloth, wood, etc)

-/obj/item/stack/New(var/loc, var/amount=null)
-	..()
-	if (!stacktype)
+/obj/item/stack/Initialize(var/ml, var/amount)
+	. = ..()
+	if(!stacktype)
 		stacktype = type
-	if (amount)
+	if(amount)
 		src.amount = amount
 	update_icon()
-	return

 /obj/item/stack/Destroy()
 	if(uses_charge)
@@ -170,8 +169,37 @@
 		var/atom/O
 		if(recipe.use_material)
 			O = new recipe.result_type(user.loc, recipe.use_material)
+
+			if(istype(O, /obj))
+				var/obj/Ob = O
+
+				if(LAZYLEN(Ob.matter))	// Law of equivalent exchange.
+					Ob.matter.Cut()
+
+				else
+					Ob.matter = list()
+
+				var/mattermult = istype(Ob, /obj/item) ? min(2000, 400 * Ob.w_class) : 2000
+
+				Ob.matter[recipe.use_material] = mattermult / produced * required
+
 		else
 			O = new recipe.result_type(user.loc)
+
+			if(recipe.matter_material)
+				if(istype(O, /obj))
+					var/obj/Ob = O
+
+					if(LAZYLEN(Ob.matter))	// Law of equivalent exchange.
+						Ob.matter.Cut()
+
+					else
+						Ob.matter = list()
+
+					var/mattermult = istype(Ob, /obj/item) ? min(2000, 400 * Ob.w_class) : 2000
+
+					Ob.matter[recipe.use_material] = mattermult / produced * required
+
 		O.set_dir(user.dir)
 		O.add_fingerprint(user)

@@ -379,8 +407,9 @@
 	var/on_floor = 0
 	var/use_material
 	var/pass_color
+	var/matter_material 	// Material type used for recycling. Default, uses use_material. For non-material-based objects however, matter_material is needed.

-/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0, supplied_material = null, pass_stack_color)
+/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0, supplied_material = null, pass_stack_color, recycle_material = null)
 	src.title = title
 	src.result_type = result_type
 	src.req_amount = req_amount
@@ -392,6 +421,12 @@
 	src.use_material = supplied_material
 	src.pass_color = pass_stack_color

+	if(!recycle_material && src.use_material)
+		src.matter_material = src.use_material
+
+	else if(recycle_material)
+		src.matter_material = recycle_material
+
 /*
 * Recipe list datum
 */
@@ -7,7 +7,7 @@
 	w_class = ITEMSIZE_TINY
 	max_amount = 30

-/obj/item/stack/arcadeticket/New(loc, amount = null)
+/obj/item/stack/arcadeticket/Initialize()
 	. = ..()
 	update_icon()

@@ -20,8 +20,8 @@
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'

-/obj/item/stack/tile/New()
-	..()
+/obj/item/stack/tile/Initialize()
+	. = ..()
 	randpixel_xy()

 /*
@@ -23,6 +23,8 @@
 	drop_sound = 'sound/items/drop/device.ogg'
 	pickup_sound = 'sound/items/pickup/device.ogg'

+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
+
 //Called when the circuitboard is used to contruct a new machine.
 /obj/item/weapon/circuitboard/proc/construct(var/obj/machinery/M)
 	if(istype(M, build_path))
@@ -10,37 +10,37 @@
 	name = T_BOARD("guestpass console")
 	build_path = /obj/machinery/computer/guestpass
 	board_type = new /datum/frame/frame_types/guest_pass_console
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/status_display
 	name = T_BOARD("status display")
 	build_path = /obj/machinery/status_display
 	board_type = new /datum/frame/frame_types/display
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/ai_status_display
 	name = T_BOARD("ai status display")
 	build_path = /obj/machinery/ai_status_display
 	board_type = new /datum/frame/frame_types/display
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/newscaster
 	name = T_BOARD("newscaster")
 	build_path = /obj/machinery/newscaster
 	board_type = new /datum/frame/frame_types/newscaster
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/atm
 	name = T_BOARD("atm")
 	build_path = /obj/machinery/atm
 	board_type = new /datum/frame/frame_types/atm
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/request
 	name = T_BOARD("request console")
 	build_path = /obj/machinery/requests_console
 	board_type = new /datum/frame/frame_types/supply_request_console
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 //Alarm

@@ -48,25 +48,25 @@
 	name = T_BOARD("fire alarm")
 	build_path = /obj/machinery/firealarm
 	board_type = new /datum/frame/frame_types/fire_alarm
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/airalarm
 	name = T_BOARD("air alarm")
 	build_path = /obj/machinery/alarm
 	board_type = new /datum/frame/frame_types/air_alarm
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/intercom
 	name = T_BOARD("intercom")
 	build_path = /obj/item/device/radio/intercom
 	board_type = new /datum/frame/frame_types/intercom
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/keycard_auth
 	name = T_BOARD("keycard authenticator")
 	build_path = /obj/machinery/keycard_auth
 	board_type = new /datum/frame/frame_types/keycard_authenticator
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 //Computer

@@ -74,7 +74,7 @@
 	name = T_BOARD("holopad")
 	build_path = /obj/machinery/hologram/holopad
 	board_type = new /datum/frame/frame_types/holopad
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/scanner_console
 	name = T_BOARD("body scanner console")
@@ -94,7 +94,7 @@
 	name = T_BOARD("photocopier")
 	build_path = /obj/machinery/photocopier
 	board_type = new /datum/frame/frame_types/photocopier
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/scanning_module = 1,
 							/obj/item/weapon/stock_parts/motor = 1,
@@ -105,7 +105,7 @@
 	name = T_BOARD("fax")
 	build_path = /obj/machinery/photocopier/faxmachine
 	board_type = new /datum/frame/frame_types/fax
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/scanning_module = 1,
 							/obj/item/weapon/stock_parts/motor = 1,
@@ -116,6 +116,7 @@
 	name = T_BOARD("conveyor")
 	build_path = /obj/machinery/conveyor
 	board_type = new /datum/frame/frame_types/conveyor
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/gear = 2,
 							/obj/item/weapon/stock_parts/motor = 2,
@@ -125,6 +126,7 @@
 	name = T_BOARD("recharger")
 	build_path = /obj/machinery/recharger
 	board_type = new /datum/frame/frame_types/recharger
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/capacitor = 1,
 							/obj/item/stack/cable_coil = 5)
@@ -138,6 +140,7 @@
 	name = T_BOARD("heavy-duty cell charger")
 	build_path = /obj/machinery/cell_charger
 	board_type = new /datum/frame/frame_types/cell_charger
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/capacitor = 1,
 							/obj/item/stack/cable_coil = 5)
@@ -146,7 +149,7 @@
 	name = T_BOARD("washing machine")
 	build_path = /obj/machinery/washing_machine
 	board_type = new /datum/frame/frame_types/washing_machine
-	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/motor = 1,
 							/obj/item/weapon/stock_parts/gear = 2)
@@ -155,6 +158,7 @@
 	name = T_BOARD("reagent grinder")
 	build_path = /obj/machinery/reagentgrinder
 	board_type = new /datum/frame/frame_types/grinder
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/motor = 1,
 							/obj/item/weapon/stock_parts/gear = 1,
@@ -163,6 +167,7 @@
 /obj/item/weapon/circuitboard/distiller
 	build_path = /obj/machinery/portable_atmospherics/powered/reagent_distillery
 	board_type = new /datum/frame/frame_types/reagent_distillery
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/capacitor = 1,
 							/obj/item/weapon/stock_parts/micro_laser = 1,
@@ -173,6 +178,7 @@
 	name = T_BOARD("teleporter hub")
 	build_path = /obj/machinery/teleport/hub
 	board_type = "teleporter_hub"
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_GOLD = 100)
 //	origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4)
 	req_components = list(
 							/obj/item/weapon/stock_parts/scanning_module = 4,
@@ -183,6 +189,7 @@
 	name = T_BOARD("teleporter station")
 	build_path = /obj/machinery/teleport/station
 	board_type = "teleporter_station"
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_GOLD = 100)
 //	origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 3)
 	req_components = list(
 							/obj/item/weapon/stock_parts/console_screen = 1,
@@ -194,6 +201,7 @@
 	build_path = /obj/machinery/bodyscanner
 	board_type = new /datum/frame/frame_types/medical_pod
 	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/scanning_module = 3,
 							/obj/item/stack/material/glass/reinforced = 2)
@@ -202,6 +210,7 @@
 	name = T_BOARD("sleeper")
 	build_path = /obj/machinery/sleeper
 	board_type = new /datum/frame/frame_types/medical_pod
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)
 	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
 	req_components = list(
 							/obj/item/weapon/stock_parts/manipulator = 1,
@@ -214,6 +223,7 @@
 	name = T_BOARD("VR sleeper")
 	build_path = /obj/machinery/vr_sleeper
 	board_type = new /datum/frame/frame_types/medical_pod
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_GOLD = 100)
 	origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
 	req_components = list(
 							/obj/item/weapon/stock_parts/scanning_module = 1,
@@ -223,6 +233,7 @@
 	name = T_BOARD("dna analyzer")
 	build_path = /obj/machinery/dnaforensics
 	board_type = new /datum/frame/frame_types/dna_analyzer
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_GOLD = 100)
 	origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2, TECH_DATA = 2)
 	req_components = list(
 							/obj/item/weapon/stock_parts/scanning_module = 2,
@@ -233,6 +244,7 @@
 	name = T_BOARD("mass driver")
 	build_path = /obj/machinery/mass_driver
 	board_type = new /datum/frame/frame_types/mass_driver
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_GOLD = 100)
 	req_components = list(
 							/obj/item/weapon/stock_parts/gear = 2,
 							/obj/item/weapon/stock_parts/motor = 2,
@@ -8,6 +8,7 @@
 	icon = 'icons/obj/module.dmi'
 	icon_state = "std_mod"
 	board_type = "other"
+	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50, MAT_COPPER = 100)

 /obj/item/weapon/circuitboard/mecha/ripley
 		origin_tech = list(TECH_DATA = 3)
@@ -13,6 +13,7 @@
 	var/brightness_on = 1
 	chem_volume = 0 //ecig has no storage on its own but has reagent container created by parent obj
 	item_state = "ecigoff"
+	is_pipe = TRUE //to avoid a runtime in examine()
 	var/icon_off
 	var/icon_empty
 	var/ecig_colors = list(null, COLOR_DARK_GRAY, COLOR_RED_GRAY, COLOR_BLUE_GRAY, COLOR_GREEN_GRAY, COLOR_PURPLE_GRAY)
@@ -21,6 +22,28 @@
 	..()
 	ec_cartridge = new cartridge_type(src)

+/obj/item/clothing/mask/smokable/ecig/examine(mob/user)
+	. = ..()
+	
+	if(active)
+		. += "<span class='notice'>It is turned on.</span>"
+	else
+		. += "<span class='notice'>It is turned off.</span>"
+	if(Adjacent(user))
+		if(ec_cartridge)
+			if(!ec_cartridge.reagents?.total_volume)
+				. += "<span class='notice'>Its cartridge is empty!</span>"
+			else if (ec_cartridge.reagents.total_volume <= ec_cartridge.volume * 0.25)
+				. += "<span class='notice'>Its cartridge is almost empty!</span>"
+			else if (ec_cartridge.reagents.total_volume <= ec_cartridge.volume * 0.66)
+				. += "<span class='notice'>Its cartridge is half full!</span>"
+			else if (ec_cartridge.reagents.total_volume <= ec_cartridge.volume * 0.90)
+				. += "<span class='notice'>Its cartridge is almost full!</span>"
+			else
+				. += "<span class='notice'>Its cartridge is full!</span>"
+		else
+			. += "<span class='notice'>It has no cartridge.</span>"
+
 /obj/item/clothing/mask/smokable/ecig/simple
 	name = "simple electronic cigarette"
 	desc = "A cheap Lucky 1337 electronic cigarette, styled like a traditional cigarette."
@@ -56,6 +79,7 @@
 		var/mob/living/carbon/human/C = loc
 		if (src == C.wear_mask && C.check_has_mouth()) // if it's in the human/monkey mouth, transfer reagents to the mob
 			if (!active || !ec_cartridge || !ec_cartridge.reagents.total_volume)//no cartridge
+				to_chat(C, "<span class='notice'>[src] turns off.</span> ")
 				active=0//autodisable the cigarette
 				STOP_PROCESSING(SSobj, src)
 				update_icon()
@@ -7,6 +7,8 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "implant"
 	w_class = ITEMSIZE_TINY
+	show_messages = TRUE
+
 	var/implanted = null
 	var/mob/imp_in = null
 	var/obj/item/organ/external/part = null
@@ -14,7 +16,7 @@
 	var/allow_reagents = 0
 	var/malfunction = 0
 	var/initialize_loc = BP_TORSO
-	show_messages = 1
+	var/known_implant = FALSE

 /obj/item/weapon/implant/proc/trigger(emote, source as mob)
 	return
@@ -65,16 +67,17 @@
 	malfunction = MALFUNCTION_PERMANENT

 /obj/item/weapon/implant/proc/implant_loadout(var/mob/living/carbon/human/H)
-	if(H)
-		if(handle_implant(H, initialize_loc))
-			invisibility = initial(invisibility)
-			post_implant(H)
+	. = istype(H) && handle_implant(H, initialize_loc)
+	if(.)
+		invisibility = initial(invisibility)
+		known_implant = TRUE
+		post_implant(H)

 /obj/item/weapon/implant/Destroy()
 	if(part)
 		part.implants.Remove(src)
+		part = null
 	listening_objects.Remove(src)
-	part = null
 	imp_in = null
 	return ..()

@@ -100,6 +103,7 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/weapon/implant/tracking
 /obj/item/weapon/implant/tracking
 	name = "tracking implant"
 	desc = "An implant normally given to dangerous criminals. Allows security to track your location."
+	known_implant = TRUE
 	var/id = 1
 	var/degrade_time = 10 MINUTES	//How long before the implant stops working outside of a living body.

@@ -348,6 +352,7 @@ GLOBAL_LIST_BOILERPLATE(all_chem_implants, /obj/item/weapon/implant/chem)
 	name = "chemical implant"
 	desc = "Injects things."
 	allow_reagents = 1
+	known_implant = TRUE

 /obj/item/weapon/implant/chem/get_data()
 	var/dat = {"
@@ -418,6 +423,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 /obj/item/weapon/implant/loyalty
 	name = "loyalty implant"
 	desc = "Makes you loyal or such."
+	known_implant = TRUE

 /obj/item/weapon/implant/loyalty/get_data()
 	var/dat = {"
@@ -491,6 +497,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	name = "death alarm implant"
 	desc = "An alarm which monitors host vital signs and transmits a radio message upon death."
 	origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 2, TECH_DATA = 1)
+	known_implant = TRUE
 	var/mobname = "Will Robinson"

 /obj/item/weapon/implant/death_alarm/get_data()
@@ -299,3 +299,13 @@
 	src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist/blade( src )
 	..()
 	return
+
+/obj/item/weapon/implantcase/restrainingbolt
+	name = "glass case - 'Restraining Bolt'"
+	desc = "A case containing a restraining bolt."
+	icon_state = "implantcase-b"
+
+/obj/item/weapon/implantcase/restrainingbolt/New()
+	src.imp = new /obj/item/weapon/implant/restrainingbolt( src )
+	..()
+	return
@@ -4,18 +4,6 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "implant"
 	initialize_loc = BP_HEAD
-	var/roundstart = TRUE

 /obj/item/weapon/implant/dud/torso
-	name = "unknown implant"
-	desc = "A small device with small connector wires."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "implant"
 	initialize_loc = BP_TORSO
-
-/obj/item/weapon/implant/dud/old
-	name = "old implant"
-	desc = "A small device with small connector wires."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "implant"
-	roundstart = FALSE
--- a/Show More
+++ b/Show More