Merge fix

code/datums/action.dm

@@ -101,7 +101,7 @@
 //Presets for item actions
 /datum/action/item_action
 	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS
-
+	var/use_itemicon = TRUE
 /datum/action/item_action/New(Target)
 	..()
 	var/obj/item/I = target
@@ -121,17 +121,19 @@
 	return 1
 
 /datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button)
-	current_button.overlays.Cut()
-	if(target)
-		var/obj/item/I = target
-		var/old_layer = I.layer
-		var/old_plane = I.plane
-		I.layer = 21
-		I.plane = HUD_PLANE
-		current_button.overlays += I
-		I.layer = old_layer
-		I.plane = old_plane
-
+	if(use_itemicon)
+		current_button.overlays.Cut()
+		if(target)
+			var/obj/item/I = target
+			var/old_layer = I.layer
+			var/old_plane = I.plane
+			I.layer = 21
+			I.plane = HUD_PLANE
+			current_button.overlays += I
+			I.layer = old_layer
+			I.plane = old_plane
+	else
+		..()
 /datum/action/item_action/toggle_light
 	name = "Toggle Light"
 

code/datums/cargoprofile.dm

@@ -1,4 +1,3 @@
-#define MAXCOIL 30
 /datum/cargoprofile
 	var/name = "All Items"
 	var/id = "all" // unique ID for the UI
@@ -787,4 +786,3 @@
 		var/punches = punch(M,remaining / PUNCH_WORK)
 		if(punches>1)master.sleep++
 		return punches * PUNCH_WORK
-#undef MAXCOIL

code/datums/hud.dm

@@ -1,4 +1,5 @@
 /* HUD DATUMS */
+var/global/list/all_huds = list()
 
 ///GLOBAL HUD LIST
 var/datum/atom_hud/huds = list( \
@@ -7,6 +8,7 @@ var/datum/atom_hud/huds = list( \
 	DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \
 	DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), \
 	DATA_HUD_DIAGNOSTIC = new/datum/atom_hud/data/diagnostic(), \
+	DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(), \
 	DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), \
 	GAME_HUD_NATIONS = new/datum/atom_hud/antag(), \
 	ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \
@@ -26,6 +28,18 @@ var/datum/atom_hud/huds = list( \
 	var/list/mob/hudusers = list() //list with all mobs who can see the hud
 	var/list/hud_icons = list() //these will be the indexes for the atom's hud_list
 
+
+/datum/atom_hud/New()
+	all_huds += src
+
+/datum/atom_hud/Destroy()
+	for(var/v in hudusers)
+		remove_hud_from(v)
+	for(var/v in hudatoms)
+		remove_from_hud(v)
+	all_huds -= src
+	return ..()
+
 /datum/atom_hud/proc/remove_hud_from(mob/M)
 	if(!M)
 		return
@@ -82,7 +96,7 @@ var/datum/atom_hud/huds = list( \
 			serv_huds += serv.thrallhud
 
 
-	for(var/datum/atom_hud/hud in (huds|serv_huds))//|gang_huds))
+	for(var/datum/atom_hud/hud in (all_huds|serv_huds))//|gang_huds))
 		if(src in hud.hudusers)
 			hud.add_hud_to(src)
 

code/datums/material_container.dm

@@ -40,6 +40,8 @@
 		materials[MAT_BANANIUM] = new /datum/material/bananium()
 	if(mat_list[MAT_TRANQUILLITE])
 		materials[MAT_TRANQUILLITE] = new /datum/material/tranquillite()
+	if(mat_list[MAT_TITANIUM])
+		materials[MAT_TITANIUM] = new /datum/material/titanium()
 
 /datum/material_container/Destroy()
 	QDEL_LIST_ASSOC_VAL(materials)
@@ -276,6 +278,13 @@
 	material_type = MAT_TRANQUILLITE
 	sheet_type = /obj/item/stack/sheet/mineral/tranquillite
 
+/datum/material/titanium
+
+/datum/material/titanium/New()
+	..()
+	material_type = MAT_TITANIUM
+	sheet_type = /obj/item/stack/sheet/mineral/titanium
+
 /datum/material/biomass
 
 /datum/material/biomass/New()

code/datums/mind.dm

@@ -89,7 +89,7 @@
 		current.mind = null
 		leave_all_huds() //leave all the huds in the old body, so it won't get huds if somebody else enters it
 
-		nanomanager.user_transferred(current, new_character)
+		SSnanoui.user_transferred(current, new_character)
 
 	if(new_character.mind)		//remove any mind currently in our new body's mind variable
 		new_character.mind.current = null

code/datums/mutable_appearance.dm

@@ -0,0 +1,13 @@
+// Mutable appearances are an inbuilt byond datastructure. Read the documentation on them by hitting F1 in DM.
+// Basically use them instead of images for overlays/underlays and when changing an object's appearance if you're doing so with any regularity.
+// Unless you need the overlay/underlay to have a different direction than the base object. Then you have to use an image due to a bug.
+
+// Mutable appearances are children of images, just so you know.
+
+// Helper similar to image()
+/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER)
+	var/mutable_appearance/MA = new()
+	MA.icon = icon
+	MA.icon_state = icon_state
+	MA.layer = layer
+	return MA

code/datums/spells/mind_transfer.dm

@@ -20,15 +20,8 @@ Make sure spells that are removed from spell_list are actually removed and delet
 Also, you never added distance checking after target is selected. I've went ahead and did that.
 */
 /obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets, mob/user = usr, distanceoverride)
