Merge branch 'master' into donoritemmodularization

code/game/machinery/computer/arcade.dm

@@ -229,7 +229,6 @@
 			playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
 
 			if(emagged)
-				SSblackbox.inc("arcade_win_emagged")
 				new /obj/effect/spawner/newbomb/timer/syndicate(loc)
 				new /obj/item/clothing/head/collectable/petehat(loc)
 				message_admins("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.")
@@ -237,8 +236,9 @@
 				Reset()
 				emagged = FALSE
 			else
-				SSblackbox.inc("arcade_win_normal")
 				prizevend()
+			SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("win", (emagged ? "emagged":"normal")))
+
 
 	else if (emagged && (turtle >= 4))
 		var/boomamt = rand(5,10)
@@ -259,10 +259,8 @@
 			temp = "You have been drained! GAME OVER"
 			playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10)
 			if(emagged)
-				SSblackbox.inc("arcade_loss_mana_emagged")
 				usr.gib()
-			else
-				SSblackbox.inc("arcade_loss_mana_normal")
+			SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (emagged ? "emagged":"normal")))
 
 	else if ((enemy_hp <= 10) && (enemy_mp > 4))
 		temp = "[enemy_name] heals for 4 health!"
@@ -281,10 +279,8 @@
 		temp = "You have been crushed! GAME OVER"
 		playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10)
 		if(emagged)
-			SSblackbox.inc("arcade_loss_hp_emagged")
 			usr.gib()
-		else
-			SSblackbox.inc("arcade_loss_hp_normal")
+		SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (emagged ? "emagged":"normal"))) 
 
 	blocked = FALSE
 	return

code/game/machinery/computer/camera_advanced.dm

@@ -43,6 +43,7 @@
 	for(var/V in actions)
 		var/datum/action/A = V
 		A.Remove(user)
+	actions.Cut()
 	if(user.client)
 		user.reset_perspective(null)
 		eyeobj.RemoveImages()
@@ -62,6 +63,7 @@
 		current_user.unset_machine()
 	if(eyeobj)
 		qdel(eyeobj)
+	QDEL_LIST(actions)
 	return ..()
 
 /obj/machinery/computer/camera_advanced/on_unset_machine(mob/M)

code/game/machinery/computer/communications.dm

@@ -115,11 +115,6 @@
 						//Only notify the admins if an actual change happened
 						log_game("[key_name(usr)] has changed the security level to [get_security_level()].")
 						message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
-						switch(GLOB.security_level)
-							if(SEC_LEVEL_GREEN)
-								SSblackbox.inc("alert_comms_green",1)
-							if(SEC_LEVEL_BLUE)
-								SSblackbox.inc("alert_comms_blue",1)
 					tmp_alertlevel = 0
 				else
 					to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
@@ -178,7 +173,7 @@
 								SSshuttle.points -= S.credit_cost
 								minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
 								message_admins("[key_name_admin(usr)] purchased [S.name].")
-								SSblackbox.add_details("shuttle_purchase", S.name)
+								SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
 							else
 								to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
 						else
@@ -387,11 +382,6 @@
 				//Only notify the admins if an actual change happened
 				log_game("[key_name(usr)] has changed the security level to [get_security_level()].")
 				message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
-				switch(GLOB.security_level)
-					if(SEC_LEVEL_GREEN)
-						SSblackbox.inc("alert_comms_green",1)
-					if(SEC_LEVEL_BLUE)
-						SSblackbox.inc("alert_comms_blue",1)
 			tmp_alertlevel = 0
 			aistate = STATE_DEFAULT
 		if("ai-changeseclevel")

code/game/machinery/computer/dna_console.dm

@@ -75,9 +75,9 @@
 	popup.add_stylesheet("scannernew", 'html/browser/scannernew.css')
 
 	var/mob/living/carbon/viable_occupant
