Merge branch 'master' into abductor-update

code/modules/clothing/clothing.dm

@@ -223,7 +223,6 @@ BLIND     // can't see anything
 		if(H.w_uniform == src)
 			H.update_suit_sensors()
 
-	..()
 
 /obj/item/clothing/under/CtrlClick(mob/user)
 	. = ..()

code/modules/clothing/gloves/miscellaneous.dm

@@ -58,7 +58,7 @@
 
 /obj/item/clothing/gloves/rapid
 	name = "Gloves of the North Star"
-	desc = "Just looking at these fills you with an urge to beat the shit out of people."
+	desc = "Just looking at these fills you with an urge to beat the shit out of people. Violently."
 	icon_state = "rapid"
 	item_state = "rapid"
 	transfer_prints = TRUE
@@ -69,12 +69,10 @@
 		return
 
 	var/mob/living/M = loc
-
-	if(M.a_intent == INTENT_HARM)
-		M.changeNext_move(CLICK_CD_RAPID)
-		M.adjustStaminaLoss(-2) //Restore 2/3 of the stamina used assuming empty stam buffer. With proper stamina buffer management, this results in a net gain of +.5 stamina per click.
-		if(warcry)
-			M.say("[warcry]", ignore_spam = TRUE, forced = "north star warcry")
+	M.changeNext_move(CLICK_CD_RAPID)
+	M.adjustStaminaLoss(-3.5) // used to be -2 with some comment about stamina buffer management but *shrug -hatterhat
+	if(warcry)
+		M.say("[warcry]", ignore_spam = TRUE, forced = "north star warcry")
 
 	.= FALSE
 
@@ -86,7 +84,7 @@
 
 /obj/item/clothing/gloves/rapid/hug
 	name = "Hugs of the North Star"
-	desc = "Just looking at these fills you with an urge to hug the shit out of people"
+	desc = "Just looking at these fills you with an urge to hug the shit out of people. In a very friendly manner."
 	warcry = "owo" //Shouldn't ever come into play
 
 /obj/item/clothing/gloves/rapid/hug/Touch(mob/living/target,proximity = TRUE)
@@ -97,11 +95,11 @@
 
 	if(M.a_intent == INTENT_HELP)
 		if(target.health >= 0 && !HAS_TRAIT(target, TRAIT_FAKEDEATH)) //Can't hug people who are dying/dead
-			if(target.on_fire || target.lying ) //No spamming extinguishing, helping them up, or other non-hugging/patting help interactions
+			if(target.on_fire || target.lying) //No spamming extinguishing, helping them up, or other non-hugging/patting help interactions
 				return
 			else
 				M.changeNext_move(CLICK_CD_RAPID)
 	. = FALSE
 
 /obj/item/clothing/gloves/rapid/hug/attack_self(mob/user)
-	return FALSE
+	return FALSE

code/modules/clothing/head/misc.dm

@@ -370,3 +370,10 @@
 		if(prob(3))
 			message += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
 	speech_args[SPEECH_MESSAGE] = trim(message)
+
+/obj/item/clothing/head/assu_helmet
+	name = "DAB helmet"
+	icon_state = "assu_helmet"
+	item_state = "assu_helmet"
+	desc = "A cheap replica of old riot helmet without visor. It has \"D.A.B.\" written on the front."
+	flags_inv = HIDEHAIR

code/modules/clothing/suits/miscellaneous.dm

@@ -633,3 +633,13 @@
 	flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD
 	alternate_worn_layer = UNDER_HEAD_LAYER
+
+/obj/item/clothing/suit/assu_suit
+	name = "DAB suit"
+	desc = "A cheap replica of old SWAT armor. On its back, it is written: \"<i>Desperate Assistance Battle-force</i>\"."
+	icon_state = "assu_suit"
+	item_state = "assu_suit"
+	blood_overlay_type = "armor"
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	flags_inv = HIDEJUMPSUIT
+	resistance_flags = NONE