Iiiiit's merge conflict time!

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

code/datums/action.dm

@@ -173,6 +173,9 @@
 /datum/action/item_action/toggle_mister
 	name = "Toggle Mister"
 
+/datum/action/item_action/toggle_headphones
+	name = "Toggle Headphones"
+
 /datum/action/item_action/toggle_helmet_light
 	name = "Toggle Helmet Light"
 

code/datums/spells/horsemask.dm

@@ -12,7 +12,6 @@
 	range = 7
 	cooldown_min = 30 //30 deciseconds reduction per rank
 	selection_type = "range"
-	var/list/compatible_mobs = list(/mob/living/carbon/human)
 
 	action_icon_state = "barn"
 
@@ -26,7 +25,8 @@
 	if(!target)
 		return
 
-	if((target.type in compatible_mobs) || ishuman(target))
+
+	if(!ishuman(target))
 		to_chat(user, "<span class='notice'>It'd be stupid to curse [target] with a horse's head!</span>")
 		return
 

code/datums/uplink_item.dm

@@ -894,8 +894,8 @@ var/list/uplink_items = list()
 	cost = 1
 
 /datum/uplink_item/device_tools/surgerybag
-	name = "Syndicate Surgery Dufflebag"
-	desc = "The Syndicate surgery dufflebag is a toolkit containing all surgery tools, a straitjacket, and a muzzle."
+	name = "Syndicate Surgery Duffelbag"
+	desc = "The Syndicate surgery duffelbag is a toolkit containing all surgery tools, a straitjacket, and a muzzle."
 	reference = "SSDB"
 	item = /obj/item/weapon/storage/backpack/duffel/syndie/surgery
 	cost = 4