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

code/modules/research/designs.dm

@@ -44,6 +44,7 @@ other types of metals and chemistry for reagents).
 	var/construction_time				//Amount of time required for building the object
 	var/build_path = ""					//The file path of the object that gets created
 	var/locked = 0						//If true it will spawn inside a lockbox with currently sec access
+	var/access_requirement = list(access_armory) //What special access requirements will the lockbox have? Defaults to armory.
 	var/category = null //Primarily used for Mech Fabricators, but can be used for anything
 	var/list/reagents = list()			//List of reagents. Format: "id" = amount.
 

code/modules/research/designs/weapon_designs.dm

@@ -60,6 +60,18 @@
 	locked = 1
 	category = list("Weapons")
 
+/datum/design/wormhole_projector
+	name = "Bluespace Wormhole Projector"
+	desc = "A projector that emits high density quantum-coupled bluespace beams."
+	id = "wormholeprojector"
+	req_tech = list("combat" = 6, "materials" = 6, "bluespace" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_SILVER = 1000, MAT_METAL = 5000, MAT_DIAMOND = 3000)
+	build_path = /obj/item/weapon/gun/energy/wormhole_projector
+	locked = 1
+	access_requirement = list(access_rd) //screw you, HoS, this aint yours; this is only for a man of science---and trouble.
+	category = list("Weapons")
+
 /datum/design/large_grenade
 	name = "Large Grenade"
 	desc = "A grenade that affects a larger area and use larger containers."
@@ -133,7 +145,7 @@
 	materials = list(MAT_METAL = 2000)
 	build_path = /obj/item/ammo_box/magazine/smgm9mm
 	category = list("Weapons")
-	
+
 /datum/design/mag_smg/ap_mag
 	name = "Saber Submachine Gun Magazine (9mmAP)"
 	desc = "A 30-round armour piercing magazine for the Saber submachine gun. Deals slightly less damage but bypasses most armor."

code/modules/research/rdconsole.dm

@@ -324,12 +324,6 @@ proc/CallMaterialName(ID)
 						use_power(250)
 						updateUsrDialog()
 
-	else if(href_list["lock"]) //Lock the console from use by anyone without access.
-		if(src.allowed(usr))
-			screen = text2num(href_list["lock"])
-		else
-			usr << "Unauthorized Access."
-
 	else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected.
 		screen = 0.0
 		if(!sync)
@@ -437,6 +431,11 @@ proc/CallMaterialName(ID)
 									new_item.loc = L
 									L.name += " ([new_item.name])"
 									L.origin_tech = new_item.origin_tech
+									L.req_access = being_built.access_requirement
+									var/list/lockbox_access
+									for(var/A in L.req_access)
+										lockbox_access += "[get_access_desc(A)] "
+									L.desc = "A locked box. It is locked to [lockbox_access]access."
 								else
 									new_item.loc = linked_lathe.loc
 						linked_lathe.busy = 0
@@ -656,10 +655,6 @@ proc/CallMaterialName(ID)
 
 		if(0.1) dat += "<div class='statusDisplay'>Processing and Updating Database...</div>"
 
-		if(0.2)
-			dat += "<div class='statusDisplay'>SYSTEM LOCKED</div>"
-			dat += "<A href='?src=\ref[src];lock=1.6'>Unlock</A>"
-
 		if(0.3)
 			dat += "<div class='statusDisplay'>Constructing Prototype. Please Wait...</div>"
 
@@ -772,7 +767,6 @@ proc/CallMaterialName(ID)
 				dat += "<A href='?src=\ref[src];togglesync=1'>Connect to Research Network</A><BR>"
 				dat += "<span class='linkOn'>Disconnect from Research Network</span><BR>"
 			dat += "<A href='?src=\ref[src];menu=1.7'>Device Linkage Menu</A><BR>"
-			dat += "<A href='?src=\ref[src];lock=0.2'>Lock Console</A><BR>"
 			if(check_rights(R_ADMIN,0))
 				dat += "<A href='?src=\ref[src];maxresearch=1'>\[ADMIN\] Maximize Research Levels</A><BR>"
 			dat += "<A href='?src=\ref[src];reset=1'>Reset R&D Database</A></div>"
@@ -1164,14 +1158,24 @@ proc/CallMaterialName(ID)
 	desc = "A console used to interface with R&D tools."
 	id = 2
 	req_access = list(access_robotics)
+	circuit = /obj/item/weapon/circuitboard/rdconsole/robotics
 
 /obj/machinery/computer/rdconsole/experiment
 	name = "\improper E.X.P.E.R.I-MENTOR R&D console"
 	desc = "A console used to interface with R&D tools."
 	id = 3
+	circuit = /obj/item/weapon/circuitboard/rdconsole/experiment
 
 /obj/machinery/computer/rdconsole/mechanics
 	name = "mechanics R&D console"
 	desc = "A console used to interface with R&D tools."
 	id = 4
 	req_access = list(access_mechanic)
+	circuit = /obj/item/weapon/circuitboard/rdconsole/mechanics
+
+/obj/machinery/computer/rdconsole/public
+	name = "public R&D console"
+	desc = "A console used to interface with R&D tools."
+	id = 5
+	req_access = list()
+	circuit = /obj/item/weapon/circuitboard/rdconsole/public

code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm

@@ -5,7 +5,6 @@
 	icon_state = "samak"
 	icon_living = "samak"
 	icon_dead = "samak_dead"
-	icon = 'code/modules/jungle/jungle.dmi'
 	move_to_delay = 2
 	maxHealth = 125
 	health = 125
@@ -26,7 +25,6 @@
 	icon_state = "diyaab"
 	icon_living = "diyaab"
 	icon_dead = "diyaab_dead"
-	icon = 'code/modules/jungle/jungle.dmi'
 	move_to_delay = 1
 	maxHealth = 25
 	health = 25
@@ -47,7 +45,6 @@
 	icon_state = "shantak"
 	icon_living = "shantak"
 	icon_dead = "shantak_dead"
-	icon = 'code/modules/jungle/jungle.dmi'
 	move_to_delay = 1
 	maxHealth = 75
 	health = 75
@@ -66,7 +63,6 @@
 	icon_state = "yithian"
 	icon_living = "yithian"
 	icon_dead = "yithian_dead"
-	icon = 'code/modules/jungle/jungle.dmi'
 
 /mob/living/simple_animal/tindalos
 	name = "tindalos"
@@ -74,4 +70,3 @@
 	icon_state = "tindalos"
 	icon_living = "tindalos"
 	icon_dead = "tindalos_dead"
-	icon = 'code/modules/jungle/jungle.dmi'