-	var/occupant_status = "<div class='line'><div class='statusLabel'>Subject Status:</div><div class='statusValue'>"
+	var/list/occupant_status = list("<div class='line'><div class='statusLabel'>Subject Status:</div><div class='statusValue'>")
 	var/scanner_status
-	var/temp_html
+	var/list/temp_html = list()
 	if(connected && connected.is_operational())
 		if(connected.occupant)	//set occupant_status message
 			viable_occupant = connected.occupant
@@ -117,9 +117,9 @@
 		occupant_status += "<span class='bad'>----</span></div></div>"
 		scanner_status += "<span class='bad'>Error: No scanner detected</span>"
 
-	var/status = "<div class='statusDisplay'>"
+	var/list/status = list("<div class='statusDisplay'>")
 	status += "<div class='line'><div class='statusLabel'>Scanner:</div><div class='statusValue'>[scanner_status]</div></div>"
-	status += "[occupant_status]"
+	status += occupant_status
 
 
 	status += "<div class='line'><h3>Radiation Emitter Status</h3></div>"
@@ -143,7 +143,7 @@
 	status += "<div class='line'><div class='statusLabel'>Pulse Duration:</div><div class='statusValue'>[radduration]</div></div>"
 	status += "<div class='line'><div class='statusLabel'>&nbsp;&nbsp;\> Accuracy:</div><div class='statusValue'>[chance_to_hit]</div></div>"
 	status += "<br></div>" // Close statusDisplay div
-	var/buttons = "<a href='?src=[REF(src)];'>Scan</a> "
+	var/list/buttons = list("<a href='?src=[REF(src)];'>Scan</a> ")
 	if(connected)
 		buttons += " <a href='?src=[REF(src)];task=toggleopen;'>[connected.state_open ? "Close" : "Open"] Scanner</a> "
 		if (connected.state_open)
@@ -304,7 +304,7 @@
 				temp_html += "----"
 			temp_html += "</div></div></div>"
 
-	popup.set_content(temp_html)
+	popup.set_content(temp_html.Join())
 	popup.open()
 
 

code/game/machinery/computer/robot.dm

@@ -3,7 +3,7 @@
 
 /obj/machinery/computer/robotics
 	name = "robotics control console"
-	desc = "Used to remotely lockdown or detonate linked Cyborgs."
+	desc = "Used to remotely lockdown or detonate linked Cyborgs and Drones."
 	icon_screen = "robot"
 	icon_keyboard = "rd_key"
 	req_access = list(ACCESS_ROBOTICS)

code/game/machinery/computer/telecrystalconsoles.dm

@@ -33,7 +33,8 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	if(uplinkholder)
 		to_chat(user, "<span class='notice'>[src] already has an uplink in it.</span>")
 		return
-	if(I.hidden_uplink)
+	GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, I)
+	if(hidden_uplink)
 		if(!user.transferItemToLoc(I, src))
 			return
 		uplinkholder = I
@@ -56,26 +57,28 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 
 /obj/machinery/computer/telecrystals/uplinker/proc/donateTC(amt, addLog = 1)
 	if(uplinkholder && linkedboss)
+		GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, uplinkholder)
 		if(amt < 0)
-			linkedboss.storedcrystals += uplinkholder.hidden_uplink.telecrystals
+			linkedboss.storedcrystals += hidden_uplink.telecrystals
 			if(addLog)
-				linkedboss.logTransfer("[src] donated [uplinkholder.hidden_uplink.telecrystals] telecrystals to [linkedboss].")
-			uplinkholder.hidden_uplink.telecrystals = 0
-		else if(amt <= uplinkholder.hidden_uplink.telecrystals)
-			uplinkholder.hidden_uplink.telecrystals -= amt
+				linkedboss.logTransfer("[src] donated [hidden_uplink.telecrystals] telecrystals to [linkedboss].")
+			hidden_uplink.telecrystals = 0
+		else if(amt <= hidden_uplink.telecrystals)
+			hidden_uplink.telecrystals -= amt
 			linkedboss.storedcrystals += amt
 			if(addLog)
 				linkedboss.logTransfer("[src] donated [amt] telecrystals to [linkedboss].")
 
 /obj/machinery/computer/telecrystals/uplinker/proc/giveTC(amt, addLog = 1)
 	if(uplinkholder && linkedboss)
