Merge pull request #131 from Markolie/master

Map fixes, bug fixes

code/modules/karma/karma.dm

@@ -204,31 +204,29 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 			
 		if (2) // Karma Refunds
 			var/list/refundable = list()
-			if(checkpurchased("Tajaran Ambassador"))
+			var/list/purchased = checkpurchased()
+			if("Tajaran Ambassador" in purchased)
 				refundable += "Tajaran Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Tajaran Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Tajaran Ambassador -- 30KP</a><br>"
-			if(checkpurchased("Unathi Ambassador"))
+			if("Unathi Ambassador" in purchased)
 				refundable += "Unathi Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Unathi Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Unathi Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Skrell Ambassador"))
+			if("Skrell Ambassador" in purchased)
 				refundable += "Skrell Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Skrell Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Skrell Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Diona Ambassador"))
+			if("Diona Ambassador" in purchased)
 				refundable += "Diona Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Diona Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Diona Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Kidan Ambassador"))
+			if("Kidan Ambassador" in purchased)
 				refundable += "Kidan Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Kidan Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Kidan Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Kidan Ambassador"))
-				refundable += "Kidan Ambassador"
-				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Kidan Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Kidan Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Slime People Ambassador"))
+			if("Slime People Ambassador" in purchased)
 				refundable += "Slime People Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Slime People Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Slime People Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Grey Ambassador"))
+			if("Grey Ambassador" in purchased)
 				refundable += "Grey Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Grey Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Grey Ambassador -- 30KP</a><br>"	
-			if(checkpurchased("Vox Ambassador"))
+			if("Vox Ambassador" in purchased)
 				refundable += "Vox Ambassador"
 				dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Vox Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Vox Ambassador -- 30KP</a><br>"				
 
@@ -404,7 +402,7 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 	else
 		usr << "\red Your ckey ([dbckey]) was not found."	
 		
-/client/proc/checkpurchased(var/name)
+/client/proc/checkpurchased(var/name = null) // If the first parameter is null, return a full list of purchases
 	var/DBQuery/query = dbcon.NewQuery("SELECT * FROM whitelist WHERE ckey='[usr.key]'")
 	query.Execute()	
 	
@@ -420,9 +418,12 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 		var/list/joblist = text2list(dbjob,",")
 		var/list/specieslist = text2list(dbspecies,",")
 		var/list/combinedlist = joblist + specieslist
-		if(name in combinedlist)
-			return 1
+		if(name)
+			if(name in combinedlist)
+				return 1
+			else
+				return 0
 		else
-			return 0
+			return combinedlist
 	else
 		return 0	

code/modules/mob/living/silicon/ai/ai.dm

@@ -62,6 +62,8 @@ var/list/ai_list = list()
 
 	var/obj/item/borg/sight/hud/sec/sechud = null
 	var/obj/item/borg/sight/hud/med/healthhud = null
+	
+	var/arrivalmsg = "$name, $rank has arrived on the station."
 
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names
@@ -109,7 +111,7 @@ var/list/ai_list = list()
 	if (istype(loc, /turf))
 		verbs.Add(/mob/living/silicon/ai/proc/ai_network_change, \
 		/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
-		/mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/botcall, /mob/living/silicon/ai/proc/control_integrated_radio, /mob/living/silicon/ai/proc/control_hud)
+		/mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/botcall, /mob/living/silicon/ai/proc/control_integrated_radio, /mob/living/silicon/ai/proc/control_hud, /mob/living/silicon/ai/proc/change_arrival_message)
 
 	if(!safety)//Only used by AIize() to successfully spawn an AI.
 		if (!B)//If there is no player/brain inside.
@@ -843,6 +845,16 @@ var/list/ai_list = list()
 	set desc = "Augment visual feed with internal sensor overlays."
 	set category = "AI Commands"
 	toggle_sensor_mode()
+	
+/mob/living/silicon/ai/proc/change_arrival_message()
+	set name = "Set Arrival Message"
+	set desc = "Change the message that's transmitted when a new crew member arrives on station."
+	set category = "AI Commands"
+	
+	var/newmsg = input("What would you like the arrival message to be? Use $name to substitute the crew member's name, and use $rank to substitute the crew member's rank.", "Change Arrival Message", arrivalmsg) as text
+	if(newmsg != arrivalmsg)
+		arrivalmsg = newmsg
+		usr << "The arrival message has been successfully changed."
 
 // Handled camera lighting, when toggled.
 // It will get the nearest camera from the eyeobj, lighting it.

code/modules/mob/new_player/new_player.dm

@@ -330,11 +330,23 @@
 
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
-			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
-			if(character.mind.role_alt_title)
-				rank = character.mind.role_alt_title
-			a.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", "Arrivals Announcement Computer")
-			del(a)
+			var/ailist[] = list()
+			for (var/mob/living/silicon/ai/A in living_mob_list)
+				ailist += A
+			if (ailist.len)
+				var/mob/living/silicon/ai/announcer = pick(ailist)
+				if(character.mind)
+					if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
+						var/arrivalmessage = announcer.arrivalmsg
+						arrivalmessage = replacetext(arrivalmessage,"$name",character.real_name)
+						arrivalmessage = replacetext(arrivalmessage,"$rank",rank ? "[rank]" : "visitor")
+						announcer.say(";[arrivalmessage]")
+			else
+				var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
+				if(character.mind.role_alt_title)
+					rank = character.mind.role_alt_title
+				a.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", "Arrivals Announcement Computer")
+				del(a)				
 
 	proc/LateChoices()
 		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever

code/modules/paperwork/paper.dm

@@ -305,13 +305,12 @@
 				if(user.get_inactive_hand() == src)
 					user.drop_from_inventory(src)
 
-				new /obj/effect/decal/cleanable/ash(src.loc)
+				new /obj/effect/decal/cleanable/ash(get_turf(src))
 				del(src)
 
 			else
 				user << "\red You must hold \the [P] steady to burn \the [src]."
 
-
 /obj/item/weapon/paper/Topic(href, href_list)
 	..()
 	if(!usr || (usr.stat || usr.restrained()))
@@ -564,7 +563,7 @@
 	
 /obj/item/weapon/paper/armory
 	name = "paper- 'Armory Inventory'"
