The Inhandening PR act 2, *children of the city starts playing (vlggm…

…s#1557)

At the end of the beginning, the dragon soared through the sky.

rest of the city inhands

made code actually use them

ego side

kcorp fix

quack sprites (shrimp and fullstop)

rebase

code/game/objects/items/ego_weapons/non_abnormality/kcorp.dm

@@ -94,10 +94,9 @@
 	desc = "A lime green pistol used by Kcorp."
 	icon_state = "kpistol"
 	icon = 'ModularTegustation/Teguicons/lc13_weapons.dmi'
-	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 = "kpistol"
+	lefthand_file = 'ModularTegustation/Teguicons/lc13_left.dmi'
+	righthand_file = 'ModularTegustation/Teguicons/lc13_right.dmi'
 	ammo_type = /obj/item/ammo_casing/caseless/ego_kcorp
 	fire_delay = 5
 	fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
@@ -109,6 +108,7 @@
 	name = "Kcorp Machinepistole"
 	desc = "A lime green machinepistol used by Kcorp."
 	icon_state = "ksmg"
+	inhand_icon_state = "ksmg"
 	fire_sound = 'sound/weapons/gun/smg/mp7.ogg'
 	autofire = 0.08 SECONDS
 	fire_delay = 1
@@ -124,6 +124,7 @@
 	name = "Kcorp grenade launcher"
 	desc = "A short grenade launcher used by Kcorp."
 	icon_state = "kgrenade"
+	inhand_icon_state = "kgrenade"
 	ammo_type = /obj/item/ammo_casing/caseless/ego_knade
 	fire_delay = 15
 	fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'

code/game/objects/items/ego_weapons/non_abnormality/rosespanner.dm

@@ -75,7 +75,7 @@
 	name = "rosespanner mini hammer"
 	desc = "A hammer from the rosespanner workshop. Fits in your EGO belt."
 	icon_state = "rosespanner_minihammer"
-	inhand_icon_state = "rosespanner_hammer"
+	inhand_icon_state = "rosespanner_minihammer"
 	force = 44
 	attack_speed = 1
 	charge_cost = 7	//Takes fucking forever, you can charge it a little faster
@@ -125,6 +125,8 @@
 	desc = "A gear used by Rosespanner workshop. Use them on a rosespanner weapon to augment the weapon."
 	icon = 'ModularTegustation/Teguicons/lc13_weapons.dmi'
 	icon_state = "redgear"
+	lefthand_file = 'ModularTegustation/Teguicons/lc13_left.dmi'
+	righthand_file = 'ModularTegustation/Teguicons/lc13_right.dmi'
 	damtype = RED_DAMAGE
 	armortype = RED_DAMAGE
 

code/game/objects/items/ego_weapons/non_abnormality/shrimp.dm

@@ -5,7 +5,7 @@
 	desc = "A gun used by shrimp corp, apparently."
 	icon = 'ModularTegustation/Teguicons/lc13_weapons.dmi'
 	icon_state = "sodaminigun"
-	inhand_icon_state = "sodalong"
+	inhand_icon_state = "sodaminigun"
 	ammo_type = /obj/item/ammo_casing/caseless/ego_soda
 	weapon_weight = WEAPON_HEAVY
 	drag_slowdown = 3
@@ -21,7 +21,7 @@
 	desc = "A gun used by shrimp corp, apparently."
 	icon = 'ModularTegustation/Teguicons/lc13_weapons.dmi'
 	icon_state = "sodaassault"
-	inhand_icon_state = "sodalong"
+	inhand_icon_state = "sodaassault"
 	ammo_type = /obj/item/ammo_casing/caseless/ego_soda
 	weapon_weight = WEAPON_HEAVY
 	burst_size = 3

code/game/objects/items/ego_weapons/non_abnormality/streetlight.dm

@@ -39,6 +39,7 @@
 	name = "streetlight office baton"
 	desc = "A  baton compatible with Zwei techniques. It carries a sense of regret..."
 	icon_state = "streetlight_founder"
+	inhand_icon_state = "streetlight_founder"
 	force = 32
 	damtype = BLACK_DAMAGE
 	armortype = BLACK_DAMAGE

code/game/objects/items/ego_weapons/non_abnormality/weak_edits/city.dm

@@ -4,7 +4,7 @@
 	desc = "A riot club used by the local protection."
 	special = "Attack a human to stun them after a period of time."
 	icon_state = "protection_baton"
-	inhand_icon_state = "zwei_baton"
+	inhand_icon_state = "protection_baton"
 	force = 15
 	attribute_requirements = list()
 

code/game/objects/items/ego_weapons/non_abnormality/zwei.dm

@@ -7,14 +7,10 @@
 	desc = "A zweihander used by the zwei association."
 	special = "Use in hand to buff your defense, and those of everyone around you."
 	icon_state = "zwei"
-	inhand_icon_state = "zwei"
 	force = 55
 	attack_speed = 2
 	damtype = RED_DAMAGE
 	armortype = RED_DAMAGE
-	inhand_icon_state = "claymore"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
 	attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")

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

@@ -33,6 +33,7 @@
 	name = "galaxy"
 	desc = "A shimmering wand."
 	icon_state = "galaxy"
+	inhand_icon_state = "galaxy"
 	special = "Use in hand to turn on homing mode. This mode fires slower, but homes in on a random target within 15 metres.	\
 			WARNING: This feature is not accurate."
 	ammo_type =	/obj/item/ammo_casing/caseless/ego_galaxy