July 5th TG sync (#1883)

July 5th TG sync

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

@@ -838,18 +838,14 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 /obj/item/device/pda/Destroy()
 	GLOB.PDAs -= src
-	if(id)
-		qdel(id)
-		id = null
-	if(cartridge)
-		qdel(cartridge)
-		cartridge = null
-	if(pai)
-		qdel(pai)
-		pai = null
-	if(inserted_item)
-		qdel(inserted_item)
-		inserted_item = null
+	if(istype(id))
+		QDEL_NULL(id)
+	if(istype(cartridge))
+		QDEL_NULL(cartridge)
+	if(istype(pai))
+		QDEL_NULL(pai)
+	if(istype(inserted_item))
+		QDEL_NULL(inserted_item)
 	return ..()
 
 //AI verb and proc for sending PDA messages.

code/game/objects/items/devices/PDA/PDA_types.dm

@@ -2,6 +2,7 @@
 /obj/item/device/pda/clown
 	name = "clown PDA"
 	default_cartridge = /obj/item/weapon/cartridge/virus/clown
+	inserted_item = /obj/item/toy/crayon/rainbow
 	icon_state = "pda-clown"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings."
 	ttone = "honk"
@@ -9,7 +10,7 @@
 /obj/item/device/pda/clown/Crossed(AM as mob|obj)
 	if (istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M = AM
-		if(M.slip(0, 6, src, NO_SLIP_WHEN_WALKING))
+		if(M.slip(120, src, NO_SLIP_WHEN_WALKING))
 			if (ishuman(M) && (M.real_name != src.owner))
 				if (istype(src.cartridge, /obj/item/weapon/cartridge/virus/clown))
 					var/obj/item/weapon/cartridge/virus/cart = src.cartridge
@@ -80,6 +81,7 @@
 /obj/item/device/pda/mime
 	name = "mime PDA"
 	default_cartridge = /obj/item/weapon/cartridge/virus/mime
+	inserted_item = /obj/item/toy/crayon/mime
 	icon_state = "pda-mime"
 	silent = 1
 	ttone = "silence"

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

@@ -1,62 +1,62 @@
-/obj/item/radio/integrated
-	name = "\improper PDA radio module"
-	desc = "An electronic radio system of nanotrasen origin."
-	icon = 'icons/obj/module.dmi'
-	icon_state = "power_mod"
-
-	var/on = 0 //Are we currently active??
-	var/menu_message = ""
-
+/obj/item/radio/integrated
+	name = "\improper PDA radio module"
+	desc = "An electronic radio system of nanotrasen origin."
+	icon = 'icons/obj/module.dmi'
+	icon_state = "power_mod"
+
+	var/on = 0 //Are we currently active??
+	var/menu_message = ""
+
 /obj/item/radio/integrated/Initialize()
 	. = ..()
-
-/obj/item/radio/integrated/Destroy()
-	return ..()
-
-/*
- *	Radio Cartridge, essentially a signaler.
- */
-
-
-/obj/item/radio/integrated/signal
-	var/frequency = 1457
-	var/code = 30
-	var/last_transmission
-	var/datum/radio_frequency/radio_connection
-
-/obj/item/radio/integrated/signal/Destroy()
-	if(SSradio)
-		SSradio.remove_object(src, frequency)
-	radio_connection = null
-	return ..()
-
-/obj/item/radio/integrated/signal/Initialize()
-	..()
-	if (src.frequency < 1200 || src.frequency > 1600)
-		src.frequency = sanitize_frequency(src.frequency)
-
-	set_frequency(frequency)
-
-/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency)
-	SSradio.remove_object(src, frequency)
-	frequency = new_frequency
-	radio_connection = SSradio.add_object(src, frequency)
-
-/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE")
-
-	if(last_transmission && world.time < (last_transmission + 5))
-		return
-	last_transmission = world.time
-
-	var/time = time2text(world.realtime,"hh:mm:ss")
-	var/turf/T = get_turf(src)
-	GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
-
-	var/datum/signal/signal = new
-	signal.source = src
-	signal.encryption = code
-	signal.data["message"] = message
-
-	radio_connection.post_signal(src, signal)
-
+
+/obj/item/radio/integrated/Destroy()
+	return ..()
+
+/*
+ *	Radio Cartridge, essentially a signaler.
+ */
+
+
+/obj/item/radio/integrated/signal
+	var/frequency = 1457
+	var/code = 30
+	var/last_transmission
+	var/datum/radio_frequency/radio_connection
+
+/obj/item/radio/integrated/signal/Destroy()
+	if(SSradio)
+		SSradio.remove_object(src, frequency)
+	radio_connection = null
+	return ..()
+
+/obj/item/radio/integrated/signal/Initialize()
+	..()
+	if (src.frequency < 1200 || src.frequency > 1600)
+		src.frequency = sanitize_frequency(src.frequency)
+
+	set_frequency(frequency)
+
+/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency)
+	SSradio.remove_object(src, frequency)
+	frequency = new_frequency
+	radio_connection = SSradio.add_object(src, frequency)
+
+/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE")
+
+	if(last_transmission && world.time < (last_transmission + 5))
+		return
+	last_transmission = world.time
+
+	var/time = time2text(world.realtime,"hh:mm:ss")
+	var/turf/T = get_turf(src)
+	GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
+
+	var/datum/signal/signal = new
+	signal.source = src
+	signal.encryption = code
+	signal.data["message"] = message
+
+	radio_connection.post_signal(src, signal)
+
 	return