-	info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Wrench<br>1 Welding Tool<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>3 Gas Masks<br>1 Lockbox of Loyalty Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>1 Ablative Armor Vest<br>1 Bulletproof Vest<br>2 Riot Shotguns with Ammo<br>3 Laser Guns<br>3 Energy Guns"	
+	info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>3 Gas Masks<br>1 Lockbox of Loyalty Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Advanced Tasers"	
 
 /obj/item/weapon/paper/firingrange
 	name = "paper- 'Firing Range Instructions'"	

code/modules/paperwork/paper_bundle.dm

@@ -87,7 +87,7 @@
 				if(user.get_inactive_hand() == src)
 					user.drop_from_inventory(src)
 
-				new /obj/effect/decal/cleanable/ash(src.loc)
+				new /obj/effect/decal/cleanable/ash(get_turf(src))
 				del(src)
 
 			else

code/modules/paperwork/photography.dm

@@ -41,7 +41,33 @@
 		txt = copytext(txt, 1, 128)
 		if(loc == user && user.stat == 0)
 			scribble = txt
+	else if(istype(P, /obj/item/weapon/lighter))
+		burnphoto(P, user)
 	..()
+	
+/obj/item/weapon/photo/proc/burnphoto(obj/item/weapon/lighter/P, mob/user)
+	var/class = "<span class='warning'>"
+
+	if(P.lit && !user.restrained())
+		if(istype(P, /obj/item/weapon/lighter/zippo))
+			class = "<span class='rose'>"
+
+		user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like \he's trying to burn it!", \
+		"[class]You hold \the [P] up to \the [src], burning it slowly.")
+
+		spawn(20)
+			if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
+				user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \
+				"[class]You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.")
+
+				if(user.get_inactive_hand() == src)
+					user.drop_from_inventory(src)
+
+				new /obj/effect/decal/cleanable/ash(get_turf(src))
+				del(src)
+
+			else
+				user << "\red You must hold \the [P] steady to burn \the [src]."
 
 /obj/item/weapon/photo/examine(mob/user)
 	if(in_range(usr, src) || istype(usr, /mob/dead/observer))

code/modules/research/designs.dm

@@ -60,469 +60,4 @@ other types of metals and chemistry for reagents).
 	new_reliability = Clamp(new_reliability, reliability, 100)
 	reliability = new_reliability
 	return
