Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

code/modules/research/designs/autolathe_designs.dm

@@ -273,6 +273,14 @@
 	materials = list(MAT_METAL = 100)
 	build_path = /obj/item/weapon/canvas/twentythreeXtwentythree
 	category = list("initial", "Miscellaneous")
+	
+/datum/design/glass_picture_frame
+	name = "Glass Picture Frame"
+	id = "glass_picture_frame"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 25, MAT_GLASS = 75)
+	build_path = /obj/item/weapon/picture_frame/glass
+	category = list("initial", "Miscellaneous")
 
 /datum/design/camera_assembly
 	name = "Camera Assembly"

code/modules/research/designs/weapon_designs.dm

@@ -270,4 +270,15 @@
 	materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000, MAT_METAL = 4000)
 	build_path = /obj/item/weapon/gun/energy/xray
 	locked = 1
+	category = list("Weapons")
+
+/datum/design/immolator
+	name = "Immolator Laser Gun"
+	desc = "Has fewer shots than a regular laser gun, but ignites the target on hit"
+	id = "immolator"
+	req_tech = list("combat" = 4, "materials" = 5, "powerstorage" = 5, "magnets" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000, MAT_GLASS = 1000, MAT_SILVER = 3000, MAT_PLASMA = 2000)
+	build_path = /obj/item/weapon/gun/energy/immolator
+	locked = 1
 	category = list("Weapons")

code/modules/research/message_server.dm

@@ -111,7 +111,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 			Console.set_light(2)
 
 /obj/machinery/message_server/attack_hand(user as mob)
-//	user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays."
+//	user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays."
 	user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]"
 	active = !active
 	update_icon()