-	if(!targets.len)
-		to_chat(user, "No mind found.")
-		return
 
-	if(targets.len > 1)
-		to_chat(user, "Too many minds! You're not a hive damnit!")//Whaa...aat?
-		return
-
-	var/mob/living/target = targets[1]
+	var/mob/living/target = targets[range]
 
 	if(!(target in oview(range)) && !distanceoverride)//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it.
 		to_chat(user, "They are too far away!")
@@ -50,6 +43,10 @@ Also, you never added distance checking after target is selected. I've went ahea
 		to_chat(user, "Their mind is resisting your spell.")
 		return
 
+	if(istype(target, /mob/living/silicon))
+		to_chat(user, "You feel this enslaved being is just as dead as its cold, hard exoskeleton.")
+		return
+
 	var/mob/living/victim = target//The target of the spell whos body will be transferred to.
 	var/mob/caster = user//The wizard/whomever doing the body transferring.
 

code/datums/statclick.dm

@@ -5,8 +5,8 @@
 	var/target
 
 /obj/effect/statclick/New(ntarget, text)
-	name = text
 	target = ntarget
+	name = text
 
 /obj/effect/statclick/proc/update(text)
 	name = text
@@ -15,25 +15,22 @@
 /obj/effect/statclick/debug
 	var/class
 
-/obj/effect/statclick/debug/New(ntarget)
-	name = "Initializing..."
-	target = ntarget
-	if(istype(target, /datum/controller/process))
-		class = "process"
-	else if(istype(target, /datum/controller/processScheduler))
-		class = "scheduler"
-	else if(istype(target, /datum/controller))
-		class = "controller"
-	else if(istype(target, /datum))
-		class = "datum"
-	else
-		class = "unknown"
-
-// This bit is called when clicked in the stat panel
 /obj/effect/statclick/debug/Click()
-	if(!is_admin(usr))
+	if(!is_admin(usr) || !target)
 		return
+	if(!class)
+		if(istype(target, /datum/controller/process))
+			class = "process"
+		else if(istype(target, /datum/controller/processScheduler))
+			class = "scheduler"
+		if(istype(target, /datum/controller/subsystem))
+			class = "subsystem"
+		else if(istype(target, /datum/controller))
+			class = "controller"
+		else if(istype(target, /datum))
+			class = "datum"
+		else
+			class = "unknown"
 
 	usr.client.debug_variables(target)
-
-	message_admins("Admin [key_name_admin(usr)] is debugging the [target] [class].")
+	message_admins("Admin [key_name_admin(usr)] is debugging the [target] [class].")

code/datums/status_effects/buffs.dm

@@ -0,0 +1,41 @@
+//Largely beneficial effects go here, even if they have drawbacks. An example is provided in Shadow Mend.
+
+/datum/status_effect/shadow_mend
+	id = "shadow_mend"
+	duration = 30
+	alert_type = /obj/screen/alert/status_effect/shadow_mend
+
+/obj/screen/alert/status_effect/shadow_mend
+	name = "Shadow Mend"
+	desc = "Shadowy energies wrap around your wounds, sealing them at a price. After healing, you will slowly lose health every three seconds for thirty seconds."
+	icon_state = "shadow_mend"
+
+/datum/status_effect/shadow_mend/on_apply()
+	owner.visible_message("<span class='notice'>Violet light wraps around [owner]'s body!</span>", "<span class='notice'>Violet light wraps around your body!</span>")
+	playsound(owner, 'sound/magic/teleport_app.ogg', 50, 1)
+	return ..()
+
+/datum/status_effect/shadow_mend/tick()
+	owner.adjustBruteLoss(-15)
+	owner.adjustFireLoss(-15)
+
+/datum/status_effect/shadow_mend/on_remove()
+	owner.visible_message("<span class='warning'>The violet light around [owner] glows black!</span>", "<span class='warning'>The tendrils around you cinch tightly and reap their toll...</span>")
+	playsound(owner, 'sound/magic/teleport_diss.ogg', 50, 1)
+	owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE)
+
+
+/datum/status_effect/void_price
+	id = "void_price"
+	duration = 300
+	tick_interval = 30
+	alert_type = /obj/screen/alert/status_effect/void_price
+
+/obj/screen/alert/status_effect/void_price
+	name = "Void Price"
+	desc = "Black tendrils cinch tightly against you, digging wicked barbs into your flesh."
+	icon_state = "shadow_mend"
+
+/datum/status_effect/void_price/tick()
+	playsound(owner, 'sound/weapons/bite.ogg', 50, 1)
+	owner.adjustBruteLoss(3)

