Merge remote-tracking branch 'origin/master' into rustsql

code/datums/components/crafting/recipes/recipes_misc.dm

@@ -45,8 +45,8 @@
 /datum/crafting_recipe/bloodsucker/blackcoffin
 	name = "Black Coffin"
 	result = /obj/structure/closet/crate/coffin/blackcoffin
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/screwdriver)
+	tools = list(TOOL_WELDER,
+				TOOL_SCREWDRIVER)
 	reqs = list(/obj/item/stack/sheet/cloth = 1,
 				/obj/item/stack/sheet/mineral/wood = 5,
 				/obj/item/stack/sheet/metal = 1)
@@ -72,8 +72,8 @@
 /datum/crafting_recipe/bloodsucker/metalcoffin
 	name = "Metal Coffin"
 	result =/obj/structure/closet/crate/coffin/metalcoffin
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/screwdriver)
+	tools = list(TOOL_WELDER,
+				TOOL_SCREWDRIVER)
 	reqs = list(/obj/item/stack/sheet/metal = 5)
 	time = 100
 	subcategory = CAT_FURNITURE
@@ -84,9 +84,9 @@
 	name = "Persuasion Rack"
 	//desc = "For converting crewmembers into loyal Vassals."
 	result = /obj/structure/bloodsucker/vassalrack
-	tools = list(/obj/item/weldingtool,
-				 	//obj/item/screwdriver,
-					/obj/item/wrench
+	tools = list(TOOL_WELDER,
+				 	//TOOL_SCREWDRIVER,
+					TOOL_WRENCH
 					 )
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 3,
 				/obj/item/stack/sheet/metal = 2,
@@ -108,8 +108,8 @@
 	name = "Candelabrum"
 	//desc = "For converting crewmembers into loyal Vassals."
 	result = /obj/structure/bloodsucker/candelabrum
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/wrench
+	tools = list(TOOL_WELDER,
+				 TOOL_WRENCH
 				)
 	reqs = list(/obj/item/stack/sheet/metal = 3,
 				/obj/item/stack/rods = 1,

code/datums/components/remote_materials.dm

@@ -84,38 +84,37 @@ handles linking back and forth.
 		_MakeLocal()
 
 /datum/component/remote_materials/proc/OnAttackBy(datum/source, obj/item/I, mob/user)
-	if (istype(I, /obj/item/multitool))
-		var/obj/item/multitool/M = I
-		if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo))
-			if (silo == M.buffer)
+	if(I.tool_behaviour == TOOL_MULTITOOL)
+		if((I.buffer) && istype(I.buffer, /obj/machinery/ore_silo))
+			if(silo == I.buffer)
 				to_chat(user, "<span class='notice'>[parent] is already connected to [silo].</span>")
 				return COMPONENT_NO_AFTERATTACK
-			if (silo)
+			if(silo)
 				silo.connected -= src
 				silo.updateUsrDialog()
-			else if (mat_container)
+			else if(mat_container)
 				mat_container.retrieve_all()
 				qdel(mat_container)
-			silo = M.buffer
+			silo = I.buffer
 			silo.connected += src
 			silo.updateUsrDialog()
 			mat_container = silo.GetComponent(/datum/component/material_container)
 			to_chat(user, "<span class='notice'>You connect [parent] to [silo] from the multitool's buffer.</span>")
 			return COMPONENT_NO_AFTERATTACK
 
-	else if (silo && istype(I, /obj/item/stack))
-		if (silo.remote_attackby(parent, user, I))
+	else if(silo && istype(I, /obj/item/stack))
+		if(silo.remote_attackby(parent, user, I))
 			return COMPONENT_NO_AFTERATTACK
 
 /datum/component/remote_materials/proc/on_hold()
 	return silo && silo.holds["[get_area(parent)]/[category]"]
 
 /datum/component/remote_materials/proc/silo_log(obj/machinery/M, action, amount, noun, list/mats)
-	if (silo)
+	if(silo)
 		silo.silo_log(M || parent, action, amount, noun, mats)
 
 /datum/component/remote_materials/proc/format_amount()
-	if (mat_container)
+	if(mat_container)
 		return "[mat_container.total_amount] / [mat_container.max_amount == INFINITY ? "Unlimited" : mat_container.max_amount] ([silo ? "remote" : "local"])"
 	else
 		return "0 / 0"

code/datums/components/rotation.dm

@@ -125,7 +125,7 @@
 	else
 		if(!default_can_user_rotate(user, default_rotation_direction))
 			return
-	if(istype(I,/obj/item/wrench))
+	if(I.tool_behaviour == TOOL_WRENCH)
 		BaseRot(user,default_rotation_direction)
 		return COMPONENT_NO_AFTERATTACK
 

code/datums/traits/neutral.dm

@@ -105,6 +105,22 @@
 	gain_text = "<span class='notice'>You desire to be hurt.</span>"
 	lose_text = "<span class='notice'>Pain has become less exciting for you.</span>"
 
+/datum/quirk/libido
+	name = "Nymphomaniac"
+	desc = "You are much more sensitive to arousal."
+	value = 0
+	mob_trait = TRAIT_NYMPHO
+	gain_text = "<span class='notice'>You are feeling extra wild.</span>"
+	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
+
+/datum/quirk/libido/add()
+	var/mob/living/carbon/human/H = quirk_holder
+	H.arousal_rate = 3 * initial(H.arousal_rate)
+
+/datum/quirk/libido/remove()
+	var/mob/living/carbon/human/H = quirk_holder
+	H.arousal_rate = initial(H.arousal_rate)
+
 /datum/quirk/alcohol_intolerance
 	name = "Alcohol Intolerance"
 	desc = "You take toxin damage from alcohol rather than getting drunk."

code/datums/wires/_wires.dm

@@ -265,11 +265,10 @@
 		reveal_wires = TRUE
 
 	// Same for anyone with an abductor multitool.
-	else if(user.is_holding_item_of_type(/obj/item/multitool/abductor))
-		reveal_wires = TRUE
-	// and advanced multitool
-	else if(user.is_holding_item_of_type(/obj/item/multitool/advanced))
-		reveal_wires = TRUE
+	else if(user.is_holding_tool_quality(TOOL_MULTITOOL))
+		var/obj/item/tool = user.is_holding_tool_quality(TOOL_MULTITOOL)
+		if(tool.show_wires)
+			reveal_wires = TRUE
 
 	// Station blueprints do that too, but only if the wires are not randomized.
 	else if(user.is_holding_item_of_type(/obj/item/areaeditor/blueprints) && !randomize)

code/datums/wounds/_wounds.dm

@@ -134,6 +134,7 @@
 	if(status_effect_type)
 		linked_status_effect = victim.apply_status_effect(status_effect_type, src)
 	SEND_SIGNAL(victim, COMSIG_CARBON_GAIN_WOUND, src, limb)
+	victim.emote("pain")
 	if(!victim.alerts["wound"]) // only one alert is shared between all of the wounds
 		victim.throw_alert("wound", /obj/screen/alert/status_effect/wound)