Merge branch 'master' into client-hud-consistency

code/datums/datumvars.dm

@@ -1,5 +1,14 @@
 // reference: /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
 
+/**
+  * Proc to check if a datum allows proc calls on it
+  *
+  * Returns TRUE if you can call a proc on the datum, FALSE if you cant
+  *
+  */
+/datum/proc/CanProcCall(procname)
+	return TRUE
+
 /datum/proc/can_vv_get(var_name)
 	return TRUE
 
@@ -1232,22 +1241,6 @@
 		log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]")
 		qdel(rem_organ)
 
-	else if(href_list["fix_nano"])
-		if(!check_rights(R_DEBUG)) return
-
-		var/mob/H = locateUID(href_list["fix_nano"])
-
-		if(!istype(H) || !H.client)
-			to_chat(usr, "This can only be done on mobs with clients")
-			return
-
-		H.client.reload_nanoui_resources()
-
-		to_chat(usr, "Resource files sent")
-		to_chat(H, "Your NanoUI Resource files have been refreshed")
-
-		log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)]")
-
 	else if(href_list["regenerateicons"])
 		if(!check_rights(0))	return
 

code/datums/helper_datums/construction_datum.dm

@@ -69,10 +69,10 @@
 
 /datum/construction/proc/check_all_steps(atom/used_atom,mob/user as mob) //check all steps, remove matching one.
 	for(var/i=1;i<=steps.len;i++)
-		var/list/L = steps[i];
+		var/list/L = steps[i]
 		if(do_tool_or_atom_check(used_atom, L["key"]) && custom_action(i, used_atom, user))
 			steps[i]=null;//stupid byond list from list removal...
-			listclearnulls(steps);
+			listclearnulls(steps)
 			if(!steps.len)
 				spawn_result(user)
 			return 1

code/datums/mind.dm

@@ -547,11 +547,20 @@
 				if(objective&&(objective.type in objective_list) && objective:target)
 					def_target = objective.target.current
 				possible_targets = sortAtom(possible_targets)
-				possible_targets += "Free objective"
 
-				var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
-				if(!new_target)
-					return
+				var/new_target
+				if(length(possible_targets) > 0)
+					if(alert(usr, "Do you want to pick the objective yourself? No will randomise it", "Pick objective", "Yes", "No") == "Yes")
+						possible_targets += "Free objective"
+						new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
+					else
+						new_target = pick(possible_targets)
+
+					if(!new_target)
+						return
+				else
+					to_chat(usr, "<span class='warning'>No possible target found. Defaulting to a Free objective.</span>")
+					new_target = "Free objective"
 
 				var/objective_path = text2path("/datum/objective/[new_obj_type]")
 				if(new_target == "Free objective")

code/datums/ruins/space.dm

@@ -182,3 +182,68 @@
 	name = "Crashed Wizard Shuttle"
 	description = "A shuttle of the Wizard Federation, sent out to crush some wandless scum. Unfortunately, the pilot suffered a magic-related accident and the shuttle crashed into a nearby asteroid."
 	cost = 2
+
+/datum/map_template/ruin/space/abandonedtele
+	id = "abandonedtele"
+	suffix = "abandonedtele.dmm"
+	name = "Abandoned Teleporter"
+	description = "An old teleporter, seemingly part of what used to be a larger satellite."
+
+/datum/map_template/ruin/space/blowntcommsat
+	id = "blowntcommsat"
+	suffix = "blowntcommsat.dmm"
+	name = "Blown-out Telecommunications Satellite"
+	description = "The remains of an old telecommunications satellite once utilised by NanoTrasen. It lays derelict, with quite a few pieces missing."
+	cost = 5 // This is a chonky boy
+	allow_duplicates = FALSE // Absolutely huge, also has its own APC and the area isnt set to allow many
+
+/datum/map_template/ruin/space/clownmime
+	id = "clownmime"
+	suffix = "clownmime.dmm"
+	name = "Clown & Mime Mineral Deposits"
+	description = "A crash site of two opposing factions, both trying to complete mining trips for their own valuable minerals. While all the crew have long perished, the minerals are likely intact."
+
+/datum/map_template/ruin/space/dj
+	id = "dj"
+	suffix = "dj.dmm"
+	name = "Russian DJ Station"
+	description = "An old russian listening station, long since defunct and lifeless, however the equipment is likely still in working condition."
+	cost = 2
+
+/datum/map_template/ruin/space/druglab
+	id = "druglab"
+	suffix = "druglab.dmm"
+	name = "Drug Lab"
+	description = "An old abandoned \"Chemistry\" site, which has a strong aura of amphetamines around it."
+
+/datum/map_template/ruin/space/syndiedepot
+	id = "syndiedepot"
+	suffix = "syndiedepot.dmm"
+	name = "Suspicious Supply Depot"
+	description = "A syndicate supply depot, heavily stocked, but heavily guarded with an assortment of shields, sentry bots, armed operatives and more."
+	allow_duplicates = FALSE // One of these is enough
+	always_place = TRUE // This is on the always spawn list because of the shielding chance
+	cost = 0 // Force spawned so shouldnt have a cost
+
+/datum/map_template/ruin/space/ussp_tele
+	id = "ussp_tele"
+	suffix = "ussp_tele.dmm"
+	name = "USSP Teleporter"
+	description = "An old, almost fully destroyed teleporter, seemingly part of what used to be a much larger structure."
+
+/datum/map_template/ruin/space/ussp
+	id = "ussp"
+	suffix = "ussp.dmm"
+	name = "USSP"
+	description = "A decript station of seemingly russian origin. The last contact had with this station was a distress signal, and the rest was dark."
+	allow_duplicates = FALSE // One of these has enough loot
+	cost = 5 // This ruin is 100x100 tiles, so we dont want it to be treated like a 10x10 meteor
+
+/datum/map_template/ruin/space/whiteship
+	id = "whiteship"
+	suffix = "whiteship.dmm"
+	name = "NT Medical Ship"
+	description = "An old, abandoned NT medical ship. Its computer can navigate to other landmarks within space with ease."
+	allow_duplicates = FALSE // I dont even want to think about what happens if you have 2 shuttles with the same ID. Likely scary stuff.
+	always_place = TRUE // Its designed to make exploring other space ruins more accessible
+	cost = 0 // Force spawned so shouldnt have a cost

code/datums/uplink_item.dm

@@ -238,6 +238,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 2
 	job = list("Chef")
 
+/datum/uplink_item/jobspecific/Chef_CQC
+	name = " A chefs manual to CQC"
+	desc = "An old manual teaching you how to bring your home advantage outside the kitchen."
+	reference = "CCQC"
+	item = /obj/item/CQC_manual/chef
+	cost = 12
+	job = list("Chef")
+
 //Chaplain
 
 /datum/uplink_item/jobspecific/voodoo

code/datums/wires/syndicatebomb.dm

@@ -96,7 +96,6 @@
 		if(BOMB_WIRE_ACTIVATE)
 			if(!mended && B.active)
 				holder.visible_message("<span class='notice'>[bicon(B)] The timer stops! The bomb has been defused!</span>")
-				B.active = FALSE
 				B.defused = TRUE
 				B.update_icon()
 	..()