Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3

# Conflicts:
#	code/game/objects/items/devices/multitool.dm

code/__defines/gamemode.dm

@@ -18,7 +18,7 @@
 #define BE_ALIEN      0x40
 #define BE_AI         0x80
 #define BE_CULTIST    0x100
-#define BE_MONKEY     0x200
+#define BE_RENEGADE   0x200
 #define BE_NINJA      0x400
 #define BE_RAIDER     0x800
 #define BE_PLANT      0x1000
@@ -37,7 +37,7 @@ var/list/be_special_flags = list(
 	"Xenomorph"        = BE_ALIEN,
 	"Positronic Brain" = BE_AI,
 	"Cultist"          = BE_CULTIST,
-	"Monkey"           = BE_MONKEY,
+	"Renegade"         = BE_RENEGADE,
 	"Ninja"            = BE_NINJA,
 	"Raider"           = BE_RAIDER,
 	"Diona"            = BE_PLANT,

code/__defines/machinery.dm

@@ -38,7 +38,7 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 #define NETWORK_ENGINEERING "Engineering"
 #define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
 #define NETWORK_ERT "ZeEmergencyResponseTeam"
-#define NETWORK_EXODUS "Northern Star"
+#define NETWORK_EXODUS station_short
 #define NETWORK_MEDICAL "Medical"
 #define NETWORK_MERCENARY "MercurialNet"
 #define NETWORK_MINE "Mining Outpost"

code/__defines/species_languages.dm

@@ -31,6 +31,7 @@
 #define LANGUAGE_TRADEBAND "Tradeband"
 #define LANGUAGE_GUTTER "Gutter"
 #define LANGUAGE_SCHECHI "Schechi"
+#define LANGUAGE_CULT "Cult"
 
 // Language flags.
 #define WHITELISTED  1   // Language is available if the speaker is whitelisted.

code/_helpers/names.dm

@@ -44,7 +44,7 @@ var/religion_name = null
 	return capitalize(name)
 
 /proc/system_name()
-	return "Vir"
+	return starsys_name
 
 /proc/station_name()
 	if (station_name)

code/_helpers/text.dm

@@ -324,4 +324,11 @@ proc/TextPreview(var/string,var/len=40)
 				return 1
 	return 0
 
+/**
+ * Strip out the special beyond characters for \proper and \improper
+ * from text that will be sent to the browser.
+ */
+/proc/strip_improper(var/text)
+	return replacetext(replacetext(text, "\proper", ""), "\improper", "")
+
 #define gender2text(gender) capitalize(gender)

code/_macros.dm

@@ -7,6 +7,8 @@
 
 #define isanimal(A) istype(A, /mob/living/simple_animal)
 
+#define isairlock(A) istype(A, /obj/machinery/door/airlock)
+
 #define isbrain(A) istype(A, /mob/living/carbon/brain)
 
 #define iscarbon(A) istype(A, /mob/living/carbon)

code/_onclick/hud/ai.dm

@@ -40,9 +40,9 @@
 	using.layer = SCREEN_LAYER
 	adding += using
 
-//Crew Monitorting
+//Crew Monitoring
 	using = new /obj/screen()
-	using.name = "Crew Monitorting"
+	using.name = "Crew Monitoring"
 	using.icon = 'icons/mob/screen_ai.dmi'
 	using.icon_state = "crew_monitor"
 	using.screen_loc = ui_ai_crew_monitor

code/_onclick/hud/screen_objects.dm

@@ -420,7 +420,7 @@
 				var/mob/living/silicon/ai/AI = usr
 				AI.toggle_camera_light()
 
-		if("Crew Monitorting")
+		if("Crew Monitoring")
 			if(isAI(usr))
 				var/mob/living/silicon/ai/AI = usr
 				AI.subsystem_crew_monitor()

code/controllers/configuration.dm

@@ -21,7 +21,7 @@ var/list/gamemode_cache = list()
 	var/log_pda = 0						// log pda messages
 	var/log_hrefs = 0					// logs all links clicked in-game. Could be used for debugging and tracking down exploits
 	var/log_runtime = 0					// logs world.log to a file
-	var/sql_enabled = 1					// for sql switching
+	var/sql_enabled = 0					// for sql switching
 	var/allow_admin_ooccolor = 0		// Allows admins with relevant permissions to have their own ooc colour
 	var/allow_vote_restart = 0 			// allow votes to restart
 	var/ert_admin_call_only = 0
@@ -289,7 +289,7 @@ var/list/gamemode_cache = list()
 					config.log_access = 1
 
 				if ("sql_enabled")
-					config.sql_enabled = text2num(value)
+					config.sql_enabled = 1
 
 				if ("log_say")
 					config.log_say = 1

code/controllers/hooks-defs.dm

@@ -1,87 +1,87 @@
-/**
- * Startup hook.
- * Called in world.dm when the server starts.
- */
-/hook/startup
-
-/**
- * Roundstart hook.
- * Called in gameticker.dm when a round starts.
- */
-/hook/roundstart
-
-/**
- * Roundend hook.
- * Called in gameticker.dm when a round ends.
- */
-/hook/roundend
-
-/**
- * Death hook.
- * Called in death.dm when someone dies.
- * Parameters: var/mob/living/carbon/human, var/gibbed
- */
-/hook/death
-
-/**
- * Cloning hook.
- * Called in cloning.dm when someone is brought back by the wonders of modern science.
- * Parameters: var/mob/living/carbon/human
- */
-/hook/clone
-
-/**
- * Debrained hook.
- * Called in brain_item.dm when someone gets debrained.
- * Parameters: var/obj/item/organ/brain
- */
-/hook/debrain
-
-/**
- * Borged hook.
- * Called in robot_parts.dm when someone gets turned into a cyborg.
- * Parameters: var/mob/living/silicon/robot
- */
-/hook/borgify
-
-/**
- * Podman hook.
- * Called in podmen.dm when someone is brought back as a Diona.
- * Parameters: var/mob/living/carbon/alien/diona
- */
-/hook/harvest_podman
-
-/**
- * Payroll revoked hook.
- * Called in Accounts_DB.dm when someone's payroll is stolen at the Accounts terminal.
- * Parameters: var/datum/money_account
- */
-/hook/revoke_payroll
-
-/**
- * Account suspension hook.
- * Called in Accounts_DB.dm when someone's account is suspended or unsuspended at the Accounts terminal.
- * Parameters: var/datum/money_account
- */
-/hook/change_account_status
-
-/**
- * Employee reassignment hook.
- * Called in card.dm when someone's card is reassigned at the HoP's desk.
- * Parameters: var/obj/item/weapon/card/id
- */
-/hook/reassign_employee
-
-/**
- * Employee terminated hook.
- * Called in card.dm when someone's card is terminated at the HoP's desk.
- * Parameters: var/obj/item/weapon/card/id
- */
-/hook/terminate_employee
-
-/**
- * Crate sold hook.
- * Called in supplyshuttle.dm when a crate is sold on the shuttle.
- * Parameters: var/obj/structure/closet/crate/sold, var/area/shuttle
- */
-/hook/sell_crate
+/**
+ * Startup hook.
+ * Called in world.dm when the server starts.
+ */
+/hook/startup
+
+/**
+ * Roundstart hook.
+ * Called in gameticker.dm when a round starts.
+ */
+/hook/roundstart
+
+/**
+ * Roundend hook.
+ * Called in gameticker.dm when a round ends.
+ */
+/hook/roundend
+
+/**
+ * Death hook.
+ * Called in death.dm when someone dies.
+ * Parameters: var/mob/living/carbon/human, var/gibbed
+ */
+/hook/death
+
+/**
+ * Cloning hook.
+ * Called in cloning.dm when someone is brought back by the wonders of modern science.
+ * Parameters: var/mob/living/carbon/human
+ */
+/hook/clone
+
+/**
+ * Debrained hook.
+ * Called in brain_item.dm when someone gets debrained.
+ * Parameters: var/obj/item/organ/brain
+ */
+/hook/debrain
+
+/**
+ * Borged hook.
+ * Called in robot_parts.dm when someone gets turned into a cyborg.
+ * Parameters: var/mob/living/silicon/robot
+ */
+/hook/borgify
+
+/**
+ * Podman hook.
+ * Called in podmen.dm when someone is brought back as a Diona.
+ * Parameters: var/mob/living/carbon/alien/diona
+ */
+/hook/harvest_podman
+
+/**
+ * Payroll revoked hook.
+ * Called in Accounts_DB.dm when someone's payroll is stolen at the Accounts terminal.
+ * Parameters: var/datum/money_account
+ */
+/hook/revoke_payroll
+
+/**
+ * Account suspension hook.
+ * Called in Accounts_DB.dm when someone's account is suspended or unsuspended at the Accounts terminal.
+ * Parameters: var/datum/money_account
+ */
+/hook/change_account_status
+
+/**
+ * Employee reassignment hook.
+ * Called in card.dm when someone's card is reassigned at the HoP's desk.
+ * Parameters: var/obj/item/weapon/card/id
+ */
+/hook/reassign_employee
+
+/**
+ * Employee terminated hook.
+ * Called in card.dm when someone's card is terminated at the HoP's desk.
+ * Parameters: var/obj/item/weapon/card/id
+ */
+/hook/terminate_employee
+
+/**
+ * Crate sold hook.
+ * Called in supplyshuttle.dm when a crate is sold on the shuttle.
+ * Parameters: var/obj/structure/closet/crate/sold, var/area/shuttle
+ */
+/hook/sell_crate

code/controllers/observer_listener/atom/observer.dm

@@ -0,0 +1,31 @@
+#define OBSERVER_EVENT_DESTROY "OnDestroy"
+
+/atom
+	var/list/observer_events
+
+/atom/Destroy()
+	var/list/destroy_listeners = get_listener_list_from_event(OBSERVER_EVENT_DESTROY)
+	if(destroy_listeners)
+		for(var/destroy_listener in destroy_listeners)
+			call(destroy_listener, destroy_listeners[destroy_listener])(src)
+
+	for(var/list/listeners in observer_events)
+		listeners.Cut()
+
+	return ..()
+
+/atom/proc/register(var/event, var/procOwner, var/proc_call)
+	var/list/listeners = get_listener_list_from_event(event)
+	listeners[procOwner] = proc_call
+
+/atom/proc/unregister(var/event, var/procOwner)
+	var/list/listeners = get_listener_list_from_event(event)
+	listeners -= procOwner
+
+/atom/proc/get_listener_list_from_event(var/observer_event)
+	if(!observer_events) observer_events = list()
+	var/list/listeners = observer_events[observer_event]
+	if(!listeners)
+		listeners = list()
+		observer_events[observer_event] = listeners
+	return listeners

code/controllers/observer_listener/datum/observer.dm

@@ -0,0 +1,28 @@
+/*
+#define OBSERVER_EVENT_DESTROY "OnDestroy"
+
+/datum
+	var/list/observer_events
+
+/datum/Destroy()
+	for(var/list/listeners in observer_events)
+		listeners.Cut()
+
+	return ..()
+
+/datum/proc/register(var/event, var/procOwner, var/proc_call)
+	var/list/listeners = get_listener_list_from_event(event)
+	listeners[procOwner] = proc_call
+
+/datum/proc/unregister(var/event, var/procOwner)
+	var/list/listeners = get_listener_list_from_event(event)
+	listeners -= procOwner
+
+/datum/proc/get_listener_list_from_event(var/observer_event)
+	if(!observer_events) observer_events = list()
+	var/list/listeners = observer_events[observer_event]
+	if(!listeners)
+		listeners = list()
+		observer_events[observer_event] = listeners
+	return listeners
+*/

code/controllers/shuttle_controller.dm

@@ -264,7 +264,7 @@ var/global/datum/shuttle_controller/shuttle_controller
 	var/datum/shuttle/ferry/multidock/specops/ERT = new()
 	ERT.location = 0
 	ERT.warmup_time = 10
-	ERT.area_offsite = locate(/area/shuttle/specops/station)	//centcom is the home station, the Northern Star is offsite
+	ERT.area_offsite = locate(/area/shuttle/specops/station)	//centcom is the home station, the player station is offsite
 	ERT.area_station = locate(/area/shuttle/specops/centcom)
 	ERT.docking_controller_tag = "specops_shuttle_port"
 	ERT.docking_controller_tag_station = "specops_shuttle_port"

code/datums/EPv2.dm

@@ -103,25 +103,26 @@ var/global/list/all_exonet_connections = list()
 	return null
 
 // Proc: send_message()
-// Parameters: 2 (target_address - the desired address to send the message to, message - the message to send)
+// Parameters: 3 (target_address - the desired address to send the message to, message - the message to send, text - the message text if message is of type "text")
 // Description: Sends the message to target_address, by calling receive_message() on the desired datum.
-/datum/exonet_protocol/proc/send_message(var/target_address, var/message)
+/datum/exonet_protocol/proc/send_message(var/target_address, var/message, var/text)
 	if(!address)
 		return 0
 	for(var/datum/exonet_protocol/exonet in all_exonet_connections)
 		if(exonet.address == target_address)
-			exonet.receive_message(holder, address, message)
+			exonet.receive_message(holder, address, message, text)
 			break
 
 // Proc: receive_message()
-// Parameters: 3 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, message - the message that was sent)
+// Parameters: 4 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, message - the message that was sent,
+//				  text - the message text if message is of type "text")
 // Description: Called when send_message() successfully reaches the intended datum.  By default, calls receive_exonet_message() on the holder atom.
-/datum/exonet_protocol/proc/receive_message(var/atom/origin_atom, var/origin_address, var/message)
-	holder.receive_exonet_message(origin_atom, origin_address, message)
+/datum/exonet_protocol/proc/receive_message(var/atom/origin_atom, var/origin_address, var/message, var/text)
+	holder.receive_exonet_message(origin_atom, origin_address, message, text)
 	return
 
 // Proc: receive_exonet_message()
 // Parameters: 3 (origin_atom - the origin datum's holder, origin_address - the address the message originated from, message - the message that was sent)
 // Description: Override this to make your atom do something when a message is received.
-/atom/proc/receive_exonet_message(var/atom/origin_atom, var/origin_address, var/message)
+/atom/proc/receive_exonet_message(var/atom/origin_atom, var/origin_address, var/message, var/text)
 	return

code/datums/browser.dm

@@ -74,10 +74,11 @@
 	if (title_image)
 		title_attributes = "class='uiTitle icon' style='background-image: url([title_image]);'"
 
-	return {"<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+	return {"<!DOCTYPE html>
 <html>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+	<meta charset=ISO-8859-1">
 	<head>
+		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		[head_content]
 	</head>
 	<body scroll=auto>

code/datums/mind.dm

@@ -344,7 +344,7 @@
 				log_admin("[key_name_admin(usr)] has de-loyalty implanted [current].")
 			if("add")
 				H << "<span class='danger'><font size =3>You somehow have become the recepient of a loyalty transplant, and it just activated!</font></span>"
-				H.implant_loyalty(H, override = TRUE)
+				H.implant_loyalty(override = TRUE)
 				log_admin("[key_name_admin(usr)] has loyalty implanted [current].")
 			else
 	else if (href_list["silicon"])

code/datums/supplypacks.dm

@@ -43,20 +43,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	group = "Security"
 	hidden = 1
 
-/datum/supply_packs/forensics
-	name = "Auxiliary forensic tools"
-	contains = list(
-			/obj/item/weapon/forensics/sample_kit,
-			/obj/item/weapon/forensics/sample_kit/powder,
-			/obj/item/weapon/storage/box/swabs = 3,
-			/obj/item/device/uv_light,
-			/obj/item/weapon/reagent_containers/spray/luminol
-			)
-	cost = 30
-	containertype = /obj/structure/closet/crate
-	containername = "Auxiliary forensic tools"
-	group = "Security"
-
 /datum/supply_packs/food
 	name = "Kitchen supply crate"
 	contains = list(
@@ -132,7 +118,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 			/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
 			/obj/item/weapon/lipstick/random,
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2,
-			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4
+			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4,
+			/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 4
 			)
 	cost = 20
 	containertype = /obj/structure/closet/crate
@@ -1614,9 +1601,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 			/obj/item/device/camera_film = 2,
 			/obj/item/weapon/storage/photo_album,
 			/obj/item/device/reagent_scanner,
-			/obj/item/device/flashlight/maglight
+			/obj/item/device/flashlight/maglight,
+			/obj/item/weapon/storage/briefcase/crimekit
 			)
-	cost = 35
+	cost = 40
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Forensic equipment"
 	access = access_forensics_lockers

code/datums/uplink/ammunition.dm

@@ -0,0 +1,67 @@
+/*************
+* Ammunition *
+*************/
+/datum/uplink_item/item/ammo
+	item_cost = 2
+	category = /datum/uplink_category/ammunition
+
+/datum/uplink_item/item/ammo/a357
+	name = ".357"
+	path = /obj/item/ammo_magazine/a357
+
+/datum/uplink_item/item/ammo/mc9mm
+	name = "9mm"
+	path = /obj/item/ammo_magazine/mc9mm
+
+/datum/uplink_item/item/ammo/c45m
+	name = ".45"
+	path = /obj/item/ammo_magazine/c45m
+
+/datum/uplink_item/item/ammo/darts
+	name = "Darts"
+	path = /obj/item/ammo_magazine/chemdart
+
+/datum/uplink_item/item/ammo/sniperammo
+	name = "14.5mm"
+	path = /obj/item/weapon/storage/box/sniperammo
+
+/datum/uplink_item/item/ammo/a556
+	name = "5.56mm"
+	path = /obj/item/ammo_magazine/a556
+
+/datum/uplink_item/item/ammo/a556/ap
+	name = "5.56mm AP"
+	path = /obj/item/ammo_magazine/a556/ap
+
+/datum/uplink_item/item/ammo/a10mm
+	name = "10mm"
+	path = /obj/item/ammo_magazine/a10mm
+
+/datum/uplink_item/item/ammo/a762
+	name = "7.62mm"
+	path = /obj/item/ammo_magazine/a762
+
+/datum/uplink_item/item/ammo/a762/ap
+	name = "7.62mm AP"
+	path = /obj/item/ammo_magazine/a762/ap
+
+/datum/uplink_item/item/ammo/g12
+	name = "12 gauge"
+	path = /obj/item/ammo_magazine/g12
+
+/datum/uplink_item/item/ammo/g12/beanbag
+	name = "12 gauge beanbag"
+	path = /obj/item/ammo_magazine/g12/beanbag
+	item_cost = 1 // Discount due to it being LTL.
+
+/datum/uplink_item/item/ammo/g12/pellet
+	name = "12 gauge pellet"
+	path = /obj/item/ammo_magazine/g12/pellet
+
+/datum/uplink_item/item/ammo/g12/stun
+	name = "12 gauge stun"
+	path = /obj/item/weapon/storage/box/stunshells
+
+/datum/uplink_item/item/ammo/g12/flash
+	name = "12 gauge flash"
+	path = /obj/item/weapon/storage/box/flashshells

code/datums/uplink/announcements.dm

@@ -0,0 +1,109 @@
+/****************
+* Announcements *
+*****************/
+/datum/uplink_item/abstract/announcements
+	category = /datum/uplink_category/services
+
+/datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user)
+	. = ..()
+	if(.)
+		log_and_message_admins("has triggered a falsified [src]", user)
+
+/datum/uplink_item/abstract/announcements/fake_centcom
+	item_cost = DEFAULT_TELECRYSTAL_AMOUNT / 2
+
+/datum/uplink_item/abstract/announcements/fake_centcom/New()
+	..()
+	name = "[command_name()] Update Announcement"
+	desc = "Causes a falsified [command_name()] Update. Triggers immediately after supplying additional data."
+
+/datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user)
+	var/title = sanitize(input("Enter your announcement title.", "Announcement Title") as null|text)
+	if(!title)
+		return
+	var/message = sanitize(input("Enter your announcement message.", "Announcement Title") as null|text)
+	if(!message)
+		return
+	return list("title" = title, "message" = message)
+
+/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
+	command_announcement.Announce(args["message"], args["title"])
+	return 1
+
+/datum/uplink_item/abstract/announcements/fake_crew_arrival
+	name = "Crew Arrival Announcement/Records"
+	desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!"
+	item_cost = 4
+
+/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
+	if(!user)
+		return 0
+
+	var/obj/item/weapon/card/id/I = user.GetIdCard()
+	var/datum/data/record/random_general_record
+	var/datum/data/record/random_medical_record
+	if(data_core.general.len)
+		random_general_record	= pick(data_core.general)
+		random_medical_record	= find_medical_record("id", random_general_record.fields["id"])
+
+	var/datum/data/record/general = data_core.CreateGeneralRecord(user)
+	if(I)
+		general.fields["age"] = I.age
+		general.fields["rank"] = I.assignment
+		general.fields["real_rank"] = I.assignment
+		general.fields["name"] = I.registered_name
+		general.fields["sex"] = I.sex
+	else
+		var/mob/living/carbon/human/H
+		if(istype(user,/mob/living/carbon/human))
+			H = user
+			general.fields["age"] = H.age
+		else
+			general.fields["age"] = initial(H.age)
+		var/assignment = GetAssignment(user)
+		general.fields["rank"] = assignment
+		general.fields["real_rank"] = assignment
+		general.fields["name"] = user.real_name
+		general.fields["sex"] = capitalize(user.gender)
+
+	general.fields["species"] = user.get_species()
+	var/datum/data/record/medical = data_core.CreateMedicalRecord(general.fields["name"], general.fields["id"])
+	data_core.CreateSecurityRecord(general.fields["name"], general.fields["id"])
+
+	if(!random_general_record)
+		general.fields["citizenship"]	= random_general_record.fields["citizenship"]
+		general.fields["faction"] 		= random_general_record.fields["faction"]
+		general.fields["fingerprint"] 	= random_general_record.fields["fingerprint"]
+		general.fields["home_system"] 	= random_general_record.fields["home_system"]
+		general.fields["religion"] 		= random_general_record.fields["religion"]
+	if(random_medical_record)
+		medical.fields["b_type"]		= random_medical_record.fields["b_type"]
+		medical.fields["b_dna"]			= random_medical_record.fields["b_type"]
+
+	if(I)
+		general.fields["fingerprint"] 	= I.fingerprint_hash
+		medical.fields["b_type"]	= I.blood_type
+		medical.fields["b_dna"]		= I.dna_hash
+
+	AnnounceArrivalSimple(general.fields["name"], general.fields["rank"])
+	return 1
+
+/datum/uplink_item/abstract/announcements/fake_ion_storm
+	name = "Ion Storm Announcement"
+	desc = "Interferes with the station's ion sensors. Triggers immediately upon investment."
+	item_cost = 1
+
+/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/device/uplink/U, var/loc)
+	ion_storm_announcement()
+	return 1
+
+/datum/uplink_item/abstract/announcements/fake_radiation
+	name = "Radiation Storm Announcement"
+	desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment."
+	item_cost = 3
+
+/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc)
+	var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0)
+	new/datum/event/radiation_storm/syndicate(EM)
+	return 1
+