+		GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, uplinkholder)
 		if(amt < 0)
-			uplinkholder.hidden_uplink.telecrystals += linkedboss.storedcrystals
+			hidden_uplink.telecrystals += linkedboss.storedcrystals
 			if(addLog)
 				linkedboss.logTransfer("[src] received [linkedboss.storedcrystals] telecrystals from [linkedboss].")
 			linkedboss.storedcrystals = 0
 		else if(amt <= linkedboss.storedcrystals)
-			uplinkholder.hidden_uplink.telecrystals += amt
+			hidden_uplink.telecrystals += amt
 			linkedboss.storedcrystals -= amt
 			if(addLog)
 				linkedboss.logTransfer("[src] received [amt] telecrystals from [linkedboss].")
@@ -95,7 +98,8 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 		dat += "No linked management consoles detected. Scan for uplink stations using the management console.<BR><BR>"
 
 	if(uplinkholder)
-		dat += "[uplinkholder.hidden_uplink.telecrystals] telecrystals remain in this uplink.<BR>"
+		GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, uplinkholder)
+		dat += "[hidden_uplink.telecrystals] telecrystals remain in this uplink.<BR>"
 		if(linkedboss)
 			dat += "Donate TC: <a href='byond://?src=[REF(src)];donate=1'>1</a> | <a href='byond://?src=[REF(src)];donate=5'>5</a> | <a href='byond://?src=[REF(src)];donate=-1'>All</a>"
 		dat += "<br><a href='byond://?src=[REF(src)];eject=1'>Eject Uplink</a>"
@@ -175,7 +179,8 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	for(var/obj/machinery/computer/telecrystals/uplinker/A in TCstations)
 		dat += "[A.name] | "
 		if(A.uplinkholder)
-			dat += "[A.uplinkholder.hidden_uplink.telecrystals] telecrystals."
+			GET_COMPONENT_FROM(hidden_uplink, /datum/component/uplink, A.uplinkholder)
+			dat += "[hidden_uplink.telecrystals] telecrystals."
 		if(storedcrystals)
 			dat+= "<BR>Add TC: <a href ='?src=[REF(src)];target=[REF(A)];give=1'>1</a> | <a href ='?src=[REF(src)];target=[REF(A)];give=5'>5</a> | <a href ='?src=[REF(src)];target=[REF(A)];give=10'>10</a> | <a href ='?src=[REF(src)];target=[REF(A)];give=-1'>All</a>"
 		dat += "<BR>"

code/game/machinery/doors/airlock.dm

@@ -49,6 +49,7 @@
 	var/normal_integrity = AIRLOCK_INTEGRITY_N
 	integrity_failure = 70
 	damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N
+	interact_open = TRUE
 
 	var/security_level = 0 //How much are wires secured
 	var/aiControlDisabled = 0 //If 1, AI control is disabled until the AI hacks back in and disables the lock. If 2, the AI has bypassed the lock. If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in.
@@ -118,8 +119,8 @@
 	if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL)
 		damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R
 	prepare_huds()
-	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
-	diag_hud.add_to_hud(src)
+	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
+		diag_hud.add_to_hud(src)
 	diag_hud_set_electrified()
 
 	return INITIALIZE_HINT_LATELOAD
@@ -241,8 +242,8 @@
 		for(var/obj/machinery/doorButtons/D in GLOB.machines)
 			D.removeMe(src)
 	qdel(note)
-	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
-	diag_hud.remove_from_hud(src)
+	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
+		diag_hud.remove_from_hud(src)
 	return ..()
 
 /obj/machinery/door/airlock/handle_atom_del(atom/A)

code/game/machinery/doors/door.dm

@@ -255,12 +255,15 @@
 		return 1
 	if(operating)
 		return