-
-/////////////////////////////////////////
-/////////////////Mining//////////////////
-/////////////////////////////////////////
-
-/datum/design/drill_diamond
-	name = "Diamond Mining Drill"
-	desc = "Yours is the drill that will pierce the heavens!"
-	id = "drill_diamond"
-	req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
-	reliability_base = 79
-	build_path = /obj/item/weapon/pickaxe/diamonddrill
-	category = list("Mining")
-	
-/datum/design/pick_diamond
-	name = "Diamond Pickaxe"
-	desc = "A pickaxe with a diamond pick head, this is just like minecraft."
-	id = "pick_diamond"
-	req_tech = list("materials" = 6)
-	build_type = PROTOLATHE
-	materials = list("$diamond" = 3000)
-	build_path = /obj/item/weapon/pickaxe/diamond
-	category = list("Mining")
-
-/datum/design/drill
-	name = "Mining Drill"
-	desc = "Yours is the drill that will pierce through the rock walls."
-	id = "drill"
-	req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 6000, "$glass" = 1000)
-	build_path = /obj/item/weapon/pickaxe/drill
-	category = list("Mining")	
-	
-/datum/design/mesons
-	name = "Optical Meson Scanners"
-	desc = "Used for seeing walls, floors, and stuff through anything."
-	id = "mesons"
-	req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100)
-	build_path = /obj/item/clothing/glasses/meson
-	category = list("Mining")
-	
-/datum/design/plasmacutter
-	name = "Plasma Cutter"
-	desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
-	id = "plasmacutter"
-	req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
-	reliability_base = 79
-	build_path = /obj/item/weapon/pickaxe/plasmacutter
-	category = list("Mining")
-	
-/datum/design/jackhammer
-	name = "Sonic Jackhammer"
-	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
-	id = "jackhammer"
-	req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
-	build_path = /obj/item/weapon/pickaxe/jackhammer
-	category = list("Mining")
-
-/////////////////////////////////////////
-/////////////////Misc Designs////////////
-/////////////////////////////////////////
-	
-/datum/design/design_disk
-	name = "Design Storage Disk"
-	desc = "Produce additional disks for storing device designs."
-	id = "design_disk"
-	req_tech = list("programming" = 1)
-	build_type = PROTOLATHE | AUTOLATHE
-	materials = list("$metal" = 30, "$glass" = 10)
-	build_path = /obj/item/weapon/disk/design_disk
-	category = list("Miscellaneous")
-	
-/datum/design/intellicard
-	name = "Intellicard"
-	desc = "Allows for the construction of an intellicard."
-	id = "intellicard"
-	req_tech = list("programming" = 4, "materials" = 4)
-	build_type = PROTOLATHE
-	materials = list("$glass" = 1000, "$gold" = 200)
-	build_path = /obj/item/device/aicard
-	category = list("Miscellaneous")
-	
-/datum/design/paicard
-	name = "Personal Artificial Intelligence Card"
-	desc = "Allows for the construction of a pAI Card"
-	id = "paicard"
-	req_tech = list("programming" = 2)
-	build_type = PROTOLATHE
-	materials = list("$glass" = 500, "$metal" = 500)
-	build_path = /obj/item/device/paicard
-	category = list("Miscellaneous")
-
-/datum/design/tech_disk
-	name = "Technology Data Storage Disk"
-	desc = "Produce additional disks for storing technology data."
-	id = "tech_disk"
-	req_tech = list("programming" = 1)
-	build_type = PROTOLATHE | AUTOLATHE
-	materials = list("$metal" = 30, "$glass" = 10)
-	build_path = /obj/item/weapon/disk/tech_disk
-	category = list("Miscellaneous")
-
-/////////////////////////////////////////
-//////////////Blue Space/////////////////
-/////////////////////////////////////////
-
-/datum/design/bluespace_crystal
-	name = "Artificial Bluespace Crystal"
-	desc = "A small blue crystal with mystical properties."
-	id = "bluespace_crystal"
-	req_tech = list("bluespace" = 4, "materials" = 6)
-	build_type = PROTOLATHE
-	materials = list("$diamond" = 1500, "$plasma" = 1500)
-	reliability_base = 100
-	build_path = /obj/item/bluespace_crystal/artificial
-	category = list("Bluespace")	
-	
-/datum/design/bag_holding
-	name = "Bag of Holding"
-	desc = "A backpack that opens into a localized pocket of Blue Space."
-	id = "bag_holding"
-	req_tech = list("bluespace" = 4, "materials" = 6)
-	build_type = PROTOLATHE
-	materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
-	reliability_base = 80
-	build_path = /obj/item/weapon/storage/backpack/holding
-	category = list("Bluespace")
-
-/datum/design/telesci_gps
-	name = "GPS Device"
-	desc = "A device that can track its position at all times."
-	id = "telesci_Gps"
-	req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 500, "$glass" = 1000)
-	build_path = /obj/item/device/gps
-	category = list("Bluespace")
-
-/datum/design/telepad_beacon
-	name = "Telepad Beacon"
-	desc = "Use to warp in a cargo telepad."
-	id = "telepad_beacon"
-	req_tech = list("bluespace" = 3, "materials" = 4)
-	build_type = PROTOLATHE
-	materials = list ("$metal" = 2000, "$glass" = 1750, "$silver" = 500)
-	build_path = /obj/item/device/telepad_beacon
-	category = list("Bluespace")
-
-/datum/design/beacon
-	name = "Tracking Beacon"
-	desc = "A blue space tracking beacon."
-	id = "beacon"
-	req_tech = list("bluespace" = 1)
-	build_type = PROTOLATHE
-	materials = list ("$metal" = 20, "$glass" = 10)
-	build_path = /obj/item/device/radio/beacon
-	category = list("Bluespace")
-
-/////////////////////////////////////////
-/////////////////Equipment///////////////
-/////////////////////////////////////////
-
-/datum/design/health_hud
-	name = "Health Scanner HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
-	id = "health_hud"
-	req_tech = list("biotech" = 2, "magnets" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/clothing/glasses/hud/health
-	category = list("Equipment")
-	
-/datum/design/magboots
-	name = "Magnetic Boots"
-	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
-	id = "magboots"
-	req_tech = list("materials" = 4, "magnets" = 4, "engineering" = 5)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500)
-	build_path = /obj/item/clothing/shoes/magboots
-	category = list("Equipment")
-	
-/datum/design/night_vision_goggles
-	name = "Night Vision Goggles"
-	desc = "Goggles that let you see through darkness unhindered."
-	id = "night_visision_goggles"
-	req_tech = list("magnets" = 4)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 100, "$glass" = 100, "$uranium" = 1000)
-	build_path = /obj/item/clothing/glasses/night
-	category = list("Equipment")
-
-/datum/design/health_hud_night
-	name = "Night Vision Health Scanner HUD"
-	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
-	id = "health_hud_night"
-	req_tech = list("biotech" = 4, "magnets" = 5)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
-	build_path = /obj/item/clothing/glasses/hud/health/night
-	category = list("Equipment")
-	
-/datum/design/security_hud_night
-	name = "Night Vision Security HUD"
-	desc = "A heads-up display which provides id data and vision in complete darkness."
-	id = "security_hud_night"
-	req_tech = list("magnets" = 5, "combat" = 4)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
-	build_path = /obj/item/clothing/glasses/hud/security/night
-	category = list("Equipment")
-
-/datum/design/security_hud
-	name = "Security HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
-	id = "security_hud"
-	req_tech = list("magnets" = 3, "combat" = 2)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/clothing/glasses/hud/security
-	category = list("Equipment")
-
-/////////////////////////////////////////
-/////////////PDA and Radio stuff/////////
-/////////////////////////////////////////
-
-/datum/design/binaryencrypt
-	name = "Binary Encryption Key"
-	desc = "An encyption key for a radio headset. Contains cypherkeys."
-	id = "binaryencrypt"
-	req_tech = list("syndicate" = 2)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 300, "$glass" = 300)
-	build_path = /obj/item/device/encryptionkey/binary
-	category = list("Communication")
-	
-/datum/design/cart_atmos
-	name = "BreatheDeep Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_atmos"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/atmos
-	category = list("Communication")
-	
-/datum/design/cart_chemistry
-	name = "ChemWhiz Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_chemistry"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/chemistry
-	category = list("Communication")
-	
-/datum/design/cart_janitor
-	name = "CustodiPRO Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_janitor"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/janitor
-	category = list("Communication")
-	
-/datum/design/cart_mime
-	name = "Gestur-O 1000 Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_mime"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/mime
-	category = list("Communication")	
-	
-/datum/design/cart_basic
-	name = "Generic Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_basic"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge
-	category = list("Communication")	
-	
-/datum/design/cart_clown
-	name = "Honkworks 5.0 Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_clown"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/clown
-	category = list("Communication")
-	
-/datum/design/cart_hop
-	name = "Human Resources 9001 Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_hop"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/hop
-	locked = 1
-	category = list("Communication")
-	
-/datum/design/cart_medical
-	name = "Med-U Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_medical"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/medical
-	category = list("Communication")	
-	
-/datum/design/cart_cmo
-	name = "Med-U DELUXE Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_cmo"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/cmo
-	locked = 1
-	category = list("Communication")
-	
-/datum/design/pda
-	name = "PDA"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
-	id = "pda"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/device/pda
-	category = list("Communication")
-	
-/datum/design/cart_engineering
-	name = "Power-ON Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_engineering"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/engineering
-	category = list("Communication")
-	
-/datum/design/cart_ce
-	name = "Power-On DELUXE Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_ce"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/ce
-	locked = 1
-	category = list("Communication")
-
-/datum/design/cart_security
-	name = "R.O.B.U.S.T. Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_security"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = "/obj/item/weapon/cartridge/security"
-	locked = 1
-	category = list("Communication")
-	
-/datum/design/cart_hos
-	name = "R.O.B.U.S.T. DELUXE Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_hos"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/hos
-	locked = 1
-	category = list("Communication")
-	
-/datum/design/cart_toxins
-	name = "Signal Ace 2 Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_toxins"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/signal/toxins
-	category = list("Communication")
-
-/datum/design/cart_rd
-	name = "Signal Ace DELUXE Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_rd"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/rd
-	locked = 1
-	category = list("Communication")
-	
-/datum/design/cart_quartermaster
-	name = "Space Parts & Space Vendors Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_quartermaster"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/quartermaster
-	locked = 1
-	category = list("Communication")
-	
-/datum/design/cart_captain
-	name = "Value-PAK Cartridge"
-	desc = "A data cartridge for portable microcomputers."
-	id = "cart_captain"
-	req_tech = list("engineering" = 2, "powerstorage" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 50, "$glass" = 50)
-	build_path = /obj/item/weapon/cartridge/captain
-	locked = 1
-	category = list("Communication")
-
-/////////////////////////////////////////
-////////////Janitor Designs//////////////
-/////////////////////////////////////////
-	
-/datum/design/advmop
-	name = "Advanced Mop"
-	desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
-	id = "advmop"
-	req_tech = list("materials" = 4, "engineering" = 3)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 2500, "$glass" = 200)
-	build_path = /obj/item/weapon/mop/advanced
-	category = list("Janitorial")
-
-/datum/design/holosign
-	name = "Holographic Sign Projector"
-	desc = "A holograpic projector used to project various warning signs."
-	id = "holosign"
-	req_tech = list("magnets" = 3, "powerstorage" = 2)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 2000, "$glass" = 1000)
-	build_path = /obj/item/weapon/holosign_creator
-	category = list("Janitorial")
-	
-/datum/design/light_replacer
-	name = "Light Replacer"
-	desc = "A device to automatically replace lights. Refill with working lightbulbs."
-	id = "light_replacer"
-	req_tech = list("magnets" = 3, "materials" = 4)
-	build_type = PROTOLATHE
-	materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000)
-	build_path = /obj/item/device/lightreplacer
-	category = list("Janitorial")
+	

