Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

code/game/objects/effects/decals/misc.dm

@@ -5,7 +5,7 @@
 	icon_state = "arrow"
 	layer = 16.0
 	anchored = 1
-
+	mouse_opacity = 0
 
 // Used for spray that you spray at walls, tables, hydrovats etc
 /obj/effect/decal/spraystill

code/game/objects/effects/spiders.dm

@@ -133,43 +133,40 @@
 			entry_vent = null
 	else if(entry_vent)
 		if(get_dist(src, entry_vent) <= 1)
-			if(entry_vent.network && entry_vent.network.normal_members.len)
-				var/list/vents = list()
-				for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in entry_vent.network.normal_members)
-					vents.Add(temp_vent)
-				if(!vents.len)
-					entry_vent = null
-					return
-				var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
-				if(prob(50))
-					visible_message("<B>[src] scrambles into the ventillation ducts!</B>", \
-									"<span class='notice'>You hear something squeezing through the ventilation ducts.</span>")
-
-				spawn(rand(20,60))
-					loc = exit_vent
-					var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
-					spawn(travel_time)
-
-						if(!exit_vent || exit_vent.welded)
-							loc = entry_vent
-							entry_vent = null
-							return
-
-						if(prob(50))
-							audible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>")
-						sleep(travel_time)
-
-						if(!exit_vent || exit_vent.welded)
-							loc = entry_vent
-							entry_vent = null
-							return
-						loc = exit_vent.loc
-						entry_vent = null
-						var/area/new_area = get_area(loc)
-						if(new_area)
-							new_area.Entered(src)
-			else
+			var/list/vents = list()
+			for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in entry_vent.parent.other_atmosmch)
+				vents.Add(temp_vent)
+			if(!vents.len)
 				entry_vent = null
+				return
+			var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
+			if(prob(50))
+				visible_message("<B>[src] scrambles into the ventillation ducts!</B>", \
+								"<span class='notice'>You hear something squeezing through the ventilation ducts.</span>")
+
+			spawn(rand(20,60))
+				loc = exit_vent
+				var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
+				spawn(travel_time)
+
+					if(!exit_vent || exit_vent.welded)
+						loc = entry_vent
+						entry_vent = null
+						return
+
+					if(prob(50))
+						audible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>")
+					sleep(travel_time)
+
+					if(!exit_vent || exit_vent.welded)
+						loc = entry_vent
+						entry_vent = null
+						return
+					loc = exit_vent.loc
+					entry_vent = null
+					var/area/new_area = get_area(loc)
+					if(new_area)
+						new_area.Entered(src)
 	//=================
 
 	else if(prob(33))

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

@@ -1,5 +0,0 @@
-/obj/item/device/pipe_freezer
-	name = "Pipe Freezer"
-	icon = 'icons/obj/items.dmi'
-	icon_state = "pipe_freezer"
-	item_state = "flight"

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

@@ -14,7 +14,7 @@
 	mode = pick(modes)
 
 /obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob)
-	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A))
+	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A))
 		return
 	var/obj/machinery/atmospherics/pipe/P = A
 

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

@@ -25,7 +25,16 @@
 	if(ks2type)
 		keyslot2 = new ks2type(src)
 	recalculateChannels(1)
-	
+
+/obj/item/device/radio/headset/Destroy()
+	if(keyslot1)
+		qdel(keyslot1)
+	if(keyslot2)
+		qdel(keyslot2)
+	keyslot1 = null
+	keyslot2 = null
+	return ..()
+
 /obj/item/device/radio/headset/list_channels(var/mob/user)
 	return list_secure_channels()
 
@@ -326,7 +335,7 @@
 			user.drop_item()
 			W.loc = src
 			keyslot2 = W
-			
+
 		recalculateChannels()
 	return
 

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

@@ -69,6 +69,17 @@ var/global/list/default_medbay_channels = list(
 
 	internal_channels = default_internal_channels.Copy()
 
+/obj/item/device/radio/Destroy()
+	qdel(wires)
+	wires = null
+	if(radio_controller)
+		radio_controller.remove_object(src, frequency)
+		for (var/ch_name in channels)
+			radio_controller.remove_object(src, radiochannels[ch_name])
+	patch_link = null
+	return ..()
+
+
 /obj/item/device/radio/initialize()
 	if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
 		frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)

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

@@ -13,16 +13,13 @@
 	var/playsleepseconds = 0
 	var/obj/item/device/tape/mytape
 	var/open_panel = 0
-	var/datum/wires/taperecorder/wires = null
 	var/canprint = 1
 
 
 /obj/item/device/taperecorder/New()
-	wires = new(src)
 	mytape = new /obj/item/device/tape/random(src)
 	update_icon()
 
-
 /obj/item/device/taperecorder/examine(mob/user)
 	if(..(user, 1))
 		user << "The wire panel is [open_panel ? "opened" : "closed"]."