+	if(welded)
+		return
 	if(safe)
 		for(var/atom/movable/M in get_turf(src))
 			if(M.density && M != src) //something is blocking the door
 				if(autoclose)
 					addtimer(CALLBACK(src, .proc/autoclose), 60)
 				return
+
 	operating = TRUE
 
 	do_animate("closing")

code/game/machinery/exonet_node.dm

@@ -1,106 +0,0 @@
-/obj/machinery/exonet_node
-	name = "exonet node"
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "exonet_node"
-	idle_power_usage = 25
-	var/on = TRUE
-	var/toggle = TRUE
-	density = TRUE
-	anchored = TRUE
-	circuit = /obj/item/circuitboard/machine/exonet_node
-	max_integrity = 300
-	integrity_failure = 100
-	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
-	desc = "This machine is exonet node."
-	var/list/logs = list() // Gets written to by exonet's send_message() function.
-	var/opened = FALSE
-
-/obj/machinery/exonet_node/Initialize()
-	. = ..()
-	SScircuit.all_exonet_nodes += src
-
-/obj/machinery/exonet_node/Destroy()
-	SScircuit.all_exonet_nodes -= src
-	return ..()
-
-/obj/machinery/exonet_node/proc/is_operating()
-	return on && !stat
-
-// Proc: update_icon()
-// Parameters: None
-// Description: Self explanatory.
-/obj/machinery/exonet_node/update_icon()
-	icon_state = "[initial(icon_state)][on? "" : "_off"]"
-
-// Proc: update_power()
-// Parameters: None
-// Description: Sets the device on/off and adjusts power draw based on stat and toggle variables.
-/obj/machinery/exonet_node/proc/update_power()
-	on = is_operational() && toggle
-	use_power = on
-	update_icon()
-
-// Proc: emp_act()
-// Parameters: 1 (severity - how strong the EMP is, with lower numbers being stronger)
-// Description: Shuts off the machine for awhile if an EMP hits it.  Ion anomalies also call this to turn it off.
-/obj/machinery/exonet_node/emp_act(severity)
-	if(!(stat & EMPED))
-		stat |= EMPED
-		var/duration = (300 * 10)/severity
-		addtimer(CALLBACK(src, /obj/machinery/exonet_node/proc/unemp_act), rand(duration - 20, duration + 20))
-	update_icon()
-	..()
-
-/obj/machinery/exonet_node/proc/unemp_act(severity)
-	stat &= ~EMPED
-
-// Proc: attackby()
-// Parameters: 2 (I - the item being whacked against the machine, user - the person doing the whacking)
-// Description: Handles deconstruction.
-/obj/machinery/exonet_node/attackby(obj/item/I, mob/user)
-	if(istype(I, /obj/item/screwdriver))
-		default_deconstruction_screwdriver(user, I)
-	else if(istype(I, /obj/item/crowbar))
-		default_deconstruction_crowbar(user, I)
-	else
-		return ..()
-
-// Proc: attack_ai()
-// Parameters: 1 (user - the AI clicking on the machine)
-// Description: Redirects to attack_hand()
-/obj/machinery/exonet_node/attack_ai(mob/user)
-	ui_interact(user)
-
-
-/obj/machinery/exonet_node/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, var/force_open = 1,datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "exonet_node", name, 600, 300, master_ui, state)
-		ui.open()
-
-/obj/machinery/exonet_node/ui_data(mob/user)
-	var/list/data = list()
-	data["toggle"] = toggle
-	data["logs"] = logs
-	return data
-
-/obj/machinery/exonet_node/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("toggle_power")
-			toggle = !toggle
-			update_power()
-			if(!toggle)
-				investigate_log("has been turned off by [key_name(usr)].", INVESTIGATE_EXONET)
-			. = TRUE
-	update_icon()
-	add_fingerprint(usr)
-
-// Proc: get_exonet_node()
-// Parameters: None
-// Description: Helper proc to get a reference to an Exonet node.
-
-/obj/machinery/exonet_node/proc/write_log(var/origin_address, var/target_address, var/data_type, var/content)
-	var/msg = "[time2text(world.time, "hh:mm:ss")] | FROM [origin_address] TO [target_address] | TYPE: [data_type] | CONTENT: [content]"
-	logs.Add(msg)

