Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-03-03 03:08:41 -07:00
parent c21bd60929 fde24492b9
commit 1e99cd0bfe
485 changed files with 2456 additions and 2614 deletions
@@ -84,7 +84,7 @@
 /obj/item/melee/baton/process()
 	deductcharge(round(hitcost * STUNBATON_DEPLETION_RATE), FALSE, FALSE)

-/obj/item/melee/baton/update_icon()
+/obj/item/melee/baton/update_icon_state()
 	if(status)
 		icon_state = "[initial(name)]_active"
 	else if(!cell)
@@ -195,7 +195,7 @@
 		L.adjustStaminaLoss(stunpwr)
 	else
 		L.drop_all_held_items()					//no knockdown/stamina damage, instead disarm.
-	
+
 	L.apply_effect(EFFECT_STUTTER, stamforce)
 	SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
 	if(user)