Merge pull request #7129 from PsiOmegaDelta/Wires

Wires

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

@@ -1,5 +1,3 @@
-
-
 /obj/item/device/radio
 	icon = 'icons/obj/radio.dmi'
 	name = "station bounced radio"
@@ -12,7 +10,7 @@
 	var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
 	var/canhear_range = 3 // the range which mobs can hear this radio from
 	var/obj/item/device/radio/patch_link = null
-	var/wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT
+	var/datum/wires/radio/wires = null
 	var/b_stat = 0
 	var/broadcasting = 0
 	var/listening = 1
@@ -29,13 +27,8 @@
 	w_class = 2
 
 	matter = list("glass" = 25,"metal" = 75)
-
-	var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
-	var/const/WIRE_RECEIVE = 2
-	var/const/WIRE_TRANSMIT = 4
-	var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio
 	var/const/FREQ_LISTENING = 1
-		//FREQ_BROADCASTING = 2
+
 
 /obj/item/device/radio
 	var/datum/radio_frequency/radio_connection
@@ -48,6 +41,7 @@
 
 /obj/item/device/radio/New()
 	..()
+	wires = new(src)
 	if(radio_controller)
 		initialize()
 
@@ -102,14 +96,9 @@
 	return
 
 /obj/item/device/radio/proc/text_wires()
-	if (!b_stat)
-		return ""
-	return {"
-			<hr>
-			Green Wire: <A href='byond://?src=\ref[src];wires=4'>[(wires & 4) ? "Cut" : "Mend"] Wire</A><BR>
-			Red Wire:   <A href='byond://?src=\ref[src];wires=2'>[(wires & 2) ? "Cut" : "Mend"] Wire</A><BR>
-			Blue Wire:  <A href='byond://?src=\ref[src];wires=1'>[(wires & 1) ? "Cut" : "Mend"] Wire</A><BR>
-			"}
+	if (b_stat)
+		return wires.GetInteractWindow()
+	return
 
 
 /obj/item/device/radio/proc/text_sec_channel(var/chan_name, var/chan_stat)
@@ -156,14 +145,7 @@
 				channels[chan_name] &= ~FREQ_LISTENING
 			else
 				channels[chan_name] |= FREQ_LISTENING
-	else if (href_list["wires"])
-		var/t1 = text2num(href_list["wires"])
-		if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))
-			return
-		if (wires & t1)
-			wires &= ~t1
-		else
-			wires |= t1
+
 	if (!( master ))
 		if (istype(loc, /mob))
 			interact(loc)
@@ -223,7 +205,7 @@
 
 	//  Uncommenting this. To the above comment:
 	// 	The permacell radios aren't suppose to be able to transmit, this isn't a bug and this "fix" is just making radio wires useless. -Giacom
-	if(!(src.wires & WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
+	if(wires.IsIndexCut(WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
 		return 0
 
 	M.last_target_click = world.time
@@ -438,7 +420,7 @@
 	// what the range is in which mobs will hear the radio
 	// returns: -1 if can't receive, range otherwise
 
-	if (!(wires & WIRE_RECEIVE))
+	if (wires.IsIndexCut(WIRE_RECEIVE))
 		return -1
 	if(!listening)
 		return -1

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

@@ -1,45 +1,86 @@
+/obj/item/weapon/plastique
+	name = "plastic explosives"
+	desc = "Used to put holes in specific areas without too much extra hole."
+	gender = PLURAL
+	icon = 'icons/obj/assemblies.dmi'
+	icon_state = "plastic-explosive0"
+	item_state = "plasticx"
+	flags = FPRINT | TABLEPASS | NOBLUDGEON
+	w_class = 2.0
+	origin_tech = "syndicate=2"
+	var/datum/wires/explosive/c4/wires = null
+	var/timer = 10
+	var/atom/target = null
+	var/open_panel = 0
+	var/image_overlay = null
+
+/obj/item/weapon/plastique/New()
+	wires = new(src)
+	image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2")
+	..()
+
+/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		open_panel = !open_panel
+		user << "<span class='notice'>You [open_panel ? "open" : "close"] the wire panel.</span>"
+	else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler ))
+		wires.Interact(user)
+	else
+		..()
+
 /obj/item/weapon/plastique/attack_self(mob/user as mob)
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
-	if(newtime < 10)
-		newtime = 10
-	timer = newtime
-	user << "Timer set for [timer] seconds."
+	if(user.get_active_hand() == src)
+		newtime = Clamp(newtime, 10, 60000)
+		timer = newtime
+		user << "Timer set for [timer] seconds."
 
-/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag)
+/obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag)
 	if (!flag)
 		return
-	if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/))
+	if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/))
 		return
 	user << "Planting explosives..."
-	if(ismob(target))
-
-		user.attack_log += "\[[time_stamp()]\] <font color='red'> [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])</font>"
-		msg_admin_attack("[user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-
-		user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!")
 
 	if(do_after(user, 50) && in_range(user, target))
 		user.drop_item()
-		target = target
+		src.target = target
 		loc = null
-		var/location
-		if (isturf(target)) location = target
-		if (isobj(target)) location = target.loc
+
 		if (ismob(target))
-			target:attack_log += "\[[time_stamp()]\]<font color='orange'> Had the [name] planted on them by [user.real_name] ([user.ckey])</font>"
-			user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
-		target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
+			add_logs(user, target, "planted [name] on")
+			user.visible_message("<span class='danger'>[user.name] finished planting an explosive on [target.name]!</span>")
+			message_admins("[key_name(user, user.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) planted [src.name] on [key_name(target)](<A HREF='?_src_=holder;adminmoreinfo=\ref[target]'>?</A>) with [timer] second fuse",0,1)
+			log_game("[key_name(user)] planted [src.name] on [key_name(target)] with [timer] second fuse")
+
+		else
+			message_admins("[key_name(user, user.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[target.x];Y=[target.y];Z=[target.z]'>JMP</a>) with [timer] second fuse",0,1)
+			log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
+
+		target.overlays += image_overlay
 		user << "Bomb has been planted. Timer counting down from [timer]."
 		spawn(timer*10)
-			if(target)
-				explosion(location, -1, -1, 2, 3)
-				if (istype(target, /turf/simulated/wall)) target:dismantle_wall(1)
-				else target.ex_act(1)
-				if (isobj(target))
-					if (target)
-						del(target)
-				if (src)
-					del(src)
+			explode(get_turf(target))
+
+/obj/item/weapon/plastique/proc/explode(var/location)
+	if(!target)
+		target = get_atom_on_turf(src)
+	if(!target)
+		target = src
+	if(location)
+		explosion(location, -1, -1, 2, 3)
+
+	if(target)
+		if (istype(target, /turf/simulated/wall))
+			var/turf/simulated/wall/W = target
+			W.dismantle_wall(1)
+		else if(istype(target, /mob/living))
+			target.ex_act(2) // c4 can't gib mobs anymore.
+		else
+			target.ex_act(1)
+	if(target)
+		target.overlays -= image_overlay
+	del(src) // qdel
 
 /obj/item/weapon/plastique/attack(mob/M as mob, mob/user as mob, def_zone)
-	return
+	return