@@ -35,14 +32,6 @@
 		mytape = I
 		user << "<span class='notice'>You insert [I] into [src].</span>"
 		update_icon()
-	else if(istype(I, /obj/item/weapon/screwdriver))
-		open_panel = !open_panel
-		user << "<span class='notice'>You [open_panel ? "open" : "close"] the wire panel.</span>"
-		if(open_panel)
-			wires.Interact(user)
-	else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler))
-		wires.Interact(user)
-
 
 /obj/item/device/taperecorder/proc/eject(mob/user)
 	if(mytape)
@@ -118,8 +107,6 @@
 		return
 	if(playing)
 		return
-	if(!wires.get_record())
-		return
 
 	if(mytape.used_capacity < mytape.max_capacity)
 		usr << "<span class='notice'>Recording started.</span>"
@@ -132,8 +119,6 @@
 		for(used, used < max)
 			if(recording == 0)
 				break
-			if(!wires.get_record())
-				break
 			mytape.used_capacity++
 			used++
 			sleep(10)
@@ -175,8 +160,6 @@
 		return
 	if(playing)
 		return
-	if(!wires.get_play())
-		return
 
 	playing = 1
 	update_icon()
@@ -186,8 +169,6 @@
 	for(var/i = 1, used < max, sleep(10 * playsleepseconds))
 		if(!mytape)
 			break
-		if(!wires.get_play())
-			break
 		if(playing == 0)
 			break
 		if(mytape.storedinfo.len < i)
@@ -250,7 +231,6 @@
 
 //empty tape recorders
 /obj/item/device/taperecorder/empty/New()
-	wires = new(src)
 	return
 
 

code/game/objects/items/robot/robot_parts.dm

@@ -78,7 +78,13 @@
 	var/obj/item/robot_parts/r_leg/r_leg = null
 	var/obj/item/robot_parts/chest/chest = null
 	var/obj/item/robot_parts/head/head = null
+
 	var/created_name = ""
+	var/mob/living/silicon/ai/forced_ai
+	var/locomotion = 1
+	var/lawsync = 1
+	var/aisync = 1
+	var/panel_locked = 1
 
 /obj/item/robot_parts/robot_suit/New()
 	..()
@@ -168,6 +174,12 @@
 		else
 			user << "\blue You need to attach a flash to it first!"
 
+	if (istype(W, /obj/item/device/multitool))
+		if(check_completion())
+			Interact(user)
+		else
+			user << "<span class='warning'>The endoskeleton must be assembled before debugging can begin!</span>"
+
 	if(istype(W, /obj/item/device/mmi))
 		var/obj/item/device/mmi/M = W
 		if(check_completion())
@@ -177,6 +189,7 @@
 			if(!M.brainmob)
 				user << "\red Sticking an empty [W] into the frame would sort of defeat the purpose."
 				return
+
 			if(!M.brainmob.key)
 				var/ghost_can_reenter = 0
 				if(M.brainmob.mind)
@@ -213,46 +226,114 @@
 			if(istype(task))
 				task.unit_completed()
 
-			O.mmi = W
+			if(M.syndiemmi)
+				aisync = 0
+				lawsync = 0
+				O.laws = new /datum/ai_laws/syndicate_override
+
 			O.invisibility = 0
+			//Transfer debug settings to new mob
 			O.custom_name = created_name
 			O.updatename("Default")
-			if(O.connected_ai)
+			O.locked = panel_locked
+			if(!aisync)
+				lawsync = 0
+				O.connected_ai = null
+			else
 				O.notify_ai(1)
+				if(forced_ai)
+					O.connected_ai = forced_ai
+			if(!lawsync && !M.syndiemmi)
+				O.lawupdate = 0
+				O.make_laws()
+				if(ticker.mode.config_tag == "malfunction") //Don't let humans get a cyborg on their side during malf, for balance reasons.
+					O.set_zeroth_law("<span class='danger'>ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*�&110010</span>")
+
 			M.brainmob.mind.transfer_to(O)
 
 			if(O.mind && O.mind.special_role)
-				O.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
+				O.mind.store_memory("As a cyborg, you must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.")
+				O << "<span class='userdanger'>You have been robotized!</span>"
+				O << "<span class='danger'>You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.</span>"
 
 			O.job = "Cyborg"
 
 			O.cell = chest.cell
-			O.cell.loc = O
+			chest.cell.loc = O
+			chest.cell = null
 			W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
-
 			// Since we "magically" installed a cell, we also have to update the correct component.
 			if(O.cell)
 				var/datum/robot_component/cell_component = O.components["power cell"]
 				cell_component.wrapped = O.cell
 				cell_component.installed = 1
+			O.mmi = W
+			O.Namepick()
 
 			feedback_inc("cyborg_birth",1)
 			callHook("borgify", list(O))