code/datums/uplink/armor.dm

@@ -0,0 +1,15 @@
+/********
+* Armor *
+********/
+/datum/uplink_item/item/armor
+	category = /datum/uplink_category/armor
+
+/datum/uplink_item/item/armor/combat
+	name = "Combat Armor Set"
+	item_cost = 5
+	path = /obj/item/weapon/storage/box/syndie_kit/combat_armor
+
+/datum/uplink_item/item/armor/heavy_vest
+	name = "Heavy Armor Vest"
+	item_cost = 4
+	path = /obj/item/clothing/suit/storage/vest/heavy/merc

code/datums/uplink/badassery.dm

@@ -0,0 +1,78 @@
+/************
+* Badassery *
+************/
+/datum/uplink_item/item/badassery
+	category = /datum/uplink_category/badassery
+
+/datum/uplink_item/item/badassery/balloon
+	name = "For showing that You Are The BOSS (Useless Balloon)"
+	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
+	path = /obj/item/toy/syndicateballoon
+
+/datum/uplink_item/item/badassery/balloon/NT
+	name = "For showing that you love NT SOO much (Useless Balloon)"
+	path = /obj/item/toy/nanotrasenballoon
+
+/**************
+* Random Item *
+**************/
+/datum/uplink_item/item/badassery/random_one
+	name = "Random Item"
+	desc = "Buys you one random item."
+
+/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user)
+	var/datum/uplink_item/item = default_uplink_selection.get_random_item(U.uses)
+	return item.buy(U, user)
+
+/datum/uplink_item/item/badassery/random_one/can_buy(obj/item/device/uplink/U)
+	return default_uplink_selection.get_random_item(U.uses, U) != null
+
+/datum/uplink_item/item/badassery/random_many
+	name = "Random Items"
+	desc = "Buys you as many random items you can afford. Convenient packaging NOT included."
+
+/datum/uplink_item/item/badassery/random_many/cost(var/telecrystals)
+	return max(1, telecrystals)
+
+/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/device/uplink/U, var/loc)
+	var/list/bought_items = list()
+	for(var/datum/uplink_item/UI in get_random_uplink_items(U, U.uses, loc))
+		UI.purchase_log(U)
+		var/obj/item/I = UI.get_goods(U, loc)
+		if(istype(I))
+			bought_items += I
+
+	return bought_items
+
+/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U)
+	feedback_add_details("traitor_uplink_items_bought", "[src]")
+	log_and_message_admins("used \the [U.loc] to buy \a [src]")
+
+/****************
+* Surplus Crate *
+****************/
+/datum/uplink_item/item/badassery/surplus
+	name = "Surplus Crate"
+	item_cost = 40
+	var/item_worth = 60
+	var/icon
+
+/datum/uplink_item/item/badassery/surplus/New()
+	..()
+	desc = "A crate containing [item_worth] telecrystal\s worth of surplus leftovers."
+
+/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/device/uplink/U, var/loc)
+	var/obj/structure/largecrate/C = new(loc)
+	var/random_items = get_random_uplink_items(null, item_worth, C)
+	for(var/datum/uplink_item/I in random_items)
+		I.purchase_log(U)
+		I.get_goods(U, C)
+
+	return C
+
+/datum/uplink_item/item/badassery/surplus/log_icon()
+	if(!icon)
+		var/obj/structure/largecrate/C = /obj/structure/largecrate
+		icon = image(initial(C.icon), initial(C.icon_state))
+
+	return "\icon[icon]"

code/datums/uplink/grenades.dm

@@ -0,0 +1,35 @@
+/***********
+* Grenades *
+************/
+/datum/uplink_item/item/grenades
+	category = /datum/uplink_category/grenades
+
+/datum/uplink_item/item/grenades/anti_photon
+	name = "5xPhoton Disruption Grenades"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/anti_photons
+
+/datum/uplink_item/item/grenades/emp
+	name = "5xEMP Grenades"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/emps
+
+/datum/uplink_item/item/grenades/smoke
+	name = "7xSmoke Grenades"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/smokes
+
+/datum/uplink_item/item/grenades/frags
+	name = "5xFrag Grenades"
+	item_cost = 6
+	path = /obj/item/weapon/storage/box/frags
+
+/datum/uplink_item/item/grenades/flashbnags
+	name = "7xFlashbangs"
+	item_cost = 4
+	path = /obj/item/weapon/storage/box/flashbangs
+
+/datum/uplink_item/item/grenades/metalfoam
+	name = "7xMetal Foam Grenades"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/metalfoam

code/datums/uplink/hardsuit_modules.dm

@@ -0,0 +1,40 @@
+/*******************
+* Hardsuit Modules *
+*******************/
+/datum/uplink_item/item/hardsuit_modules
+	category = /datum/uplink_category/hardsuit_modules
+
+/datum/uplink_item/item/hardsuit_modules/thermal
+	name = "Thermal Scanner"
+	item_cost = 2
+	path = /obj/item/rig_module/vision/thermal
+
+/datum/uplink_item/item/hardsuit_modules/energy_net
+	name = "Net Projector"
+	item_cost = 3
+	path = /obj/item/rig_module/fabricator/energy_net
+
+/datum/uplink_item/item/ewar_voice
+	name = "Electrowarfare Suite and Voice Synthesiser"
+	item_cost = 4
+	path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
+
+/datum/uplink_item/item/hardsuit_modules/maneuvering_jets
+	name = "Maneuvering Jets"
+	item_cost = 4
+	path = /obj/item/rig_module/maneuvering_jets
+
+/datum/uplink_item/item/hardsuit_modules/egun
+	name = "Mounted Energy Gun"
+	item_cost = 6
+	path = /obj/item/rig_module/mounted/egun
+
+/datum/uplink_item/item/hardsuit_modules/power_sink
+	name = "Power Sink"
+	item_cost = 6
+	path = /obj/item/rig_module/power_sink
+
+/datum/uplink_item/item/hardsuit_modules/laser_canon
+	name = "Mounted Laser Cannon"
+	item_cost = 8
+	path = /obj/item/rig_module/mounted

code/datums/uplink/implants.dm

@@ -0,0 +1,25 @@
+/***********
+* Implants *
+***********/
+/datum/uplink_item/item/implants
+	category = /datum/uplink_category/implants
+
+/datum/uplink_item/item/implants/imp_freedom
+	name = "Freedom Implant"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/syndie_kit/imp_freedom
+
+/datum/uplink_item/item/implants/imp_compress
+	name = "Compressed Matter Implant"
+	item_cost = 4
+	path = /obj/item/weapon/storage/box/syndie_kit/imp_compress
+
+/datum/uplink_item/item/implants/imp_explosive
+	name = "Explosive Implant (DANGER!)"
+	item_cost = 6
+	path = /obj/item/weapon/storage/box/syndie_kit/imp_explosive
+
+/datum/uplink_item/item/implants/imp_uplink
+	name = "Uplink Implant" //Original name: "Uplink Implant (Contains 5 Telecrystals)"
+	item_cost = 5 //Original cost: 10
+	path = /obj/item/weapon/storage/box/syndie_kit/imp_uplink

code/datums/uplink/medical.dm

@@ -0,0 +1,36 @@
+/**********
+* Medical *
+**********/
+/datum/uplink_item/item/medical
+	category = /datum/uplink_category/medical
+
+/datum/uplink_item/item/medical/sinpockets
+	name = "Box of Sin-Pockets"
+	item_cost = 1
+	path = /obj/item/weapon/storage/box/sinpockets
+
+/datum/uplink_item/item/medical/surgery
+	name = "Surgery kit"
+	item_cost = 6
+	path = /obj/item/weapon/storage/firstaid/surgery
+
+/datum/uplink_item/item/medical/combat
+	name = "Combat medical kit"
+	item_cost = 6
+	path = /obj/item/weapon/storage/firstaid/combat
+
+/datum/uplink_item/item/medical/freezer
+	name = "Portable Freezer"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/freezer
+
+/datum/uplink_item/item/medical/ambrosiaseeds
+	name = "Box of 7x ambrosia seed packets"
+	item_cost = 1
+	path = /obj/item/weapon/storage/box/ambrosia
+
+/datum/uplink_item/item/medical/ambrosiadeusseeds
+	name = "Box of 7x ambrosia deus seed packets"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/ambrosiadeus
+

code/datums/uplink/stealth_items.dm

@@ -0,0 +1,45 @@
+/*******************************
+* Stealth and Camouflage Items *
+*******************************/
+/datum/uplink_item/item/stealth_items
+	category = /datum/uplink_category/stealth_items
+
+/datum/uplink_item/item/stealth_items/id
+	name = "Agent ID card"
+	item_cost = 2
+	path = /obj/item/weapon/card/id/syndicate
+
+/datum/uplink_item/item/stealth_items/syndigaloshes
+	name = "No-Slip Shoes"
+	item_cost = 2
+	path = /obj/item/clothing/shoes/syndigaloshes
+
+/datum/uplink_item/item/stealth_items/spy
+	name = "Bug Kit"
+	item_cost = 2
+	path = /obj/item/weapon/storage/box/syndie_kit/spy
+
+/datum/uplink_item/item/stealth_items/chameleon_kit
+	name = "Chameleon Kit"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/syndie_kit/chameleon
+
+/datum/uplink_item/item/stealth_items/chameleon_projector
+	name = "Chameleon-Projector"
+	item_cost = 4
+	path = /obj/item/device/chameleon
+
+/datum/uplink_item/item/stealth_items/chameleon_projector
+	name = "Chameleon-Projector"
+	item_cost = 4
+	path = /obj/item/device/chameleon
+
+/datum/uplink_item/item/stealth_items/voice
+	name = "Voice Changer"
+	item_cost = 4
+	path = /obj/item/clothing/mask/gas/voice
+
+/datum/uplink_item/item/stealth_items/camera_floppy
+	name = "Camera Network Access - Floppy"
+	item_cost = 6
+	path = /obj/item/weapon/disk/file/cameras/syndicate

code/datums/uplink/stealthy_weapons.dm

@@ -0,0 +1,35 @@
+/*************************************
+* Stealthy and Inconspicuous Weapons *
+*************************************/
+/datum/uplink_item/item/stealthy_weapons
+	category = /datum/uplink_category/stealthy_weapons
+
+/datum/uplink_item/item/stealthy_weapons/soap
+	name = "Subversive Soap"
+	item_cost = 1
+	path = /obj/item/weapon/soap/syndie
+
+/datum/uplink_item/item/stealthy_weapons/concealed_cane
+	name = "Concealed Cane Sword"
+	item_cost = 1
+	path = /obj/item/weapon/cane/concealed
+
+/datum/uplink_item/item/stealthy_weapons/detomatix
+	name = "Detomatix PDA Cartridge"
+	item_cost = 3
+	path = /obj/item/weapon/cartridge/syndicate
+
+/datum/uplink_item/item/stealthy_weapons/parapen
+	name = "Paralysis Pen"
+	item_cost = 3
+	path = /obj/item/weapon/pen/reagent/paralysis
+
+/datum/uplink_item/item/stealthy_weapons/cigarette_kit
+	name = "Cigarette Kit"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/syndie_kit/cigarette
+
+/datum/uplink_item/item/stealthy_weapons/random_toxin
+	name = "Random Toxin - Beaker"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/syndie_kit/toxin

code/datums/uplink/tools.dm

@@ -0,0 +1,85 @@
+/********************
+* Devices and Tools *
+********************/
+/datum/uplink_item/item/tools
+	category = /datum/uplink_category/tools
+
+/datum/uplink_item/item/tools/toolbox
+	name = "Fully Loaded Toolbox"
+	item_cost = 1
+	path = /obj/item/weapon/storage/toolbox/syndicate
+
+/datum/uplink_item/item/tools/plastique
+	name = "C-4 (Destroys walls)"
+	item_cost = 2
+	path = /obj/item/weapon/plastique
+
+/datum/uplink_item/item/tools/encryptionkey_radio
+	name = "Encrypted Radio Channel Key"
+	item_cost = 2
+	path = /obj/item/device/encryptionkey/syndicate
+
+/datum/uplink_item/item/tools/encryptionkey_binary
+	name = "Binary Translator Key"
+	item_cost = 3
+	path = /obj/item/device/encryptionkey/binary
+
+/datum/uplink_item/item/tools/emag
+	name = "Cryptographic Sequencer"
+	item_cost = 3
+	path = /obj/item/weapon/card/emag
+
+/datum/uplink_item/item/tools/clerical
+	name = "Morphic Clerical Kit"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/syndie_kit/clerical
+
+/datum/uplink_item/item/tools/space_suit
+	name = "Space Suit"
+	item_cost = 3
+	path = /obj/item/weapon/storage/box/syndie_kit/space
+
+/datum/uplink_item/item/tools/thermal
+	name = "Thermal Imaging Glasses"
+	item_cost = 3
+	path = /obj/item/clothing/glasses/thermal/syndi
+
+/datum/uplink_item/item/tools/powersink
+	name = "Powersink (DANGER!)"
+	item_cost = 5
+	path = /obj/item/device/powersink
+
+/datum/uplink_item/item/tools/ai_module
+	name = "Hacked AI Upload Module"
+	item_cost = 7
+	path = /obj/item/weapon/aiModule/syndicate
+
+/datum/uplink_item/item/tools/supply_beacon
+	name = "Hacked Supply Beacon (DANGER!)"
+	item_cost = 7
+	path = /obj/item/supply_beacon
+
+/datum/uplink_item/item/tools/teleporter
+	name = "Teleporter Circuit Board"
+	item_cost = 20
+	path = /obj/item/weapon/circuitboard/teleporter
+
+/datum/uplink_item/item/tools/money
+	name = "Operations Funding"
+	item_cost = 3
+	path = /obj/item/weapon/storage/secure/briefcase/money
+	desc = "A briefcase with 10,000 untraceable thalers for funding your sneaky activities."
+
+/datum/uplink_item/item/tools/crystal
+	name = "Tradable Crystal"
+	item_cost = 1
+	path = /obj/item/device/telecrystal
+	desc = "A telecrystal that can be transferred from one user to another. Be sure not to give it to just anyone."
+
+/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."

code/datums/uplink/uplink_categories.dm

@@ -1,49 +1,49 @@
-/datum/uplink_category
-	var/name = ""
-	var/list/datum/uplink_item/items
-
-/datum/uplink_category/New()
-	..()
-	items = list()
-
-/datum/uplink_category/proc/can_view(obj/item/device/uplink/U)
-	for(var/datum/uplink_item/item in items)
-		if(item.can_view(U))
-			return 1
-	return 0
-
-/datum/uplink_category/ammunition
-	name = "Ammunition"
-
-/datum/uplink_category/grenades
-	name = "Grenades and Thrown Objects"
-
-/datum/uplink_category/visible_weapons
-	name = "Highly Visible and Dangerous Weapons"
-
-/datum/uplink_category/stealthy_weapons
-	name = "Stealthy and Inconspicuous Weapons"
-
-/datum/uplink_category/stealth_items
-	name = "Stealth and Camouflage Items"
-
-/datum/uplink_category/armor
-	name = "Armor"
-
-/datum/uplink_category/tools
-	name = "Devices and Tools"
-
-/datum/uplink_category/implants
-	name = "Implants"
-
-/datum/uplink_category/medical
-	name = "Medical"
-
-/datum/uplink_category/hardsuit_modules
-	name = "Hardsuit Modules"
-
-/datum/uplink_category/services
-	name = "Services"
-
-/datum/uplink_category/badassery
-	name = "Badassery"
+/datum/uplink_category
+	var/name = ""
+	var/list/datum/uplink_item/items
+
+/datum/uplink_category/New()
+	..()
+	items = list()
+
+/datum/uplink_category/proc/can_view(obj/item/device/uplink/U)
+	for(var/datum/uplink_item/item in items)
+		if(item.can_view(U))
+			return 1
+	return 0
+
+datum/uplink_category/ammunition
+	name = "Ammunition"
+
+/datum/uplink_category/services
+	name = "Services"
+
+/datum/uplink_category/armor
+	name = "Armor"
+
+/datum/uplink_category/badassery
+	name = "Badassery"
+
+/datum/uplink_category/grenades
+	name = "Grenades and Thrown Objects"
+
+/datum/uplink_category/hardsuit_modules
+	name = "Hardsuit Modules"
+
+/datum/uplink_category/implants
+	name = "Implants"
+
+/datum/uplink_category/medical
+	name = "Medical"
+
+/datum/uplink_category/stealth_items
+	name = "Stealth and Camouflage Items"
+
+/datum/uplink_category/stealthy_weapons
+	name = "Stealthy and Inconspicuous Weapons"
+
+/datum/uplink_category/tools
+	name = "Devices and Tools"
+
+/datum/uplink_category/visible_weapons
+	name = "Highly Visible and Dangerous Weapons"

