Tg 2 11 sync (#215)

* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -7,7 +7,6 @@
 	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "engineering=2;bluespace=1"
 	var/translate_binary = 0
-	var/translate_hive = 0
 	var/syndie = 0
 	var/centcom = 0
 	var/list/channels = list()

code/game/objects/items/devices/radio/headset.dm

@@ -273,9 +273,6 @@
 		if(keyslot2.translate_binary)
 			src.translate_binary = 1
 
-		if(keyslot2.translate_hive)
-			src.translate_hive = 1
-
 		if(keyslot2.syndie)
 			src.syndie = 1
 

code/game/objects/items/devices/radio/radio.dm

@@ -17,7 +17,6 @@
 	var/broadcasting = 0
 	var/listening = 1
 	var/translate_binary = 0
-	var/translate_hive = 0
 	var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
 	var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
 	var/obj/item/device/encryptionkey/keyslot //To allow the radio to accept encryption keys.
@@ -58,7 +57,6 @@
 /obj/item/device/radio/proc/recalculateChannels()
 	channels = list()
 	translate_binary = 0
-	translate_hive = 0
 	syndie = 0
 	centcom = 0
 
@@ -72,9 +70,6 @@
 		if(keyslot.translate_binary)
 			translate_binary = 1
 
-		if(keyslot.translate_hive)
-			translate_hive = 1
-
 		if(keyslot.syndie)
 			syndie = 1
 

code/game/objects/items/devices/taperecorder.dm

@@ -272,12 +272,17 @@
 
 
 /obj/item/device/tape/attackby(obj/item/I, mob/user, params)
-	if(ruined && istype(I, /obj/item/weapon/screwdriver))
-		user << "<span class='notice'>You start winding the tape back in...</span>"
-		if(do_after(user, 120*I.toolspeed, target = src))
-			user << "<span class='notice'>You wound the tape back in.</span>"
-			fix()
-
+	if(ruined)
+		var/delay = -1
+		if (istype(I, /obj/item/weapon/screwdriver))
+			delay = 120*I.toolspeed
+		else if(istype(I, /obj/item/weapon/pen))
+			delay = 120*1.5
+		if (delay != -1)
+			user << "<span class='notice'>You start winding the tape back in...</span>"
+			if(do_after(user, delay, target = src))
+				user << "<span class='notice'>You wound the tape back in.</span>"
+				fix()
 
 //Random colour tapes
 /obj/item/device/tape/random/New()