Merge branch 'master' into fruit

code/modules/clothing/under/miscellaneous.dm

@@ -703,14 +703,6 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
-/obj/item/clothing/under/durathread
-	name = "durathread jumpsuit"
-	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
-	icon_state = "durathread"
-	item_state = "durathread"
-	item_color = "durathread"
-	can_adjust = FALSE
-	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
 
 /obj/item/clothing/under/gear_harness
 	name = "gear harness"
@@ -725,5 +717,15 @@
 	icon_state = "durathread"
 	item_state = "durathread"
 	item_color = "durathread"
+	can_adjust = TRUE
+	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
+
+/obj/item/clothing/under/duraskirt
+	name = "durathread jumpskirt"
+	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer. Being a short skirt, it naturally doesn't protect the legs."
+	icon_state = "duraskirt"
+	item_state = "duraskirt"
+	item_color = "durathread"
 	can_adjust = FALSE
+	body_parts_covered = CHEST|GROIN|ARMS
 	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)

code/modules/mob/living/simple_animal/slime/life.dm

@@ -69,7 +69,7 @@
 
 						if(Target.Adjacent(src))
 							Target.attack_slime(src)
-					return
+					break
 				if(!Target.lying && prob(80))
 
 					if(Target.client && Target.health >= 20)

code/modules/mob/mob.dm

@@ -457,13 +457,17 @@
 	set name = ".click"
 	set hidden = TRUE
 	set category = null
-	return
+	var/msg = "[key_name_admin(src)]([ADMIN_KICK(src)]) attempted to use the .click macro!"
+	log_admin(msg)
+	message_admins(msg)
 
 /mob/verb/DisDblClick(argu = null as anything, sec = "" as text, number1 = 0 as num  , number2 = 0 as num)
 	set name = ".dblclick"
 	set hidden = TRUE
 	set category = null
-	return
+	var/msg = "[key_name_admin(src)]([ADMIN_KICK(src)]) attempted to use the .dblclick macro!"
+	log_admin(msg)
+	message_admins(msg)
 
 /mob/Topic(href, href_list)
 	if(href_list["mach_close"])