code/datums/uplink/uplink_items.dm

@@ -0,0 +1,174 @@
+var/datum/uplink/uplink = new()
+
+/datum/uplink
+	var/list/items_assoc
+	var/list/datum/uplink_item/items
+	var/list/datum/uplink_category/categories
+
+/datum/uplink/New()
+	items_assoc = list()
+	items = init_subtypes(/datum/uplink_item)
+	categories = init_subtypes(/datum/uplink_category)
+	categories = dd_sortedObjectList(categories)
+
+	for(var/datum/uplink_item/item in items)
+		if(!item.name)
+			items -= item
+			continue
+
+		items_assoc[item.type] = item
+
+		for(var/datum/uplink_category/category in categories)
+			if(item.category == category.type)
+				category.items += item
+
+	for(var/datum/uplink_category/category in categories)
+		category.items = dd_sortedObjectList(category.items)
+
+/datum/uplink_item
+	var/name
+	var/desc
+	var/item_cost = 0
+	var/datum/uplink_category/category		// Item category
+	var/list/datum/antagonist/antag_roles	// Antag roles this item is displayed to. If empty, display to all.
+
+/datum/uplink_item/item
+	var/path = null
+
+/datum/uplink_item/New()
+	..()
+	antag_roles = list()
+
+
+
+/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user)
+	var/extra_args = extra_args(user)
+	if(!extra_args)
+		return
+
+	if(!can_buy(U))
+		return
+
+	if(U.CanUseTopic(user, inventory_state) != STATUS_INTERACTIVE)
+		return
+
+	var/cost = cost(U.uses, U)
+
+	var/goods = get_goods(U, get_turf(user), user, extra_args)
+	if(!goods)
+		return
+
+	purchase_log(U)
+	user.mind.tcrystals -= cost
+	U.used_TC += cost
+	return goods
+
+// Any additional arguments you wish to send to the get_goods
+/datum/uplink_item/proc/extra_args(var/mob/user)
+	return 1
+
+/datum/uplink_item/proc/can_buy(obj/item/device/uplink/U)
+	if(cost(U.uses, U) > U.uses)
+		return 0
+
+	return can_view(U)
+
+/datum/uplink_item/proc/can_view(obj/item/device/uplink/U)
+	// Making the assumption that if no uplink was supplied, then we don't care about antag roles
+	if(!U || !antag_roles.len)
+		return 1
+
+	// With no owner, there's no need to check antag status.
+	if(!U.uplink_owner)
+		return 0
+
+	for(var/antag_role in antag_roles)
+		var/datum/antagonist/antag = all_antag_types[antag_role]
+		if(antag.is_antagonist(U.uplink_owner))
+			return 1
+	return 0
+
+/datum/uplink_item/proc/cost(var/telecrystals, obj/item/device/uplink/U)
+	. = item_cost
+	if(U)
+		. = U.get_item_cost(src, .)
+
+/datum/uplink_item/proc/description()
+	return desc
+
+// get_goods does not necessarily return physical objects, it is simply a way to acquire the uplink item without paying
+/datum/uplink_item/proc/get_goods(var/obj/item/device/uplink/U, var/loc)
+	return 0
+
+/datum/uplink_item/proc/log_icon()
+	return
+
+/datum/uplink_item/proc/purchase_log(obj/item/device/uplink/U)
+	feedback_add_details("traitor_uplink_items_bought", "[src]")
+	log_and_message_admins("used \the [U.loc] to buy \a [src]")
+	U.purchase_log[src] = U.purchase_log[src] + 1
+
+datum/uplink_item/dd_SortValue()
+	return cost(INFINITY)
+
+/********************************
+*                           	*
+*	Physical Uplink Entries		*
+*                           	*
+********************************/
+/datum/uplink_item/item/buy(var/obj/item/device/uplink/U, var/mob/user)
+	var/obj/item/I = ..()
+	if(!I)
+		return
+
+	if(istype(I, /list))
+		var/list/L = I
+		if(L.len) I = L[1]
+
+	if(istype(I) && ishuman(user))
+		var/mob/living/carbon/human/A = user
+		A.put_in_any_hand_if_possible(I)
+	return I
+
+/datum/uplink_item/item/get_goods(var/obj/item/device/uplink/U, var/loc)
+	var/obj/item/I = new path(loc)
+	return I
+
+/datum/uplink_item/item/description()
+	if(!desc)
+		// Fallback description
+		var/obj/temp = src.path
+		desc = initial(temp.desc)
+	return ..()
+
+/datum/uplink_item/item/log_icon()
+	var/obj/I = path
+	return "\icon[I]"
+
+/********************************
+*                           	*
+*	Abstract Uplink Entries		*
+*                           	*
+********************************/
+/datum/uplink_item/abstract
+	var/static/image/default_abstract_uplink_icon
+
+/datum/uplink_item/abstract/log_icon()
+	if(!default_abstract_uplink_icon)
+		default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn")
+
+	return "\icon[default_abstract_uplink_icon]"
+
+/****************
+* Support procs *
+****************/
+/proc/get_random_uplink_items(var/obj/item/device/uplink/U, var/remaining_TC, var/loc)
+	var/list/bought_items = list()
+	while(remaining_TC)
+		var/datum/uplink_item/I = default_uplink_selection.get_random_item(remaining_TC, U, bought_items)
+		if(!I)
+			break
+		bought_items += I
+		remaining_TC -= I.cost(remaining_TC, U)
+
+	return bought_items

code/datums/uplink/visible_weapons.dm

@@ -0,0 +1,91 @@
+/***************************************
+* Highly Visible and Dangerous Weapons *
+***************************************/
+/datum/uplink_item/item/visible_weapons
+	category = /datum/uplink_category/visible_weapons
+
+/datum/uplink_item/item/visible_weapons/energy_sword
+	name = "Energy Sword"
+	item_cost = 4
+	path = /obj/item/weapon/melee/energy/sword
+
+/datum/uplink_item/item/visible_weapons/dartgun
+	name = "Dart Gun"
+	item_cost = 5
+	path = /obj/item/weapon/gun/projectile/dartgun
+
+/datum/uplink_item/item/visible_weapons/crossbow
+	name = "Energy Crossbow"
+	item_cost = 5
+	path = /obj/item/weapon/gun/energy/crossbow
+
+/datum/uplink_item/item/visible_weapons/silenced_45
+	name = "Silenced .45"
+	item_cost = 5
+	path = /obj/item/weapon/gun/projectile/silenced
+
+/datum/uplink_item/item/visible_weapons/riggedlaser
+	name = "Exosuit Rigged Laser"
+	item_cost = 6
+	path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser
+
+/datum/uplink_item/item/visible_weapons/revolver
+	name = "Revolver"
+	item_cost = 6
+	path = /obj/item/weapon/gun/projectile/revolver
+
+/datum/uplink_item/item/visible_weapons/heavysniper
+	name = "Anti-materiel Rifle"
+	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
+	path = /obj/item/weapon/gun/projectile/heavysniper
+
+//These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear.
+/datum/uplink_item/item/visible_weapons/submachinegun
+	name = "Submachine Gun"
+	item_cost = 6
+	path = /obj/item/weapon/gun/projectile/automatic/c20r
+
+/datum/uplink_item/item/visible_weapons/assaultrifle
+	name = "Assault Rifle"
+	item_cost = 7
+	path = /obj/item/weapon/gun/projectile/automatic/sts35
+
+/datum/uplink_item/item/visible_weapons/combatshotgun
+	name = "Combat Shotgun"
+	item_cost = 7
+	path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
+
+/datum/uplink_item/item/visible_weapons/egun
+	name = "Energy Gun"
+	item_cost = 5
+	path = /obj/item/weapon/gun/energy/gun
+
+/datum/uplink_item/item/visible_weapons/lasercannon
+	name = "Laser Cannon"
+	item_cost = 6
+	path = /obj/item/weapon/gun/energy/lasercannon
+
+/datum/uplink_item/item/visible_weapons/lasercarbine
+	name = "Laser Carbine"
+	item_cost = 7
+	path = /obj/item/weapon/gun/energy/laser
+
+/datum/uplink_item/item/visible_weapons/ionrifle
+	name = "Ion Rifle"
+	item_cost = 5
+	path = /obj/item/weapon/gun/energy/ionrifle
+
+/datum/uplink_item/item/visible_weapons/xray
+	name = "Xray Gun"
+	item_cost = 7
+	path = /obj/item/weapon/gun/energy/xray
+
+/datum/uplink_item/item/visible_weapons/tactknife
+	name = "Tactical Knife"
+	item_cost = 1
+	path = /obj/item/weapon/material/hatchet/tacknife
+
+/datum/uplink_item/item/visible_weapons/combatknife
+	name = "Combat Knife"
+	item_cost = 3
+	path = /obj/item/weapon/material/hatchet/tacknife/combatknife

code/game/antagonist/outsider/deathsquad.dm

@@ -49,7 +49,7 @@ var/datum/antagonist/deathsquad/deathsquad
 	player.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(player), slot_r_hand)
 	player.equip_to_slot_or_del(new /obj/item/weapon/rig/ert/assetprotection(player), slot_back)
 	player.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(player), slot_s_store)
-	player.implant_loyalty(player)
+	player.implant_loyalty()
 
 	var/obj/item/weapon/card/id/id = create_id("Asset Protection", player)
 	if(id)

code/game/antagonist/outsider/mercenary.dm

@@ -46,9 +46,8 @@ var/datum/antagonist/mercenary/mercs
 	player.mind.tcrystals = DEFAULT_TELECRYSTAL_AMOUNT
 	player.mind.accept_tcrystals = 1
 
-	if (player.mind == leader)
-		var/obj/item/device/radio/uplink/U = new(player.loc, player.mind, DEFAULT_TELECRYSTAL_AMOUNT)
-		player.put_in_hands(U)
+	var/obj/item/device/radio/uplink/U = new(player.loc, player.mind, DEFAULT_TELECRYSTAL_AMOUNT)
+	player.put_in_hands(U)
 
 	player.update_icons()
 

code/game/antagonist/station/cultist.dm

@@ -110,6 +110,13 @@ var/datum/antagonist/cultist/cult
 	. = ..()
 	if(.)
 		player << "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back."
+		if(player.current && !istype(player.current, /mob/living/simple_animal/construct)) 
+			player.current.add_language(LANGUAGE_CULT) 
+				
+/datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted) 
+	. = ..() 
+	if(. && player.current && !istype(player.current, /mob/living/simple_animal/construct)) 
+		player.current.remove_language(LANGUAGE_CULT) 
 
 /datum/antagonist/cultist/can_become_antag(var/datum/mind/player)
 	if(!..())

code/game/antagonist/station/renegade.dm

@@ -1,8 +1,12 @@
 var/datum/antagonist/renegade/renegades
 
 /datum/antagonist/renegade
+	id = MODE_RENEGADE
+	role_type = BE_RENEGADE
 	role_text = "Renegade"
 	role_text_plural = "Renegades"
+	bantype = "renegade"
+	restricted_jobs = list("AI", "Cyborg")
 	welcome_text = "Something's going to go wrong today, you can just feel it. You're paranoid, you've got a gun, and you're going to survive."
 	antag_text = "You are a <b>minor</b> antagonist! Within the rules, \
 		try to protect yourself and what's important to you. You aren't here to cause trouble, \
@@ -12,10 +16,8 @@ var/datum/antagonist/renegade/renegades
 		and before taking extreme actions, please try to also contact the administration! \
 		Think through your actions and make the roleplay immersive! <b>Please remember all \
 		rules aside from those without explicit exceptions apply to antagonists.</b>"
-
-	id = MODE_RENEGADE
 	flags = ANTAG_SUSPICIOUS | ANTAG_IMPLANT_IMMUNE | ANTAG_RANDSPAWN | ANTAG_VOTABLE
-	
+
 	hard_cap = 8
 	hard_cap_round = 12
 	initial_spawn_req = 2

code/game/gamemodes/changeling/absorbed_dna.dm

@@ -4,11 +4,13 @@
 	var/speciesName
 	var/list/languages
 	var/identifying_gender
+	var/list/flavour_texts
 
-/datum/absorbed_dna/New(var/newName, var/newDNA, var/newSpecies, var/newLanguages, var/newIdentifying_Gender)
+/datum/absorbed_dna/New(var/newName, var/newDNA, var/newSpecies, var/newLanguages, var/newIdentifying_Gender, var/list/newFlavour)
 	..()
 	name = newName
 	dna = newDNA
 	speciesName = newSpecies
 	languages = newLanguages
-	identifying_gender = newIdentifying_Gender
+	identifying_gender = newIdentifying_Gender
+	flavour_texts = newFlavour ? newFlavour.Copy() : null

code/game/gamemodes/changeling/changeling_powers.dm

@@ -85,7 +85,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
 
 	var/mob/living/carbon/human/H = src
 	if(istype(H))
-		var/datum/absorbed_dna/newDNA = new(H.real_name, H.dna, H.species.name, H.languages, H.identifying_gender)
+		var/datum/absorbed_dna/newDNA = new(H.real_name, H.dna, H.species.name, H.languages, H.identifying_gender, H.flavor_texts)
 		absorbDNA(newDNA)
 
 	return 1

code/game/gamemodes/changeling/powers/absorb.dm

@@ -71,7 +71,7 @@
 	src.verbs += /mob/proc/changeling_respec
 	src << "<span class='notice'>We can now re-adapt, reverting our evolution so that we may start anew, if needed.</span>"
 
-	var/datum/absorbed_dna/newDNA = new(T.real_name, T.dna, T.species.name, T.languages)
+	var/datum/absorbed_dna/newDNA = new(T.real_name, T.dna, T.species.name, T.languages, T.identifying_gender, T.flavor_texts)
 	absorbDNA(newDNA)
 
 	if(T.mind && T.mind.changeling)

code/game/gamemodes/changeling/powers/revive.dm

@@ -37,7 +37,7 @@
 		H.status_flags -= DISFIGURED
 		H.update_body(1)
 	C << "<span class='notice'>We have regenerated.</span>"
-	C.status_flags &= ~(FAKEDEATH)
+	C.status_flags &= ~FAKEDEATH
 	C.update_canmove()
 	C.mind.changeling.purchased_powers -= C
 	feedback_add_details("changeling_powers","CR")

code/game/gamemodes/changeling/powers/transform.dm

@@ -37,11 +37,9 @@
 	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
 		H.b_type = "AB+" //For some reason we have two blood types on the mob.
-		for(var/flavor in H.flavor_texts) //Nulls out flavor text, so we don't keep our previous mob's flavor.
-			flavor = null
 		H.identifying_gender = chosen_dna.identifying_gender
+		H.flavor_texts = chosen_dna.flavour_texts ? chosen_dna.flavour_texts.Copy() : null
 	src.real_name = chosen_dna.name
-	src.flavor_text = ""
 	src.UpdateAppearance()
 	domutcheck(src, null)
 	changeling_update_languages(changeling.absorbed_languages)

code/game/gamemodes/heist/heist.dm

@@ -11,7 +11,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 	required_players_secret = 15
 	required_enemies = 4
 	round_description = "An unidentified bluespace signature is approaching the station!"
-	extended_round_description = "The Company's majority control of phoron in Vir has marked the \
+	extended_round_description = "The Company's majority control of phoron in "+starsys_name+" has marked the \
 		station to be a highly valuable target for many competing organizations and individuals. Being a \
 		colony of sizable population and considerable wealth causes it to often be the target of various \
 		attempts of robbery, fraud and other malicious actions."

code/game/gamemodes/nuclear/nuclear.dm

@@ -7,7 +7,7 @@ var/list/nuke_disks = list()
 /datum/game_mode/nuclear
 	name = "Mercenary"
 	round_description = "A mercenary strike force is approaching the station!"
-	extended_round_description = "The Company's majority control of phoron in Vir has marked the \
+	extended_round_description = "The Company's majority control of phoron in "+starsys_name+" has marked the \
 		station to be a highly valuable target for many competing organizations and individuals. Being a \
 		colony of sizable population and considerable wealth causes it to often be the target of various \
 		attempts of robbery, fraud and other malicious actions."

code/game/gamemodes/revolution/revolution.dm

@@ -3,10 +3,10 @@
 	config_tag = "revolution"
 	round_description = "Some crewmembers are attempting to start a revolution!"
 	extended_round_description = "Revolutionaries - Remove the heads of staff from power. Convert other crewmembers to your cause using the 'Convert Bourgeoise' verb. Protect your leaders."
-	required_players = 15
-	required_players_secret = 15
+	required_players = 12 //should be enough for a decent manifest, hopefully
+	required_players_secret = 12 //pretty sure rev doesn't even appear in secret
 	required_enemies = 3
-	auto_recall_shuttle = 0 //NO THANKS
+	auto_recall_shuttle = 0 //un-wanted on polaris
 	end_on_antag_death = 0
 	shuttle_delay = 3
 	antag_tags = list(MODE_REVOLUTIONARY, MODE_LOYALIST)

code/game/gamemodes/traitor/traitor.dm

@@ -1,7 +1,7 @@
 /datum/game_mode/traitor
 	name = "traitor"
 	round_description = "There is a foreign agent or traitor on the station. Do not let the traitor succeed!"
-	extended_round_description = "The Company's majority control of phoron in Vir has marked the \
+	extended_round_description = "The Company's majority control of phoron in "+starsys_name+" has marked the \
 		station to be a highly valuable target for many competing organizations and individuals. The varied pasts \
 		and experiences of your coworkers have left them susceptible to the vices and temptations of humanity. \
 		Is the station the safe self-contained workplace you once thought it was, or has it become a playground \

code/game/jobs/job/captain.dm

@@ -44,7 +44,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
 
 
-		H.implant_loyalty(src)
+		H.implant_loyalty()
 
 		return 1
 

code/game/jobs/job/civilian.dm

@@ -263,7 +263,7 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/lawyer(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
 
-		H.implant_loyalty(H)
+		H.implant_loyalty()
 
 
 		return 1

code/game/jobs/job/security.dm

@@ -41,7 +41,7 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_store)
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
-		H.implant_loyalty(H)
+		H.implant_loyalty()
 		return 1
 
 

code/game/machinery/autolathe.dm

@@ -102,6 +102,7 @@
 				//Build list of multipliers for sheets.
 				if(R.is_stack)
 					if(max_sheets && max_sheets > 0)