code/game/machinery/hologram.dm

@@ -47,6 +47,12 @@ Possible to do for anyone motivated enough:
 	var/temp = ""
 	var/list/holo_calls	//array of /datum/holocalls
 	var/datum/holocall/outgoing_call	//do not modify the datums only check and call the public procs
+	var/obj/item/disk/holodisk/disk //Record disk
+	var/replay_mode = FALSE //currently replaying a recording
+	var/record_mode = FALSE //currently recording
+	var/record_start = 0  	//recording start time
+	var/record_user			//user that inititiated the recording
+	var/obj/effect/overlay/holo_pad_hologram/replay_holo	//replay hologram
 	var/static/force_answer_call = FALSE	//Calls will be automatically answered after a couple rings, here for debugging
 	var/static/list/holopads = list()
 
@@ -64,6 +70,14 @@ Possible to do for anyone motivated enough:
 
 	for (var/I in masters)
 		clear_holo(I)
+
+	if(replay_mode)
+		replay_stop()
+	if(record_mode)
+		record_stop()
+	
+	QDEL_NULL(disk)
+
 	holopads -= src
 	return ..()
 
@@ -72,6 +86,10 @@ Possible to do for anyone motivated enough:
 		stat &= ~NOPOWER
 	else
 		stat |= NOPOWER
+		if(replay_mode)
+			replay_stop()
+		if(record_mode)
+			record_stop()
 		if(outgoing_call)
 			outgoing_call.ConnectionFailure(src)
 
@@ -101,6 +119,18 @@ Possible to do for anyone motivated enough:
 
 	if(default_deconstruction_crowbar(P))
 		return
+
+	if(istype(P,/obj/item/disk/holodisk))
+		if(disk)
+			to_chat(user,"<span class='notice'>There's already a disk inside [src]</span>")
+			return
+		if (!user.transferItemToLoc(P,src))
+			return
+		to_chat(user,"<span class='notice'>You insert [P] into [src]</span>")
+		disk = P
+		updateDialog()
+		return
+
 	return ..()
 
 /obj/machinery/holopad/AltClick(mob/living/carbon/human/user)
@@ -122,6 +152,17 @@ Possible to do for anyone motivated enough:
 	else
 		dat = "<a href='?src=[REF(src)];AIrequest=1'>Request an AI's presence.</a><br>"
 		dat += "<a href='?src=[REF(src)];Holocall=1'>Call another holopad.</a><br>"
+		if(disk)
+			if(disk.record)
+				//Replay
+				dat += "<a href='?src=[REF(src)];replay_start=1'>Replay disk recording.</a><br>"
+				//Clear
+				dat += "<a href='?src=[REF(src)];record_clear=1'>Clear disk recording.</a><br>"
+			else
+				//Record
+				dat += "<a href='?src=[REF(src)];record_start=1'>Start new recording.</a><br>"
+			//Eject
+			dat += "<a href='?src=[REF(src)];disk_eject=1'>Eject disk.</a><br>"
 
 		if(LAZYLEN(holo_calls))
 			dat += "=====================================================<br>"
@@ -145,7 +186,7 @@ Possible to do for anyone motivated enough:
 				dat += "<a href='?src=[REF(src)];disconnectcall=[REF(HC)]'>Disconnect call from [HC.user].</a><br>"
 
 
-	var/datum/browser/popup = new(user, "holopad", name, 300, 130)
+	var/datum/browser/popup = new(user, "holopad", name, 300, 150)
 	popup.set_content(dat)
 	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
 	popup.open()
