Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.

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

@@ -163,6 +163,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/shaftminer
 	icon_state = "pda-miner"
+	default_cartridge = /obj/item/weapon/cartridge/miner
 
 /obj/item/device/pda/syndicate
 	default_cartridge = /obj/item/weapon/cartridge/syndicate
@@ -172,6 +173,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	hidden = 1
 
 /obj/item/device/pda/chaplain
+	default_cartridge = /obj/item/weapon/cartridge/service
 	icon_state = "pda-holy"
 	ttone = "holy"
 
@@ -181,13 +183,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	ttone = "..."
 
 /obj/item/device/pda/botanist
-	//default_cartridge = /obj/item/weapon/cartridge/botanist
+	default_cartridge = /obj/item/weapon/cartridge/service
 	icon_state = "pda-hydro"
 
 /obj/item/device/pda/roboticist
+	default_cartridge = /obj/item/weapon/cartridge/signal/science
 	icon_state = "pda-robot"
 
 /obj/item/device/pda/librarian
+	default_cartridge = /obj/item/weapon/cartridge/service
 	icon_state = "pda-libb"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader."
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
@@ -200,9 +204,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
 
 /obj/item/device/pda/chef
+	default_cartridge = /obj/item/weapon/cartridge/service
 	icon_state = "pda-chef"
 
 /obj/item/device/pda/bar
+	default_cartridge = /obj/item/weapon/cartridge/service
 	icon_state = "pda-bar"
 
 /obj/item/device/pda/atmos
