The Inhandening PR + Some organization (#1552)

* Adds 62 unique inhands

* quick alignment fix

code/game/objects/items/ego_weapons/aleph.dm

@@ -462,6 +462,7 @@
 /obj/item/ego_weapon/soulmate/Initialize()
 	RegisterSignal(src, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
 	..()
+	AddElement(/datum/element/update_icon_updates_onmob)
 
 /obj/item/ego_weapon/soulmate/attack(mob/living/target, mob/living/user)
 	..()
@@ -470,6 +471,7 @@
 			gunmark_targets = list()
 			bladebuff = TRUE
 			icon_state = "soulmate_blade"
+			update_icon_state()
 			update_icon()
 			attack_speed = 0.4
 			gunmark_cooldown = world.time + mark_cooldown_time
@@ -506,6 +508,7 @@
 			blademark_targets = list()
 			gunbuff = TRUE
 			icon_state = "soulmate_gun"
+			update_icon_state()
 			update_icon()
 			blademark_cooldown = world.time + mark_cooldown_time
 			addtimer(CALLBACK(src, .proc/GunRevert), 80)
@@ -517,13 +520,15 @@
 /obj/item/ego_weapon/soulmate/proc/BladeRevert()
 	if(bladebuff)
 		icon_state = "soulmate"
+		update_icon_state()
 		update_icon()
 		attack_speed = 0.8
 		bladebuff = FALSE
 
 /obj/item/ego_weapon/soulmate/proc/GunRevert()
 	if(gunbuff)
 		icon_state = "soulmate"
+		update_icon_state()
 		update_icon()
 		gunbuff = FALSE
 
@@ -553,6 +558,10 @@
 							)
 	var/canaoe
 
+/obj/item/ego_weapon/space/Initialize()
+	..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
 /obj/item/ego_weapon/space/attack_self(mob/living/carbon/user)
 	if(!CanUseEgo(user))
 		return
@@ -571,6 +580,7 @@
 		return
 
 	icon_state = "space_aoe"
+	update_icon_state()
 	user.density = FALSE
 	user.adjustStaminaLoss(15, TRUE, TRUE)
 	user.throw_at(dodgelanding, 3, 2, spin = FALSE) // This still collides with people, by the way.
@@ -601,6 +611,7 @@
 			L.apply_damage(aoe, BLACK_DAMAGE, null, L.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE)
 			L.apply_damage(aoe, WHITE_DAMAGE, null, L.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE)
 	icon_state = "space"
+	update_icon_state()
 	canaoe = FALSE
 
 /obj/item/ego_weapon/space/EgoAttackInfo(mob/user)

code/game/objects/items/ego_weapons/special.dm

@@ -141,6 +141,10 @@
 	var/ramping_speed = 0 //maximum of 20
 	var/ramping_damage = 0 //no maximum, will stack as long as people are attacking with it.
 
+/obj/item/ego_weapon/iron_maiden/Initialize()
+	..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
 /obj/item/ego_weapon/iron_maiden/proc/Multihit(mob/living/target, mob/living/user, attack_amount)
 	sleep(1)
 	for(var/i = 1 to attack_amount)
@@ -179,6 +183,7 @@
 			if(icon_state != "iron_maiden_open")
 				playsound(src, 'sound/abnormalities/we_can_change_anything/change_gas.ogg', 50, TRUE)
 				icon_state = "iron_maiden_open"
+				update_icon_state()
 			Multihit(target, user, 3)
 	return
 
@@ -190,6 +195,7 @@
 	playsound(src, 'sound/abnormalities/we_can_change_anything/change_gas.ogg', 50, TRUE)
 	if(do_after(user, 2.5 SECONDS, src))
 		icon_state = "iron_maiden"
+		update_icon_state()
 		playsound(src, 'sound/abnormalities/we_can_change_anything/change_start.ogg', 50, FALSE)
 		ramping_speed = 0
 		ramping_damage = 0

code/game/objects/items/ego_weapons/teth.dm

@@ -228,6 +228,10 @@
 	desc = "Home sweet home. Warmth and safety aplenty."
 	special = "This weapon has a ranged attack."
 	icon_state = "hearth"
+	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
 	var/icon_on = "hearth_glow"
 	var/icon_off = "hearth"
 	force = 18

code/modules/projectiles/guns/ego_gun/he.dm

@@ -18,7 +18,7 @@
 	name = "gaze"
 	desc = "A magnum pistol featuring excellent burst firing potential."
 	icon_state = "gaze"
-	inhand_icon_state = "executive"
+	inhand_icon_state = "gaze"
 	ammo_type = /obj/item/ammo_casing/caseless/ego_gaze
 	fire_delay = 20
 	fire_sound = 'sound/weapons/gun/pistol/deagle.ogg'
@@ -137,6 +137,7 @@
 	name = "harmony"
 	desc = "A massive blocky launcher with some suspicious stains on it."
 	icon_state = "harmony"
+	inhand_icon_state = "harmony"
 	special = "This weapon fires bouncing, piercing shots."
 	ammo_type = /obj/item/ammo_casing/caseless/ego_harmony
 	fire_sound = 'sound/weapons/ego/harmony1.ogg'

code/modules/projectiles/guns/ego_gun/teth.dm

@@ -30,7 +30,7 @@
 	name = "beak mk2"
 	desc = "A heavy revolver that fires at a surprisingly fast rate, and is deadly accurate."
 	icon_state = "beakmagnum"
-	inhand_icon_state = "beak"
+	inhand_icon_state = "beakmagnum"
 	special = "This weapon has pinpoint accuracy when dual wielded."
 	ammo_type = /obj/item/ammo_casing/caseless/ego_beakmagnum
 	fire_delay = 20

code/modules/projectiles/guns/ego_gun/zayin.dm

@@ -3,10 +3,7 @@
 	desc = "A glock reminiscent of a certain detective who fought evil for 25 years, losing hair as time went by."
 	special = "Use this weapon in your hand when wearing matching armor to turn others nearby bald."
 	icon_state = "bald"
-	inhand_icon_state = "gun"
-	worn_icon_state = "gun"
-	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+	inhand_icon_state = "bald"
 	ammo_type = /obj/item/ammo_casing/caseless/ego_tough
 	burst_size = 1
 	fire_delay = 10