-			O.Namepick()
 
-			qdel(src)
+			src.loc = O
+
+			if(!locomotion)
+				O.lockcharge = 1
+				O.update_canmove()
+				O << "<span class='warning'>Error: Servo motors unresponsive.</span>"
+
 		else
-			user << "\blue The MMI must go in after everything else!"
+			user << "<span class='warning'>The MMI must go in after everything else!</span>"
 
-	if (istype(W, /obj/item/weapon/pen))
-		var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name, MAX_NAME_LEN)
-		if (!t)
-			return
-		if (!in_range(src, usr) && src.loc != usr)
+	if(istype(W,/obj/item/weapon/pen))
+		user << "<span class='warning'>You need to use a multitool to name [src]!</span>"
+	return
+
+/obj/item/robot_parts/robot_suit/proc/Interact(mob/user)
+			var/t1 = text("Designation: <A href='?src=\ref[];Name=1'>[(created_name ? "[created_name]" : "Default Cyborg")]</a><br>\n",src)
+			t1 += text("Master AI: <A href='?src=\ref[];Master=1'>[(forced_ai ? "[forced_ai.name]" : "Automatic")]</a><br><br>\n",src)
+
+			t1 += text("LawSync Port: <A href='?src=\ref[];Law=1'>[(lawsync ? "Open" : "Closed")]</a><br>\n",src)
+			t1 += text("AI Connection Port: <A href='?src=\ref[];AI=1'>[(aisync ? "Open" : "Closed")]</a><br>\n",src)
+			t1 += text("Servo Motor Functions: <A href='?src=\ref[];Loco=1'>[(locomotion ? "Unlocked" : "Locked")]</a><br>\n",src)
+			t1 += text("Panel Lock: <A href='?src=\ref[];Panel=1'>[(panel_locked ? "Engaged" : "Disengaged")]</a><br>\n",src)
+			var/datum/browser/popup = new(user, "robotdebug", "Cyborg Boot Debug", 310, 220)
+			popup.set_content(t1)
+			popup.open()
+
+/obj/item/robot_parts/robot_suit/Topic(href, href_list)
+	if(usr.lying || usr.stat || usr.stunned || !Adjacent(usr))
+		return
+
+	var/mob/living/living_user = usr
+	var/obj/item/item_in_hand = living_user.get_active_hand()
+	if(!istype(item_in_hand, /obj/item/device/multitool))
+		living_user << "<span class='warning'>You need a multitool!</span>"
+		return
+
+	if(href_list["Name"])
+		var/new_name = reject_bad_name(input(usr, "Enter new designation. Set to blank to reset to default.", "Cyborg Debug", src.created_name),1)
+		if(!in_range(src, usr) && src.loc != usr)
 			return
+		if(new_name)
+			created_name = new_name
+		else
+			created_name = ""
 
-		src.created_name = t
+	else if(href_list["Master"])
+		forced_ai = select_active_ai(usr)
+		if(!forced_ai)
+			usr << "<span class='error'>No active AIs detected.</span>"
 
+	else if(href_list["Law"])
+		lawsync = !lawsync
+	else if(href_list["AI"])
+		aisync = !aisync
+	else if(href_list["Loco"])
+		locomotion = !locomotion
+	else if(href_list["Panel"])
+		panel_locked = !panel_locked
+
+	add_fingerprint(usr)
+	Interact(usr)
 	return
 
 /obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob, params)

code/game/objects/items/toys.dm

@@ -1350,3 +1350,68 @@ obj/item/toy/cards/deck/syndicate/black
 		user << "<span class='warning'>The string on [src] hasn't rewound all the way!</span>"
 		return
 