@@ -215,6 +256,22 @@ Possible to do for anyone motivated enough:
 		temp = ""
 		if(outgoing_call)
 			outgoing_call.Disconnect()
+	
+	else if(href_list["disk_eject"])
+		if(disk && !replay_mode)
+			disk.forceMove(drop_location())
+			disk = null
+	
+	else if(href_list["replay_stop"])
+		replay_stop()
+	else if(href_list["replay_start"])
+		replay_start()
+	else if(href_list["record_start"])
+		record_start(usr)
+	else if(href_list["record_stop"])
+		record_stop()
+	else if(href_list["record_clear"])
+		record_clear()
 
 	updateDialog()
 
@@ -269,6 +326,7 @@ Possible to do for anyone motivated enough:
 			else
 				playsound(src, 'sound/machines/twobeep.ogg', 100)	//bring, bring!
 
+
 /obj/machinery/holopad/proc/activate_holo(mob/living/user)
 	var/mob/living/silicon/ai/AI = user
 	if(!istype(AI))
@@ -321,15 +379,24 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	if(outgoing_call && speaker == outgoing_call.user)
 		outgoing_call.hologram.say(raw_message)
 
+	if(record_mode && speaker == record_user)
+		record_message(speaker,raw_message,message_language)
+
 /obj/machinery/holopad/proc/SetLightsAndPower()
 	var/total_users = masters.len + LAZYLEN(holo_calls)
 	use_power = total_users > 0 ? ACTIVE_POWER_USE : IDLE_POWER_USE
 	active_power_usage = HOLOPAD_PASSIVE_POWER_USAGE + (HOLOGRAM_POWER_USAGE * total_users)
-	if(total_users)
+	if(total_users || replay_mode)
 		set_light(2)
-		icon_state = "holopad1"
 	else
 		set_light(0)
+	update_icon()
+
+/obj/machinery/holopad/update_icon()
+	var/total_users = masters.len + LAZYLEN(holo_calls)
+	if(total_users || replay_mode)
+		icon_state = "holopad1"
+	else
 		icon_state = "holopad0"
 
 /obj/machinery/holopad/proc/set_holo(mob/living/user, var/obj/effect/overlay/holo_pad_hologram/h)
@@ -365,6 +432,128 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 			clear_holo(user)
 	return TRUE
 