code/datums/status_effects/debuffs.dm

@@ -0,0 +1,10 @@
+//OTHER DEBUFFS
+
+/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
+	id = "cult_ghost"
+	duration = -1
+	alert_type = null
+
+/datum/status_effect/cultghost/tick()
+	if(owner.reagents)
+		owner.reagents.del_reagent("holywater") //can't be deconverted

code/datums/status_effects/neutral.dm

@@ -0,0 +1,9 @@
+//entirely neutral or internal status effects go here
+
+/datum/status_effect/high_five
+	id = "high_five"
+	duration = 25
+	alert_type = null
+
+/datum/status_effect/high_five/on_timeout()
+	owner.visible_message("[owner] was left hanging....")

code/datums/status_effects/status_effect.dm

@@ -0,0 +1,120 @@
+
+//Status effects are used to apply temporary or permanent effects to mobs. Mobs are aware of their status effects at all times.
+//This file contains their code, plus code for applying and removing them.
+//When making a new status effect, add a define to status_effects.dm in __DEFINES for ease of use!
+
+/datum/status_effect
+	var/id = "effect" //Used for screen alerts.
+	var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
+	var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
+	var/mob/living/owner //The mob affected by the status effect.
+	var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
+	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
+	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
+	var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
+	var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
+
+/datum/status_effect/New(list/arguments)
+	on_creation(arglist(arguments))
+
+/datum/status_effect/proc/on_creation(mob/living/new_owner, ...)
+	if(new_owner)
+		owner = new_owner
+	if(owner)
+		LAZYADD(owner.status_effects, src)
+	if(!owner || !on_apply())
+		qdel(src)
+		return
+	if(duration != -1)
+		duration = world.time + duration
+	tick_interval = world.time + tick_interval
+	if(alert_type)
+		var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
+		A.attached_effect = src //so the alert can reference us, if it needs to
+		linked_alert = A //so we can reference the alert, if we need to
+	fast_processing.Add(src)
+	return TRUE
+
+/datum/status_effect/Destroy()
+	fast_processing.Remove(src)
+	if(owner)
+		owner.clear_alert(id)
+		LAZYREMOVE(owner.status_effects, src)
+		on_remove()
+		owner = null
+	return ..()
+
+/datum/status_effect/proc/process()
+	if(!owner)
+		qdel(src)
+		return
+	if(tick_interval < world.time)
+		tick()
+		tick_interval = world.time + initial(tick_interval)
+	if(duration != -1 && duration < world.time)
+		on_timeout()
+		qdel(src)
+
+/datum/status_effect/proc/on_apply() //Called whenever the buff is applied; returning FALSE will cause it to autoremove itself.
+	return TRUE
+/datum/status_effect/proc/tick() //Called every tick.
+/datum/status_effect/proc/on_timeout()//called when a buff times out
+/datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
+/datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted
+	owner.clear_alert(id)
+	LAZYREMOVE(owner.status_effects, src)
+	owner = null
+	qdel(src)
+
+////////////////
+// ALERT HOOK //
+////////////////
+
+/obj/screen/alert/status_effect
+	name = "Curse of Mundanity"
+	desc = "You don't feel any different..."
+	var/datum/status_effect/attached_effect
+
+//////////////////
+// HELPER PROCS //
+//////////////////
+
+/mob/living/proc/apply_status_effect(effect, ...) //applies a given status effect to this mob, returning the effect if it was successful
+	. = FALSE
+	var/datum/status_effect/S1 = effect
+	LAZYINITLIST(status_effects)
+	for(var/datum/status_effect/S in status_effects)
+		if(S.id == initial(S1.id) && S.status_type)
+			if(S.status_type == STATUS_EFFECT_REPLACE)
+				S.be_replaced()
+			else
+				return
+	var/list/arguments = args.Copy()
+	arguments[1] = src
+	S1 = new effect(arguments)
+	. = S1
+
+/mob/living/proc/remove_status_effect(effect) //removes all of a given status effect from this mob, returning TRUE if at least one was removed
+	. = FALSE
+	if(status_effects)
+		var/datum/status_effect/S1 = effect
+		for(var/datum/status_effect/S in status_effects)
+			if(initial(S1.id) == S.id)
+				qdel(S)
+				. = TRUE
+
+/mob/living/proc/has_status_effect(effect) //returns the effect if the mob calling the proc owns the given status effect
+	. = FALSE
+	if(status_effects)
+		var/datum/status_effect/S1 = effect
+		for(var/datum/status_effect/S in status_effects)
+			if(initial(S1.id) == S.id)
+				return S
+
+/mob/living/proc/has_status_effect_list(effect) //returns a list of effects with matching IDs that the mod owns; use for effects there can be multiple of
+	. = list()
+	if(status_effects)
+		var/datum/status_effect/S1 = effect
+		for(var/datum/status_effect/S in status_effects)
+			if(initial(S1.id) == S.id)
+				. += S

