initial commit - game folder + maps + dme

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

@@ -4,7 +4,7 @@
 	icon_state = "headset"
 	item_state = "headset"
 	materials = list(MAT_METAL=75)
-	subspace_transmission = 1
+	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away
 
 	slot_flags = SLOT_EARS
@@ -22,10 +22,7 @@
 	recalculateChannels()
 
 /obj/item/device/radio/headset/Destroy()
-	qdel(keyslot)
-	qdel(keyslot2)
-	keyslot = null
-	keyslot2 = null
+	QDEL_NULL(keyslot2)
 	return ..()
 
 /obj/item/device/radio/headset/talk_into(mob/living/M, message, channel, list/spans,datum/language/language)
@@ -33,14 +30,14 @@
 		return ITALICS | REDUCE_RANGE
 	return ..()
 
-/obj/item/device/radio/headset/receive_range(freq, level, AIuser)
+/obj/item/device/radio/headset/can_receive(freq, level, AIuser)
 	if(ishuman(src.loc))
 		var/mob/living/carbon/human/H = src.loc
 		if(H.ears == src)
 			return ..(freq, level)
 	else if(AIuser)
 		return ..(freq, level)
-	return -1
+	return FALSE
 
 /obj/item/device/radio/headset/syndicate //disguised to look like a normal headset for stealth ops
 
@@ -209,32 +206,24 @@
 	keyslot2 = new /obj/item/device/encryptionkey/ai
 	command = TRUE
 
-/obj/item/device/radio/headset/ai/receive_range(freq, level)
-	return ..(freq, level, 1)
+/obj/item/device/radio/headset/ai/can_receive(freq, level)
+	return ..(freq, level, TRUE)
 
 /obj/item/device/radio/headset/attackby(obj/item/W, mob/user, params)
 	user.set_machine(src)
 
 	if(istype(W, /obj/item/screwdriver))
 		if(keyslot || keyslot2)
-
-
 			for(var/ch_name in channels)
 				SSradio.remove_object(src, GLOB.radiochannels[ch_name])
 				secure_radio_connections[ch_name] = null
 
-
-			if(keyslot)
-				var/turf/T = get_turf(user)
-				if(T)
+			var/turf/T = user.drop_location()
+			if(T)
+				if(keyslot)
 					keyslot.forceMove(T)
 					keyslot = null
-
-
-
-			if(keyslot2)
-				var/turf/T = get_turf(user)
-				if(T)
+				if(keyslot2)
 					keyslot2.forceMove(T)
 					keyslot2 = null
 
@@ -244,7 +233,7 @@
 		else
 			to_chat(user, "<span class='warning'>This headset doesn't have any unique encryption keys!  How useless...</span>")
 
-	else if(istype(W, /obj/item/device/encryptionkey/))
+	else if(istype(W, /obj/item/device/encryptionkey))
 		if(keyslot && keyslot2)
 			to_chat(user, "<span class='warning'>The headset can't hold another key!</span>")
 			return
@@ -269,26 +258,19 @@
 	..()
 	if(keyslot2)
 		for(var/ch_name in keyslot2.channels)
-			if(ch_name in src.channels)
-				continue
-			src.channels += ch_name
-			src.channels[ch_name] = keyslot2.channels[ch_name]
+			if(!(ch_name in src.channels))
+				channels[ch_name] = keyslot2.channels[ch_name]
 
 		if(keyslot2.translate_binary)
-			src.translate_binary = 1
-
+			translate_binary = TRUE
 		if(keyslot2.syndie)
-			src.syndie = 1
-
+			syndie = TRUE
 		if (keyslot2.independent)
 			independent = TRUE
 
-
 	for(var/ch_name in channels)
 		secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name])
 
-	return
-
 /obj/item/device/radio/headset/AltClick(mob/living/user)
 	if(!istype(user) || !Adjacent(user) || user.incapacitated())
 		return