Merge pull request #10622 from Steelpoint/AyylienGun

[SPRITE|MAP] Abductor Sprite and Animation Change

_maps/map_files/generic/z2.dmm

@@ -882,7 +882,7 @@
 "qX" = (/obj/effect/landmark/abductor/scientist{team = 2},/turf/simulated/floor/plating/abductor,/area/abductor_ship)
 "qY" = (/obj/item/weapon/retractor/alien,/obj/item/weapon/hemostat/alien,/obj/structure/table/abductor,/turf/simulated/floor/plating/abductor,/area/abductor_ship)
 "qZ" = (/turf/indestructible/abductor{icon_state = "alien11"},/area/abductor_ship)
-"ra" = (/obj/item/weapon/storage/box/handcuffs,/obj/structure/table/abductor,/turf/simulated/floor/plating/abductor,/area/abductor_ship)
+"ra" = (/obj/structure/table/abductor,/obj/item/weapon/storage/box/alienhandcuffs,/turf/simulated/floor/plating/abductor,/area/abductor_ship)
 "rb" = (/turf/indestructible/abductor{icon_state = "alien10"},/area/abductor_ship)
 "rc" = (/obj/effect/landmark/abductor/agent{team = 3},/turf/simulated/floor/plating/abductor,/area/abductor_ship)
 "rd" = (/obj/effect/landmark/abductor/scientist{team = 3},/turf/simulated/floor/plating/abductor,/area/abductor_ship)

code/game/gamemodes/abduction/abduction_gear.dm

@@ -301,12 +301,11 @@
 	icon_state = "alienpistol"
 	item_state = "alienpistol"
 
-/obj/item/weapon/gun/energy/decloner/alien/update_icon() // No charge levels
-	return
-
 /obj/item/weapon/paper/abductor
 	name = "Dissection Guide"
+	icon_state = "alienpaper_words"
 	info = {"<b>Dissection for Dummies</b><br>
+
 <br>
  1.Acquire fresh specimen.<br>
  2.Put the specimen on operating table<br>
@@ -322,6 +321,9 @@
 <br>
 Congratulations! You are now trained for xenobiology research!"}
 
+/obj/item/weapon/paper/abductor/update_icon()
+	return
+
 #define BATON_STUN 0
 #define BATON_SLEEP 1
 #define BATON_CUFF 2
@@ -333,7 +335,7 @@ Congratulations! You are now trained for xenobiology research!"}
 	desc = "A quad-mode baton used for incapacitation and restraining of specimens."
 	var/mode = BATON_STUN
 	icon = 'icons/obj/abductor.dmi'
-	icon_state = "wonderprod"
+	icon_state = "wonderprodStun"
 	item_state = "wonderprod"
 	slot_flags = SLOT_BELT
 	origin_tech = "materials=6;combat=5;biotech=7"
@@ -360,13 +362,17 @@ Congratulations! You are now trained for xenobiology research!"}
 /obj/item/weapon/abductor_baton/update_icon()
 	switch(mode)
 		if(BATON_STUN)
-			icon_state = "wonderprod"
+			icon_state = "wonderprodStun"
+			item_state = "wonderprodStun"
 		if(BATON_SLEEP)
-			icon_state = "wonderprod"
+			icon_state = "wonderprodSleep"
+			item_state = "wonderprodSleep"
 		if(BATON_CUFF)
-			icon_state = "wonderprod"
+			icon_state = "wonderprodCuff"
+			item_state = "wonderprodCuff"
 		if(BATON_PROBE)
-			icon_state = "wonderprod"
+			icon_state = "wonderprodProbe"
+			item_state = "wonderprodProbe"
 
 /obj/item/weapon/abductor_baton/proc/IsAbductor(mob/living/user)
 	if(!ishuman(user))

code/game/objects/items/weapons/handcuffs.dm

@@ -94,6 +94,9 @@
 /obj/item/weapon/restraints/handcuffs/cable/white
 	icon_state = "cuff_white"
 
+/obj/item/weapon/restraints/handcuffs/alien
+	icon_state = "handcuffAlien"
+
 /obj/item/weapon/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/stack/rods))

code/game/objects/items/weapons/storage/boxes.dm

@@ -478,6 +478,21 @@
 	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
 	new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
 
+/obj/item/weapon/storage/box/alienhandcuffs
+	name = "box of spare handcuffs"
+	desc = "A box full of handcuffs."
+	icon_state = "alienboxCuffs"
+
+/obj/item/weapon/storage/box/alienhandcuffs/New()
+	..()
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+	new	/obj/item/weapon/restraints/handcuffs/alien(src)
+
 /obj/item/weapon/storage/box/fakesyndiesuit
 	name = "boxed space suit and helmet"
 	desc = "A sleek, sturdy box used to hold replica spacesuits."