+// RECORDED MESSAGES
+
+/obj/machinery/holopad/proc/setup_replay_holo(datum/holorecord/record)
+	var/obj/effect/overlay/holo_pad_hologram/Hologram = new(loc)//Spawn a blank effect at the location.
+	Hologram.add_overlay(record.caller_image)
+	Hologram.alpha = 170
+	Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY)
+	Hologram.dir = SOUTH //for now
+	Hologram.grant_all_languages(omnitongue=TRUE)
+	var/datum/language_holder/holder = Hologram.get_language_holder()
+	holder.selected_default_language = record.language
+	Hologram.mouse_opacity = MOUSE_OPACITY_TRANSPARENT//So you can't click on it.
+	Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
+	Hologram.anchored = TRUE//So space wind cannot drag it.
+	Hologram.name = "[record.caller_name] (Hologram)"//If someone decides to right click.
+	Hologram.set_light(2)	//hologram lighting
+	visible_message("<span class='notice'>A holographic image of [record.caller_name] flickers to life before your eyes!</span>")
+	return Hologram
+
+/obj/machinery/holopad/proc/replay_start()
+	if(!replay_mode)
+		replay_mode = TRUE
+		replay_holo = setup_replay_holo(disk.record)
+		temp = "Replaying...<br>"
+		temp += "<A href='?src=[REF(src)];replay_stop=1'>End replay.</A>"
+		SetLightsAndPower()
+		replay_entry(1)
+	return
+
+/obj/machinery/holopad/proc/replay_stop()
+	if(replay_mode)
+		replay_mode = FALSE
+		temp = null
+		QDEL_NULL(replay_holo)
+		SetLightsAndPower()
+		updateDialog()
+
+/obj/machinery/holopad/proc/record_start(mob/living/user)
+	if(!user || !disk || disk.record)
+		return
+	disk.record = new
+	record_mode = TRUE
+	record_start = world.time
+	record_user = user
+	disk.record.caller_image = get_record_icon(user)
+	temp = "Recording...<br>"
+	temp += "<A href='?src=[REF(src)];record_stop=1'>End recording.</A>"
+
+/obj/machinery/holopad/proc/get_record_icon(mob/living/user)
+	var/olddir = user.dir
+	user.setDir(SOUTH)
+	. = getFlatIcon(user)
+	user.setDir(olddir)
+
+/obj/machinery/holopad/proc/record_message(mob/living/speaker,message,language)
+	if(!record_mode)
+		return
+	//make this command so you can have multiple languages in single record
+	if(!disk.record.caller_name && istype(speaker))
+		disk.record.caller_name = speaker.name
+	if(!disk.record.language)
+		disk.record.language = language
+	else if(language != disk.record.language)
+		disk.record.entries += list(list(HOLORECORD_LANGUAGE,language))
+
+	var/current_delay = 0
+	for(var/E in disk.record.entries)
+		var/list/entry = E
+		if(entry[1] != HOLORECORD_DELAY)
+			continue
+		current_delay += entry[2]
+
+	var/time_delta = world.time - record_start - current_delay
+	
+	if(time_delta >= 1)
+		disk.record.entries += list(list(HOLORECORD_DELAY,time_delta))
+	disk.record.entries += list(list(HOLORECORD_SAY,message))
+	if(disk.record.entries.len >= HOLORECORD_MAX_LENGTH)
+		record_stop()
+
+/obj/machinery/holopad/proc/replay_entry(entry_number)
+	if(!replay_mode)
+		return
+	if(disk.record.entries.len < entry_number)
+		replay_stop()
+		return
+	var/list/entry = disk.record.entries[entry_number]
+	var/command = entry[1]
+	switch(command)
+		if(HOLORECORD_SAY)
+			var/message = entry[2]
+			if(replay_holo)
+				replay_holo.say(message)
+		if(HOLORECORD_SOUND)
+			playsound(src,entry[2],50,1)
+		if(HOLORECORD_DELAY)
+			addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2])
+			return
+		if(HOLORECORD_LANGUAGE)
+			var/datum/language_holder/holder = replay_holo.get_language_holder()
+			holder.selected_default_language = entry[2]
+		if(HOLORECORD_PRESET)
+			var/preset_type = entry[2]
+			var/datum/preset_holoimage/H = new preset_type
+			replay_holo.cut_overlays()
+			replay_holo.add_overlay(H.build_image())
+		if(HOLORECORD_RENAME)
+			replay_holo.name = entry[2] + " (Hologram)"
+	.(entry_number+1)
+
+/obj/machinery/holopad/proc/record_stop()
+	if(record_mode)
+		record_mode = FALSE
+		temp = null
+		record_user = null
+		updateDialog()
+
+/obj/machinery/holopad/proc/record_clear()
+	if(disk && disk.record)
+		QDEL_NULL(disk.record)
+	updateDialog()
+
 /obj/effect/overlay/holo_pad_hologram
 	var/mob/living/Impersonation
 	var/datum/holocall/HC

code/game/machinery/iv_drip.dm

@@ -175,7 +175,7 @@
 		return
 
 	if(beaker)
-		beaker.forceMove(get_turf(src))
+		beaker.forceMove(drop_location())
 		beaker = null
 		update_icon()
 

code/game/machinery/launch_pad.dm

@@ -155,7 +155,7 @@
 		briefcase = loc
 	else
 		log_game("[src] has been spawned without a briefcase.")
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 
 /obj/machinery/launchpad/briefcase/Destroy()
 	QDEL_NULL(briefcase)

code/game/machinery/newscaster.dm

@@ -533,7 +533,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(choice=="Confirm")
 					scan_user(usr)
 					GLOB.news_network.CreateFeedChannel(channel_name, scanned_user, c_locked)