@@ -304,6 +310,99 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	ttone = "assist"
 
 
+// Used for the PDA multicaster, which mirrors messages sent to it to a specific department,
+/obj/item/device/pda/multicaster
+	ownjob = "Relay"
+	icon_state = "NONE"
+	ttone = "data"
+	detonate = 0
+	news_silent = 1
+	var/list/cartridges_to_send_to = list()
+
+// This is what actually mirrors the message,
+/obj/item/device/pda/multicaster/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
+	if(sender)
+		var/list/targets = list()
+		for(var/obj/item/device/pda/pda in PDAs)
+			if(pda.cartridge && pda.owner && is_type_in_list(pda.cartridge, cartridges_to_send_to))
+				targets |= pda
+		if(targets.len)
+			for(var/obj/item/device/pda/target in targets)
+				create_message(target, sender, sender_job, message)
+
+// This has so much copypasta,
+/obj/item/device/pda/multicaster/create_message(var/obj/item/device/pda/P, var/original_sender, var/original_job, var/t)
+	t = sanitize(t, MAX_MESSAGE_LEN, 0)
+	t = replace_characters(t, list(""" = "\""))
+	if (!t || !istype(P))
+		return
+
+	if (isnull(P)||P.toff || toff)
+		return
+
+	last_text = world.time
+	var/datum/reception/reception = get_reception(src, P, t)
+	t = reception.message
+
+	if(reception.message_server && (reception.telecomms_reception & TELECOMMS_RECEPTION_SENDER)) // only send the message if it's stable,
+		if(reception.telecomms_reception & TELECOMMS_RECEPTION_RECEIVER == 0) // Does our recipient have a broadcaster on their level?,
+			return
+		var/send_result = reception.message_server.send_pda_message("[P.owner]","[owner]","[t]")
+		if (send_result)
+			return
+
+		P.tnote.Add(list(list("sent" = 0, "owner" = "[owner]", "job" = "[ownjob]", "message" = "[t]", "target" = "\ref[src]")))
+
+		if(!P.conversations.Find("\ref[src]"))
+			P.conversations.Add("\ref[src]")
+
+		P.new_message(src, "[original_sender] \[Relayed\]", original_job, t, 0)
+
+	else
+		return
+
+/obj/item/device/pda/multicaster/command/New()
+	..()
+	owner = "Command Department"
+	name = "Command Department (Relay)"
+	cartridges_to_send_to = command_cartridges
+
+/obj/item/device/pda/multicaster/security/New()
+	..()
+	owner = "Security Department"
+	name = "Security Department (Relay)"
+	cartridges_to_send_to = security_cartridges
+
+/obj/item/device/pda/multicaster/engineering/New()
+	..()
+	owner = "Engineering Department"
+	name = "Engineering Department (Relay)"
+	cartridges_to_send_to = engineering_cartridges
+
+/obj/item/device/pda/multicaster/medical/New()
+	..()
+	owner = "Medical Department"
+	name = "Medical Department (Relay)"
+	cartridges_to_send_to = medical_cartridges
+
+/obj/item/device/pda/multicaster/research/New()
+	..()
+	owner = "Research Department"
+	name = "Research Department (Relay)"
+	cartridges_to_send_to = research_cartridges
+
+/obj/item/device/pda/multicaster/cargo/New()
+	..()
+	owner = "Cargo Department"
+	name = "Cargo Department (Relay)"
+	cartridges_to_send_to = cargo_cartridges
+
+/obj/item/device/pda/multicaster/civilian/New()
+	..()
+	owner = "Civilian Services Department"
+	name = "Civilian Services Department (Relay)"
+	cartridges_to_send_to = civilian_cartridges
+
 /*
  *	The Actual PDA
  */
@@ -932,7 +1031,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		message += "Your [P] bleeps loudly."
 		j = prob(10)
 
-	if(j) //This kills the PDA
+	if(j && detonate) //This kills the PDA
 		qdel(P)
 		if(message)
 			message += "It melts in a puddle of plastic."
@@ -1046,8 +1145,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda/proc/new_message_from_pda(var/obj/item/device/pda/sending_device, var/message)
 	new_message(sending_device, sending_device.owner, sending_device.ownjob, message)
 
-/obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
-	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>)"
+/obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message, var/reply = 1)
+	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" ([reply ? "<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>" : "Unable to Reply"])"
 	new_info(message_silent, ttone, reception_message)
 
 	log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")

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

@@ -1,3 +1,48 @@
+var/list/command_cartridges = list(
+	/obj/item/weapon/cartridge/captain,
+	/obj/item/weapon/cartridge/hop,
+	/obj/item/weapon/cartridge/hos,
+	/obj/item/weapon/cartridge/ce,
+	/obj/item/weapon/cartridge/rd,
+	/obj/item/weapon/cartridge/head,
+	/obj/item/weapon/cartridge/lawyer // Internal Affaris,
+	)
+
+var/list/security_cartridges = list(
+	/obj/item/weapon/cartridge/security,
+	/obj/item/weapon/cartridge/detective,
+	/obj/item/weapon/cartridge/hos
+	)
+
+var/list/engineering_cartridges = list(
+	/obj/item/weapon/cartridge/engineering,
+	/obj/item/weapon/cartridge/atmos,
+	/obj/item/weapon/cartridge/ce
+	)
+
+var/list/medical_cartridges = list(
+	/obj/item/weapon/cartridge/medical,
+	/obj/item/weapon/cartridge/chemistry,
+	/obj/item/weapon/cartridge/cmo
+	)
+
+var/list/research_cartridges = list(
+	/obj/item/weapon/cartridge/signal/science,
+	/obj/item/weapon/cartridge/rd
+	)
+
+var/list/cargo_cartridges = list(
+	/obj/item/weapon/cartridge/quartermaster, // This also covers cargo-techs, apparently,
+	/obj/item/weapon/cartridge/miner,
+	/obj/item/weapon/cartridge/hop
+	)
+
+var/list/civilian_cartridges = list(
+	/obj/item/weapon/cartridge/janitor,
+	/obj/item/weapon/cartridge/service,
+	/obj/item/weapon/cartridge/hop
+	)
+
 /obj/item/weapon/cartridge
 	name = "generic cartridge"
 	desc = "A data cartridge for portable microcomputers."
@@ -98,6 +143,10 @@
 	access_flora = 1
 */
 
+/obj/item/weapon/cartridge/service
+	name = "\improper Serv-U Pro"
+	desc = "A data cartridge designed to serve YOU!"
+
 /obj/item/weapon/cartridge/signal
 	name = "generic signaler cartridge"
 	desc = "A data cartridge with an integrated radio signaler module."
@@ -124,6 +173,11 @@
 	icon_state = "cart-q"
 	access_quartermaster = 1
 
+/obj/item/weapon/cartridge/miner
+	name = "\improper Drill-Jockey 4.5"
+	desc = "It's covered in some sort of sand."
+	icon_state = "cart-q"
+
 /obj/item/weapon/cartridge/head
 	name = "\improper Easy-Record DELUXE"
 	icon_state = "cart-h"

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

@@ -60,6 +60,10 @@
 		else	//can only use it  5 times a minute
 			user << "<span class='warning'>*click* *click*</span>"
 			return
+
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.do_attack_animation(M)
+
 	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
 	var/flashfail = 0
 
@@ -112,6 +116,7 @@
 
 /obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
 	if(!user || !clown_check(user)) 	return
+
 	if(broken)
 		user.show_message("<span class='warning'>The [src.name] is broken</span>", 2)
 		return
@@ -131,6 +136,7 @@
 		else	//can only use it  5 times a minute
 			user.show_message("<span class='warning'>*click* *click*</span>", 2)
 			return
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
 	flick("flash2", src)
 	if(user && isrobot(user))

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

@@ -0,0 +1,100 @@
+/obj/item/device/multitool/hacktool
+	var/is_hacking = 0
+	var/max_known_targets
+
+	var/in_hack_mode = 0
+	var/list/known_targets
+	var/list/supported_types
+	var/datum/topic_state/default/must_hack/hack_state
+
+/obj/item/device/multitool/hacktool/New()
+	..()
+	known_targets = list()
+	max_known_targets = 5 + rand(1,3)
+	supported_types = list(/obj/machinery/door/airlock)
+	hack_state = new(src)
+
+/obj/item/device/multitool/hacktool/Destroy()
+	for(var/T in known_targets)
+		var/atom/target = T
+		target.unregister(OBSERVER_EVENT_DESTROY, src)
+	known_targets.Cut()
+	qdel(hack_state)
+	hack_state = null
+	return ..()
+
+/obj/item/device/multitool/hacktool/attackby(var/obj/W, var/mob/user)
+	if(isscrewdriver(W))
+		in_hack_mode = !in_hack_mode
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+	else
+		..()
+
+/obj/item/device/multitool/hacktool/resolve_attackby(atom/A, mob/user)
+	sanity_check()
+
+	if(!in_hack_mode)
+		return ..()
+
+	if(!attempt_hack(user, A))
+		return 0
+
+	A.ui_interact(user, state = hack_state)
+	return 1
+
+/obj/item/device/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target)
+	if(is_hacking)
+		user << "<span class='warning'>You are already hacking!</span>"
+		return 0
+	if(!is_type_in_list(target, supported_types))
+		user << "\icon[src] <span class='warning'>Unable to hack this target!</span>"
+		return 0
+	var/found = known_targets.Find(target)
+	if(found)
+		known_targets.Swap(1, found)	// Move the last hacked item first
+		return 1
+
+	user << "<span class='notice'>You begin hacking \the [target]...</span>"
+	is_hacking = 1
+	// On average hackin takes ~30 seconds. Fairly small random span to avoid people simply aborting and trying again
+	var/hack_result = do_after(user, (20 SECONDS + rand(0, 10 SECONDS) + rand(0, 10 SECONDS)))
+	is_hacking = 0
+
+	if(hack_result && in_hack_mode)
+		user << "<span class='notice'>Your hacking attempt was succesful!</span>"
+		playsound(src.loc, 'sound/piano/A#6.ogg', 75)
+	else
+		user << "<span class='warning'>Your hacking attempt failed!</span>"
+		return 0
+
+	known_targets.Insert(1, target)	// Insert the newly hacked target first,
+	target.register(OBSERVER_EVENT_DESTROY, src, /obj/item/device/multitool/hacktool/proc/on_target_destroy)
+	return 1
+
+/obj/item/device/multitool/hacktool/proc/sanity_check()
+	if(max_known_targets < 1) max_known_targets = 1
+	// Cut away the oldest items if the capacity has been reached
+	if(known_targets.len > max_known_targets)
+		for(var/i = (max_known_targets + 1) to known_targets.len)
+			var/atom/A = known_targets[i]
+			A.unregister(OBSERVER_EVENT_DESTROY, src)
+		known_targets.Cut(max_known_targets + 1)
+
+/obj/item/device/multitool/hacktool/proc/on_target_destroy(var/target)
+	known_targets -= target
+
+/datum/topic_state/default/must_hack
+	var/obj/item/device/multitool/hacktool/hacktool
+
+/datum/topic_state/default/must_hack/New(var/hacktool)
+	src.hacktool = hacktool
+	..()
+
+/datum/topic_state/default/must_hack/Destroy()
+	hacktool = null
+	return ..()
+
+/datum/topic_state/default/must_hack/can_use_topic(var/src_object, var/mob/user)
+	if(!hacktool || !hacktool.in_hack_mode || !(src_object in hacktool.known_targets))
+		return STATUS_CLOSE
+	return ..()

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

@@ -20,4 +20,4 @@
 
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
-	var/obj/machinery/clonepod/connecting //same for cryopod linkage
+	var/obj/machinery/clonepod/connecting //same for cryopod linkage

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

@@ -411,6 +411,14 @@ datum/uplink_item/dd_SortValue()
 	item_cost = 3
 	path = /obj/item/weapon/card/emag
 
+/datum/uplink_item/item/tools/hacking_tool
+	name = "Door Hacking Tool"
+	item_cost = 2
+	path = /obj/item/device/multitool/hacktool
+	desc = "Appears and functions as a standard multitool until the mode is toggled by applying a screwdriver appropriately. \
+			When in hacking mode this device will grant full access to any standard airlock within 20 to 40 seconds. \
+			This device will also be able to immediately access the last 6 to 8 hacked airlocks."
+
 /datum/uplink_item/item/tools/clerical
 	name = "Morphic Clerical Kit"
 	item_cost = 3

code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm

@@ -87,3 +87,14 @@
 							/obj/item/weapon/stock_parts/subspace/crystal = 1,
 							/obj/item/weapon/stock_parts/subspace/treatment = 2,
 							/obj/item/stack/cable_coil = 2)
+
+/obj/item/weapon/circuitboard/telecomms/pda_multicaster
+	name = T_BOARD("pda multicaster")
+	build_path = "/obj/machinery/pda_multicaster"
+	origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2)
+	req_components = list(
+							/obj/item/weapon/stock_parts/subspace/ansible = 1,
+							/obj/item/weapon/stock_parts/subspace/filter = 1,
+							/obj/item/weapon/stock_parts/manipulator = 1,
+							/obj/item/weapon/stock_parts/subspace/treatment = 1,
+							/obj/item/stack/cable_coil = 2)

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

@@ -22,13 +22,13 @@
 			B.update_icon()
 
 		new/obj/effect/effect/sparks(src.loc)
-		new/obj/effect/effect/smoke/illumination(src.loc, brightness=15)
+		new/obj/effect/effect/smoke/illumination(src.loc, 5, range=30, power=30, color="#FFFFFF")
 		qdel(src)
 		return
 
 	proc/bang(var/turf/T , var/mob/living/carbon/M)					// Added a new proc called 'bang' that takes a location and a person to be banged.
 		M << "<span class='danger'>BANG</span>"						// Called during the loop that bangs people in lockers/containers and when banging
-		playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5)		// people in normal view.  Could theroetically be called during other explosions.
+		playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 30)		// people in normal view.  Could theroetically be called during other explosions.
 																	// -- Polymorph
 
 //Checking for protections

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

@@ -57,6 +57,8 @@
 	name = "fork"
 	desc = "It's a fork. Sure is pointy."
 	icon_state = "fork"
+	sharp = 1
+	edge = 0
 
 /obj/item/weapon/material/kitchen/utensil/fork/plastic
 	default_material = "plastic"

code/game/objects/items/weapons/material/misc.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/material/harpoon
 	name = "harpoon"
 	sharp = 1
-	edge = 1
+	edge = 0
 	desc = "Tharr she blows!"
 	icon_state = "harpoon"
 	item_state = "harpoon"

code/game/objects/items/weapons/material/twohanded.dm

@@ -68,7 +68,7 @@
 /obj/item/weapon/material/twohanded/update_icon()
 	icon_state = "[base_icon][wielded]"
 	item_state = icon_state
-	
+
 /obj/item/weapon/material/twohanded/dropped()
 	..()
 	if(wielded)
@@ -119,7 +119,7 @@
 	unwielded_force_divisor = 0.65 // 14 when unwielded based on above
 	thrown_force_divisor = 1.5 // 20 when thrown with weight 15 (glass)
 	throw_speed = 3
-	edge = 1
+	edge = 0
 	sharp = 1
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")

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

@@ -46,6 +46,7 @@
 	throw_range = 5
 	matter = list(DEFAULT_WALL_MATERIAL = 75)
 	attack_verb = list("stabbed")
+	sharp  = 1
 
 	suicide_act(mob/user)
 		viewers(user) << pick("<span class='danger'>\The [user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.</span>", \