code/modules/research/designs/bluespace_designs.dm

@@ -0,0 +1,54 @@
+/////////////////////////////////////////
+//////////////Bluespace//////////////////
+/////////////////////////////////////////
+/datum/design/bluespace_crystal
+	name = "Artificial Bluespace Crystal"
+	desc = "A small blue crystal with mystical properties."
+	id = "bluespace_crystal"
+	req_tech = list("bluespace" = 4, "materials" = 6)
+	build_type = PROTOLATHE
+	materials = list("$diamond" = 1500, "$plasma" = 1500)
+	reliability_base = 100
+	build_path = /obj/item/bluespace_crystal/artificial
+	category = list("Bluespace")	
+	
+/datum/design/bag_holding
+	name = "Bag of Holding"
+	desc = "A backpack that opens into a localized pocket of Blue Space."
+	id = "bag_holding"
+	req_tech = list("bluespace" = 4, "materials" = 6)
+	build_type = PROTOLATHE
+	materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
+	reliability_base = 80
+	build_path = /obj/item/weapon/storage/backpack/holding
+	category = list("Bluespace")
+
+/datum/design/telesci_gps
+	name = "GPS Device"
+	desc = "A device that can track its position at all times."
+	id = "telesci_Gps"
+	req_tech = list("materials" = 2, "magnets" = 3, "bluespace" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 500, "$glass" = 1000)
+	build_path = /obj/item/device/gps
+	category = list("Bluespace")
+
+/datum/design/telepad_beacon
+	name = "Telepad Beacon"
+	desc = "Use to warp in a cargo telepad."
+	id = "telepad_beacon"
+	req_tech = list("bluespace" = 3, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list ("$metal" = 2000, "$glass" = 1750, "$silver" = 500)
+	build_path = /obj/item/device/telepad_beacon
+	category = list("Bluespace")
+
+/datum/design/beacon
+	name = "Tracking Beacon"
+	desc = "A blue space tracking beacon."
+	id = "beacon"
+	req_tech = list("bluespace" = 1)
+	build_type = PROTOLATHE
+	materials = list ("$metal" = 20, "$glass" = 10)
+	build_path = /obj/item/device/radio/beacon
+	category = list("Bluespace")

code/modules/research/designs/equipment_designs.dm

@@ -0,0 +1,62 @@
+/////////////////////////////////////////
+/////////////////Equipment///////////////
+/////////////////////////////////////////
+/datum/design/health_hud
+	name = "Health Scanner HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
+	id = "health_hud"
+	req_tech = list("biotech" = 2, "magnets" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/clothing/glasses/hud/health
+	category = list("Equipment")
+	
+/datum/design/magboots
+	name = "Magnetic Boots"
+	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
+	id = "magboots"
+	req_tech = list("materials" = 4, "magnets" = 4, "engineering" = 5)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500)
+	build_path = /obj/item/clothing/shoes/magboots
+	category = list("Equipment")
+	
+/datum/design/night_vision_goggles
+	name = "Night Vision Goggles"
+	desc = "Goggles that let you see through darkness unhindered."
+	id = "night_visision_goggles"
+	req_tech = list("magnets" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 100, "$glass" = 100, "$uranium" = 1000)
+	build_path = /obj/item/clothing/glasses/night
+	category = list("Equipment")
+
+/datum/design/health_hud_night
+	name = "Night Vision Health Scanner HUD"
+	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+	id = "health_hud_night"
+	req_tech = list("biotech" = 4, "magnets" = 5)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
+	build_path = /obj/item/clothing/glasses/hud/health/night
+	category = list("Equipment")
+	
+/datum/design/security_hud_night
+	name = "Night Vision Security HUD"
+	desc = "A heads-up display which provides id data and vision in complete darkness."
+	id = "security_hud_night"
+	req_tech = list("magnets" = 5, "combat" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
+	build_path = /obj/item/clothing/glasses/hud/security/night
+	category = list("Equipment")
+
+/datum/design/security_hud
+	name = "Security HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+	id = "security_hud"
+	req_tech = list("magnets" = 3, "combat" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/clothing/glasses/hud/security
+	category = list("Equipment")

code/modules/research/designs/janitorial_designs.dm

@@ -0,0 +1,32 @@
+/////////////////////////////////////////
+///////////Janitorial Designs////////////
+/////////////////////////////////////////
+/datum/design/advmop
+	name = "Advanced Mop"
+	desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
+	id = "advmop"
+	req_tech = list("materials" = 4, "engineering" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 2500, "$glass" = 200)
+	build_path = /obj/item/weapon/mop/advanced
+	category = list("Janitorial")
+
+/datum/design/holosign
+	name = "Holographic Sign Projector"
+	desc = "A holograpic projector used to project various warning signs."
+	id = "holosign"
+	req_tech = list("magnets" = 3, "powerstorage" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 2000, "$glass" = 1000)
+	build_path = /obj/item/weapon/holosign_creator
+	category = list("Janitorial")
+	
+/datum/design/light_replacer
+	name = "Light Replacer"
+	desc = "A device to automatically replace lights. Refill with working lightbulbs."
+	id = "light_replacer"
+	req_tech = list("magnets" = 3, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000)
+	build_path = /obj/item/device/lightreplacer
+	category = list("Janitorial")

code/modules/research/designs/mecha_designs.dm

@@ -1,10 +1,9 @@
 ///////////////////////////////////
 //////////Mecha Module Disks///////
 ///////////////////////////////////
-
 // Ripley
 /datum/design/ripley_main
-	name = "Circuit Design (APLU \"Ripley\" Central Control module)"
+	name = "Exosuit Board (APLU \"Ripley\" Central Control module)"
 	desc = "Allows for the construction of a \"Ripley\" Central Control module."
 	id = "ripley_main"
 	req_tech = list("programming" = 3)
@@ -14,7 +13,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/ripley_peri
-	name = "Circuit Design (APLU \"Ripley\" Peripherals Control module)"
+	name = "Exosuit Board (APLU \"Ripley\" Peripherals Control module)"
 	desc = "Allows for the construction of a  \"Ripley\" Peripheral Control module."
 	id = "ripley_peri"
 	req_tech = list("programming" = 3)
@@ -25,7 +24,7 @@
 
 // Odysseus
 /datum/design/odysseus_main
-	name = "Circuit Design (\"Odysseus\" Central Control module)"
+	name = "Exosuit Board (\"Odysseus\" Central Control module)"
 	desc = "Allows for the construction of a \"Odysseus\" Central Control module."
 	id = "odysseus_main"
 	req_tech = list("programming" = 3,"biotech" = 2)
@@ -35,7 +34,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/odysseus_peri
-	name = "Circuit Design (\"Odysseus\" Peripherals Control module)"
+	name = "Exosuit Board (\"Odysseus\" Peripherals Control module)"
 	desc = "Allows for the construction of a \"Odysseus\" Peripheral Control module."
 	id = "odysseus_peri"
 	req_tech = list("programming" = 3,"biotech" = 2)
@@ -46,7 +45,7 @@
 
 // Gygax
 /datum/design/gygax_main
-	name = "Circuit Design (\"Gygax\" Central Control module)"
+	name = "Exosuit Board (\"Gygax\" Central Control module)"
 	desc = "Allows for the construction of a \"Gygax\" Central Control module."
 	id = "gygax_main"
 	req_tech = list("programming" = 4)
@@ -56,7 +55,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/gygax_peri
-	name = "Circuit Design (\"Gygax\" Peripherals Control module)"
+	name = "Exosuit Board (\"Gygax\" Peripherals Control module)"
 	desc = "Allows for the construction of a \"Gygax\" Peripheral Control module."
 	id = "gygax_peri"
 	req_tech = list("programming" = 4)
@@ -66,7 +65,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/gygax_targ
-	name = "Circuit Design (\"Gygax\" Weapons & Targeting Control module)"
+	name = "Exosuit Board (\"Gygax\" Weapons & Targeting Control module)"
 	desc = "Allows for the construction of a \"Gygax\" Weapons & Targeting Control module."
 	id = "gygax_targ"
 	req_tech = list("programming" = 4, "combat" = 2)
@@ -77,7 +76,7 @@
 
 // Durand
 /datum/design/durand_main
-	name = "Circuit Design (\"Durand\" Central Control module)"
+	name = "Exosuit Board (\"Durand\" Central Control module)"
 	desc = "Allows for the construction of a \"Durand\" Central Control module."
 	id = "durand_main"
 	req_tech = list("programming" = 4)
@@ -87,7 +86,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/durand_peri
-	name = "Circuit Design (\"Durand\" Peripherals Control module)"
+	name = "Exosuit Board (\"Durand\" Peripherals Control module)"
 	desc = "Allows for the construction of a \"Durand\" Peripheral Control module."
 	id = "durand_peri"
 	req_tech = list("programming" = 4)
@@ -97,7 +96,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/durand_targ
-	name = "Circuit Design (\"Durand\" Weapons & Targeting Control module)"
+	name = "Exosuit Board (\"Durand\" Weapons & Targeting Control module)"
 	desc = "Allows for the construction of a \"Durand\" Weapons & Targeting Control module."
 	id = "durand_targ"
 	req_tech = list("programming" = 4, "combat" = 2)
@@ -108,7 +107,7 @@
 
 // Phazon
 /datum/design/phazon_main
-	name = "Exosuit Design (\"Phazon\" Central Control module)"
+	name = "Exosuit Board (\"Phazon\" Central Control module)"
 	desc = "Allows for the construction of a \"Phazon\" Central Control module."
 	id = "phazon_main"
 	req_tech = list("programming" = 5, "materials" = 7, "powerstorage" = 6)
@@ -118,7 +117,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/phazon_peri
-	name = "Exosuit Design (\"Phazon\" Peripherals Control module)"
+	name = "Exosuit Board (\"Phazon\" Peripherals Control module)"
 	desc = "Allows for the construction of a \"Phazon\" Peripheral Control module."
 	id = "phazon_peri"
 	req_tech = list("programming" = 5, "bluespace" = 6)
@@ -139,7 +138,7 @@
 
 // H.O.N.K.
 /datum/design/honker_main
-	name = "Circuit Design (\"H.O.N.K\" Central Control module)"
+	name = "Exosuit Board (\"H.O.N.K\" Central Control module)"
 	desc = "Allows for the construction of a \"H.O.N.K\" Central Control module."
 	id = "honker_main"
 	req_tech = list("programming" = 3)
@@ -149,7 +148,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/honker_peri
-	name = "Circuit Design (\"H.O.N.K\" Peripherals Control module)"
+	name = "Exosuit Board (\"H.O.N.K\" Peripherals Control module)"
 	desc = "Allows for the construction of a \"H.O.N.K\" Peripheral Control module."
 	id = "honker_peri"
 	req_tech = list("programming" = 3)
@@ -159,7 +158,7 @@
 	category = list("Exosuit Modules")
 
 /datum/design/honker_targ
-	name = "Circuit Design (\"H.O.N.K\" Weapons & Targeting Control module)"
+	name = "Exosuit Board (\"H.O.N.K\" Weapons & Targeting Control module)"
 	desc = "Allows for the construction of a \"H.O.N.K\" Weapons & Targeting Control module."
 	id = "honker_targ"
 	req_tech = list("programming" = 3)
@@ -167,10 +166,10 @@
 	materials = list("$glass" = 1000, "sacid" = 20)
 	build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
 	category = list("Exosuit Modules")
-
+	
 // Space pod
 //datum/design/spacepod_main
-	name = "Circuit Design (Space Pod Mainboard)"
+	name = "Exosuit Board (Space Pod Mainboard)"
 	desc = "Allows for the construction of a Space Pod mainboard."
 	id = "spacepod_main"
 	req_tech = list("programming" = 4)

code/modules/research/designs/mechfabricator_designs.dm

@@ -1,7 +1,6 @@
 ////////////////////////////////////////
-/////////// Mecha Equpment /////////////
+/////////// Mecha Designs //////////////
 ////////////////////////////////////////
-
 //Cyborg
 /datum/design/borg_suit
 	name = "Cyborg Endoskeleton"
@@ -99,7 +98,7 @@
 	id = "borg_diagnosis_unit"
 	build_type = MECHFAB
 	build_path = /obj/item/robot_parts/robot_component/diagnosis_unit
-	materials = list("$metal"=3000)
+	materials = list("$metal"=3500)
 	construction_time = 200
 	category = list("Cyborg Repair")
 	
@@ -114,7 +113,7 @@
 	
 /datum/design/borg_armor
 	name = "Cyborg Armor"
-	id = "borg_camera"
+	id = "borg_armor"
 	build_type = MECHFAB
 	build_path = /obj/item/robot_parts/robot_component/armour
 	materials = list("$metal"=5000)
@@ -131,7 +130,7 @@
 	construction_time = 100
 	category = list("Ripley")
 
-//firefighter subtype
+//Firefighter subtype
 /datum/design/firefighter_chassis
 	name = "Exosuit Chassis (APLU \"Firefighter\")"
 	id = "firefighter_chassis"
@@ -641,6 +640,206 @@
 	materials = list("$metal"=20000,"$bananium"=5000)
 	construction_time = 300
 	category = list("Exosuit Equipment")
+	
+// Exosuit Modules
+/datum/design/mech_diamond_drill
+	name = "Exosuit Module (Diamond Mining Drill)"
+	desc = "An upgraded version of the standard drill."
+	id = "mech_diamond_drill"
+	build_type = MECHFAB
+	req_tech = list("materials" = 4, "engineering" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
+	materials = list("$metal"=10000,"$diamond"=6500)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_generator_nuclear
+	name = "Exosuit Module (ExoNuclear Reactor)"
+	desc = "Compact nuclear reactor module."
+	id = "mech_generator_nuclear"
+	build_type = MECHFAB
+	req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
+	materials = list("$metal"=10000,"$glass"=1000,"$silver"=500)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_gravcatapult
+	name = "Exosuit Module (Gravitational Catapult Module)"
+	desc = "An exosuit mounted Gravitational Catapult."
+	id = "mech_gravcatapult"
+	build_type = MECHFAB
+	req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_wormhole_gen
+	name = "Exosuit Module (Localized Wormhole Generator)"
+	desc = "An exosuit module that allows generating of small quasi-stable wormholes."
+	id = "mech_wormhole_gen"
+	build_type = MECHFAB
+	req_tech = list("bluespace" = 3, "magnets" = 2)
+	build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_rcd
+	name = "Exosuit Module (RCD Module)"
+	desc = "An exosuit-mounted Rapid Construction Device."
+	id = "mech_rcd"
+	build_type = MECHFAB
+	req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4)
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd
+	materials = list("$metal"=30000,"$gold"=20000,"$plasma"=25000,"$silver"=20000)
+	construction_time = 1200
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_ccw_armor
+	name = "Exosuit Module (Reactive Armor Booster Module)"
+	desc = "Exosuit-mounted armor booster."
+	id = "mech_ccw_armor"
+	build_type = MECHFAB
+	req_tech = list("materials" = 5, "combat" = 4)
+	build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster
+	materials = list("$metal"=20000,"$silver"=5000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_proj_armor
+	name = "Exosuit Module (Reflective Armor Booster Module)"
+	desc = "Exosuit-mounted armor booster."
+	id = "mech_proj_armor"
+	build_type = MECHFAB
+	req_tech = list("materials" = 5, "combat" = 5, "engineering"=3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
+	materials = list("$metal"=20000,"$gold"=5000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_repair_droid
+	name = "Exosuit Module (Repair Droid Module)"
+	desc = "Automated Repair Droid. BEEP BOOP"
+	id = "mech_repair_droid"
+	build_type = MECHFAB
+	req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid
+	materials = list("$metal"=10000,"$glass"=5000,"$gold"=1000,"$silver"=2000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/clusterbang_launcher
+	name = "Exosuit Module (SOB-3 Clusterbang Launcher)"
+	desc = "A weapon that violates the Geneva Convention at 3 rounds per minute"
+	id = "clusterbang_launcher"
+	build_type = MECHFAB
+	req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang
+	materials = list("$metal"=20000,"$gold"=10000,"$uranium"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_teleporter
+	name = "Exosuit Module (Teleporter Module)"
+	desc = "An exosuit module that allows exosuits to teleport to any position in view."
+	id = "mech_teleporter"
+	build_type = MECHFAB
+	req_tech = list("bluespace" = 10, "magnets" = 5)
+	build_path = /obj/item/mecha_parts/mecha_equipment/teleporter
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_energy_relay
+	name = "Exosuit Module (Tesla Energy Relay)"
+	desc = "Tesla Energy Relay"
+	id = "mech_energy_relay"
+	build_type = MECHFAB
+	req_tech = list("magnets" = 4, "powerstorage" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
+	materials = list("$metal"=10000,"$glass"=2000,"$gold"=2000,"$silver"=3000)
+	construction_time = 100
+	category = list("Exosuit Equipment")	
+	
+// Exosuit Weapons
+/datum/design/mech_laser_heavy
+	name = "Exosuit Weapon (CH-LC \"Solaris\" Laser Cannon)"
+	desc = "Allows for the construction of CH-LC Laser Cannon."
+	id = "mech_laser_heavy"
+	build_type = MECHFAB
+	req_tech = list("combat" = 4, "magnets" = 4)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_laser
+	name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)"
+	desc = "Allows for the construction of CH-PS Laser."
+	id = "mech_laser"
+	build_type = MECHFAB
+	req_tech = list("combat" = 3, "magnets" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_carbine
+	name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)"
+	desc = "Allows for the construction of FNX-99 \"Hades\" Carbine."
+	id = "mech_carbine"
+	build_type = MECHFAB
+	req_tech = list("combat" = 5, "materials" = 4)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_scattershot
+	name = "Exosuit Weapon (LBX AC 10 \"Scattershot\")"
+	desc = "Allows for the construction of LBX AC 10."
+	id = "mech_scattershot"
+	build_type = MECHFAB
+	req_tech = list("combat" = 4)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+	
+/datum/design/mech_ion
+	name = "Exosuit Weapon (MKIV Ion Heavy Cannon)"
+	desc = "Allows for the construction of MKIV Ion Heavy Cannon."
+	id = "mech_ion"
+	build_type = MECHFAB
+	req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
+	materials = list("$metal"=20000,"$silver"=6000,"$uranium"=2000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_grenade_launcher
+	name = "Exosuit Weapon (SGL-6 Grenade Launcher)"
+	desc = "Allows for the construction of SGL-6 Grenade Launcher."
+	id = "mech_grenade_launcher"
+	build_type = MECHFAB
+	req_tech = list("combat" = 3)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
+	materials = list("$metal"=22000,"$gold"=6000,"$silver"=8000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_missile_rack
+	name = "Exosuit Weapon (SRM-8 Missile Rack)"
+	desc = "Allows for the construction of SRM-8 Missile Rack."
+	id = "mech_missile_rack"
+	build_type = MECHFAB
+	req_tech = list("combat" = 6, "materials" = 6)
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
+	materials = list("$metal"=22000,"$gold"=6000,"$silver"=8000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
 
 //Cyborg Upgrade Modules
 /datum/design/borg_syndicate_module

code/modules/research/designs/medical_designs.dm

@@ -174,7 +174,7 @@
 	category = list("Medical")
 
 /datum/design/synthetic_flash
-	name = "Flash"
+	name = "Synthetic Flash"
 	desc = "A synthetic flash used mostly in borg construction."
 	id = "sflash"
 	req_tech = list("magnets" = 3, "combat" = 2)

code/modules/research/designs/mining_designs.dm

@@ -0,0 +1,64 @@
+/////////////////////////////////////////
+/////////////////Mining//////////////////
+/////////////////////////////////////////
+/datum/design/drill_diamond
+	name = "Diamond Mining Drill"
+	desc = "Yours is the drill that will pierce the heavens!"
+	id = "drill_diamond"
+	req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
+	reliability_base = 79
+	build_path = /obj/item/weapon/pickaxe/diamonddrill
+	category = list("Mining")
+	
+/datum/design/pick_diamond
+	name = "Diamond Pickaxe"
+	desc = "A pickaxe with a diamond pick head, this is just like minecraft."
+	id = "pick_diamond"
+	req_tech = list("materials" = 6)
+	build_type = PROTOLATHE
+	materials = list("$diamond" = 3000)
+	build_path = /obj/item/weapon/pickaxe/diamond
+	category = list("Mining")
+
+/datum/design/drill
+	name = "Mining Drill"
+	desc = "Yours is the drill that will pierce through the rock walls."
+	id = "drill"
+	req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 6000, "$glass" = 1000)
+	build_path = /obj/item/weapon/pickaxe/drill
+	category = list("Mining")	
+	
+/datum/design/mesons
+	name = "Optical Meson Scanners"
+	desc = "Used for seeing walls, floors, and stuff through anything."
+	id = "mesons"
+	req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100)
+	build_path = /obj/item/clothing/glasses/meson
+	category = list("Mining")
+	
+/datum/design/plasmacutter
+	name = "Plasma Cutter"
+	desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+	id = "plasmacutter"
+	req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
+	reliability_base = 79
+	build_path = /obj/item/weapon/pickaxe/plasmacutter
+	category = list("Mining")
+	
+/datum/design/jackhammer
+	name = "Sonic Jackhammer"
+	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+	id = "jackhammer"
+	req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
+	build_path = /obj/item/weapon/pickaxe/jackhammer
+	category = list("Mining")

code/modules/research/designs/misc_designs.dm

@@ -0,0 +1,42 @@
+/////////////////////////////////////////
+/////////////////Misc Designs////////////
+/////////////////////////////////////////
+/datum/design/design_disk
+	name = "Design Storage Disk"
+	desc = "Produce additional disks for storing device designs."
+	id = "design_disk"
+	req_tech = list("programming" = 1)
+	build_type = PROTOLATHE | AUTOLATHE
+	materials = list("$metal" = 30, "$glass" = 10)
+	build_path = /obj/item/weapon/disk/design_disk
+	category = list("Miscellaneous")
+	
+/datum/design/intellicard
+	name = "Intellicard"
+	desc = "Allows for the construction of an intellicard."
+	id = "intellicard"
+	req_tech = list("programming" = 4, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list("$glass" = 1000, "$gold" = 200)
+	build_path = /obj/item/device/aicard
+	category = list("Miscellaneous")
+	
+/datum/design/paicard
+	name = "Personal Artificial Intelligence Card"
+	desc = "Allows for the construction of a pAI Card"
+	id = "paicard"
+	req_tech = list("programming" = 2)
+	build_type = PROTOLATHE
+	materials = list("$glass" = 500, "$metal" = 500)
+	build_path = /obj/item/device/paicard
+	category = list("Miscellaneous")
+
+/datum/design/tech_disk
+	name = "Technology Data Storage Disk"
+	desc = "Produce additional disks for storing technology data."
+	id = "tech_disk"
+	req_tech = list("programming" = 1)
+	build_type = PROTOLATHE | AUTOLATHE
+	materials = list("$metal" = 30, "$glass" = 10)
+	build_path = /obj/item/weapon/disk/tech_disk
+	category = list("Miscellaneous")

code/modules/research/designs/power_designs.dm

@@ -10,8 +10,7 @@
 	build_type = PROTOLATHE | AUTOLATHE |MECHFAB
 	materials = list("$metal" = 700, "$glass" = 50)
 	build_path = /obj/item/weapon/cell
-	category = "Misc"
-	category = list("Misc","Power Designs","Power")
+	category = list("Misc","Power")
 
 /datum/design/high_cell
 	name = "High-Capacity Power Cell"
@@ -21,7 +20,7 @@
 	build_type = PROTOLATHE | AUTOLATHE | MECHFAB
 	materials = list("$metal" = 700, "$glass" = 60)
 	build_path = /obj/item/weapon/cell/high
-	category = list("Misc","Power Designs","Power")
+	category = list("Misc","Power")
 	
 /datum/design/hyper_cell
 	name = "Hyper-Capacity Power Cell"
@@ -32,7 +31,7 @@
 	build_type = PROTOLATHE | MECHFAB
 	materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70)
 	build_path = /obj/item/weapon/cell/hyper
-	category = list("Misc","Power Designs","Power")
+	category = list("Misc","Power")
 	
 /datum/design/super_cell
 	name = "Super-Capacity Power Cell"
@@ -43,10 +42,10 @@
 	build_type = PROTOLATHE | MECHFAB
 	materials = list("$metal" = 700, "$glass" = 70)
 	build_path = /obj/item/weapon/cell/super
-	category = list("Misc","Power Designs","Power")
+	category = list("Misc","Power")
 	
 /datum/design/pacman
-	name = "PACMAN-type Generator Board"
+	name = "Machien Board (PACMAN-type Generator)"
 	desc = "The circuit board that for a PACMAN-type portable generator."
 	id = "pacman"
 	req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3)
@@ -57,7 +56,7 @@
 	category = list("Engineering Machinery")
 	
 /datum/design/mrspacman
-	name = "MRSPACMAN-type Generator Board"
+	name = "Machine Board (MRSPACMAN-type Generator)"
 	desc = "The circuit board that for a MRSPACMAN-type portable generator."
 	id = "mrspacman"
 	req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 5)
@@ -68,7 +67,7 @@
 	category = list("Engineering Machinery")
 
 /datum/design/superpacman
-	name = "SUPERPACMAN-type Generator Board"
+	name = "Machine Board (SUPERPACMAN-type Generator)"
 	desc = "The circuit board that for a SUPERPACMAN-type portable generator."
 	id = "superpacman"
 	req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4)

code/modules/research/designs/radio_pda_designs.dm

@@ -0,0 +1,200 @@
+/////////////////////////////////////////
+/////////////PDA and Radio///////////////
+/////////////////////////////////////////
+/datum/design/binaryencrypt
+	name = "Binary Encryption Key"
+	desc = "An encyption key for a radio headset. Contains cypherkeys."
+	id = "binaryencrypt"
+	req_tech = list("syndicate" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 300, "$glass" = 300)
+	build_path = /obj/item/device/encryptionkey/binary
+	category = list("Communication")
+	
+/datum/design/cart_atmos
+	name = "BreatheDeep Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_atmos"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/atmos
+	category = list("Communication")
+	
+/datum/design/cart_chemistry
+	name = "ChemWhiz Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_chemistry"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/chemistry
+	category = list("Communication")
+	
+/datum/design/cart_janitor
+	name = "CustodiPRO Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_janitor"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/janitor
+	category = list("Communication")
+	
+/datum/design/cart_mime
+	name = "Gestur-O 1000 Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_mime"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/mime
+	category = list("Communication")	
+	
+/datum/design/cart_basic
+	name = "Generic Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_basic"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge
+	category = list("Communication")	
+	
+/datum/design/cart_clown
+	name = "Honkworks 5.0 Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_clown"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/clown
+	category = list("Communication")
+	
+/datum/design/cart_hop
+	name = "Human Resources 9001 Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_hop"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/hop
+	locked = 1
+	category = list("Communication")
+	
+/datum/design/cart_medical
+	name = "Med-U Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_medical"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/medical
+	category = list("Communication")	
+	
+/datum/design/cart_cmo
+	name = "Med-U DELUXE Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_cmo"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/cmo
+	locked = 1
+	category = list("Communication")
+	
+/datum/design/pda
+	name = "PDA"
+	desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
+	id = "pda"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/device/pda
+	category = list("Communication")
+	
+/datum/design/cart_engineering
+	name = "Power-ON Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_engineering"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/engineering
+	category = list("Communication")
+	
+/datum/design/cart_ce
+	name = "Power-On DELUXE Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_ce"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/ce
+	locked = 1
+	category = list("Communication")
+
+/datum/design/cart_security
+	name = "R.O.B.U.S.T. Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_security"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = "/obj/item/weapon/cartridge/security"
+	locked = 1
+	category = list("Communication")
+	
+/datum/design/cart_hos
+	name = "R.O.B.U.S.T. DELUXE Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_hos"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/hos
+	locked = 1
+	category = list("Communication")
+	
+/datum/design/cart_toxins
+	name = "Signal Ace 2 Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_toxins"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/signal/toxins
+	category = list("Communication")
+
+/datum/design/cart_rd
+	name = "Signal Ace DELUXE Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_rd"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/rd
+	locked = 1
+	category = list("Communication")
+	
+/datum/design/cart_quartermaster
+	name = "Space Parts & Space Vendors Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_quartermaster"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/quartermaster
+	locked = 1
+	category = list("Communication")
+	
+/datum/design/cart_captain
+	name = "Value-PAK Cartridge"
+	desc = "A data cartridge for portable microcomputers."
+	id = "cart_captain"
+	req_tech = list("engineering" = 2, "powerstorage" = 3)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 50, "$glass" = 50)
+	build_path = /obj/item/weapon/cartridge/captain
+	locked = 1
+	category = list("Communication")