Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/modules/movespeed/_movespeed_modifier.dm

@@ -199,7 +199,13 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
 			else
 				continue
 		. += amt
+	var/old = cached_multiplicative_slowdown		// CITAEDL EDIT - To make things a bit less jarring, when in situations where
+	// your delay decreases, "give" the delay back to the client
 	cached_multiplicative_slowdown = .
+	var/diff = old - cached_multiplicative_slowdown
+	if((diff > 0) && client)
+		if(client.move_delay > world.time + 1.5)
+			client.move_delay -= diff
 
 /// Get the move speed modifiers list of the mob
 /mob/proc/get_movespeed_modifiers()

code/modules/projectiles/gun.dm

@@ -182,7 +182,7 @@
 			return
 		if(!ismob(target) || user.a_intent == INTENT_HARM) //melee attack
 			return
-		if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH) //so we can't shoot ourselves (unless mouth selected)
+		if(target == user && user.zone_selected != BODY_ZONE_PRECISE_MOUTH && (user.a_intent != INTENT_DISARM)) //so we can't shoot ourselves (unless mouth selected or disarm intent)
 			return
 		if(iscarbon(target))
 			var/mob/living/carbon/C = target

code/modules/projectiles/guns/energy/stun.dm

@@ -24,7 +24,7 @@
 	ammo_x_offset = 2
 	// Not enough guns have altfire systems like this yet for this to be a universal framework.
 	var/last_altfire = 0
-	var/altfire_delay = 15
+	var/altfire_delay = CLICK_CD_RANGE
 
 /obj/item/gun/energy/e_gun/advtaser/altafterattack(atom/target, mob/user, proximity_flag, params)
 	. = TRUE

code/modules/projectiles/guns/misc/medbeam.dm

@@ -47,7 +47,7 @@
 
 	if(current_target)
 		LoseTarget()
-	if(!isliving(target))
+	if(!isliving(target) || (user == target))
 		return
 
 	current_target = target

html/changelogs/AutoChangeLog-pr-12862.yml

@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - rscadd: "you can now shoot yourself by disarm-intenting yourself with a gun."

html/changelogs/AutoChangeLog-pr-12888.yml

@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - rscdel: "no more self healing with medibeam guns"

html/changelogs/AutoChangeLog-pr-12898.yml

@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - rscadd: "polychromatic cloaks to loadout"

html/changelogs/AutoChangeLog-pr-12900.yml

@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - balance: "oh no, taser buff. alt fire delay dropped to 0.4 seconds."

modular_citadel/code/modules/client/loadout/neck.dm

@@ -92,3 +92,8 @@
 	name = "Headphones"
 	category = SLOT_NECK
 	path = /obj/item/clothing/ears/headphones
+
+/datum/gear/polycloak
+	name = "Polychromatic Cloak"
+	category = SLOT_NECK
+	path = /obj/item/clothing/neck/cloak/polychromic