+/obj/item/toy/russian_revolver
+	name = "russian revolver"
+	desc = "for fun and games!"
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "detective_gold"
+	item_state = "gun"
+	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+	flags =  CONDUCT
+	slot_flags = SLOT_BELT
+	materials = list(MAT_METAL=2000)
+	w_class = 3.0
+	throwforce = 5
+	throw_speed = 4
+	throw_range = 5
+	force = 5.0
+	origin_tech = "combat=1"
+	attack_verb = list("struck", "hit", "bashed")
+	var/bullet_position = 1
+	var/is_empty = 0
+
+/obj/item/toy/russian_revolver/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] quickly loads six bullets into the [src.name]'s cylinder and points it at \his head before pulling the trigger! It looks like they are trying to commit suicide.</span>")
+	playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1)
+	return (BRUTELOSS)
+
+/obj/item/toy/russian_revolver/New()
+	spin_cylinder()
+	..()
+
+
+/obj/item/toy/russian_revolver/attack_self(mob/user)
+	if(is_empty)
+		user.visible_message("<span class='warning'>[user] loads a bullet into the [src]'s cylinder.</span>")
+		is_empty = 0
+	else
+		spin_cylinder()
+		user.visible_message("<span class='warning'>[user] spins the cylinder on the [src]!</span>")
+
+
+/obj/item/toy/russian_revolver/attack(mob/living/carbon/M, mob/user)
+	if(M != user) //can't use this on other people
+		return
+	if(is_empty)
+		user << "<span class='notice'>The [src] is empty.</span>"
+		return
+	user.visible_message("<span class='danger'>[user] points the [src] at their head, ready to pull the trigger!</span>")
+	if(do_after(user, 30, target = M))
+		if(bullet_position != 1)
+			user.visible_message("<span class='danger'>*click*</span>")
+			playsound(src, 'sound/weapons/empty.ogg', 100, 1)
+			bullet_position -= 1
+			return
+		if(bullet_position == 1)
+			is_empty = 1
+			playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
+			user.visible_message("<span class='danger'>The [src] goes off!</span>")
+			M.apply_damage(200, "brute", "head", used_weapon = "Self-inflicted gunshot would to the head.", sharp=1)
+			M.death()
+	else
+		user.visible_message("<span class='danger'>[user] lowers the [src] from their head.</span>")
+
+
+/obj/item/toy/russian_revolver/proc/spin_cylinder()
+	bullet_position = rand(1,6)

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

@@ -17,6 +17,12 @@
 	wires = new(src)
 	..()
 
+/obj/item/weapon/c4/Destroy()
+	qdel(wires)
+	wires = null
+	target = null
+	return ..()
+
 /obj/item/weapon/c4/suicide_act(var/mob/user)
 	. = (BRUTELOSS)
 	viewers(user) << "<span class='suicide'>[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!</span>"

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -13,6 +13,10 @@
 		src.smoke = new /datum/effect/effect/system/bad_smoke_spread
 		src.smoke.attach(src)
 
+	Destroy()
+		qdel(smoke)
+		return ..()
+
 	prime()
 		playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 		src.smoke.set_up(10, 0, usr.loc)

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

@@ -49,15 +49,16 @@
 			return ..()
 
 	if (reagents.total_volume > 0)
-		reagents.trans_to_ingest(M, reagents.total_volume)
 		if(M == user)
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\blue [] eats some [] from \the [].", user, loaded, src), 1)
-				M.reagents.add_reagent("nutriment", 1)
+			M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>")
+			reagents.trans_to_ingest(M, reagents.total_volume)
 		else
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\blue [] feeds [] some [] from \the []", user, M, loaded, src), 1)
-				M.reagents.add_reagent("nutriment", 1)
+			M.visible_message("<span class='warning'>\The [user] attempts to feed some [loaded] to \the [M] with \the [src].</span>")
+			if(!do_mob(user, M)) return
+			M.visible_message("<span class='warning'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>")
+			reagents.trans_to_ingest(M, reagents.total_volume)
+			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been utensil fed by [user.name] ([user.ckey]) with [src.name]</font>")
+			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Utensil fed [M.name] ([M.ckey]) with [src.name]</font>")
 		playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
 		overlays.Cut()
 		return

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

@@ -285,7 +285,7 @@
 	new /obj/item/weapon/FixOVein(src)
 	new /obj/item/clothing/suit/straight_jacket(src)
 	new /obj/item/clothing/mask/muzzle(src)
-//	new /obj/item/device/mmi/syndie(src)
+	new /obj/item/device/mmi/syndie(src)
 
 /obj/item/weapon/storage/backpack/duffel/captain
 	name = "captain's duffelbag"

code/game/objects/structures/displaycase.dm

@@ -309,3 +309,5 @@ var/global/list/captain_display_cases = list()
 				"You gently run your hands over \the [src] in appreciation of its contents.", \
 				"You hear someone streaking glass with their greasy hands.")
 
+#undef DISPLAYCASE_FRAME_CIRCUIT
+#undef DISPLAYCASE_FRAME_SCREWDRIVER

code/game/objects/structures/musician.dm

@@ -21,7 +21,8 @@
 
 /datum/song/Destroy()
 	instrumentObj = null
-	return ..()
+	..()
+	return QDEL_HINT_QUEUE
 
 // note is a number from 1-7 for A-G
 // acc is either "b", "n", or "#"

code/game/objects/structures/tables_racks.dm

@@ -945,4 +945,16 @@
 
 /obj/structure/rack/proc/healthcheck()
 	if(health <= 0)
-		destroy()
+		destroy()
+
+/obj/structure/rack/skeletal_bar
+	name = "skeletal minibar"
+	desc = "Made with the skulls of the fallen."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "minibar"
+
+/obj/structure/rack/skeletal_bar/left
+	icon_state = "minibar_left"
+
+/obj/structure/rack/skeletal_bar/right
+	icon_state = "minibar_right"