Merge branch 'master' into development

code/game/gamemodes/cult/ritual.dm

@@ -389,9 +389,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 				english += list(words[entry] = entry)
 
 		for (var/entry in dictionary)
-			var/list/required = dictionary[entry]
-			if (length(english&required) == required.len)
-				scribewords += entry
+			scribewords += entry
 
 		var/chosen_rune = null
 

code/game/gamemodes/vampire/vampire_powers.dm

@@ -747,7 +747,7 @@
 
 	admin_attack_log(src, T, "used diseased touch on [key_name(T)]", "was given a lethal disease by [key_name(src)]", "used diseased touch (<a href='?src=\ref[lethal];info=1'>virus info</a>) on")
 
-	vampire.use_blood(200)
+	vampire.use_blood(100)
 	verbs -= /mob/living/carbon/human/proc/vampire_diseasedtouch
 	ADD_VERB_IN_IF(src, 1800, /mob/living/carbon/human/proc/vampire_diseasedtouch, CALLBACK(src, .proc/finish_vamp_timeout))
 

code/game/jobs/access.dm

@@ -104,28 +104,28 @@
 	if(!priv_all_access)
 		priv_all_access = get_access_ids()
 
-	return priv_all_access
+	return priv_all_access.Copy()
 
 /var/list/priv_station_access
 /proc/get_all_station_access()
 	if(!priv_station_access)
 		priv_station_access = get_access_ids(ACCESS_TYPE_STATION)
 
-	return priv_station_access
+	return priv_station_access.Copy()
 
 /var/list/priv_centcom_access
 /proc/get_all_centcom_access()
 	if(!priv_centcom_access)
 		priv_centcom_access = get_access_ids(ACCESS_TYPE_CENTCOM)
 
-	return priv_centcom_access
+	return priv_centcom_access.Copy()
 
 /var/list/priv_syndicate_access
 /proc/get_all_syndicate_access()
 	if(!priv_syndicate_access)
 		priv_syndicate_access = get_access_ids(ACCESS_TYPE_SYNDICATE)
 
-	return priv_syndicate_access
+	return priv_syndicate_access.Copy()
 
 /var/list/priv_region_access
 /proc/get_region_accesses(var/code)

code/game/machinery/computer/prisoner.dm

@@ -32,7 +32,7 @@
 			var/turf/Tr = null
 			for(var/obj/item/weapon/implant/chem/C in implants)
 				Tr = get_turf(C)
-				if((Tr) && (Tr.z != src.z))	continue//Out of range
+				if(Tr && !isStationLevel(Tr.z))	continue//Out of range
 				if(!C.implanted) continue
 				dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: "
 				dat += "<A href='?src=\ref[src];inject1=\ref[C]'>(<font color=red>(1)</font>)</A>"
@@ -42,11 +42,11 @@
 			dat += "<HR>Tracking Implants<BR>"
 			for(var/obj/item/weapon/implant/tracking/T in implants)
 				Tr = get_turf(T)
-				if((Tr) && (Tr.z != src.z))	continue//Out of range
+				if(Tr && !isStationLevel(Tr.z))	continue//Out of range
 				if(!T.implanted) continue
 				var/loc_display = "Unknown"
 				var/mob/living/carbon/M = T.imp_in
-				if((M.z in current_map.station_levels) && !istype(M.loc, /turf/space))
+				if(isStationLevel(M.z) && !istype(M.loc, /turf/space))
 					var/turf/mob_loc = get_turf(M)
 					loc_display = mob_loc.loc
 				if(T.malfunction)

code/game/machinery/machinery.dm

@@ -371,6 +371,7 @@ Class Procs:
 						B.loc = src
 						user << "<span class='notice'>[A.name] replaced with [B.name].</span>"
 						break
+		RefreshParts()  
 		update_icon()
 	else
 		user << "<span class='notice'>Following parts detected in the machine:</span>"

code/game/mecha/mecha.dm

@@ -984,6 +984,10 @@
 		occupant  << "<span class='warning'>The [src] has no traction! There is nothing solid in reach to launch off.</span>"
 		return 0
 
+	if(state)
+		occupant_message("<span class='warning'>Maintenance protocols in effect.</span>")
+		return
+
 	lastcrash = world.time
 
 	occupant << "<span class='warning'>You take a step back, and then...</span>"

code/game/objects/items/devices/uplink.dm

@@ -318,16 +318,16 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 // Includes normal radio uplink, multitool uplink,
 // implant uplink (not the implant tool) and a preset headset uplink.
 
-/obj/item/device/radio/uplink/New()
-	hidden_uplink = new(src)
+/obj/item/device/radio/uplink/New(var/loc, var/mind)
+	hidden_uplink = new(src, mind)
 	icon_state = "radio"
 
 /obj/item/device/radio/uplink/attack_self(mob/user as mob)
 	if(hidden_uplink)
 		hidden_uplink.trigger(user)
 
-/obj/item/device/multitool/uplink/New()
-	hidden_uplink = new(src)
+/obj/item/device/multitool/uplink/New(var/loc, var/mind)
+	hidden_uplink = new(src, mind)
 
 /obj/item/device/multitool/uplink/attack_self(mob/user as mob)
 	if(hidden_uplink)
@@ -336,9 +336,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/radio/headset/uplink
 	traitor_frequency = 1445
 
-/obj/item/device/radio/headset/uplink/New()
+/obj/item/device/radio/headset/uplink/New(var/loc, var/mind)
 	..()
-	hidden_uplink = new(src)
+	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
 
 /*
@@ -353,9 +353,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	flags = CONDUCT
 	w_class = 2
 
-/obj/item/device/contract_uplink/New()
+/obj/item/device/contract_uplink/New(var/loc, var/mind)
 	..()
-	hidden_uplink = new(src)
+	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = 0
 	hidden_uplink.nanoui_menu = 3
 
@@ -397,9 +397,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	flags = CONDUCT
 	w_class = 2
 
-/obj/item/device/ninja_uplink/New()
+/obj/item/device/ninja_uplink/New(var/loc, var/mind)
 	..()
-	hidden_uplink = new(src)
+	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
 	hidden_uplink.nanoui_menu = 1
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -230,7 +230,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(istype(W, /obj/item/weapon/melee/energy/sword))
 		var/obj/item/weapon/melee/energy/sword/S = W
 		if(S.active)
-			light("<span class='warning'>[user] swings their [W], barely missing their nose. They light their [name] in the process.</span>")
+			light("<span class='warning'>[user] swings their [W], barely missing themselves. They light their [name] in the process.</span>")
 
 	return