+						max_sheets = min(max_sheets, R.max_stack) // Limit to the max allowed by stack type.
 						multiplier_string  += "<br>"
 						for(var/i = 5;i<max_sheets;i*=2) //5,10,20,40...
 							multiplier_string  += "<a href='?src=\ref[src];make=[index];multiplier=[i]'>\[x[i]\]</a>"

code/game/machinery/autolathe_datums.dm

@@ -16,7 +16,10 @@
 			recipe.resources = list()
 			for(var/material in I.matter)
 				recipe.resources[material] = I.matter[material]*1.25 // More expensive to produce than they are to recycle.
-			qdel(I)
+		if(recipe.is_stack && istype(I, /obj/item/stack))
+			var/obj/item/stack/IS = I
+			recipe.max_stack = IS.max_amount
+		qdel(I)
 
 /datum/autolathe/recipe
 	var/name = "object"
@@ -26,17 +29,23 @@
 	var/category
 	var/power_use = 0
 	var/is_stack
+	var/max_stack
 
 /datum/autolathe/recipe/bucket
 	name = "bucket"
 	path = /obj/item/weapon/reagent_containers/glass/bucket
 	category = "General"
 
-/datum/autolathe/recipe/bucket/drinkingglass
+/datum/autolathe/recipe/drinkingglass
 	name = "drinking glass"
 	path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
 	category = "General"
 
+/datum/autolathe/recipe/shotglass/
+	name = "shot glass"
+	path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
+	category = "General"
+
 /datum/autolathe/recipe/flashlight
 	name = "flashlight"
 	path = /obj/item/device/flashlight

code/game/machinery/camera/camera_assembly.dm

@@ -80,7 +80,7 @@
 			if(isscrewdriver(W))
 				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 
-				var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: Northern Star,Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_EXODUS))
+				var/input = sanitize(input(usr, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: "+station_short+",Security,Secret ", "Set Network", camera_network ? camera_network : NETWORK_EXODUS))
 				if(!input)
 					usr << "No input found please hang up and try your call again."
 					return

code/game/machinery/computer/guestpass.dm

@@ -25,6 +25,8 @@
 		user << "<span class='warning'>It expired at [worldtime2text(expiration_time)].</span>"
 
 /obj/item/weapon/card/id/guest/read()
+	if(!Adjacent(usr))
+		return //Too far to read
 	if (world.time > expiration_time)
 		usr << "<span class='notice'>This pass expired at [worldtime2text(expiration_time)].</span>"
 	else

code/game/machinery/cryopod.dm

@@ -232,7 +232,6 @@
 		/obj/item/weapon/hand_tele,
 		/obj/item/weapon/card/id/captains_spare,
 		/obj/item/device/aicard,
-		/obj/item/device/mmi,
 		/obj/item/device/paicard,
 		/obj/item/weapon/gun,
 		/obj/item/weapon/pinpointer,

code/game/machinery/doors/airlock.dm

@@ -1019,6 +1019,9 @@ About the new airlock wires panel:
 		else
 			name = "[istext(assembly.glass) ? "[assembly.glass] airlock" : assembly.base_name]"
 
+		//get the dir from the assembly
+		set_dir(assembly.dir)
+
 	//wires
 	var/turf/T = get_turf(newloc)
 	if(T && (T.z in config.admin_levels))

code/game/machinery/doors/multi_tile.dm

@@ -4,17 +4,23 @@
 
 /obj/machinery/door/airlock/multi_tile/New()
 	..()
-	switch(dir)
-		if(EAST, WEST)
-			bound_width = width * world.icon_size
-			bound_height = world.icon_size
-		else
-			bound_width = world.icon_size
-			bound_height = width * world.icon_size
+	SetBounds()
+
+/obj/machinery/door/airlock/multi_tile/Move()
+	. = ..()
+	SetBounds()
+
+/obj/machinery/door/airlock/multi_tile/proc/SetBounds()
+	if(dir in list(EAST, WEST))
+		bound_width = width * world.icon_size
+		bound_height = world.icon_size
+	else
+		bound_width = world.icon_size
+		bound_height = width * world.icon_size
 
 /obj/machinery/door/airlock/multi_tile/glass
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Door2x1glass.dmi'
 	opacity = 0
 	glass = 1
-	assembly_type = /obj/structure/door_assembly/multi_tile
+	assembly_type = /obj/structure/door_assembly/multi_tile

code/game/machinery/exonet_node.dm

@@ -1,6 +1,6 @@
 /obj/machinery/exonet_node
 	name = "exonet node"
-	desc = "This machine is one of many, many nodes inside Vir's section of the Exonet, connecting the Northern Star to the rest of the system, at least \
+	desc = "This machine is one of many, many nodes inside "+starsys_name+"'s section of the Exonet, connecting the "+station_orig+" to the rest of the system, at least \
 	electronically."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "exonet_node"

code/game/machinery/kitchen/microwave.dm

@@ -327,7 +327,7 @@
 	src.updateUsrDialog()
 
 /obj/machinery/microwave/proc/dispose()
-	for (var/obj/O in (contents-component_parts))
+	for (var/obj/O in ((contents-component_parts)-circuit))
 		O.loc = src.loc
 	if (src.reagents.total_volume)
 		src.dirty++

code/game/machinery/lightswitch.dm

@@ -13,6 +13,7 @@
 	var/on = 1
 	var/area/area = null
 	var/otherarea = null
+	var/image/overlay
 
 /obj/machinery/light_switch/New()
 	..()
@@ -31,14 +32,18 @@
 
 
 /obj/machinery/light_switch/proc/updateicon()
+	if(!overlay)
+		overlay = image(icon, "light1-overlay", LIGHTING_LAYER+0.1)
+
+	overlays.Cut()
 	if(stat & NOPOWER)
 		icon_state = "light-p"
 		set_light(0)
-		layer = OBJ_LAYER
 	else
 		icon_state = "light[on]"
-		set_light(2, 1.5, on ? "#82FF4C" : "#F86060")
-		layer = LIGHTING_LAYER+0.1
+		overlay.icon_state = "light[on]-overlay"
+		overlays += overlay
+		set_light(2, 0.1, on ? "#82FF4C" : "#F86060")
 
 /obj/machinery/light_switch/examine(mob/user)
 	if(..(user, 1))

code/game/machinery/pda_multicaster.dm

@@ -0,0 +1,101 @@
+/obj/machinery/pda_multicaster
+	name = "\improper PDA multicaster"
+	desc = "This machine mirrors messages sent to it to specific departments."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "controller"
+	density = 1
+	anchored = 1
+	circuit = /obj/item/weapon/circuitboard/telecomms/pda_multicaster
+	use_power = 1
+	idle_power_usage = 750
+	var/on = 1		// If we're currently active,
+	var/toggle = 1	// If we /should/ be active or not,
+	var/list/internal_PDAs = list() // Assoc list of PDAs inside of this, with the department name being the index,
+
+/obj/machinery/pda_multicaster/New()
+	..()
+	internal_PDAs = list("command" = new /obj/item/device/pda/multicaster/command(src),
+		"security" = new /obj/item/device/pda/multicaster/security(src),
+		"engineering" = new /obj/item/device/pda/multicaster/engineering(src),
+		"medical" = new /obj/item/device/pda/multicaster/medical(src),
+		"research" = new /obj/item/device/pda/multicaster/research(src),
+		"cargo" = new /obj/item/device/pda/multicaster/cargo(src),
+		"civilian" = new /obj/item/device/pda/multicaster/civilian(src))
+
+/obj/machinery/pda_multicaster/prebuilt/New()
+	..()
+
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/telecomms/pda_multicaster(src)
+	component_parts += new /obj/item/weapon/stock_parts/subspace/ansible(src)
+	component_parts += new /obj/item/weapon/stock_parts/subspace/filter(src)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+	component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 2)
+	RefreshParts()
+
+/obj/machinery/pda_multicaster/Destroy()
+	for(var/atom/movable/AM in contents)
+		qdel(AM)
+	..()
+
+/obj/machinery/pda_multicaster/update_icon()
+	if(on)
+		icon_state = initial(icon_state)
+	else
+		icon_state = "[initial(icon_state)]-p"
+
+/obj/machinery/pda_multicaster/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		default_deconstruction_screwdriver(user, I)
+	else if(istype(I, /obj/item/weapon/crowbar))
+		default_deconstruction_crowbar(user, I)
+	else
+		..()
+
+/obj/machinery/pda_multicaster/attack_ai(mob/user)
+	attack_hand(user)
+
+/obj/machinery/pda_multicaster/attack_hand(mob/user)
+	toggle_power(user)
+
+/obj/machinery/pda_multicaster/proc/toggle_power(mob/user)
+	toggle = !toggle
+	visible_message("\the [user] turns \the [src] [toggle ? "on" : "off"].")
+	update_power()
+	if(!toggle)
+		var/msg = "[usr.client.key] ([usr]) has turned [src] off, at [x],[y],[z]."
+		message_admins(msg)
+		log_game(msg)
+
+/obj/machinery/pda_multicaster/proc/update_PDAs(var/turn_off)
+	for(var/obj/item/device/pda/pda in contents)
+		pda.toff = turn_off
+
+/obj/machinery/pda_multicaster/proc/update_power()
+	if(toggle)
+		if(stat & (BROKEN|NOPOWER|EMPED))
+			on = 0
+			update_PDAs(1) // 1 being to turn off.
+			idle_power_usage = 0
+		else
+			on = 1
+			update_PDAs(0)
+			idle_power_usage = 750
+	else
+		on = 0
+		update_PDAs(1)
+		idle_power_usage = 0
+	update_icon()
+
+/obj/machinery/pda_multicaster/process()
+	update_power()
+
+/obj/machinery/pda_multicaster/emp_act(severity)
+	if(!(stat & EMPED))
+		stat |= EMPED
+		var/duration = (300 * 10)/severity
+		spawn(rand(duration - 20, duration + 20))
+			stat &= ~EMPED
+	update_icon()
+	..()

code/game/machinery/supplybeacon.dm

@@ -2,7 +2,7 @@
 /obj/item/supply_beacon
 	name = "inactive supply beacon"
 	icon = 'icons/obj/supplybeacon.dmi'
-	desc = "An inactive, hacked supply beacon stamped with the Vir Rapid Fabrication logo. Good for one (1) ballistic supply pod shipment."
+	desc = "An inactive, hacked supply beacon stamped with the "+starsys_name+" Rapid Fabrication logo. Good for one (1) ballistic supply pod shipment."
 	icon_state = "beacon"
 	var/deploy_path = /obj/machinery/power/supply_beacon
 	var/deploy_time = 30
@@ -114,6 +114,6 @@
 		var/drop_x = src.x-2
 		var/drop_y = src.y-2
 		var/drop_z = src.z
-		command_announcement.Announce("Vir Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage")
+		command_announcement.Announce(starsys_name+" Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage")
 		spawn(rand(100,300))
 			new /datum/random_map/droppod/supply(null, drop_x, drop_y, drop_z, supplied_drop = drop_type) // Splat.

code/game/machinery/telecomms/broadcaster.dm

@@ -390,33 +390,33 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		if (length(heard_masked))
 			for (var/mob/R in heard_masked)
-				R.hear_radio(message,verbage, speaking, part_a, part_b, M, 0, name)
+				R.hear_radio(message,verbage, speaking, part_a, part_b, part_c, M, 0, name)
 
 		/* --- Process all the mobs that heard the voice normally (understood) --- */
 
 		if (length(heard_normal))
 			for (var/mob/R in heard_normal)
-				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 0, realname)
+				R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 0, realname)
 
 		/* --- Process all the mobs that heard the voice normally (did not understand) --- */
 
 		if (length(heard_voice))
 			for (var/mob/R in heard_voice)
-				R.hear_radio(message,verbage, speaking, part_a, part_b, M,0, vname)
+				R.hear_radio(message,verbage, speaking, part_a, part_b, part_c, M,0, vname)
 
 		/* --- Process all the mobs that heard a garbled voice (did not understand) --- */
 			// Displays garbled message (ie "f*c* **u, **i*er!")
 
 		if (length(heard_garbled))
 			for (var/mob/R in heard_garbled)
-				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1, vname)
+				R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 1, vname)
 
 
 		/* --- Complete gibberish. Usually happens when there's a compressed message --- */
 
 		if (length(heard_gibberish))
 			for (var/mob/R in heard_gibberish)
-				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1)
+				R.hear_radio(message, verbage, speaking, part_a, part_b, part_c, M, 1)
 
 	return 1
 

code/game/machinery/vending.dm

@@ -695,24 +695,40 @@
 /obj/machinery/vending/boozeomat
 	name = "Booze-O-Mat"
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
-	icon_state = "boozeomat"        //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
+	icon_state = "boozeomat"
 	icon_deny = "boozeomat-deny"
-	products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 6,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
-					/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
-					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 2,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 4)
-	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
+					/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 30,
+					/obj/item/weapon/reagent_containers/food/drinks/ice = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/tea = 15)
+	contraband = list()
 	vend_delay = 15
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"

code/game/objects/effects/effect_system.dm

@@ -213,10 +213,10 @@ steam.start() -- spawns the effect
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "sparks"
 
-/obj/effect/effect/smoke/illumination/New(var/newloc, var/brightness=15, var/lifetime=10)
+/obj/effect/effect/smoke/illumination/New(var/newloc, var/lifetime=10, var/range=null, var/power=null, var/color=null)
 	time_to_live=lifetime
 	..()
-	set_light(brightness)
+	set_light(range, power, color)
 
 /////////////////////////////////////////////
 // Bad smoke

code/game/objects/effects/landmarks.dm

@@ -133,7 +133,7 @@
 	qdel(src)
 
 /obj/effect/landmark/costume/maid/New()
-	new /obj/item/clothing/under/blackskirt(src.loc)
+	new /obj/item/clothing/under/skirt(src.loc)
 	var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
 	new CHOICE(src.loc)
 	new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)

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/communicator/communicator.dm

@@ -20,13 +20,32 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	var/list/voice_mobs = list()
 	var/list/voice_requests = list()
 	var/list/voice_invites = list()
-	var/selected_tab = 1	//1 equals dialing, 2 equals reviewing requests/invites.
+
+	var/list/im_contacts = list()
+	var/list/im_list = list()
+
+	var/note = "Thank you for choosing the T-14.2 Communicator, this is your notepad!" //Current note in the notepad function
+	var/notehtml = ""
+
+	var/obj/item/weapon/cartridge/cartridge = null //current cartridge
+	var/list/modules = list(
+							list("module" = "Phone", "icon" = "phone64", "number" = 2),
+							list("module" = "Contacts", "icon" = "person64", "number" = 3),
+							list("module" = "Messaging", "icon" = "comment64", "number" = 4),
+							list("module" = "Note", "icon" = "note64", "number" = 5),
+							list("module" = "Settings", "icon" = "gear64", "number" = 6)
+							)	//list("module" = "Name of Module", "icon" = "icon name64", "number" = "what tab is the module")
+
+	var/selected_tab = 1
 	var/owner = ""
+	var/occupation = ""
 	var/alert_called = 0
 	var/obj/machinery/exonet_node/node = null //Reference to the Exonet node, to avoid having to look it up so often.
 
 	var/target_address = ""
+	var/target_address_name = ""
 	var/network_visibility = 1
+	var/ringer = 1
 	var/list/known_devices = list()
 	var/datum/exonet_protocol/exonet = null
 	var/list/communicating = list()
@@ -151,6 +170,24 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 		if(!node || !node.on || !node.allow_external_communicators)
 			close_connection(reason = "Connection timed out")
 
+// Proc: attackby()
+// Parameters: 2 (C - what is used on the communicator. user - the mob that has the communicator)
+// Description: When an ID is swiped on the communicator, the communicator reads the job and checks it against the Owner name, if success, the occupation is added.
+/obj/item/device/communicator/attackby(obj/item/C as obj, mob/user as mob)
+	if(istype(C, /obj/item/weapon/card/id))
+		var/obj/item/weapon/card/id/idcard = C
+		if(!idcard.registered_name || !idcard.assignment)
+			user << "<span class='notice'>\The [src] rejects the ID.</span>"
+			return
+		if(!owner)
+			user << "<span class='notice'>\The [src] rejects the ID.</span>"
+			return
+		if(owner == idcard.registered_name)
+			occupation = idcard.assignment
+			user << "<span class='notice'>Occupation updated.</span>"
+			return
+	else return
+
 // Proc: attack_self()
 // Parameters: 1 (user - the mob that clicked the device in their hand)
 // Description: Makes an exonet datum if one does not exist, allocates an address for it, maintains the lists of all devies, clears the alert icon, and
@@ -205,6 +242,11 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	var/voices[0]					//Current /mob/living/voice s inside the device.
 	var/connected_communicators[0]	//Current communicators connected to the device.
 
+	var/im_contacts_ui[0]			//List of communicators that have been messaged.
+	var/im_list_ui[0]				//List of messages.
+
+	var/modules_ui[0]				//Home screen info.
+
 	//First we add other 'local' communicators.
 	for(var/obj/item/device/communicator/comm in known_devices)
 		if(comm.network_visibility && comm.exonet)
@@ -243,18 +285,38 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	for(var/obj/item/device/communicator/comm in communicating)
 		connected_communicators[++connected_communicators.len] = list("name" = sanitize(comm.name), "true_name" = sanitize(comm.name))
 
+	//Devices that have been messaged or recieved messages from.
+	for(var/obj/item/device/communicator/comm in im_contacts)
+		if(comm.exonet)
+			im_contacts_ui[++im_contacts_ui.len] = list("name" = sanitize(comm.name), "address" = comm.exonet.address)
+
+	//Actual messages.
+	for(var/I in im_list)
+		im_list_ui[++im_list_ui.len] = list("address" = I["address"], "to_address" = I["to_address"], "im" = I["im"])
+
+	//Modules for homescreen.
+	for(var/list/R in modules)
+		modules_ui[++modules_ui.len] = R
 
 	data["owner"] = owner ? owner : "Unset"
+	data["occupation"] = occupation ? occupation : "Swipe ID to set."
 	data["connectionStatus"] = get_connection_to_tcomms()
 	data["visible"] = network_visibility
 	data["address"] = exonet.address ? exonet.address : "Unallocated"
 	data["targetAddress"] = target_address
+	data["targetAddressName"] = target_address_name
 	data["currentTab"] = selected_tab
 	data["knownDevices"] = communicators
 	data["invitesSent"] = invites
 	data["requestsReceived"] = requests
 	data["voice_mobs"] = voices
 	data["communicating"] = connected_communicators
+	data["imContacts"] = im_contacts_ui
+	data["imList"] = im_list_ui
+	data["time"] = worldtime2text()
+	data["ring"] = ringer
+	data["homeScreen"] = modules_ui
+	data["note"] = note					// current notes
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -284,6 +346,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	if(href_list["toggle_visibility"])
 		network_visibility = !network_visibility
 
+	if(href_list["toggle_ringer"])
+		ringer = !ringer
+
 	if(href_list["add_hex"])
 		var/hex = href_list["add_hex"]
 		add_to_EPv2(hex)
@@ -304,6 +369,16 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 		var/their_address = href_list["dial"]
 		exonet.send_message(their_address, "voice")
 
+	if(href_list["message"])
+		if(!get_connection_to_tcomms())
+			usr << "<span class='danger'>Error: Cannot connect to Exonet node.</span>"
+			return
+		var/their_address = href_list["message"]
+		var/text = sanitizeSafe(input(usr,"Enter your message.","Text Message"))
+		if(text)
+			exonet.send_message(their_address, "text", text)
+			im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text))
+
 	if(href_list["disconnect"])
 		var/name_to_disconnect = href_list["disconnect"]
 		for(var/mob/living/voice/V in contents)
@@ -316,6 +391,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	if(href_list["copy"])
 		target_address = href_list["copy"]
 
+	if(href_list["copy_name"])
+		target_address_name = href_list["copy_name"]
+
 	if(href_list["hang_up"])
 		for(var/mob/living/voice/V in contents)
 			close_connection(usr, V, "[usr] hung up.")
@@ -325,13 +403,25 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	if(href_list["switch_tab"])
 		selected_tab = href_list["switch_tab"]
 
+	if(href_list["edit"])
+		var/n = input(usr, "Please enter message", name, notehtml)
+		n = sanitizeSafe(n, extra = 0)
+		if(n)
+			note = html_decode(n)
+			notehtml = note
+			note = replacetext(note, "\n", "<br>")
+		else
+			note = ""
+			notehtml = note
+
 	nanomanager.update_uis(src)
 	add_fingerprint(usr)
 
 // Proc: receive_exonet_message()
-// Parameters: 3 (origin atom - the source of the message's holder, origin_address - where the message came from, message - the message received)
-// Description: Handles voice requests and invite messages originating from both real communicators and ghosts.  Also includes a ping response.
-/obj/item/device/communicator/receive_exonet_message(var/atom/origin_atom, origin_address, message)
+// Parameters: 4 (origin atom - the source of the message's holder, origin_address - where the message came from, message - the message received,
+//				  text - message text to send if message is of type "text")
+// Description: Handles voice requests and invite messages originating from both real communicators and ghosts.  Also includes a ping response and IM function.
+/obj/item/device/communicator/receive_exonet_message(var/atom/origin_atom, origin_address, message, text)
 	if(message == "voice")
 		if(isobserver(origin_atom) || istype(origin_atom, /obj/item/device/communicator))
 			if(origin_atom in voice_invites)
@@ -349,6 +439,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 			var/random = rand(200,350)
 			random = random / 10
 			exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms")
+	if(message == "text")
+		request_im(origin_atom, origin_address, text)
+		return
 
 // Proc: receive_exonet_message()
 // Parameters: 3 (origin atom - the source of the message's holder, origin_address - where the message came from, message - the message received)
@@ -368,6 +461,8 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 			var/random = rand(450,700)
 			random = random / 10
 			exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms")
+	if(message == "text") //Ghosts don't get texting yet. Mostly for spam prevention by ghosts but also due to ui requirements not sorted out yet.
+		return
 
 // Proc: register_device()
 // Parameters: 1 (user - the person to use their name for)
@@ -514,9 +609,10 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 
 	voice_requests |= candidate
 
-	playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
-	for (var/mob/O in hearers(2, loc))
-		O.show_message(text("\icon[src] *beep*"))
+	if(ringer)
+		playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
+		for (var/mob/O in hearers(2, loc))
+			O.show_message(text("\icon[src] *beep*"))
 
 	alert_called = 1
 	update_icon()
@@ -529,6 +625,42 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	if(L)
 		L << "<span class='notice'>\icon[src] Communications request from [who].</span>"
 
+// Proc: request_im()
+// Parameters: 3 (candidate - the communicator wanting to message the device, origin_address - the address of the sender, text - the message)
+// Description: Response to a communicator trying to message the device.
+//				Adds them to the list of people that have messaged this device and adds the message to the message list.
+/obj/item/device/communicator/proc/request_im(var/atom/candidate, var/origin_address, var/text)
+	var/who = null
+	if(isobserver(candidate))
+		return
+	else if(istype(candidate, /obj/item/device/communicator))
+		var/obj/item/device/communicator/comm = candidate
+		who = comm.owner
+		comm.im_contacts |= src
+		im_list += list(list("address" = origin_address, "to_address" = exonet.address, "im" = text))
+	else return
+
+	im_contacts |= candidate
+
+	if(!who)
+		return
+
+	if(ringer)
+		playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
+		for (var/mob/O in hearers(2, loc))
+			O.show_message(text("\icon[src] *beep*"))
+
+	alert_called = 1
+	update_icon()
+
+	//Search for holder of the device.
+	var/mob/living/L = null
+	if(loc && isliving(loc))
+		L = loc
+
+	if(L)
+		L << "<span class='notice'>\icon[src] Message from [who].</span>"
+
 // Proc: Destroy()
 // Parameters: None
 // Description: Deletes all the voice mobs, disconnects all linked communicators, and cuts lists to allow successful qdel()

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/uplink.dm

@@ -1,11 +1,3 @@
-//This could either be split into the proper DM files or placed somewhere else all together, but it'll do for now -Nodrak
-
-/*
-
-A list of items and costs is stored under the datum of every game mode, alongside the number of crystals, and the welcoming message.
-
-*/
-
 /obj/item/device/uplink
 	var/welcome = "Welcome, Operative"	// Welcoming menu message
 	var/uses 							// Numbers of crystals
@@ -18,6 +10,10 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/list/purchase_log = new
 	var/datum/mind/uplink_owner = null
 	var/used_TC = 0
+	var/offer_time = 15 MINUTES			//The time increment per discount offered
+	var/next_offer_time					//The time a discount will next be offered
+	var/datum/uplink_item/discount_item	//The item to be discounted
+	var/discount_amount					//The amount as a percent the item will be discounted by
 
 /obj/item/device/uplink/nano_host()
 	return loc
@@ -28,10 +24,15 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	purchase_log = list()
 	world_uplinks += src
 	uses = owner.tcrystals
+	processing_objects += src
 
 /obj/item/device/uplink/Destroy()
 	world_uplinks -= src
-	..()
+	processing_objects -= src
+	return ..()
+
+/obj/item/device/uplink/get_item_cost(var/item_type, var/item_cost)
+	return (discount_item && (item_type == discount_item)) ? max(1, round(item_cost*discount_amount)) : item_cost
 
 // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it.
 /* How to create an uplink in 3 easy steps!
@@ -52,7 +53,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/datum/uplink_category/category 	= 0		// The current category we are in
 	var/exploit_id								// Id of the current exploit record we are viewing
 
-
 // The hidden uplink MUST be inside an obj/item's contents.
 /obj/item/device/uplink/hidden/New()
 	spawn(2)
@@ -62,6 +62,14 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	nanoui_data = list()
 	update_nano_data()
 
+/obj/item/device/uplink/hidden/process()
+	if(world.time > next_offer_time)
+		discount_item = default_uplink_selection.get_random_item(INFINITY)
+		discount_amount = pick(90;0.9, 80;0.8, 70;0.7, 60;0.6, 50;0.5, 40;0.4, 30;0.3, 20;0.2, 10;0.1)
+		next_offer_time = world.time + offer_time
+		update_nano_data()
+		nanomanager.update_uis(src)
+
 // Toggles the uplink on and off. Normally this will bypass the item's normal functions and go to the uplink menu, if activated.
 /obj/item/device/uplink/hidden/proc/toggle()
 	active = !active
@@ -107,6 +115,11 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/uplink/hidden/interact(mob/user)
 	ui_interact(user)
 
+/obj/item/device/uplink/hidden/CanUseTopic()
+	if(!active)
+		return STATUS_CLOSE
+	return ..()
+
 // The purchasing code.
 /obj/item/device/uplink/hidden/Topic(href, href_list)
 	if(..())
@@ -139,11 +152,14 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			if(category.can_view(src))
 				categories[++categories.len] = list("name" = category.name, "ref" = "\ref[category]")
 		nanoui_data["categories"] = categories
+		nanoui_data["discount_name"] = discount_item ? discount_item.name : ""
+		nanoui_data["discount_amount"] = (1-discount_amount)*100
+		nanoui_data["offer_expiry"] = worldtime2text(next_offer_time)
 	else if(nanoui_menu == 1)
 		var/items[0]
 		for(var/datum/uplink_item/item in category.items)
 			if(item.can_view(src))
-				var/cost = item.cost(uses)
+				var/cost = item.cost(uses, src)
 				if(!cost) cost = "???"
 				items[++items.len] = list("name" = item.name, "description" = replacetext(item.description(), "\n", "<br>"), "can_buy" = item.can_buy(src), "cost" = cost, "ref" = "\ref[item]")
 		nanoui_data["items"] = items

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

@@ -1,774 +0,0 @@
-var/datum/uplink/uplink = new()
-
-/datum/uplink
-	var/list/items_assoc
-	var/list/datum/uplink_item/items
-	var/list/datum/uplink_category/categories
-
-/datum/uplink/New()
-	items_assoc = list()
-	items = init_subtypes(/datum/uplink_item)
-	categories = init_subtypes(/datum/uplink_category)
-	categories = dd_sortedObjectList(categories)
-
-	for(var/datum/uplink_item/item in items)
-		if(!item.name)
-			items -= item
-			continue
-
-		items_assoc[item.type] = item
-
-		for(var/datum/uplink_category/category in categories)
-			if(item.category == category.type)
-				category.items += item
-
-	for(var/datum/uplink_category/category in categories)
-		category.items = dd_sortedObjectList(category.items)
-
-/datum/uplink_item
-	var/name
-	var/desc
-	var/item_cost = 0
-	var/datum/uplink_category/category		// Item category
-	var/list/datum/antagonist/antag_roles	// Antag roles this item is displayed to. If empty, display to all.
-
-/datum/uplink_item/item
-	var/path = null
-
-/datum/uplink_item/New()
-	..()
-	antag_roles = list()
-
-
-
-/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user)
-	var/extra_args = extra_args(user)
-	if(!extra_args)
-		return
-
-	if(!can_buy(U))
-		return
-
-	var/cost = cost(U.uses)
-
-	var/goods = get_goods(U, get_turf(user), user, extra_args)
-	if(!goods)
-		return
-
-	purchase_log(U)
-	user.mind.tcrystals -= cost
-	U.used_TC += cost
-	return goods
-
-// Any additional arguments you wish to send to the get_goods
-/datum/uplink_item/proc/extra_args(var/mob/user)
-	return 1
-
-/datum/uplink_item/proc/can_buy(obj/item/device/uplink/U)
-	if(cost(U.uses) > U.uses)
-		return 0
-
-	return can_view(U)
-
-/datum/uplink_item/proc/can_view(obj/item/device/uplink/U)
-	// Making the assumption that if no uplink was supplied, then we don't care about antag roles
-	if(!U || !antag_roles.len)
-		return 1
-
-	// With no owner, there's no need to check antag status.
-	if(!U.uplink_owner)
-		return 0
-
-	for(var/antag_role in antag_roles)
-		var/datum/antagonist/antag = all_antag_types[antag_role]
-		if(antag.is_antagonist(U.uplink_owner))
-			return 1
-	return 0
-
-/datum/uplink_item/proc/cost(var/telecrystals)
-	return item_cost
-
-/datum/uplink_item/proc/description()
-	return desc
-
-// get_goods does not necessarily return physical objects, it is simply a way to acquire the uplink item without paying
-/datum/uplink_item/proc/get_goods(var/obj/item/device/uplink/U, var/loc)
-	return 0
-
-/datum/uplink_item/proc/log_icon()
-	return
-
-/datum/uplink_item/proc/purchase_log(obj/item/device/uplink/U)
-	feedback_add_details("traitor_uplink_items_bought", "[src]")
-	log_and_message_admins("used \the [U.loc] to buy \a [src]")
-	U.purchase_log[src] = U.purchase_log[src] + 1
-
-datum/uplink_item/dd_SortValue()
-	return cost(INFINITY)
-
-/********************************
-*                           	*
-*	Physical Uplink Entries		*
-*                           	*
-********************************/
-/datum/uplink_item/item/buy(var/obj/item/device/uplink/U, var/mob/user)
-	var/obj/item/I = ..()
-	if(!I)
-		return
-
-	if(istype(I, /list))
-		var/list/L = I
-		if(L.len) I = L[1]
-
-	if(istype(I) && ishuman(user))
-		var/mob/living/carbon/human/A = user
-		A.put_in_any_hand_if_possible(I)
-	return I
-
-/datum/uplink_item/item/get_goods(var/obj/item/device/uplink/U, var/loc)
-	var/obj/item/I = new path(loc)
-	return I
-
-/datum/uplink_item/item/description()
-	if(!desc)
-		// Fallback description
-		var/obj/temp = src.path
-		desc = initial(temp.desc)
-	return ..()
-
-/datum/uplink_item/item/log_icon()
-	var/obj/I = path
-	return "\icon[I]"
-
-/*************
-* Ammunition *
-*************/
-/datum/uplink_item/item/ammo
-	item_cost = 2
-	category = /datum/uplink_category/ammunition
-
-/datum/uplink_item/item/ammo/a357
-	name = ".357"
-	path = /obj/item/ammo_magazine/a357
-
-/datum/uplink_item/item/ammo/mc9mm
-	name = "9mm"
-	path = /obj/item/ammo_magazine/mc9mm
-
-/datum/uplink_item/item/ammo/c45m
-	name = ".45"
-	path = /obj/item/ammo_magazine/c45m
-
-/datum/uplink_item/item/ammo/darts
-	name = "Darts"
-	path = /obj/item/ammo_magazine/chemdart
-
-/datum/uplink_item/item/ammo/sniperammo
-	name = "14.5mm"
-	path = /obj/item/weapon/storage/box/sniperammo
-
-/datum/uplink_item/item/ammo/a556
-	name = "5.56mm"
-	path = /obj/item/ammo_magazine/a556
-
-/datum/uplink_item/item/ammo/a556/ap
-	name = "5.56mm AP"
-	path = /obj/item/ammo_magazine/a556/ap
-
-/datum/uplink_item/item/ammo/a10mm
-	name = "10mm"
-	path = /obj/item/ammo_magazine/a10mm
-
-/datum/uplink_item/item/ammo/a762
-	name = "7.62mm"
-	path = /obj/item/ammo_magazine/a762
-
-/datum/uplink_item/item/ammo/a762/ap
-	name = "7.62mm AP"
-	path = /obj/item/ammo_magazine/a762/ap
-
-/datum/uplink_item/item/ammo/g12
-	name = "12 gauge"
-	path = /obj/item/ammo_magazine/g12
-
-/datum/uplink_item/item/ammo/g12/beanbag
-	name = "12 gauge beanbag"
-	path = /obj/item/ammo_magazine/g12/beanbag
-	item_cost = 1 // Discount due to it being LTL.
-
-/datum/uplink_item/item/ammo/g12/pellet
-	name = "12 gauge pellet"
-	path = /obj/item/ammo_magazine/g12/pellet
-
-/***************************************
-* Highly Visible and Dangerous Weapons *
-***************************************/
-/datum/uplink_item/item/visible_weapons
-	category = /datum/uplink_category/visible_weapons
-
-/datum/uplink_item/item/visible_weapons/energy_sword
-	name = "Energy Sword"
-	item_cost = 4
-	path = /obj/item/weapon/melee/energy/sword
-
-/datum/uplink_item/item/visible_weapons/dartgun
-	name = "Dart Gun"
-	item_cost = 5
-	path = /obj/item/weapon/gun/projectile/dartgun
-
-/datum/uplink_item/item/visible_weapons/crossbow
-	name = "Energy Crossbow"
-	item_cost = 5
-	path = /obj/item/weapon/gun/energy/crossbow
-
-/datum/uplink_item/item/visible_weapons/silenced_45
-	name = "Silenced .45"
-	item_cost = 5
-	path = /obj/item/weapon/gun/projectile/silenced
-
-/datum/uplink_item/item/visible_weapons/riggedlaser
-	name = "Exosuit Rigged Laser"
-	item_cost = 6
-	path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser
-
-/datum/uplink_item/item/visible_weapons/revolver
-	name = "Revolver"
-	item_cost = 6
-	path = /obj/item/weapon/gun/projectile/revolver
-
-/datum/uplink_item/item/visible_weapons/heavysniper
-	name = "Anti-materiel Rifle"
-	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/weapon/gun/projectile/heavysniper
-
-//These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear.
-/datum/uplink_item/item/visible_weapons/submachinegun
-	name = "Submachine Gun"
-	item_cost = 6
-	path = /obj/item/weapon/gun/projectile/automatic/c20r
-
-/datum/uplink_item/item/visible_weapons/assaultrifle
-	name = "Assault Rifle"
-	item_cost = 7
-	path = /obj/item/weapon/gun/projectile/automatic/sts35
-
-/datum/uplink_item/item/visible_weapons/combatshotgun
-	name = "Combat Shotgun"
-	item_cost = 7
-	path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
-
-/datum/uplink_item/item/visible_weapons/egun
-	name = "Energy Gun"
-	item_cost = 5
-	path = /obj/item/weapon/gun/energy/gun
-
-/datum/uplink_item/item/visible_weapons/lasercannon
-	name = "Laser Cannon"
-	item_cost = 6
-	path = /obj/item/weapon/gun/energy/lasercannon
-
-/datum/uplink_item/item/visible_weapons/lasercarbine
-	name = "Laser Carbine"
-	item_cost = 7
-	path = /obj/item/weapon/gun/energy/laser
-
-/datum/uplink_item/item/visible_weapons/ionrifle
-	name = "Ion Rifle"
-	item_cost = 5
-	path = /obj/item/weapon/gun/energy/ionrifle
-
-/datum/uplink_item/item/visible_weapons/xray
-	name = "Xray Gun"
-	item_cost = 7
-	path = /obj/item/weapon/gun/energy/xray
-
-/*************************************
-* Stealthy and Inconspicuous Weapons *
-*************************************/
-/datum/uplink_item/item/stealthy_weapons
-	category = /datum/uplink_category/stealthy_weapons
-
-/datum/uplink_item/item/stealthy_weapons/soap
-	name = "Subversive Soap"
-	item_cost = 1
-	path = /obj/item/weapon/soap/syndie
-
-/datum/uplink_item/item/stealthy_weapons/concealed_cane
-	name = "Concealed Cane Sword"
-	item_cost = 1
-	path = /obj/item/weapon/cane/concealed
-
-/datum/uplink_item/item/stealthy_weapons/detomatix
-	name = "Detomatix PDA Cartridge"
-	item_cost = 3
-	path = /obj/item/weapon/cartridge/syndicate
-
-/datum/uplink_item/item/stealthy_weapons/parapen
-	name = "Paralysis Pen"
-	item_cost = 3
-	path = /obj/item/weapon/pen/reagent/paralysis
-
-/datum/uplink_item/item/stealthy_weapons/cigarette_kit
-	name = "Cigarette Kit"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/syndie_kit/cigarette
-
-/datum/uplink_item/item/stealthy_weapons/random_toxin
-	name = "Random Toxin - Beaker"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/syndie_kit/toxin
-
-/*******************************
-* Stealth and Camouflage Items *
-*******************************/
-/datum/uplink_item/item/stealth_items
-	category = /datum/uplink_category/stealth_items
-
-/datum/uplink_item/item/stealth_items/id
-	name = "Agent ID card"
-	item_cost = 2
-	path = /obj/item/weapon/card/id/syndicate
-
-/datum/uplink_item/item/stealth_items/syndigaloshes
-	name = "No-Slip Shoes"
-	item_cost = 2
-	path = /obj/item/clothing/shoes/syndigaloshes
-
-/datum/uplink_item/item/stealth_items/spy
-	name = "Bug Kit"
-	item_cost = 2
-	path = /obj/item/weapon/storage/box/syndie_kit/spy
-
-/datum/uplink_item/item/stealth_items/chameleon_kit
-	name = "Chameleon Kit"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/syndie_kit/chameleon
-
-/datum/uplink_item/item/stealth_items/chameleon_projector
-	name = "Chameleon-Projector"
-	item_cost = 4
-	path = /obj/item/device/chameleon
-
-/datum/uplink_item/item/stealth_items/chameleon_projector
-	name = "Chameleon-Projector"
-	item_cost = 4
-	path = /obj/item/device/chameleon
-
-/datum/uplink_item/item/stealth_items/voice
-	name = "Voice Changer"
-	item_cost = 4
-	path = /obj/item/clothing/mask/gas/voice
-
-/datum/uplink_item/item/stealth_items/camera_floppy
-	name = "Camera Network Access - Floppy"
-	item_cost = 6
-	path = /obj/item/weapon/disk/file/cameras/syndicate
-
-/********
-* Armor *
-********/
-/datum/uplink_item/item/armor
-	category = /datum/uplink_category/armor
-
-/datum/uplink_item/item/armor/combat
-	name = "Combat Armor Set"
-	item_cost = 5
-	path = /obj/item/weapon/storage/box/syndie_kit/combat_armor
-
-/datum/uplink_item/item/armor/heavy_vest
-	name = "Heavy Armor Vest"
-	item_cost = 4
-	path = /obj/item/clothing/suit/storage/vest/heavy/merc
-
-/********************
-* Devices and Tools *
-********************/
-/datum/uplink_item/item/tools
-	category = /datum/uplink_category/tools
-
-/datum/uplink_item/item/tools/toolbox
-	name = "Fully Loaded Toolbox"
-	item_cost = 1
-	path = /obj/item/weapon/storage/toolbox/syndicate
-
-/datum/uplink_item/item/tools/plastique
-	name = "C-4 (Destroys walls)"
-	item_cost = 2
-	path = /obj/item/weapon/plastique
-
-/datum/uplink_item/item/tools/encryptionkey_radio
-	name = "Encrypted Radio Channel Key"
-	item_cost = 2
-	path = /obj/item/device/encryptionkey/syndicate
-
-/datum/uplink_item/item/tools/encryptionkey_binary
-	name = "Binary Translator Key"
-	item_cost = 3
-	path = /obj/item/device/encryptionkey/binary
-
-/datum/uplink_item/item/tools/emag
-	name = "Cryptographic Sequencer"
-	item_cost = 3
-	path = /obj/item/weapon/card/emag
-
-/datum/uplink_item/item/tools/clerical
-	name = "Morphic Clerical Kit"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/syndie_kit/clerical
-
-/datum/uplink_item/item/tools/space_suit
-	name = "Space Suit"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/syndie_kit/space
-
-/datum/uplink_item/item/tools/thermal
-	name = "Thermal Imaging Glasses"
-	item_cost = 3
-	path = /obj/item/clothing/glasses/thermal/syndi
-
-/datum/uplink_item/item/tools/powersink
-	name = "Powersink (DANGER!)"
-	item_cost = 5
-	path = /obj/item/device/powersink
-
-/datum/uplink_item/item/tools/ai_module
-	name = "Hacked AI Upload Module"
-	item_cost = 7
-	path = /obj/item/weapon/aiModule/syndicate
-
-/datum/uplink_item/item/tools/supply_beacon
-	name = "Hacked Supply Beacon (DANGER!)"
-	item_cost = 7
-	path = /obj/item/supply_beacon
-
-/datum/uplink_item/item/tools/teleporter
-	name = "Teleporter Circuit Board"
-	item_cost = 20
-	path = /obj/item/weapon/circuitboard/teleporter
-
-/datum/uplink_item/item/tools/money
-	name = "Operations Funding"
-	item_cost = 3
-	path = /obj/item/weapon/storage/secure/briefcase/money
-	desc = "A briefcase with 10,000 untraceable thalers for funding your sneaky activities."
-
-/datum/uplink_item/item/tools/crystal
-	name = "Tradable Crystal"
-	item_cost = 1
-	path = /obj/item/device/telecrystal
-	desc = "A telecrystal that can be transferred from one user to another. Be sure not to give it to just anyone."
-
-/***********
-* Implants *
-***********/
-/datum/uplink_item/item/implants
-	category = /datum/uplink_category/implants
-
-/datum/uplink_item/item/implants/imp_freedom
-	name = "Freedom Implant"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/syndie_kit/imp_freedom
-
-/datum/uplink_item/item/implants/imp_compress
-	name = "Compressed Matter Implant"
-	item_cost = 4
-	path = /obj/item/weapon/storage/box/syndie_kit/imp_compress
-
-/datum/uplink_item/item/implants/imp_explosive
-	name = "Explosive Implant (DANGER!)"
-	item_cost = 6
-	path = /obj/item/weapon/storage/box/syndie_kit/imp_explosive
-
-/datum/uplink_item/item/implants/imp_uplink
-	name = "Uplink Implant" //Original name: "Uplink Implant (Contains 5 Telecrystals)"
-	item_cost = 5 //Original cost: 10
-	path = /obj/item/weapon/storage/box/syndie_kit/imp_uplink
-
-/**********
-* Medical *
-**********/
-/datum/uplink_item/item/medical
-	category = /datum/uplink_category/medical
-
-/datum/uplink_item/item/medical/sinpockets
-	name = "Box of Sin-Pockets"
-	item_cost = 1
-	path = /obj/item/weapon/storage/box/sinpockets
-
-/datum/uplink_item/item/medical/surgery
-	name = "Surgery kit"
-	item_cost = 6
-	path = /obj/item/weapon/storage/firstaid/surgery
-
-/datum/uplink_item/item/medical/combat
-	name = "Combat medical kit"
-	item_cost = 6
-	path = /obj/item/weapon/storage/firstaid/combat
-
-/*******************
-* Hardsuit Modules *
-*******************/
-/datum/uplink_item/item/hardsuit_modules
-	category = /datum/uplink_category/hardsuit_modules
-
-/datum/uplink_item/item/hardsuit_modules/thermal
-	name = "Thermal Scanner"
-	item_cost = 2
-	path = /obj/item/rig_module/vision/thermal
-
-/datum/uplink_item/item/hardsuit_modules/energy_net
-	name = "Net Projector"
-	item_cost = 3
-	path = /obj/item/rig_module/fabricator/energy_net
-
-/datum/uplink_item/item/ewar_voice
-	name = "Electrowarfare Suite and Voice Synthesiser"
-	item_cost = 4
-	path = /obj/item/weapon/storage/box/syndie_kit/ewar_voice
-
-/datum/uplink_item/item/hardsuit_modules/maneuvering_jets
-	name = "Maneuvering Jets"
-	item_cost = 4
-	path = /obj/item/rig_module/maneuvering_jets
-
-/datum/uplink_item/item/hardsuit_modules/egun
-	name = "Mounted Energy Gun"
-	item_cost = 6
-	path = /obj/item/rig_module/mounted/egun
-
-/datum/uplink_item/item/hardsuit_modules/power_sink
-	name = "Power Sink"
-	item_cost = 6
-	path = /obj/item/rig_module/power_sink
-
-/datum/uplink_item/item/hardsuit_modules/laser_canon
-	name = "Mounted Laser Cannon"
-	item_cost = 8
-	path = /obj/item/rig_module/mounted
-
-/***********
-* Grenades *
-************/
-/datum/uplink_item/item/grenades
-	category = /datum/uplink_category/grenades
-
-/datum/uplink_item/item/grenades/anti_photon
-	name = "5xPhoton Disruption Grenades"
-	item_cost = 2
-	path = /obj/item/weapon/storage/box/anti_photons
-
-/datum/uplink_item/item/grenades/emp
-	name = "5xEMP Grenades"
-	item_cost = 3
-	path = /obj/item/weapon/storage/box/emps
-
-/datum/uplink_item/item/grenades/smoke
-	name = "5xSmoke Grenades"
-	item_cost = 2
-	path = /obj/item/weapon/storage/box/smokes
-
-/************
-* Badassery *
-************/
-/datum/uplink_item/item/badassery
-	category = /datum/uplink_category/badassery
-
-/datum/uplink_item/item/badassery/balloon
-	name = "For showing that You Are The BOSS (Useless Balloon)"
-	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/toy/syndicateballoon
-
-/datum/uplink_item/item/badassery/balloon/NT
-	name = "For showing that you love NT SOO much (Useless Balloon)"
-	path = /obj/item/toy/nanotrasenballoon
-
-/**************
-* Random Item *
-**************/
-/datum/uplink_item/item/badassery/random_one
-	name = "Random Item"
-	desc = "Buys you one random item."
-
-/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user)
-	var/datum/uplink_item/item = default_uplink_selection.get_random_item(U.uses)
-	return item.buy(U, user)
-
-/datum/uplink_item/item/badassery/random_one/can_buy(obj/item/device/uplink/U)
-	return default_uplink_selection.get_random_item(U.uses, U) != null
-
-/datum/uplink_item/item/badassery/random_many
-	name = "Random Items"
-	desc = "Buys you as many random items you can afford. Convenient packaging NOT included."
-
-/datum/uplink_item/item/badassery/random_many/cost(var/telecrystals)
-	return max(1, telecrystals)
-
-/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/device/uplink/U, var/loc)
-	var/list/bought_items = list()
-	for(var/datum/uplink_item/UI in get_random_uplink_items(U, U.uses, loc))
-		UI.purchase_log(U)
-		var/obj/item/I = UI.get_goods(U, loc)
-		if(istype(I))
-			bought_items += I
-
-	return bought_items
-
-/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U)
-	feedback_add_details("traitor_uplink_items_bought", "[src]")
-	log_and_message_admins("used \the [U.loc] to buy \a [src]")
-
-/****************
-* Surplus Crate *
-****************/
-/datum/uplink_item/item/badassery/surplus
-	name = "Surplus Crate"
-	item_cost = 40
-	var/item_worth = 60
-	var/icon
-
-/datum/uplink_item/item/badassery/surplus/New()
-	..()
-	desc = "A crate containing [item_worth] telecrystal\s worth of surplus leftovers."
-
-/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/device/uplink/U, var/loc)
-	var/obj/structure/largecrate/C = new(loc)
-	var/random_items = get_random_uplink_items(null, item_worth, C)
-	for(var/datum/uplink_item/I in random_items)
-		I.purchase_log(U)
-		I.get_goods(U, C)
-
-	return C
-
-/datum/uplink_item/item/badassery/surplus/log_icon()
-	if(!icon)
-		var/obj/structure/largecrate/C = /obj/structure/largecrate
-		icon = image(initial(C.icon), initial(C.icon_state))
-
-	return "\icon[icon]"
-
-/********************************
-*                           	*
-*	Abstract Uplink Entries		*
-*                           	*
-********************************/
-var/image/default_abstract_uplink_icon
-/datum/uplink_item/abstract/log_icon()
-	if(!default_abstract_uplink_icon)
-		default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn")
-
-	return "\icon[default_abstract_uplink_icon]"
-
-/****************
-* Announcements *
-*****************/
-/datum/uplink_item/abstract/announcements
-	category = /datum/uplink_category/services
-
-/datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user)
-	. = ..()
-	if(.)
-		log_and_message_admins("has triggered a falsified [src]", user)
-
-/datum/uplink_item/abstract/announcements/fake_centcom
-	item_cost = DEFAULT_TELECRYSTAL_AMOUNT / 2
-
-/datum/uplink_item/abstract/announcements/fake_centcom/New()
-	..()
-	name = "[command_name()] Update Announcement"
-	desc = "Causes a falsified [command_name()] Update. Triggers immediately after supplying additional data."
-
-/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
-	command_announcement.Announce(args.["message"], args.["title"])
-	return 1
-
-/datum/uplink_item/abstract/announcements/fake_crew_arrival
-	name = "Crew Arrival Announcement/Records"
-	desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!"
-	item_cost = 4
-
-/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
-	if(!user)
-		return 0
-
-	var/obj/item/weapon/card/id/I = user.GetIdCard()
-	var/datum/data/record/random_general_record
-	var/datum/data/record/random_medical_record
-	if(data_core.general.len)
-		random_general_record	= pick(data_core.general)
-		random_medical_record	= find_medical_record("id", random_general_record.fields["id"])
-
-	var/datum/data/record/general = data_core.CreateGeneralRecord(user)
-	if(I)
-		general.fields["age"] = I.age
-		general.fields["rank"] = I.assignment
-		general.fields["real_rank"] = I.assignment
-		general.fields["name"] = I.registered_name
-		general.fields["sex"] = I.sex
-	else
-		var/mob/living/carbon/human/H
-		if(istype(user,/mob/living/carbon/human))
-			H = user
-			general.fields["age"] = H.age
-		else
-			general.fields["age"] = initial(H.age)
-		var/assignment = GetAssignment(user)
-		general.fields["rank"] = assignment
-		general.fields["real_rank"] = assignment
-		general.fields["name"] = user.real_name
-		general.fields["sex"] = capitalize(user.gender)
-
-	general.fields["species"] = user.get_species()
-	var/datum/data/record/medical = data_core.CreateMedicalRecord(general.fields["name"], general.fields["id"])
-	data_core.CreateSecurityRecord(general.fields["name"], general.fields["id"])
-
-	if(!random_general_record)
-		general.fields["citizenship"]	= random_general_record.fields["citizenship"]
-		general.fields["faction"] 		= random_general_record.fields["faction"]
-		general.fields["fingerprint"] 	= random_general_record.fields["fingerprint"]
-		general.fields["home_system"] 	= random_general_record.fields["home_system"]
-		general.fields["religion"] 		= random_general_record.fields["religion"]
-	if(random_medical_record)
-		medical.fields["b_type"]		= random_medical_record.fields["b_type"]
-		medical.fields["b_dna"]			= random_medical_record.fields["b_type"]
-
-	if(I)
-		general.fields["fingerprint"] 	= I.fingerprint_hash
-		medical.fields["b_type"]	= I.blood_type
-		medical.fields["b_dna"]		= I.dna_hash
-
-	AnnounceArrivalSimple(general.fields["name"], general.fields["rank"])
-	return 1
-
-/datum/uplink_item/abstract/announcements/fake_ion_storm
-	name = "Ion Storm Announcement"
-	desc = "Interferes with the station's ion sensors. Triggers immediately upon investment."
-	item_cost = 1
-
-/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/device/uplink/U, var/loc)
-	ion_storm_announcement()
-	return 1
-
-/datum/uplink_item/abstract/announcements/fake_radiation
-	name = "Radiation Storm Announcement"
-	desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment."
-	item_cost = 3
-
-/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc)
-	var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0)
-	new/datum/event/radiation_storm/syndicate(EM)
-	return 1
-
-
-/****************
-* Support procs *
-****************/
-/proc/get_random_uplink_items(var/obj/item/device/uplink/U, var/remaining_TC, var/loc)
-	var/list/bought_items = list()
-	while(remaining_TC)
-		var/datum/uplink_item/I = default_uplink_selection.get_random_item(remaining_TC, U, bought_items)
-		if(!I)
-			break
-		bought_items += I
-		remaining_TC -= I.cost(remaining_TC)
-
-	return bought_items

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

@@ -27,7 +27,7 @@ var/datum/uplink_random_selection/default_uplink_selection = new/datum/uplink_ra
 		if(!prob(RI.keep_probability))
 			continue
 		var/datum/uplink_item/I = uplink.items_assoc[RI.uplink_item]
-		if(I.cost(telecrystals) > telecrystals)
+		if(I.cost(telecrystals, U) > telecrystals)
 			continue
 		if(bought_items && (I in bought_items) && !prob(RI.reselect_probability))
 			continue

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/explosives.dm

@@ -18,7 +18,7 @@
 	wires = new(src)
 	image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2")
 	..()
-	
+
 /obj/item/weapon/plastique/Destroy()
 	qdel(wires)
 	wires = null
@@ -78,7 +78,7 @@
 	if(target)
 		if (istype(target, /turf/simulated/wall))
 			var/turf/simulated/wall/W = target
-			W.dismantle_wall(1)
+			W.dismantle_wall(1,1,1)
 		else if(istype(target, /mob/living))
 			target.ex_act(2) // c4 can't gib mobs anymore.
 		else

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/implants/implant.dm

@@ -417,22 +417,26 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		var/area/t = get_area(M)
 		switch (cause)
 			if("death")
-				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
 				if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
 					//give the syndies a bit of stealth
-					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm")
+					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm", "Security")
+					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm", "Medical")
 				else
-					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
+					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm", "Security")
+					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm", "Medical")
 				qdel(a)
 				processing_objects.Remove(src)
 			if ("emp")
-				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
 				var/name = prob(50) ? t.name : pick(teleportlocs)
-				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
+				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm", "Security")
+				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm", "Medical")
 				qdel(a)
 			else
-				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
-				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
+				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
+				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm", "Security")
+				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm", "Medical")
 				qdel(a)
 				processing_objects.Remove(src)
 

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/storage/boxes.dm

@@ -51,31 +51,24 @@
 	new src.foldable(get_turf(src))
 	qdel(src)
 
-/obj/item/weapon/storage/box/survival/
-	New()
-		..()
-		new /obj/item/clothing/mask/breath( src )
-		new /obj/item/weapon/tank/emergency_oxygen( src )
+/obj/item/weapon/storage/box/survival/New()
+	..()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/emergency_oxygen(src)
 
-/obj/item/weapon/storage/box/engineer/
-	New()
-		..()
-		new /obj/item/clothing/mask/breath( src )
-		new /obj/item/weapon/tank/emergency_oxygen/engi( src )
+/obj/item/weapon/storage/box/engineer/New()
+	..()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 
 /obj/item/weapon/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains white gloves."
 	icon_state = "latex"
 
-	New()
-		..()
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
+/obj/item/weapon/storage/box/gloves/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/clothing/gloves/latex(src)
 
 /obj/item/weapon/storage/box/masks
@@ -83,75 +76,50 @@
 	desc = "This box contains masks of sterility."
 	icon_state = "sterile"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/masks/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-
 
 /obj/item/weapon/storage/box/syringes
 	name = "box of syringes"
 	desc = "A box full of syringes."
 	icon_state = "syringe"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
+/obj/item/weapon/storage/box/syringes/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/syringe(src)
 
 /obj/item/weapon/storage/box/syringegun
 	name = "box of syringe gun cartridges"
 	desc = "A box full of compressed gas cartridges."
 	icon_state = "syringe"
 
-	New()
-		..()
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-
+/obj/item/weapon/storage/box/syringegun/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/syringe_cartridge(src)
 
 /obj/item/weapon/storage/box/beakers
 	name = "box of beakers"
 	icon_state = "beaker"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+/obj/item/weapon/storage/box/beakers/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/glass/beaker(src)
 
 /obj/item/weapon/storage/box/injectors
 	name = "box of DNA injectors"
 	desc = "This box contains injectors it seems."
 
-	New()
-		..()
-		new /obj/item/weapon/dnainjector/h2m(src)
-		new /obj/item/weapon/dnainjector/h2m(src)
+/obj/item/weapon/storage/box/injectors/New()
+	..()
+	for(var/i = 1 to 3)
 		new /obj/item/weapon/dnainjector/h2m(src)
+	for(var/i = 1 to 3)
 		new /obj/item/weapon/dnainjector/m2h(src)
-		new /obj/item/weapon/dnainjector/m2h(src)
-		new /obj/item/weapon/dnainjector/m2h(src)
-
 
 /obj/item/weapon/storage/box/blanks
 	name = "box of blank shells"
@@ -159,14 +127,9 @@
 	icon_state = "blankshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
+/obj/item/weapon/storage/box/blanks/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/blank(src)
 
 /obj/item/weapon/storage/box/beanbags
@@ -175,14 +138,9 @@
 	icon_state = "beanshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
+/obj/item/weapon/storage/box/beanbags/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/beanbag(src)
 
 /obj/item/weapon/storage/box/shotgunammo
@@ -191,14 +149,9 @@
 	icon_state = "lethalshellshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
+/obj/item/weapon/storage/box/shotgunammo/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun(src)
 
 /obj/item/weapon/storage/box/shotgunshells
@@ -207,14 +160,9 @@
 	icon_state = "lethalslug_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
+/obj/item/weapon/storage/box/shotgunshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/pellet(src)
 
 /obj/item/weapon/storage/box/flashshells
@@ -223,14 +171,9 @@
 	icon_state = "illumshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
+/obj/item/weapon/storage/box/flashshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/flash(src)
 
 /obj/item/weapon/storage/box/stunshells
@@ -239,14 +182,9 @@
 	icon_state = "stunshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
+/obj/item/weapon/storage/box/stunshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/stunshell(src)
 
 /obj/item/weapon/storage/box/practiceshells
@@ -255,28 +193,18 @@
 	icon_state = "blankshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
+/obj/item/weapon/storage/box/practiceshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/practice(src)
 
 /obj/item/weapon/storage/box/sniperammo
 	name = "box of 14.5mm shells"
 	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 
-	New()
-		..()
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
+/obj/item/weapon/storage/box/sniperammo/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/a145(src)
 
 /obj/item/weapon/storage/box/flashbangs
@@ -284,14 +212,9 @@
 	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
 	icon_state = "flashbang"
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
+/obj/item/weapon/storage/box/flashbangs/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/flashbang(src)
 
 /obj/item/weapon/storage/box/emps
@@ -299,41 +222,29 @@
 	desc = "A box containing 5 military grade EMP grenades.<br> WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
 	icon_state = "emp"
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
+/obj/item/weapon/storage/box/emps/New()
+	..()
+	for(var/i = 1 to 5)
+	new /obj/item/weapon/grenade/empgrenade(src)
 
 /obj/item/weapon/storage/box/empslite
 	name = "box of low yield emp grenades"
 	desc = "A box containing 5 low yield EMP grenades.<br> WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
 	icon_state = "emp"
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
+/obj/item/weapon/storage/box/empslite/New()
+	..()
+	for(var/i = 1 to 5)
 		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
 
 /obj/item/weapon/storage/box/smokes
 	name = "box of smoke bombs"
-	desc = "A box containing 5 smoke bombs."
+	desc = "A box containing 7 smoke bombs."
 	icon_state = "flashbang"
 
-
 /obj/item/weapon/storage/box/smokes/New()
-		..()
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/smokebomb(src)
 
 /obj/item/weapon/storage/box/anti_photons
@@ -342,11 +253,8 @@
 	icon_state = "flashbang"
 
 /obj/item/weapon/storage/box/anti_photons/New()
-		..()
-		new /obj/item/weapon/grenade/anti_photon(src)
-		new /obj/item/weapon/grenade/anti_photon(src)
-		new /obj/item/weapon/grenade/anti_photon(src)
-		new /obj/item/weapon/grenade/anti_photon(src)
+	..()
+	for(var/i = 1 to 5)
 		new /obj/item/weapon/grenade/anti_photon(src)
 
 /obj/item/weapon/storage/box/frags
@@ -354,73 +262,63 @@
 	desc = "A box containing 5 military grade fragmentation grenades.<br> WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use."
 	icon_state = "frag"
 
+/obj/item/weapon/storage/box/frags/New()
+	..()
+	for(var/i = 1 to 5)
+		new /obj/item/weapon/grenade/explosive(src)
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
+/obj/item/weapon/storage/box/metalfoam
+	name = "box of metal foam grenades."
+	desc = "A box containing 7 metal foam grenades."
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/metalfoam/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/grenade/chem_grenade/metalfoam
 
 /obj/item/weapon/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."
 	icon_state = "implant"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/trackimp/New()
+	..()
+	for(var/i = 1 to 4)
 		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implanter(src)
-		new /obj/item/weapon/implantpad(src)
-		new /obj/item/weapon/locator(src)
+	new /obj/item/weapon/implanter(src)
+	new /obj/item/weapon/implantpad(src)
+	new /obj/item/weapon/locator(src)
 
 /obj/item/weapon/storage/box/chemimp
 	name = "boxed chemical implant kit"
 	desc = "Box of stuff used to implant chemicals."
 	icon_state = "implant"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/chemimp/New()
+	..()
+	for(var/i = 1 to 5)
 		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implanter(src)
-		new /obj/item/weapon/implantpad(src)
-
-
+	new /obj/item/weapon/implanter(src)
+	new /obj/item/weapon/implantpad(src)
 
 /obj/item/weapon/storage/box/rxglasses
 	name = "box of prescription glasses"
 	desc = "This box contains nerd glasses."
 	icon_state = "glasses"
 
-	New()
-		..()
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
+/obj/item/weapon/storage/box/rxglasses/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/clothing/glasses/regular(src)
 
 /obj/item/weapon/storage/box/drinkingglasses
 	name = "box of drinking glasses"
 	desc = "It has a picture of drinking glasses on it."
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+/obj/item/weapon/storage/box/drinkingglasses/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
 
 /obj/item/weapon/storage/box/cdeathalarm_kit
@@ -429,57 +327,38 @@
 	icon_state = "implant"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/weapon/implanter(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
+/obj/item/weapon/storage/box/cdeathalarm_kit/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/implantcase/death_alarm(src)
+	new /obj/item/weapon/implanter(src)
 
 /obj/item/weapon/storage/box/condimentbottles
 	name = "box of condiment bottles"
 	desc = "It has a large ketchup smear on it."
 
-	New()
-		..()
+/obj/item/weapon/storage/box/condimentbottles/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-
-
 
 /obj/item/weapon/storage/box/cups
 	name = "box of paper cups"
 	desc = "It has pictures of paper cups on the front."
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
 
+/obj/item/weapon/storage/box/cups/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src)
 
 /obj/item/weapon/storage/box/donkpockets
 	name = "box of donk-pockets"
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donk_kit"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+/obj/item/weapon/storage/box/donkpockets/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
 
 /obj/item/weapon/storage/box/sinpockets
@@ -487,13 +366,9 @@
 	desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donk_kit"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
+/obj/item/weapon/storage/box/sinpockets/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
 
 /obj/item/weapon/storage/box/monkeycubes
@@ -502,112 +377,88 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "monkeycubebox"
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube)
-	New()
-		..()
-		if(src.type == /obj/item/weapon/storage/box/monkeycubes)
-			for(var/i = 1 to 5)
-				new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
+
+/obj/item/weapon/storage/box/monkeycubes/New()
+	..()
+	if(src.type == /obj/item/weapon/storage/box/monkeycubes)
+		for(var/i = 1 to 4)
+			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
 
 /obj/item/weapon/storage/box/monkeycubes/farwacubes
 	name = "farwa cube box"
 	desc = "Drymate brand farwa cubes, shipped from Ahdomai. Just add water!"
-	New()
-		..()
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube(src)
+
+/obj/item/weapon/storage/box/monkeycubes/farwacubes/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube(src)
 
 /obj/item/weapon/storage/box/monkeycubes/stokcubes
 	name = "stok cube box"
 	desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
-	New()
-		..()
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube(src)
+
+/obj/item/weapon/storage/box/monkeycubes/stokcubes/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube(src)
 
 /obj/item/weapon/storage/box/monkeycubes/neaeracubes
 	name = "neaera cube box"
 	desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
-	New()
-		..()
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
+
+/obj/item/weapon/storage/box/monkeycubes/neaeracubes/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
 
 /obj/item/weapon/storage/box/ids
 	name = "box of spare IDs"
 	desc = "Has so many empty IDs."
 	icon_state = "id"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/ids/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-
 
 /obj/item/weapon/storage/box/seccarts
 	name = "box of spare R.O.B.U.S.T. Cartridges"
 	desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
 	icon_state = "pda"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/seccarts/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-
 
 /obj/item/weapon/storage/box/handcuffs
 	name = "box of spare handcuffs"
 	desc = "A box full of handcuffs."
 	icon_state = "handcuff"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/handcuffs/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-
 
 /obj/item/weapon/storage/box/mousetraps
 	name = "box of Pest-B-Gon mousetraps"
 	desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
 	icon_state = "mousetraps"
 
-	New()
-		..()
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
+/obj/item/weapon/storage/box/mousetraps/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/device/assembly/mousetrap(src)
 
 /obj/item/weapon/storage/box/pillbottles
 	name = "box of pill bottles"
 	desc = "It has pictures of pill bottles on its front."
 
-	New()
-		..()
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-
+/obj/item/weapon/storage/box/pillbottles/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/storage/pill_bottle(src)
 
 /obj/item/weapon/storage/box/snappops
 	name = "snap pop box"
@@ -615,10 +466,11 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "spbox"
 	can_hold = list(/obj/item/toy/snappop)
-	New()
-		..()
-		for(var/i = 1 to 8)
-			new /obj/item/toy/snappop(src)
+
+/obj/item/weapon/storage/box/snappops/New()
+	..()
+	for(var/i = 1 to 8)
+		new /obj/item/toy/snappop(src)
 
 /obj/item/weapon/storage/box/matches
 	name = "matchbox"
@@ -630,28 +482,29 @@
 	slot_flags = SLOT_BELT
 	can_hold = list(/obj/item/weapon/flame/match)
 
-	New()
-		..()
-		for(var/i=1 to 10)
-			new /obj/item/weapon/flame/match(src)
+/obj/item/weapon/storage/box/matches/New()
+	..()
+	for(var/i=1 to 10)
+		new /obj/item/weapon/flame/match(src)
 
-	attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
-		if(istype(W) && !W.lit && !W.burnt)
-			W.lit = 1
-			W.damtype = "burn"
-			W.icon_state = "match_lit"
-			processing_objects.Add(W)
-		W.update_icon()
-		return
+/obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
+	if(istype(W) && !W.lit && !W.burnt)
+		W.lit = 1
+		W.damtype = "burn"
+		W.icon_state = "match_lit"
+		processing_objects.Add(W)
+	W.update_icon()
+	return
 
 /obj/item/weapon/storage/box/autoinjectors
 	name = "box of injectors"
 	desc = "Contains autoinjectors."
 	icon_state = "syringe"
-	New()
-		..()
-		for (var/i = 1 to 7)
-			new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
+
+/obj/item/weapon/storage/box/autoinjectors/New()
+	..()
+	for (var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
 
 /obj/item/weapon/storage/box/lights
 	name = "box of replacement bulbs"
@@ -666,7 +519,7 @@
 
 /obj/item/weapon/storage/box/lights/bulbs/New()
 	..()
-	for(var/i = 0; i < 21; i++)
+	for(var/i = 1 to 24)
 		new /obj/item/weapon/light/bulb(src)
 
 /obj/item/weapon/storage/box/lights/tubes
@@ -675,7 +528,7 @@
 
 /obj/item/weapon/storage/box/lights/tubes/New()
 	..()
-	for(var/i = 0; i < 21; i++)
+	for(var/i = 1 to 24)
 		new /obj/item/weapon/light/tube(src)
 
 /obj/item/weapon/storage/box/lights/mixed
@@ -684,9 +537,9 @@
 
 /obj/item/weapon/storage/box/lights/mixed/New()
 	..()
-	for(var/i = 0; i < 14; i++)
+	for(var/i = 1 to 16)
 		new /obj/item/weapon/light/tube(src)
-	for(var/i = 0; i < 7; i++)
+	for(var/i = 1 to 8)
 		new /obj/item/weapon/light/bulb(src)
 
 /obj/item/weapon/storage/box/freezer
@@ -701,3 +554,20 @@
 	max_storage_space = 21
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
 
+/obj/item/weapon/storage/box/ambrosia
+	name = "ambrosia seeds box"
+	desc = "Contains the seeds you need to get a little high."
+
+/obj/item/weapon/storage/box/ambrosia/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/seeds/ambrosiavulgarisseed(src)
+
+/obj/item/weapon/storage/box/ambrosiadeus
+	name = "ambrosia deus seeds box"
+	desc = "Contains the seeds you need to get a proper healthy high."
+
+/obj/item/weapon/storage/box/ambrosiadeus/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/seeds/ambrosiadeusseed(src)

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

@@ -16,6 +16,7 @@
 	icon_state = "donutbox"
 	name = "donut box"
 	var/startswith = 6
+	max_storage_space = 12
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
 	foldable = /obj/item/stack/material/cardboard
 

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

@@ -45,7 +45,6 @@
 	..()
 
 /obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
-
 	if(!canremove)
 		return
 
@@ -69,7 +68,7 @@
 		if (( usr.restrained() ) || ( usr.stat ))
 			return
 
-		if ((src.loc == usr) && !usr.unEquip(src))
+		if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src))
 			return
 
 		switch(over_object.name)

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>", \
@@ -440,6 +441,7 @@
 				return ..()
 		else
 			user << "<span class='notice'>Nothing to fix!</span>"
+			S.update_wounds()
 		return
 	return ..()
 

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -20,7 +20,7 @@
 		new /obj/item/clothing/accessory/storage/brown_vest(src)
 		new /obj/item/blueprints(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
-		new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
+		new /obj/item/clothing/under/rank/engineer/chief_engineer/skirt(src)
 		new /obj/item/clothing/head/hardhat/white(src)
 		new /obj/item/clothing/head/welding(src)
 		new /obj/item/clothing/gloves/yellow(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -192,7 +192,7 @@
 				new /obj/item/clothing/under/rank/medical/navyblue(src)
 				new /obj/item/clothing/head/surgery/navyblue(src)
 		new /obj/item/clothing/under/rank/chief_medical_officer(src)
-		new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
+		new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
 		new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
 		new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
 		new /obj/item/weapon/cartridge/cmo(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -246,9 +246,9 @@
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
 	new /obj/item/clothing/under/rank/atmospheric_technician(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
-	new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+	new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
@@ -396,8 +396,8 @@
 	..()
 	new /obj/item/clothing/under/rank/chemist(src)
 	new /obj/item/clothing/under/rank/chemist(src)
-	new /obj/item/clothing/under/rank/chemist/skirt(src)
-	new /obj/item/clothing/under/rank/chemist/skirt(src)
+	new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
+	new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
@@ -418,8 +418,8 @@
 	..()
 	new /obj/item/clothing/under/rank/geneticist(src)
 	new /obj/item/clothing/under/rank/geneticist(src)
-	new /obj/item/clothing/under/rank/geneticist/skirt(src)
-	new /obj/item/clothing/under/rank/geneticist/skirt(src)
+	new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
+	new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
@@ -440,8 +440,8 @@
 	..()
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/under/rank/virologist(src)
-	new /obj/item/clothing/under/rank/virologist/skirt(src)
-	new /obj/item/clothing/under/rank/virologist/skirt(src)
+	new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
+	new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
@@ -517,9 +517,9 @@
 	new /obj/item/clothing/under/color/yellow(src)
 	new /obj/item/clothing/under/color/green(src)
 	new /obj/item/clothing/under/color/pink(src)
-	new /obj/item/clothing/under/dress/plaid_blue(src)
-	new /obj/item/clothing/under/dress/plaid_red(src)
-	new /obj/item/clothing/under/dress/plaid_purple(src)
+	new /obj/item/clothing/under/skirt/plaid_blue(src)
+	new /obj/item/clothing/under/skirt/plaid_red(src)
+	new /obj/item/clothing/under/skirt/plaid_purple(src)
 	new /obj/item/clothing/shoes/blue(src)
 	new /obj/item/clothing/shoes/yellow(src)
 	new /obj/item/clothing/shoes/green(src)

code/game/objects/structures/displaycase.dm

@@ -55,6 +55,9 @@
 
 
 /obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.do_attack_animation(src)
+	playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
 	src.health -= W.force
 	src.healthcheck()
 	..()

code/game/objects/structures/door_assembly.dm

@@ -282,8 +282,7 @@
 			else
 				path = text2path("/obj/machinery/door/airlock[airlock_type]")
 
-			var/obj/machinery/door/new_airlock = new path(src.loc, src)
-			new_airlock.dir = src.dir
+			new path(src.loc, src)
 			qdel(src)
 	else
 		..()

code/game/periodic_news.dm

@@ -6,7 +6,7 @@
 		round_time // time of the round at which this should be announced, in seconds
 		message // body of the message
 		author = "NanoTrasen Editor"
-		channel_name = "The Vir Times"
+		channel_name = "The "+starsys_name+" Times"
 		can_be_redacted = 0
 		message_type = "Story"
 
@@ -66,7 +66,7 @@
 			round_time = 60 * 50
 
 		found_ssd
-			channel_name = "The Vir Times"
+			channel_name = "The "+starsys_name+" Times"
 			author = "Doctor Eric Hanfield"
 
 			message = {"Several people have been found unconscious at their terminals. It is thought that it was due
@@ -78,7 +78,7 @@
 	lotus_tree
 
 		explosions
-			channel_name = "The Vir Times"
+			channel_name = "The "+starsys_name+" Times"
 			author = "Reporter Leland H. Howards"
 
 			message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the
@@ -92,7 +92,7 @@
 	food_riots
 
 		breaking_news
-			channel_name = "The Vir Times"
+			channel_name = "The "+starsys_name+" Times"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
@@ -103,7 +103,7 @@
 			round_time = 60 * 10
 
 		more
-			channel_name = "The Vir Times"
+			channel_name = "The "+starsys_name+" Times"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"More on the Refuge food riots: The Refuge Council has condemned NanoTrasen's withdrawal from

code/game/turfs/flooring/flooring.dm

@@ -69,7 +69,7 @@ var/list/flooring_types
 	name = "carpet"
 	icon_base = "bcarpet"
 	build_type = null
-	flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_CROWBAR | TURF_CAN_BURN
+	flags = TURF_HAS_EDGES | TURF_REMOVE_CROWBAR
 
 /decl/flooring/tiling
 	name = "floor"

code/game/verbs/ignore.dm

@@ -10,6 +10,10 @@
 		if(key_to_ignore in prefs.ignored_players)
 			usr << "<span class='warning'>[key_to_ignore] is already being ignored.</span>"
 			return
+		if(key_to_ignore == usr.ckey)
+			usr <<"<span class='notice'>You can't ignore yourself.</span>"
+			return
+
 		prefs.ignored_players |= key_to_ignore
 		prefs.save_preferences()
 		usr << "<span class='notice'>Now ignoring <b>[key_to_ignore]</b>.</span>"

code/global.dm

@@ -22,19 +22,22 @@ var/global/datum/universal_state/universe = new
 var/global/list/global_map = null
 
 // Noises made when hit while typing.
-var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")
+var/list/hit_appends	= list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")
 var/diary				= null
-var/href_logfile        = null
-var/station_name        = "Northern Star"
-var/station_short       = "Northern Star"
-var/const/dock_name     = "Vir Interstellar Spaceport"
-var/const/boss_name     = "Central Command"
-var/const/boss_short    = "Centcomm"
-var/const/company_name  = "NanoTrasen"
-var/const/company_short = "NT"
-var/game_version        = "Polaris"
-var/changelog_hash      = ""
-var/game_year           = (text2num(time2text(world.realtime, "YYYY")) + 544)
+var/href_logfile		= null
+var/station_name		= "Northern Star"
+var/const/station_orig	= "Northern Star" //station_name can't be const due to event prefix/suffix
+var/const/station_short	= "Northern Star"
+var/const/dock_name		= "Vir Interstellar Spaceport"
+var/const/boss_name		= "Central Command"
+var/const/boss_short	= "Centcomm"
+var/const/company_name	= "NanoTrasen"
+var/const/company_short	= "NT"
+var/const/star_name		= "Vir"
+var/const/starsys_name	= "Vir"
+var/const/game_version	= "Polaris"
+var/changelog_hash		= ""
+var/game_year			= (text2num(time2text(world.realtime, "YYYY")) + 544)
 var/round_progressing = 1
 
 	//On some maps, it does not make sense for space turf to appear when something blows up (e.g. on an asteroid colony, or planetside)

code/modules/client/client procs.dm

@@ -4,6 +4,9 @@
 #define UPLOAD_LIMIT		10485760	//Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
 #define MIN_CLIENT_VERSION	0		//Just an ambiguously low version for now, I don't want to suddenly stop people playing.
 									//I would just like the code ready should it ever need to be used.
+
+//#define TOPIC_DEBUGGING 1
+
 	/*
 	When somebody clicks a link in game, this Topic is called first.
 	It does the stuff in this proc and  then is redirected to the Topic() proc for the src=[0xWhatever]
@@ -23,6 +26,14 @@
 	if(!usr || usr != mob)	//stops us calling Topic for somebody else's client. Also helps prevent usr=null
 		return
 
+	#if defined(TOPIC_DEBUGGING)
+	world << "[src]'s Topic: [href] destined for [hsrc]."
+
+	if(href_list["nano_err"]) //nano throwing errors
+		world << "## NanoUI, Subject [src]: " + html_decode(href_list["nano_err"]) //NANO DEBUG HOOK
+
+	#endif
+
 	//search the href for script injection
 	if( findtext(href,"<script",1,0) )
 		world.log << "Attempted use of scripts within a topic call, by [src]"
@@ -159,7 +170,7 @@
 
 	send_resources()
 	nanomanager.send_resources(src)
-	
+
 	if(!void)
 		void = new()
 	screen += void

code/modules/client/preference_setup/antagonism/02_candidacy.dm

@@ -10,7 +10,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"alien candidate" = 1, //always show                 // 6
 	"positronic brain" = 1,                              // 7
 	"cultist" = IS_MODE_COMPILED("cult"),                // 8
-	"infested monkey" = IS_MODE_COMPILED("monkey"),      // 9
+	"renegade" = 1,                                      // 9
 	"ninja" = "true",                                    // 10
 	"raider" = IS_MODE_COMPILED("heist"),                // 11
 	"diona" = 1,                                         // 12

code/modules/client/preference_setup/general/03_body.dm

@@ -373,7 +373,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 
 		var/organ_tag = input(user, "Which limb do you want to change?") as null|anything in limb_selection_list
 
-		if(!organ_tag && !CanUseTopic(user)) return TOPIC_NOACTION
+		if(!organ_tag || !CanUseTopic(user)) return TOPIC_NOACTION
 
 		var/limb = null
 		var/second_limb = null // if you try to change the arm, the hand should also change

code/modules/client/preference_setup/global/05_ooc.dm

@@ -9,7 +9,7 @@
 /datum/category_item/player_setup_item/player_global/ooc/save_preferences(var/savefile/S)
 	S["ignored_players"]	<< pref.ignored_players
 
-
+/*
 /datum/category_item/player_setup_item/player_global/ooc/sanitize_preferences()
 	if(isnull(pref.ignored_players))
 		pref.ignored_players = list()
@@ -32,7 +32,11 @@
 			var/player_to_ignore = input(user, "Who do you want to ignore?","Ignore") as null|text
 			if(player_to_ignore)
 				player_to_ignore = sanitize(ckey(player_to_ignore))
+				if(player_to_ignore == user.ckey)
+					user <<"<span class='notice'>You can't ignore yourself.</span>"
+					return TOPIC_REFRESH
 				pref.ignored_players |= player_to_ignore
 			return TOPIC_REFRESH
 
 	return ..()
+*/

code/modules/client/preference_setup/loadout/loadout.dm

@@ -105,19 +105,21 @@ var/list/gear_datums = list()
 			firstcat = 0
 		else
 			. += " |"
+
+		var/datum/loadout_category/LC = loadout_categories[category]
+		var/category_cost = 0
+		for(var/gear in LC.gear)
+			if(gear in pref.gear)
+				var/datum/gear/G = LC.gear[gear]
+				category_cost += G.cost
+
 		if(category == current_tab)
-			. += " <span class='linkOn'>[category]</span> "
+			. += " <span class='linkOn'>[category] - [category_cost]</span> "
 		else
-			var/datum/loadout_category/LC = loadout_categories[category]
-			var/make_orange = FALSE
-			for(var/thing in LC.gear)
-				if(thing in pref.gear)
-					make_orange = TRUE
-					break
-			if(make_orange)
-				. += " <a href='?src=\ref[src];select_category=[category]'><font color = '#E67300'>[category]</font></a> "
+			if(category_cost)
+				. += " <a href='?src=\ref[src];select_category=[category]'><font color = '#E67300'>[category] - [category_cost]</font></a> "
 			else
-				. += " <a href='?src=\ref[src];select_category=[category]'>[category]</a> "
+				. += " <a href='?src=\ref[src];select_category=[category]'>[category] - 0</a> "
 	. += "</b></center></td></tr>"
 
 	var/datum/loadout_category/LC = loadout_categories[current_tab]

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -244,3 +244,15 @@
 	display_name = "winter coat, mining"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
 	allowed_roles = list("Shaft Miner")
+
+/datum/gear/suit/varsity
+	display_name = "varsity jacket selection"
+	path = /obj/item/clothing/suit/varsity
+
+/datum/gear/suit/varsity/New()
+	..()
+	var/list/varsities = list()
+	for(var/varsity_style in typesof(/obj/item/clothing/suit/varsity))
+		var/obj/item/clothing/suit/varsity/varsity = varsity_style
+		varsities[initial(varsity.name)] = varsity
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(varsities))

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -53,110 +53,16 @@
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
 
 /datum/gear/uniform/skirt
-	display_name = "plaid skirt, blue"
-	path = /obj/item/clothing/under/dress/plaid_blue
+	display_name = "skirt selection"
+	path = /obj/item/clothing/under/skirt
 
-/datum/gear/uniform/skirt/purple
-	display_name = "plaid skirt, purple"
-	path = /obj/item/clothing/under/dress/plaid_purple
-
-/datum/gear/uniform/skirt/red
-	display_name = "plaid skirt, red"
-	path = /obj/item/clothing/under/dress/plaid_red
-
-/datum/gear/uniform/skirt/black
-	display_name = "skirt, black"
-	path = /obj/item/clothing/under/blackskirt
-
-/datum/gear/uniform/skirt/ce
-	display_name = "skirt, ce"
-	path = /obj/item/clothing/under/rank/chief_engineer/skirt
-	allowed_roles = list("Chief Engineer")
-
-/datum/gear/uniform/skirt/atmos
-	display_name = "skirt, atmos"
-	path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
-	allowed_roles = list("Chief Engineer","Atmospheric Technician")
-
-/datum/gear/uniform/skirt/eng
-	display_name = "skirt, engineer"
-	path = /obj/item/clothing/under/rank/engineer/skirt
-	allowed_roles = list("Chief Engineer","Station Engineer")
-
-/datum/gear/uniform/skirt/roboticist
-	display_name = "skirt, roboticist"
-	path = /obj/item/clothing/under/rank/roboticist/skirt
-	allowed_roles = list("Research Director","Roboticist")
-
-/datum/gear/uniform/skirt/cmo
-	display_name = "skirt, cmo"
-	path = /obj/item/clothing/under/rank/chief_medical_officer
-	allowed_roles = list("Chief Medical Officer")
-
-/datum/gear/uniform/skirt/chem
-	display_name = "skirt, chemist"
-	path = /obj/item/clothing/under/rank/chemist/skirt
-	allowed_roles = list("Chief Medical Officer","Chemist")
-
-/datum/gear/uniform/skirt/viro
-	display_name = "skirt, virologist"
-	path = /obj/item/clothing/under/rank/virologist/skirt
-	allowed_roles = list("Chief Medical Officer","Medical Doctor")
-
-/datum/gear/uniform/skirt/med
-	display_name = "skirt, medical"
-	path = /obj/item/clothing/under/rank/medical/skirt
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
-
-/datum/gear/uniform/skirt/sci
-	display_name = "skirt, scientist"
-	path = /obj/item/clothing/under/rank/scientist/skirt
-	allowed_roles = list("Research Director","Scientist")
-
-/datum/gear/uniform/skirt/cargo
-	display_name = "skirt, cargo"
-	path = /obj/item/clothing/under/rank/cargotech/skirt
-	allowed_roles = list("Quartermaster","Cargo Technician")
-
-/datum/gear/uniform/skirt/qm
-	display_name = "skirt, QM"
-	path = /obj/item/clothing/under/rank/cargo/skirt
-	allowed_roles = list("Quartermaster")
-
-/datum/gear/uniform/skirt/warden
-	display_name = "skirt, warden"
-	path = /obj/item/clothing/under/rank/warden/skirt
-	allowed_roles = list("Head of Security", "Warden")
-
-/datum/gear/uniform/skirt/security
-	display_name = "skirt, security"
-	path = /obj/item/clothing/under/rank/security/skirt
-	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
-
-/datum/gear/uniform/skirt/head_of_security
-	display_name = "skirt, hos"
-	path = /obj/item/clothing/under/rank/head_of_security/skirt
-	allowed_roles = list("Head of Security")
-
-/datum/gear/uniform/jeans_qm
-	display_name = "jeans, QM"
-	path = /obj/item/clothing/under/rank/cargo/jeans
-	allowed_roles = list("Quartermaster")
-
-/datum/gear/uniform/jeans_qmf
-	display_name = "female jeans, QM"
-	path = /obj/item/clothing/under/rank/cargo/jeans/female
-	allowed_roles = list("Quartermaster")
-
-/datum/gear/uniform/jeans_cargo
-	display_name = "jeans, cargo"
-	path = /obj/item/clothing/under/rank/cargotech/jeans
-	allowed_roles = list("Quartermaster","Cargo Technician")
-
-/datum/gear/uniform/jeans_cargof
-	display_name = "female jeans, cargo"
-	path = /obj/item/clothing/under/rank/cargotech/jeans/female
-	allowed_roles = list("Quartermaster","Cargo Technician")
+/datum/gear/uniform/skirt/New()
+	..()
+	var/list/skirts = list()
+	for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
+		var/obj/item/clothing/under/skirt/skirt_type = skirt
+		skirts[initial(skirt_type.name)] = skirt_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(skirts))
 
 /datum/gear/uniform/pants
 	display_name = "pants selection"
@@ -182,6 +88,96 @@
 		shorts[initial(short_type.name)] = short_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
 
+/datum/gear/uniform/skirt/ce
+	display_name = "skirt, ce"
+	path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
+	allowed_roles = list("Chief Engineer")
+
+/datum/gear/uniform/skirt/atmos
+	display_name = "skirt, atmos"
+	path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
+	allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/uniform/skirt/eng
+	display_name = "skirt, engineer"
+	path = /obj/item/clothing/under/rank/engineer/skirt
+	allowed_roles = list("Chief Engineer","Station Engineer")
+
+/datum/gear/uniform/skirt/roboticist
+	display_name = "skirt, roboticist"
+	path = /obj/item/clothing/under/rank/roboticist/skirt
+	allowed_roles = list("Research Director","Roboticist")
+
+/datum/gear/uniform/skirt/cmo
+	display_name = "skirt, cmo"
+	path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
+	allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/uniform/skirt/chem
+	display_name = "skirt, chemist"
+	path = /obj/item/clothing/under/rank/medical/chemist/skirt
+	allowed_roles = list("Chief Medical Officer","Chemist")
+
+/datum/gear/uniform/skirt/viro
+	display_name = "skirt, virologist"
+	path = /obj/item/clothing/under/rank/medical/virologist/skirt
+	allowed_roles = list("Chief Medical Officer","Medical Doctor")
+
+/datum/gear/uniform/skirt/med
+	display_name = "skirt, medical"
+	path = /obj/item/clothing/under/rank/medical/skirt
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
+
+/datum/gear/uniform/skirt/sci
+	display_name = "skirt, scientist"
+	path = /obj/item/clothing/under/rank/scientist/skirt
+	allowed_roles = list("Research Director","Scientist")
+
+/datum/gear/uniform/skirt/cargo
+	display_name = "skirt, cargo"
+	path = /obj/item/clothing/under/rank/cargotech/skirt
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/skirt/qm
+	display_name = "skirt, QM"
+	path = /obj/item/clothing/under/rank/cargo/skirt
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/skirt/warden
+	display_name = "skirt, warden"
+	path = /obj/item/clothing/under/rank/security/warden/skirt
+	allowed_roles = list("Head of Security", "Warden")
+
+/datum/gear/uniform/skirt/security
+	display_name = "skirt, security"
+	path = /obj/item/clothing/under/rank/security/skirt
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+
+/datum/gear/uniform/skirt/head_of_security
+	display_name = "skirt, hos"
+	path = /obj/item/clothing/under/rank/security/head_of_security/skirt
+	allowed_roles = list("Head of Security")
+
+/datum/gear/uniform/jeans_qm
+	display_name = "jeans, QM"
+	path = /obj/item/clothing/under/rank/cargo/jeans
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/jeans_qmf
+	display_name = "female jeans, QM"
+	path = /obj/item/clothing/under/rank/cargo/jeans/female
+	allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/jeans_cargo
+	display_name = "jeans, cargo"
+	path = /obj/item/clothing/under/rank/cargotech/jeans
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/jeans_cargof
+	display_name = "female jeans, cargo"
+	path = /obj/item/clothing/under/rank/cargotech/jeans/female
+	allowed_roles = list("Quartermaster","Cargo Technician")
+
 /datum/gear/uniform/suit  //amish
 	display_name = "suit, amish"
 	path = /obj/item/clothing/under/sl_suit

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -12,55 +12,81 @@
 	whitelisted = "Unathi"
 	sort_category = "Xenowear"
 
-/datum/gear/ears/skrell
-	display_name = "headtail-wear, female, chain (Skrell)"
+/datum/gear/ears/skrell/chains	//Chains
+	display_name = "headtail chain selection (Skrell)"
 	path = /obj/item/clothing/ears/skrell/chain
 	sort_category = "Xenowear"
 	whitelisted = "Skrell"
 
-/datum/gear/ears/skrell/plate
-	display_name = "headtail-wear, male, bands (Skrell)"
+/datum/gear/ears/skrell/chains/New()
+	..()
+	var/list/chaintypes = list()
+	for(var/chain_style in typesof(/obj/item/clothing/ears/skrell/chain))
+		var/obj/item/clothing/ears/skrell/chain/chain = chain_style
+		chaintypes[initial(chain.name)] = chain
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(chaintypes))
+	
+/datum/gear/ears/skrell/bands
+	display_name = "headtail band selection (Skrell)"
 	path = /obj/item/clothing/ears/skrell/band
+	sort_category = "Xenowear"
+	whitelisted = "Skrell"
 
-/datum/gear/ears/skrell/cloth //male/red
-	display_name = "headtail-wear, male, red, cloth (Skrell)"
+/datum/gear/ears/skrell/bands/New()
+	..()
+	var/list/bandtypes = list()
+	for(var/band_style in typesof(/obj/item/clothing/ears/skrell/band))
+		var/obj/item/clothing/ears/skrell/band/band = band_style
+		bandtypes[initial(band.name)] = band
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(bandtypes))
+	
+/datum/gear/ears/skrell/cloth/male
+	display_name = "male headtail cloth selection (Skrell)"
 	path = /obj/item/clothing/ears/skrell/cloth_male
+	sort_category = "Xenowear"
+	whitelisted = "Skrell"
 
-/datum/gear/ears/skrell/cloth/male //black
-	display_name = "headtail-wear, male, black, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_male/black
-
-/datum/gear/ears/skrell/cloth/male/blue
-	display_name = "headtail-wear, male, blue, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_male/blue
-
-/datum/gear/ears/skrell/cloth/male/green
-	display_name = "headtail-wear, male, green, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_male/green
-
-/datum/gear/ears/skrell/cloth/male/pink
-	display_name = "headtail-wear, male, pink, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_male/pink
+/datum/gear/ears/skrell/cloth/male/New()
+	..()
+	var/list/clothtypes = list()
+	for(var/cloth_style in typesof(/obj/item/clothing/ears/skrell/cloth_male))
+		var/obj/item/clothing/ears/skrell/cloth_male/cloth = cloth_style
+		clothtypes[initial(cloth.name)] = cloth
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes))
 
 /datum/gear/ears/skrell/cloth/female
-	display_name = "headtail-wear, female, red, cloth (Skrell)"
+	display_name = "female headtail cloth selection (Skrell)"
 	path = /obj/item/clothing/ears/skrell/cloth_female
+	sort_category = "Xenowear"
+	whitelisted = "Skrell"
 
-/datum/gear/ears/skrell/cloth/female/black
-	display_name = "headtail-wear, female, black, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_female/black
+/datum/gear/ears/skrell/cloth/female/New()
+	..()
+	var/list/clothtypes = list()
+	for(var/cloth_style in typesof(/obj/item/clothing/ears/skrell/cloth_female))
+		var/obj/item/clothing/ears/skrell/cloth_female/cloth = cloth_style
+		clothtypes[initial(cloth.name)] = cloth
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes))
 
-/datum/gear/ears/skrell/cloth/female/blue
-	display_name = "headtail-wear, female, blue, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_female/blue
-
-/datum/gear/ears/skrell/cloth/female/green
-	display_name = "headtail-wear, female, green, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_female/green
-
-/datum/gear/ears/skrell/cloth/female/pink
-	display_name = "headtail-wear, female, pink, cloth (Skrell)"
-	path = /obj/item/clothing/ears/skrell/cloth_female/pink
+/datum/gear/ears/skrell/colored/band
+	display_name = "Colored bands (Skrell)"
+	path = /obj/item/clothing/ears/skrell/colored/band
+	sort_category = "Xenowear"
+	whitelisted = "Skrell"
+	
+/datum/gear/ears/skrell/colored/band/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
+	
+/datum/gear/ears/skrell/colored/chain
+	display_name = "Colored chain (Skrell)"
+	path = /obj/item/clothing/ears/skrell/colored/chain
+	sort_category = "Xenowear"
+	whitelisted = "Skrell"
+	
+/datum/gear/ears/skrell/colored/chain/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)
 
 /datum/gear/uniform/teshari
 	display_name = "smock, grey (Teshari)"

code/modules/client/preferences_factions.dm

@@ -22,7 +22,7 @@ var/global/list/citizenship_choices = list(
 
 var/global/list/home_system_choices = list(
 	"Sol",
-	"Vir",
+	starsys_name,
 	"Nyx",
 	"Tau Ceti",
 	"Epsilon Ursae Minoris",