code/datums/uplink_item.dm

@@ -963,6 +963,13 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/storage/backpack/duffel/syndie/surgery
 	cost = 4
 
+/datum/uplink_item/device_tools/bonerepair
+	name = "Prototype Bone Repair Kit"
+	desc = "Stolen prototype bone repair nanites. Contains one nanocalcium autoinjector and guide."
+	reference = "NCAI"
+	item = /obj/item/weapon/storage/box/syndie_kit/bonerepair
+	cost = 6
+
 /datum/uplink_item/device_tools/military_belt
 	name = "Military Belt"
 	desc = "A robust seven-slot red belt made for carrying a broad variety of weapons, ammunition and explosives"

code/datums/wires/airlock.dm

@@ -58,7 +58,7 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
 		if(A.isElectrified())
 			if(A.shock(L, 100))
 				return 0
-	if(A.p_open)
+	if(A.panel_open)
 		return 1
 	return 0
 
@@ -164,9 +164,10 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
 			//one wire for door bolts. Sending a pulse through this drops door bolts if they're not down (whether power's on or not),
 			//raises them if they are down (only if power's on)
 			if(!A.locked)
-				A.lock()
-			else
-				A.unlock()
+				if(A.lock())
+					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
+			else if(A.unlock())
+				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
 
 		if(AIRLOCK_WIRE_BACKUP_POWER1)
 			//two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter).

code/datums/wires/autolathe.dm

@@ -10,10 +10,10 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4
 	switch(index)
 		if(AUTOLATHE_HACK_WIRE)
 			return "Hack"
-		
+
 		if(AUTOLATHE_SHOCK_WIRE)
 			return "Shock"
-		
+
 		if(AUTOLATHE_DISABLE_WIRE)
 			return "Disable"
 
@@ -69,6 +69,6 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4
 					updateUIs()
 
 /datum/wires/autolathe/proc/updateUIs()
-	nanomanager.update_uis(src)
+	SSnanoui.update_uis(src)
 	if(holder)
-		nanomanager.update_uis(holder)
+		SSnanoui.update_uis(holder)

code/datums/wires/nuclearbomb.dm

@@ -11,12 +11,12 @@ var/const/NUCLEARBOMB_WIRE_SAFETY		= 4
 	switch(index)
 		if(NUCLEARBOMB_WIRE_LIGHT)
 			return "Bomb Light"
-		
+
 		if(NUCLEARBOMB_WIRE_TIMING)
 			return "Bomb Timing"
-		
+
 		if(NUCLEARBOMB_WIRE_SAFETY)
-			return "Bomb Safety"	
+			return "Bomb Safety"
 
 /datum/wires/nuclearbomb/CanUse(mob/living/L)
 	var/obj/machinery/nuclearbomb/N = holder
@@ -77,6 +77,6 @@ var/const/NUCLEARBOMB_WIRE_SAFETY		= 4
 			N.lighthack = !N.lighthack
 
 /datum/wires/nuclearbomb/proc/updateUIs()
-	nanomanager.update_uis(src)
+	SSnanoui.update_uis(src)
 	if(holder)
-		nanomanager.update_uis(holder)
+		SSnanoui.update_uis(holder)

code/datums/wires/wires.dm

@@ -76,7 +76,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 		ui_interact(user)
 
 /datum/wires/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "wires.tmpl", holder.name, window_x, window_y)
 		ui.open()
@@ -174,7 +174,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 					else
 						to_chat(L, "<span class='error'>You need a remote signaller!</span>")
 
-	nanomanager.update_uis(src)
+	SSnanoui.update_uis(src)
 	return 1
 
 //
@@ -184,12 +184,12 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 // Called when wires cut/mended.
 /datum/wires/proc/UpdateCut(index, mended)
 	if(holder)
-		nanomanager.update_uis(holder)
+		SSnanoui.update_uis(holder)
 
 // Called when wire pulsed. Add code here.
 /datum/wires/proc/UpdatePulsed(index)
 	if(holder)
-		nanomanager.update_uis(holder)
+		SSnanoui.update_uis(holder)
 
 /datum/wires/proc/CanUse(mob/L)
 	return 1