-					SSblackbox.inc("newscaster_channels",1)
+					SSblackbox.record_feedback("text", "newscaster_channels", 1, "[channel_name]")
 					screen=5
 			updateUsrDialog()
 		else if(href_list["set_channel_receiving"])
@@ -556,7 +556,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				screen=6
 			else
 				GLOB.news_network.SubmitArticle("<font face=\"[PEN_FONT]\">[parsemarkdown(msg, usr)]</font>", scanned_user, channel_name, photo, 0, allow_comments)
-				SSblackbox.inc("newscaster_stories",1)
+				SSblackbox.record_feedback("amount", "newscaster_stories", 1)
 				screen=4
 				msg = ""
 			updateUsrDialog()
@@ -846,7 +846,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 		return
 
 /obj/machinery/newscaster/proc/print_paper()
-	SSblackbox.inc("newscaster_newspapers_printed",1)
+	SSblackbox.record_feedback("amount", "newspapers_printed", 1)
 	var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper
 	for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
 		NEWSPAPER.news_content += FC

code/game/machinery/porta_turret/portable_turret.dm

@@ -73,6 +73,8 @@
 
 	var/obj/machinery/turretid/cp = null
 
+	var/wall_turret_direction //The turret will try to shoot from a turf in that direction when in a wall
+
 /obj/machinery/porta_turret/Initialize()
 	. = ..()
 	if(!base)
@@ -503,6 +505,20 @@
 	if(!istype(T) || !istype(U))
 		return
 
+	//Wall turrets will try to find adjacent empty turf to shoot from to cover full arc
+	if(T.density)
+		if(wall_turret_direction)
+			var/turf/closer = get_step(T,wall_turret_direction)
+			if(istype(closer) && !is_blocked_turf(closer) && T.Adjacent(closer))
+				T = closer
+		else
+			var/target_dir = get_dir(T,target)
+			for(var/d in list(0,-45,45))
+				var/turf/closer = get_step(T,turn(target_dir,d))
+				if(istype(closer) && !is_blocked_turf(closer) && T.Adjacent(closer))
+					T = closer
+					break
+
 	update_icon()
 	var/obj/item/projectile/A
 	//any emagged turrets drains 2x power and uses a different projectile?
@@ -517,10 +533,13 @@
 
 
 	//Shooting Code:
-	A.preparePixelProjectile(target, src)
+	A.preparePixelProjectile(target, T)
 	A.fire()
 	return A
 
+/obj/machinery/porta_turret/shuttleRotate(rotation)
+	if(wall_turret_direction)
+		wall_turret_direction = turn(wall_turret_direction,rotation)
 
 /obj/machinery/porta_turret/proc/setState(on, mode)
 	if(controllock)

code/game/machinery/telecomms/broadcasting.dm

@@ -142,9 +142,7 @@
 
 	if(length(receive))
 		// --- This following recording is intended for research and feedback in the use of department radio channels ---
-
-		var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]"
-		SSblackbox.LogBroadcast(blackbox_msg, freq)
+		SSblackbox.LogBroadcast(freq)
 
 	sleep(50)
 	if(!QDELETED(virt)) //It could happen to YOU

code/game/machinery/vending.dm

@@ -510,7 +510,7 @@
 		if(icon_vend) //Show the vending animation if needed
 			flick(icon_vend,src)
 		new R.product_path(get_turf(src))
-		SSblackbox.add_details("vending_machine_usage","[type]|[R.product_path]")
+		SSblackbox.record_feedback("nested tally", "vending_machine_usage", 1, list("[type]", "[R.product_path]"))
 		vend_ready = 1
 		return
 
@@ -1066,7 +1066,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 					/obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/wrench = 12, /obj/item/device/t_scanner = 12,
 					/obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8,
 					/obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5,
-					/obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5, /obj/item/stock_parts/console_screen = 5)
+					/obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5)
 	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF