diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 70d0659d8e2..3586a180854 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_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) diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm index a84adc0b15a..89c69232a22 100644 --- a/code/game/gamemodes/abduction/abduction_gear.dm +++ b/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 = {"Dissection for Dummies
+
1.Acquire fresh specimen.
2.Put the specimen on operating table
@@ -322,6 +321,9 @@
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)) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 6aad3fe9b6c..20242e9a5f0 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/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)) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 0f9b43ad313..48e6e768abf 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/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." diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 5cc8b76350b..d4b7e0ae9c6 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 3a64e7b6dd2..a74d2ce1271 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index dbb322992eb..c08d266200f 100644 Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 3e50217bb16..830fac5dea8 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index f225be2dcf2..fb3f05626c2 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 194a21eecb6..f05c3b70f5f 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index de154778cc7..ce46721a855 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