Merge pull request #4233 from Fox-McCloud/abduction

Abduction

code/game/objects/items/stacks/sheets/mineral.dm

@@ -193,3 +193,31 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \
 	icon_state = "sheet-enruranium"
 	origin_tech = "materials=6"
 	materials = list(MAT_URANIUM=3000)
+
+/*
+ * Alien Alloy
+ */
+/obj/item/stack/sheet/mineral/abductor
+	name = "alien alloy"
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "sheet-abductor"
+	singular_name = "alien alloy sheet"
+	force = 5
+	throwforce = 5
+	w_class = 3
+	throw_speed = 1
+	throw_range = 3
+	origin_tech = "materials=6;abductor=1"
+	sheettype = "abductor"
+
+var/global/list/datum/stack_recipe/abductor_recipes = list ( \
+	new/datum/stack_recipe("alien bed", /obj/structure/stool/bed/abductor, 2, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("alien table frame", /obj/structure/abductor_tableframe, 1, time = 15, one_per_turf = 1, on_floor = 1), \
+	null, \
+	new/datum/stack_recipe("alien floor tile", /obj/item/stack/tile/mineral/abductor, 1, 4, 20), \
+	)
+
+/obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null)
+	recipes = abductor_recipes
+	..()

code/game/objects/items/stacks/tiles/tile_mineral.dm

@@ -0,0 +1,9 @@
+/obj/item/stack/tile/mineral/abductor
+	name = "alien floor tile"
+	singular_name = "alien floor tile"
+	desc = "A tile made out of alien alloy."
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "tile_abductor"
+	origin_tech = "materials=6;abductor=1"
+	turf_type = /turf/simulated/floor/mineral/abductor
+	mineralType = "abductor"

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

@@ -85,6 +85,9 @@
 /obj/item/weapon/restraints/handcuffs/cable/white
 	color = COLOR_WHITE
 
+/obj/item/weapon/restraints/handcuffs/alien
+	icon_state = "handcuffAlien"
+
 /obj/item/weapon/restraints/handcuffs/pinkcuffs
 	name = "fluffy pink handcuffs"
 	desc = "Use this to keep prisoners in line. Or you know, your significant other."

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

@@ -137,37 +137,3 @@
 		H.update_inv_r_hand()
 	add_fingerprint(user)
 	return
-
-
-/obj/item/weapon/cloaking_device
-	name = "cloaking device"
-	desc = "Use this to become invisible to the human eyesocket."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "shield0"
-	var/active = 0.0
-	flags = CONDUCT
-	item_state = "electronic"
-	throwforce = 10.0
-	throw_speed = 2
-	throw_range = 10
-	w_class = 2.0
-	origin_tech = "magnets=3;syndicate=4"
-
-
-/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
-	src.active = !( src.active )
-	if (src.active)
-		to_chat(user, "\blue The cloaking device is now active.")
-		src.icon_state = "shield1"
-	else
-		to_chat(user, "\blue The cloaking device is now inactive.")
-		src.icon_state = "shield0"
-	src.add_fingerprint(user)
-	return
-
-/obj/item/weapon/cloaking_device/emp_act(severity)
-	active = 0
-	icon_state = "shield0"
-	if(ismob(loc))
-		loc:update_icons()
-	..()

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

@@ -512,6 +512,16 @@
 		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"
+
+	New()
+		..()
+		for(var/i in 1 to 7)
+			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."