Merge pull request #15642 from AnturK/random_things

Minor fixes

code/_onclick/ai.dm

@@ -11,7 +11,7 @@
 */
 /mob/living/silicon/ai/DblClickOn(var/atom/A, params)
 	if(client.click_intercept)
-		if(call(client.click_intercept, "ClickOn")(src, params, A))
+		if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
 			return
 
 	if(control_disabled || stat) return
@@ -28,7 +28,7 @@
 	next_click = world.time + 1
 
 	if(client.click_intercept)
-		if(call(client.click_intercept, "ClickOn")(src, params, A))
+		if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
 			return
 
 	if(control_disabled || stat)

code/_onclick/click.dm

@@ -54,7 +54,7 @@
 	next_click = world.time + 1
 
 	if(client.click_intercept)
-		if(call(client.click_intercept, "ClickOn")(src, params, A))
+		if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
 			return
 
 	var/list/modifiers = params2list(params)

code/_onclick/cyborg.dm

@@ -12,7 +12,7 @@
 	next_click = world.time + 1
 
 	if(client.click_intercept)
-		if(call(client.click_intercept,"ClickOn")(src,params,A))
+		if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
 			return
 
 	if(stat || lockcharge || weakened || stunned || paralysis)

code/_onclick/observer.dm

@@ -1,6 +1,6 @@
 /mob/dead/observer/DblClickOn(var/atom/A, var/params)
 	if(client.click_intercept)
-		if(call(client.click_intercept,"ClickOn")(src,params,A))
+		if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
 			return
 
 	if(can_reenter_corpse && mind && mind.current)
@@ -19,7 +19,7 @@
 /mob/dead/observer/ClickOn(var/atom/A, var/params)
 	
 	if(client.click_intercept)
-		if(call(client.click_intercept,"ClickOn")(src,params,A))
+		if(call(client.click_intercept,"InterceptClickOn")(src,params,A))
 			return
 
 	var/list/modifiers = params2list(params)

code/game/machinery/suit_storage_unit.dm

@@ -97,6 +97,7 @@
 	storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double
 
 /obj/machinery/suit_storage_unit/New()
+	..()
 	wires = new /datum/wires/suit_storage_unit(src)
 	if(suit_type)
 		suit = new suit_type(src)

code/modules/admin/verbs/buildmode.dm

@@ -232,7 +232,7 @@
 			log_admin("[key_name(usr)] has entered build mode.")
 
 
-/datum/buildmode/proc/ClickOn(user,params,atom/object) //Click Intercept
+/datum/buildmode/proc/InterceptClickOn(user,params,atom/object) //Click Intercept
 	var/list/pa = params2list(params)
 	var/right_click = pa.Find("right")
 	var/left_click = pa.Find("left")

code/modules/admin/verbs/map_template_loadverb.dm

@@ -2,16 +2,16 @@
 	set category = "Debug"
 	set name = "Map template - Place"
 
+	var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in map_templates
+	if(!map)
+		return
+
 	var/turf/T = get_turf(mob)
 	if(!T)
 		return
 
 	var/datum/map_template/template
 
-	var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in map_templates
-	if(!map)
-		return
-
 	template = map_templates[map]
 	template.load(T)
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>(JMP)</a></span>")

code/modules/client/client defines.dm

@@ -4,7 +4,7 @@
 		//ADMIN THINGS//
 		////////////////
 	var/datum/admins/holder = null
-	var/datum/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc
+	var/datum/click_intercept = null // Needs to implement InterceptClickOn(user,params,atom) proc
 	var/AI_Interact		= 0
 
 	var/jobbancache = null //Used to cache this client's jobbans to save on DB queries

code/modules/research/experimentor.dm

@@ -576,7 +576,7 @@
 				var/list/temp_tech = ConvertReqString2List(process.origin_tech)
 				for(var/T in temp_tech)
 					linked_console.files.UpdateTech(T, temp_tech[T])
-				linked_console.files.UpdateDesigns(process,process.type)
+				linked_console.files.UpdateDesigns(process,temp_tech)
 	src.updateUsrDialog()
 	return