Merge pull request #398 from VOREStation/sync

Polaris Sync

.travis.yml

@@ -3,9 +3,9 @@ language: c
 sudo: false
 
 env:
-  BYOND_MAJOR="509"
-  BYOND_MINOR="1318"
-  MACRO_COUNT=986
+  BYOND_MAJOR="510"
+  BYOND_MINOR="1346"
+  MACRO_COUNT=987
 
 cache:
   directories:

code/__defines/math_physics.dm

@@ -15,9 +15,10 @@
 #define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 // (3 cm + 100 cm * sin(3deg))/(2*(3+100 cm)). Unitless ratio.
 #define HUMAN_EXPOSED_SURFACE_AREA          5.2 //m^2, surface area of 1.7m (H) x 0.46m (D) cylinder
 
-#define T0C  273.15 //    0.0 degrees celcius
-#define T20C 293.15 //   20.0 degrees celcius
-#define TCMB 2.7    // -270.3 degrees celcius
+#define T0C  273.15  //    0.0 degrees celcius
+#define T20C 293.15  //   20.0 degrees celcius
+#define TCMB 2.7     // -270.3 degrees celcius
+#define TN60C 213.15 //    -60 degrees celcius
 
 #define CLAMP01(x) max(0, min(1, x))
 #define QUANTIZE(variable) (round(variable,0.0001))

code/__defines/misc.dm

@@ -92,7 +92,8 @@
 // Setting this much higher than 1024 could allow spammers to DOS the server easily.
 #define MAX_MESSAGE_LEN       1024
 #define MAX_PAPER_MESSAGE_LEN 6144
-#define MAX_BOOK_MESSAGE_LEN  12288
+#define MAX_BOOK_MESSAGE_LEN  24576
+#define MAX_RECORD_LENGTH	  24576
 #define MAX_LNAME_LEN         64
 #define MAX_NAME_LEN          52
 
@@ -161,3 +162,8 @@
 #define CAT_NORMAL 1
 #define CAT_HIDDEN 2
 #define CAT_COIN   4
+
+//Antag Faction Visbility
+#define ANTAG_HIDDEN	"Hidden"
+#define ANTAG_SHARED	"Shared"
+#define ANTAG_KNOWN		"Known"

code/_onclick/_defines.dm

@@ -0,0 +1 @@
+#define CLICKCATCHER_PLANE -99

code/_onclick/click.dm

@@ -321,11 +321,19 @@
 		facedir(direction)
 
 /obj/screen/click_catcher
-	icon = 'icons/mob/screen1_full.dmi'
-	icon_state = "passage0"
-	layer = 0
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "click_catcher"
+	plane = CLICKCATCHER_PLANE
 	mouse_opacity = 2
-	screen_loc = "1,1"
+	screen_loc = "CENTER-7,CENTER-7"
+
+/obj/screen/click_catcher/proc/MakeGreed()
+	. = list()
+	for(var/i = 0, i<15, i++)
+		for(var/j = 0, j<15, j++)
+			var/obj/screen/click_catcher/CC = new()
+			CC.screen_loc = "NORTH-[i],EAST-[j]"
+			. += CC
 
 /obj/screen/click_catcher/Click(location, control, params)
 	var/list/modifiers = params2list(params)
@@ -333,6 +341,6 @@
 		var/mob/living/carbon/C = usr
 		C.swap_hand()
 	else
-		var/turf/T = screen_loc2turf(modifiers["screen-loc"], get_turf(usr))
+		var/turf/T = screen_loc2turf("screen-loc", get_turf(usr))
 		T.Click(location, control, params)
-	return 1
+	. = 1

code/_onclick/hud/alien_larva.dm

@@ -21,20 +21,6 @@
 	mymob.healths.name = "health"
 	mymob.healths.screen_loc = ui_alien_health
 
-	mymob.blind = new /obj/screen()
-	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
-	mymob.blind.icon_state = "blackimageoverlay"
-	mymob.blind.name = " "
-	mymob.blind.screen_loc = "1,1"
-	mymob.blind.layer = 0
-
-	mymob.flash = new /obj/screen()
-	mymob.flash.icon = 'icons/mob/screen1_alien.dmi'
-	mymob.flash.icon_state = "blank"
-	mymob.flash.name = "flash"
-	mymob.flash.screen_loc = ui_entire_screen
-	mymob.flash.layer = 17
-
 	mymob.fire = new /obj/screen()
 	mymob.fire.icon = 'icons/mob/screen1_alien.dmi'
 	mymob.fire.icon_state = "fire0"
@@ -42,6 +28,6 @@
 	mymob.fire.screen_loc = ui_fire
 
 	mymob.client.screen = list()
-	mymob.client.screen += list( mymob.healths, mymob.blind, mymob.flash, mymob.fire) //, mymob.rest, mymob.sleep, mymob.mach )
+	mymob.client.screen += list( mymob.healths, mymob.fire) //, mymob.rest, mymob.sleep, mymob.mach )
 	mymob.client.screen += src.adding + src.other
 	mymob.client.screen += mymob.client.void

code/_onclick/hud/fullscreen.dm

@@ -0,0 +1,118 @@
+#define FULLSCREEN_LAYER 18
+#define DAMAGE_LAYER FULLSCREEN_LAYER + 0.1
+#define BLIND_LAYER DAMAGE_LAYER + 0.1
+#define CRIT_LAYER BLIND_LAYER + 0.1
+
+/mob
+	var/list/screens = list()
+
+/mob/proc/set_fullscreen(condition, screen_name, screen_type, arg)
+	condition ? overlay_fullscreen(screen_name, screen_type, arg) : clear_fullscreen(screen_name)
+
+/mob/proc/overlay_fullscreen(category, type, severity)
+    var/obj/screen/fullscreen/screen = screens[category]
+
+    if(screen)
+        if(screen.type != type)
+            clear_fullscreen(category, FALSE)
+            screen = null
+        else if(!severity || severity == screen.severity)
+            return null
+
+    if(!screen)
+        screen = PoolOrNew(type)
+
+    screen.icon_state = "[initial(screen.icon_state)][severity]"
+    screen.severity = severity
+
+    screens[category] = screen
+    if(client && stat != DEAD)
+        client.screen += screen
+    return screen
+
+/mob/proc/clear_fullscreen(category, animated = 10)
+	var/obj/screen/fullscreen/screen = screens[category]
+	if(!screen)
+		return
+
+	screens -= category
+
+	if(animated)
+		spawn(0)
+			animate(screen, alpha = 0, time = animated)
+			sleep(animated)
+			if(client)
+				client.screen -= screen
+			qdel(screen)
+	else
+		if(client)
+			client.screen -= screen
+		qdel(screen)
+
+/mob/proc/clear_fullscreens()
+	for(var/category in screens)
+		clear_fullscreen(category)
+
+/mob/proc/hide_fullscreens()
+	if(client)
+		for(var/category in screens)
+			client.screen -= screens[category]
+
+/mob/proc/reload_fullscreen()
+	if(client && stat != DEAD) //dead mob do not see any of the fullscreen overlays that he has.
+		for(var/category in screens)
+			client.screen |= screens[category]
+
+/obj/screen/fullscreen
+	icon = 'icons/mob/screen_full.dmi'
+	icon_state = "default"
+	screen_loc = "CENTER-7,CENTER-7"
+	layer = FULLSCREEN_LAYER
+	mouse_opacity = 0
+	var/severity = 0
+
+/obj/screen/fullscreen/Destroy()
+	severity = 0
+	return ..()
+
+/obj/screen/fullscreen/brute
+	icon_state = "brutedamageoverlay"
+	layer = DAMAGE_LAYER
+
+/obj/screen/fullscreen/oxy
+	icon_state = "oxydamageoverlay"
+	layer = DAMAGE_LAYER
+
+/obj/screen/fullscreen/crit
+	icon_state = "passage"
+	layer = CRIT_LAYER
+
+/obj/screen/fullscreen/blind
+	icon_state = "blackimageoverlay"
+	layer = BLIND_LAYER
+
+/obj/screen/fullscreen/impaired
+	icon_state = "impairedoverlay"
+
+/obj/screen/fullscreen/blurry
+	icon = 'icons/mob/screen1.dmi'
+	screen_loc = "WEST,SOUTH to EAST,NORTH"
+	icon_state = "blurry"
+
+/obj/screen/fullscreen/flash
+	icon = 'icons/mob/screen1.dmi'
+	screen_loc = "WEST,SOUTH to EAST,NORTH"
+	icon_state = "flash"
+
+/obj/screen/fullscreen/flash/noise
+	icon_state = "noise"
+
+/obj/screen/fullscreen/high
+	icon = 'icons/mob/screen1.dmi'
+	screen_loc = "WEST,SOUTH to EAST,NORTH"
+	icon_state = "druggy"
+
+#undef FULLSCREEN_LAYER
+#undef BLIND_LAYER
+#undef DAMAGE_LAYER
+#undef CRIT_LAYER

code/_onclick/hud/hud.dm

@@ -269,7 +269,7 @@ datum/hud/New(mob/owner)
 	else if(isrobot(mymob))
 		robot_hud(ui_style, ui_color, ui_alpha, mymob)
 	else if(isbrain(mymob))
-		brain_hud(ui_style)
+		mymob.instantiate_hud(src)
 	else if(isalien(mymob))
 		larva_hud()
 	else if(isslime(mymob))
@@ -382,3 +382,9 @@ datum/hud/New(mob/owner)
 	hud_used.hidden_inventory_update()
 	hud_used.persistant_inventory_update()
 	update_action_buttons()
+
+/mob/proc/add_click_catcher()
+	client.screen += client.void
+
+/mob/new_player/add_click_catcher()
+	return

code/_onclick/hud/human.dm

@@ -303,32 +303,6 @@
 	mymob.ling_chem_display.icon_state = "ling_chems"
 	hud_elements |= mymob.ling_chem_display
 
-	mymob.blind = new /obj/screen()
-	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
-	mymob.blind.icon_state = "blackimageoverlay"
-	mymob.blind.name = " "
-	mymob.blind.screen_loc = "1,1"
-	mymob.blind.mouse_opacity = 0
-	mymob.blind.layer = 0
-	hud_elements |= mymob.blind
-
-	mymob.damageoverlay = new /obj/screen()
-	mymob.damageoverlay.icon = 'icons/mob/screen1_full.dmi'
-	mymob.damageoverlay.icon_state = "oxydamageoverlay0"
-	mymob.damageoverlay.name = "dmg"
-	mymob.damageoverlay.screen_loc = "1,1"
-	mymob.damageoverlay.mouse_opacity = 0
-	mymob.damageoverlay.layer = 18.1 //The black screen overlay sets layer to 18 to display it, this one has to be just on top.
-	hud_elements |= mymob.damageoverlay
-
-	mymob.flash = new /obj/screen()
-	mymob.flash.icon = ui_style
-	mymob.flash.icon_state = "blank"
-	mymob.flash.name = "flash"
-	mymob.flash.screen_loc = ui_entire_screen
-	mymob.flash.layer = 17
-	hud_elements |= mymob.flash
-
 	mymob.pain = new /obj/screen( null )
 
 	mymob.zone_sel = new /obj/screen/zone_sel( null )
@@ -366,7 +340,7 @@
 	mymob.client.screen += hud_elements
 	mymob.client.screen += src.adding + src.hotkeybuttons
 	mymob.client.screen += mymob.client.void
-	inventory_shown = 0;
+	inventory_shown = 0
 
 	return
 

code/_onclick/hud/other_mobs.dm

@@ -5,14 +5,6 @@
 /datum/hud/proc/ghost_hud()
 	return
 
-/datum/hud/proc/brain_hud(ui_style = 'icons/mob/screen1_Midnight.dmi')
-	mymob.blind = new /obj/screen()
-	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
-	mymob.blind.icon_state = "blackimageoverlay"
-	mymob.blind.name = " "
-	mymob.blind.screen_loc = "1,1"
-	mymob.blind.layer = 0
-
 /datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen1_Midnight.dmi')
 
 	blobpwrdisplay = new /obj/screen()
@@ -116,13 +108,6 @@
 	else if(istype(mymob,/mob/living/simple_animal/construct/harvester))
 		constructtype = "harvester"
 
-	mymob.flash = new /obj/screen()
-	mymob.flash.icon = 'icons/mob/screen1.dmi'
-	mymob.flash.icon_state = "blank"
-	mymob.flash.name = "flash"
-	mymob.flash.screen_loc = ui_entire_screen
-	mymob.flash.layer = 17
-
 	if(constructtype)
 		mymob.fire = new /obj/screen()
 		mymob.fire.icon = 'icons/mob/screen1_construct.dmi'
@@ -155,5 +140,5 @@
 
 	mymob.client.screen = list()
 
-	mymob.client.screen += list(mymob.fire, mymob.healths, mymob.pullin, mymob.zone_sel, mymob.purged, mymob.flash)
+	mymob.client.screen += list(mymob.fire, mymob.healths, mymob.pullin, mymob.zone_sel, mymob.purged)
 	mymob.client.screen += mymob.client.void

code/_onclick/hud/robot.dm

@@ -173,21 +173,6 @@ var/obj/screen/robot_inventory
 	mymob.pullin.screen_loc = ui_borg_pull
 	src.other += mymob.pullin
 
-	mymob.blind = new /obj/screen()
-	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
-	mymob.blind.icon_state = "blackimageoverlay"
-	mymob.blind.name = " "
-	mymob.blind.screen_loc = "1,1"
-	mymob.blind.layer = 0
-
-	mymob.flash = new /obj/screen()
-	mymob.flash.icon = ui_style
-	mymob.flash.icon_state = "blank"
-	mymob.flash.name = "flash"
-	mymob.flash.screen_loc = ui_entire_screen
-	mymob.flash.layer = 17
-	src.other += mymob.flash
-
 	mymob.zone_sel = new /obj/screen/zone_sel()
 	mymob.zone_sel.icon = ui_style
 	mymob.zone_sel.alpha = ui_alpha
@@ -210,7 +195,7 @@ var/obj/screen/robot_inventory
 
 	mymob.client.screen = list()
 
-	mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.fire, mymob.hands, mymob.healths, mymob:cells, mymob.pullin, mymob.blind, mymob.flash, robot_inventory, mymob.gun_setting_icon)
+	mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.fire, mymob.hands, mymob.healths, mymob:cells, mymob.pullin, robot_inventory, mymob.gun_setting_icon)
 	mymob.client.screen += src.adding + src.other
 	mymob.client.screen += mymob.client.void
 

code/_onclick/item_attack.dm

@@ -39,7 +39,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 /mob/living/attackby(obj/item/I, mob/user)
 	if(!ismob(user))
 		return 0
-	if(can_operate(src) && do_surgery(src,user,I)) //Surgery
+	if(can_operate(src) && I.do_surgery(src,user)) //Surgery
 		return 1
 	if(attempt_vr(src,"vore_attackby",args)) return //VOREStation Code
 	return I.attack(src, user, user.zone_sel.selecting)
@@ -77,6 +77,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 
 //Called when a weapon is used to make a successful melee attack on a mob. Returns the blocked result
 /obj/item/proc/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+	user.break_cloak()
 	if(hitsound)
 		playsound(loc, hitsound, 50, 1, -1)
 

code/controllers/configuration.dm

@@ -65,6 +65,7 @@ var/list/gamemode_cache = list()
 	var/usewhitelist = 0
 	var/kick_inactive = 0				//force disconnect for inactive players after this many minutes, if non-0
 	var/show_mods = 0
+	var/show_devs = 0
 	var/show_mentors = 0
 	var/mods_can_tempban = 0
 	var/mods_can_job_tempban = 0
@@ -505,6 +506,9 @@ var/list/gamemode_cache = list()
 				if("show_mods")
 					config.show_mods = 1
 
+				if("show_devs")
+					config.show_devs = 1
+
 				if("show_mentors")
 					config.show_mentors = 1
 

code/datums/datacore.dm

@@ -228,6 +228,8 @@
 		L.fields["faction"]		= H.personal_faction
 		L.fields["religion"]	= H.religion
 		L.fields["image"]		= getFlatIcon(H)	//This is god-awful
+		L.fields["antagfac"]	= H.antag_faction
+		L.fields["antagvis"]	= H.antag_vis
 		if(H.exploit_record && !jobban_isbanned(H, "Records"))
 			L.fields["exploit_record"] = H.exploit_record
 		else

code/datums/supplypacks/atmospherics.dm

@@ -52,7 +52,7 @@
 
 /datum/supply_packs/atmos/canister_sleeping_agent
 	name = "N2O gas canister"
-	cost = 40
+	cost = 15
 	containername = "N2O gas canister crate"
 	containertype = /obj/structure/closet/crate/secure/large
 	access = access_atmospherics
@@ -60,7 +60,7 @@
 
 /datum/supply_packs/atmos/canister_carbon_dioxide
 	name = "Carbon dioxide gas canister"
-	cost = 40
+	cost = 15
 	containername = "CO2 canister crate"
 	containertype = /obj/structure/closet/crate/secure/large
 	access = access_atmospherics
@@ -69,7 +69,7 @@
 /datum/supply_packs/atmos/air_dispenser
 	contains = list(/obj/machinery/pipedispenser/orderable)
 	name = "Pipe Dispenser"
-	cost = 35
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure/large
 	containername = "Pipe Dispenser Crate"
 	access = access_atmospherics
@@ -77,7 +77,7 @@
 /datum/supply_packs/atmos/disposals_dispenser
 	contains = list(/obj/machinery/pipedispenser/disposal/orderable)
 	name = "Disposals Pipe Dispenser"
-	cost = 35
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure/large
 	containername = "Disposal Dispenser Crate"
 	access = access_atmospherics

code/datums/supplypacks/contraband.dm

@@ -14,7 +14,7 @@
 			)
 
 	name = "Contraband crate"
-	cost = 30
+	cost = 25
 	containertype = /obj/structure/closet/crate
 	containername = "Unlabeled crate"
 	contraband = 1
@@ -28,7 +28,7 @@
 			/obj/item/weapon/pen/reagent/paralysis,
 			/obj/item/weapon/grenade/chem_grenade/incendiary
 			)
-	cost = 20
+	cost = 25
 	containertype = /obj/structure/closet/crate
 	containername = "Special Ops crate"
 	hidden = 1

code/datums/supplypacks/costumes.dm

@@ -5,10 +5,10 @@
 
 
 /datum/supply_packs/costumes
-	group = "Costumes & Clothes"
+	group = "Costumes"
 
 /datum/supply_packs/randomised/costumes
-	group = "Costumes & Clothes"
+	group = "Costumes"
 
 /datum/supply_packs/costumes/wizard
 	name = "Wizard costume"
@@ -109,7 +109,7 @@
 	containertype = /obj/structure/closet
 	containername = "Formalwear for the best occasions."
 
-datum/supply_packs/misc/witch
+datum/supply_packs/costumes/witch
 	name = "Witch costume"
 	containername = "Witch costume"
 	containertype = /obj/structure/closet
@@ -124,7 +124,7 @@ datum/supply_packs/misc/witch
 /datum/supply_packs/randomised/costumes/costume_hats
 	name = "Costume hats"
 	containername = "Actor hats crate"
-	containertype = /obj/structure/closet
+	containertype = /obj/structure/closet/crate
 	cost = 10
 	num_contained = 3
 	contains = list(

code/datums/supplypacks/engineering.dm

@@ -29,7 +29,7 @@
 			/obj/item/weapon/cell = 2,
 			/obj/item/weapon/cell/high = 2
 			)
-	cost = 15
+	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Electrical maintenance crate"
 
@@ -48,7 +48,7 @@
 /datum/supply_packs/eng/fueltank
 	name = "Fuel tank crate"
 	contains = list(/obj/structure/reagent_dispensers/fueltank)
-	cost = 8
+	cost = 10
 	containertype = /obj/structure/largecrate
 	containername = "fuel tank crate"
 
@@ -110,7 +110,7 @@
 /datum/supply_packs/eng/shield_gen
 	contains = list(/obj/item/weapon/circuitboard/shield_gen)
 	name = "Bubble shield generator circuitry"
-	cost = 50
+	cost = 30
 	containertype = /obj/structure/closet/crate/secure
 	containername = "bubble shield generator circuitry crate"
 	access = access_ce
@@ -118,7 +118,7 @@
 /datum/supply_packs/eng/shield_gen_ex
 	contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
 	name = "Hull shield generator circuitry"
-	cost = 50
+	cost = 30
 	containertype = /obj/structure/closet/crate/secure
 	containername = "hull shield generator circuitry crate"
 	access = access_ce
@@ -126,7 +126,7 @@
 /datum/supply_packs/eng/shield_cap
 	contains = list(/obj/item/weapon/circuitboard/shield_cap)
 	name = "Bubble shield capacitor circuitry"
-	cost = 50
+	cost = 30
 	containertype = /obj/structure/closet/crate/secure
 	containername = "shield capacitor circuitry crate"
 	access = access_ce
@@ -142,7 +142,7 @@
 /datum/supply_packs/eng/teg
 	contains = list(/obj/machinery/power/generator)
 	name = "Mark I Thermoelectric Generator"
-	cost = 75
+	cost = 50
 	containertype = /obj/structure/closet/crate/secure/large
 	containername = "Mk1 TEG crate"
 	access = access_engine
@@ -150,7 +150,7 @@
 /datum/supply_packs/eng/circulator
 	contains = list(/obj/machinery/atmospherics/binary/circulator)
 	name = "Binary atmospheric circulator"
-	cost = 60
+	cost = 50
 	containertype = /obj/structure/closet/crate/secure/large
 	containername = "Atmospheric circulator crate"
 	access = access_engine
@@ -167,7 +167,7 @@
 
 /datum/supply_packs/eng/pacman_parts
 	name = "P.A.C.M.A.N. portable generator parts"
-	cost = 45
+	cost = 25
 	containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
 	containertype = /obj/structure/closet/crate/secure
 	access = access_tech_storage
@@ -180,7 +180,7 @@
 
 /datum/supply_packs/eng/super_pacman_parts
 	name = "Super P.A.C.M.A.N. portable generator parts"
-	cost = 55
+	cost = 35
 	containername = "Super P.A.C.M.A.N. portable generator construction kit"
 	containertype = /obj/structure/closet/crate/secure
 	access = access_tech_storage

code/datums/supplypacks/hospitality.dm

@@ -22,7 +22,7 @@
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2,
 			/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4,
 			)
-	cost = 20
+	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "Party equipment"
 

code/datums/supplypacks/hydroponics.dm

@@ -17,21 +17,21 @@
 /datum/supply_packs/hydro/farwa
 	name = "Farwa crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes)
-	cost = 30
+	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Farwa crate"
 
 /datum/supply_packs/hydro/neara
 	name = "Neaera crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes)
-	cost = 30
+	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Neaera crate"
 
 /datum/supply_packs/hydro/stok
 	name = "Stok crate"
 	contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes)
-	cost = 30
+	cost = 20
 	containertype = /obj/structure/closet/crate/freezer
 	containername = "Stok crate"
 
@@ -55,14 +55,14 @@
 			/obj/item/weapon/material/minihoe,
 			/obj/item/weapon/storage/box/botanydisk
 			)
-	cost = 15
+	cost = 20
 	containertype = /obj/structure/closet/crate/hydroponics
 	containername = "Hydroponics crate"
 	access = access_hydroponics
 
 /datum/supply_packs/hydro/cow
 	name = "Cow crate"
-	cost = 30
+	cost = 25
 	containertype = /obj/structure/largecrate/animal/cow
 	containername = "Cow crate"
 	access = access_hydroponics
@@ -76,7 +76,7 @@
 
 /datum/supply_packs/hydro/chicken
 	name = "Chicken crate"
-	cost = 20
+	cost = 25
 	containertype = /obj/structure/largecrate/animal/chick
 	containername = "Chicken crate"
 	access = access_hydroponics
@@ -123,7 +123,7 @@
 /datum/supply_packs/hydro/watertank
 	name = "Water tank crate"
 	contains = list(/obj/structure/reagent_dispensers/watertank)
-	cost = 8
+	cost = 10
 	containertype = /obj/structure/largecrate
 	containername = "water tank crate"
 
@@ -142,7 +142,7 @@
 
 /datum/supply_packs/hydro/tray
 	name = "Empty hydroponics tray"
-	cost = 30
+	cost = 20
 	containertype = /obj/structure/closet/crate/hydroponics
 	containername = "Hydroponics tray crate"
 	contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0})

code/datums/supplypacks/medical.dm

@@ -42,7 +42,7 @@
 /datum/supply_packs/med/cryobag
 	name = "Stasis bag crate"
 	contains = list(/obj/item/bodybag/cryobag = 3)
-	cost = 50
+	cost = 40
 	containertype = /obj/structure/closet/crate/medical
 	containername = "Stasis bag crate"
 
@@ -75,7 +75,7 @@
 			/obj/item/weapon/storage/box/gloves,
 			/obj/item/weapon/storage/belt/medical = 3
 			)
-	cost = 15
+	cost = 10
 	containertype = "/obj/structure/closet/crate"
 	containername = "Sterile equipment crate"
 
@@ -87,7 +87,7 @@
 			/obj/item/device/radio/headset/headset_med/alt = 3,
 			/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3
 			)
-	cost = 15
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Medical surplus equipment"
 	access = access_medical
@@ -111,7 +111,7 @@
 			/obj/item/device/flashlight/pen,
 			/obj/item/weapon/reagent_containers/syringe
 			)
-	cost = 60
+	cost = 50
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Chief medical officer equipment"
 	access = access_cmo
@@ -157,7 +157,7 @@
 			/obj/item/weapon/storage/box/pillbottles,
 			/obj/item/weapon/reagent_containers/syringe
 			)
-	cost = 15
+	cost = 20
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Chemist equipment"
 	access = access_chemistry
@@ -204,7 +204,7 @@
 			/obj/item/weapon/pen,
 			/obj/item/weapon/cartridge/medical
 			)
-	cost = 15
+	cost = 20
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Psychiatrist equipment"
 	access = access_psychiatrist
@@ -225,7 +225,7 @@
 			/obj/item/weapon/storage/box/masks,
 			/obj/item/weapon/storage/box/gloves
 			)
-	cost = 15
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Medical scrubs crate"
 	access = access_medical_equip
@@ -269,7 +269,7 @@
 			/obj/item/weapon/storage/box/masks,
 			/obj/item/weapon/storage/box/gloves
 			)
-	cost = 15
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Medical uniform crate"
 	access = access_medical_equip

code/datums/supplypacks/misc.dm

@@ -67,7 +67,7 @@
 			/obj/item/clothing/accessory/storage/white_drop_pouches,
 			/obj/item/clothing/accessory/storage/webbing
 			)
-	cost = 15
+	cost = 10
 	containertype = "/obj/structure/closet/crate"
 	containername = "Webbing crate"
 
@@ -92,6 +92,6 @@
 			/obj/item/clothing/head/helmet/space/emergency = 4,
 			/obj/item/clothing/mask/gas = 4
 			)
-	cost = 45
+	cost = 35
 	containertype = /obj/structure/closet/crate/internals
 	containername = "Emergency crate"

code/datums/supplypacks/munitions.dm

@@ -40,7 +40,7 @@
 	contains = list(
 			/obj/item/weapon/gun/energy/xray = 2,
 			/obj/item/weapon/shield/energy = 2)
-	cost = 125
+	cost = 100
 	containertype = /obj/structure/closet/crate/secure/weapon
 	containername = "Experimental weapons crate"
 	access = access_armory
@@ -60,7 +60,7 @@
 			/obj/item/weapon/storage/box/shotgunshells,
 			/obj/item/weapon/gun/projectile/shotgun/pump/combat = 2
 			)
-	cost = 65
+	cost = 50
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Shotgun crate"
 	access = access_armory
@@ -68,7 +68,7 @@
 /datum/supply_packs/munitions/erifle
 	name = "Energy marksman crate"
 	contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
-	cost = 90
+	cost = 100
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Energy marksman crate"
 	access = access_armory
@@ -91,7 +91,7 @@
 			/obj/item/weapon/gun/projectile/automatic/wt550,
 			/obj/item/weapon/gun/projectile/automatic/z8
 			)
-	cost = 90
+	cost = 100
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Automatic weapon crate"
 	access = access_armory
@@ -119,12 +119,12 @@
  	containername = "Weapons crate"
 
 /datum/supply_packs/munitions/shotgunammo
-	name = "Ballistic ammunition crate"
+	name = "Shotgun ammunition crate"
 	contains = list(
 			/obj/item/weapon/storage/box/shotgunammo = 2,
 			/obj/item/weapon/storage/box/shotgunshells = 2
 			)
-	cost = 60
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure
 	containername = "ballistic ammunition crate"
 	access = access_armory
@@ -137,7 +137,7 @@
 			/obj/item/ammo_magazine/mc9mmt/rubber,
 			/obj/item/ammo_magazine/a556
 			)
-	cost = 20
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Automatic weapon ammunition crate"
 	access = access_armory
@@ -145,7 +145,7 @@
 /datum/supply_packs/munitions/beanbagammo
 	name = "Beanbag shells"
 	contains = list(/obj/item/weapon/storage/box/beanbags = 3)
-	cost = 30
+	cost = 25
 	containertype = /obj/structure/closet/crate
 	containername = "Beanbag shells"
 	access = null

code/datums/supplypacks/recreation.dm

@@ -19,7 +19,7 @@
 			/obj/item/weapon/material/twohanded/spear/foam = 2,
 			/obj/item/weapon/material/twohanded/fireaxe/foam = 2
 			)
-	cost = 80
+	cost = 50
 	containertype = /obj/structure/closet/crate
 	containername = "foam weapon crate"
 
@@ -33,7 +33,7 @@
 			)
 	containertype = /obj/structure/closet
 	containername = "Lasertag Closet"
-	cost = 20
+	cost = 10
 
 /datum/supply_packs/recreation/artscrafts
 	name = "Arts and Crafts supplies"

code/datums/supplypacks/robotics.dm

@@ -58,7 +58,7 @@
 			/obj/item/weapon/circuitboard/mecha/ripley/main,
 			/obj/item/weapon/circuitboard/mecha/ripley/peripherals
 			)
-	cost = 30
+	cost = 25
 	containertype = /obj/structure/closet/crate/secure
 	containername = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics

code/datums/supplypacks/science.dm

@@ -16,7 +16,7 @@
 /datum/supply_packs/sci/coolanttank
 	name = "Coolant tank crate"
 	contains = list(/obj/structure/reagent_dispensers/coolanttank)
-	cost = 16
+	cost = 15
 	containertype = /obj/structure/largecrate
 	containername = "coolant tank crate"
 

code/datums/supplypacks/security.dm

@@ -82,7 +82,7 @@
 			/obj/item/clothing/gloves/arm_guard/bulletproof,
 			/obj/item/clothing/shoes/leg_guard/bulletproof
 			)
-	cost = 35
+	cost = 40
 	containertype = /obj/structure/closet/crate/secure
 	containername = "bullet resistant armor set crate"
 	access = access_armory
@@ -104,7 +104,7 @@
 	name = "Tactical suits"
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Tactical Suit Locker"
-	cost = 60
+	cost = 40
 	access = access_armory
 	contains = list(
 			/obj/item/clothing/under/tactical,
@@ -162,7 +162,7 @@
 			/obj/item/device/radio/headset/headset_sec/alt = 3,
 			/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3
 			)
-	cost = 25
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security surplus equipment"
 	access = null
@@ -189,7 +189,7 @@
 			/obj/item/device/flashlight/maglight,
 			/obj/item/weapon/storage/briefcase/crimekit
 			)
-	cost = 40
+	cost = 20
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Forensic equipment"
 	access = access_forensics_lockers
@@ -210,7 +210,7 @@
 			/obj/item/clothing/accessory/badge/holo/detective = 2,
 			/obj/item/clothing/gloves/black = 2
 			)
-	cost = 20
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Investigation clothing"
 	access = access_forensics_lockers
@@ -240,7 +240,7 @@
 			/obj/item/weapon/gun/energy/taser,
 			/obj/item/device/flashlight/maglight
 			)
-	cost = 30
+	cost = 20
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Officer equipment"
 	access = access_brig
@@ -268,7 +268,7 @@
 			/obj/item/clothing/head/beret/sec/corporate/warden,
 			/obj/item/device/flashlight/maglight
 			)
-	cost = 45
+	cost = 20
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Warden equipment"
 	access = access_armory
@@ -294,7 +294,7 @@
 			/obj/item/clothing/head/beret/sec/corporate/hos,
 			/obj/item/device/flashlight/maglight
 			)
-	cost = 65
+	cost = 50
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Head of security equipment"
 	access = access_hos
@@ -314,7 +314,7 @@
 			/obj/item/clothing/gloves/black = 4,
 			/obj/item/weapon/storage/box/holobadge
 			)
-	cost = 20
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security uniform crate"
 
@@ -335,7 +335,7 @@
 			/obj/item/clothing/gloves/black = 4,
 			/obj/item/weapon/storage/box/holobadge
 			)
-	cost = 20
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Navy blue security uniform crate"
 
@@ -355,21 +355,22 @@
 			/obj/item/clothing/gloves/black = 4,
 			/obj/item/weapon/storage/box/holobadge
 			)
-	cost = 20
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Corporate security uniform crate"
 
 /datum/supply_packs/security/biosuit
 	name = "Security biohazard gear"
 	contains = list(
-			/obj/item/clothing/head/bio_hood/security,
-			/obj/item/clothing/under/rank/security,
-			/obj/item/clothing/suit/bio_suit/security,
-			/obj/item/clothing/shoes/white,
-			/obj/item/clothing/mask/gas,
-			/obj/item/weapon/tank/oxygen,
-			/obj/item/clothing/gloves/latex
+			/obj/item/clothing/head/bio_hood/security = 3,
+			/obj/item/clothing/under/rank/security = 3,
+			/obj/item/clothing/suit/bio_suit/security = 3,
+			/obj/item/clothing/shoes/white = 3,
+			/obj/item/clothing/mask/gas = 3,
+			/obj/item/weapon/tank/oxygen = 3,
+			/obj/item/clothing/gloves/latex,
+			/obj/item/weapon/storage/box/gloves
 			)
-	cost = 35
+	cost = 50
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security biohazard gear"

code/datums/supplypacks/supply.dm

@@ -103,7 +103,7 @@
 			/obj/item/clothing/glasses/material,
 			/obj/item/clothing/glasses/meson
 			)
-	cost = 15
+	cost = 10
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Shaft miner equipment"
 	access = access_mining
@@ -118,7 +118,7 @@
 /datum/supply_packs/supply/cargotrain
 	name = "Cargo Train Tug"
 	contains = list(/obj/vehicle/train/cargo/engine)
-	cost = 45
+	cost = 35
 	containertype = /obj/structure/largecrate
 	containername = "Cargo Train Tug Crate"
 

code/datums/supplypacks/supplypacks.dm

@@ -7,12 +7,14 @@
 
 //var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous")
 var/list/all_supply_groups = list("Atmospherics",
-								  "Costumes & Clothes",
+								  "Costumes",
 								  "Engineering",
 								  "Hospitality",
+								  "Hydroponics",
 								  "Materials",
 								  "Medical",
 								  "Miscellaneous",
+								  "Munitions",
 								  "Reagents",
 								  "Reagent Cartridges",
 								  "Recreation",

code/datums/supplypacks/voidsuits.dm

@@ -16,7 +16,7 @@
 			/obj/item/clothing/shoes/magboots = 2,
 			/obj/item/weapon/tank/oxygen = 2,
 			)
-	cost = 45
+	cost = 40
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Atmospheric voidsuit crate"
 	access = access_atmospherics
@@ -58,7 +58,7 @@
 			/obj/item/clothing/shoes/magboots = 2,
 			/obj/item/weapon/tank/oxygen = 2
 			)
-	cost = 55
+	cost = 40
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security voidsuit crate"
 
@@ -70,7 +70,7 @@
 			/obj/item/clothing/mask/breath = 2,
 			/obj/item/weapon/tank/oxygen = 2
 			)
-	cost = 35
+	cost = 40
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Mining voidsuit crate"
 	access = access_mining

code/game/antagonist/antagonist.dm

@@ -99,19 +99,23 @@
 
 	// Prune restricted status. Broke it up for readability.
 	// Note that this is done before jobs are handed out.
-	for(var/datum/mind/player in ticker.mode.get_players_for_role(role_type, id))
+	candidates = ticker.mode.get_players_for_role(role_type, id, ghosts_only)
+	for(var/datum/mind/player in candidates)
 		if(ghosts_only && !istype(player.current, /mob/observer/dead))
-			log_debug("[key_name(player)] is not eligible to become a [role_text]: Only ghosts may join as this role!")
+			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: Only ghosts may join as this role! They have been removed from the draft.")
 		else if(player.special_role)
-			log_debug("[key_name(player)] is not eligible to become a [role_text]: They already have a special role ([player.special_role])!")
+			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They already have a special role ([player.special_role])! They have been removed from the draft.")
 		else if (player in pending_antagonists)
-			log_debug("[key_name(player)] is not eligible to become a [role_text]: They have already been selected for this role!")
+			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They have already been selected for this role! They have been removed from the draft.")
 		else if(!can_become_antag(player))
-			log_debug("[key_name(player)] is not eligible to become a [role_text]: They are blacklisted for this role!")
+			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They are blacklisted for this role! They have been removed from the draft.")
 		else if(player_is_antag(player))
-			log_debug("[key_name(player)] is not eligible to become a [role_text]: They are already an antagonist!")
-		else
-			candidates += player
+			candidates -= player
+			log_debug("[key_name(player)] is not eligible to become a [role_text]: They are already an antagonist! They have been removed from the draft.")
 
 	return candidates
 

code/game/gamemodes/cult/cult_items.dm

@@ -8,6 +8,8 @@
 	throwforce = 10
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	edge = 1
+	sharp = 1
 
 /obj/item/weapon/melee/cultblade/cultify()
 	return

code/game/gamemodes/cult/cultify/obj.dm

@@ -50,7 +50,7 @@
 		src.invisibility = INVISIBILITY_MAXIMUM
 		density = 0
 
-/obj/machinery/cooking/cultify()
+/obj/machinery/cooker/cultify()
 	new /obj/structure/cult/talisman(loc)
 	qdel(src)
 

code/game/gamemodes/cult/runes.dm

@@ -465,7 +465,6 @@ var/list/sacrificed = list()
 					break
 			D.universal_speak = 1
 			D.status_flags &= ~GODMODE
-			D.s_tone = 35
 			D.b_eyes = 200
 			D.r_eyes = 200
 			D.g_eyes = 200
@@ -1052,7 +1051,7 @@ var/list/sacrificed = list()
 				for(var/mob/living/L in viewers(src))
 					if(iscarbon(L))
 						var/mob/living/carbon/C = L
-						flick("e_flash", C.flash)
+						C.flash_eyes()
 						if(C.stuttering < 1 && (!(HULK in C.mutations)))
 							C.stuttering = 1
 						C.Weaken(1)
@@ -1081,7 +1080,7 @@ var/list/sacrificed = list()
 						admin_attack_log(usr, T, "Used a stun rune.", "Was victim of a stun rune.", "used a stun rune on")
 					else if(iscarbon(T))
 						var/mob/living/carbon/C = T
-						flick("e_flash", C.flash)
+						C.flash_eyes()
 						if (!(HULK in C.mutations))
 							C.silent += 15
 						C.Weaken(25)

code/game/gamemodes/endgame/supermatter_cascade/universe.dm

@@ -43,7 +43,7 @@ var/global/universe_has_ended = 0
 	world << sound('sound/effects/cascade.ogg')
 
 	for(var/mob/M in player_list)
-		flick("e_flash", M.flash)
+		M.flash_eyes()
 
 	if(emergency_shuttle.can_recall())
 		priority_announcement.Announce("The emergency shuttle has returned due to bluespace distortion.")
@@ -122,6 +122,6 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked
 			continue
 		if(M.current.stat!=2)
 			M.current.Weaken(10)
-			flick("e_flash", M.current.flash)
+			M.current.flash_eyes()
 
 		clear_antag_roles(M)

code/game/gamemodes/game_mode.dm

@@ -372,7 +372,7 @@ var/global/list/additional_antag_types = list()
 /datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere.
 	return 0
 
-/datum/game_mode/proc/get_players_for_role(var/role, var/antag_id)
+/datum/game_mode/proc/get_players_for_role(var/role, var/antag_id, var/ghosts_only)
 	var/list/players = list()
 	var/list/candidates = list()
 
@@ -387,6 +387,8 @@ var/global/list/additional_antag_types = list()
 				continue
 			if(istype(player, /mob/new_player))
 				continue
+			if(istype(player, /mob/observer/dead) && !ghosts_only)
+				continue
 			if(!role || (player.client.prefs.be_special & role))
 				log_debug("[player.key] had [antag_id] enabled, so we are drafting them.")
 				candidates |= player.mind

code/game/jobs/job/captain.dm

@@ -30,13 +30,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back)
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/cap(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/captain(H), slot_w_uniform) 
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/captain(H), slot_w_uniform)
 		if(H.age>49)
-			// Since we can have something other than the default uniform at this  
+			// Since we can have something other than the default uniform at this
 			// point, check if we can actually attach the medal
 			var/obj/item/clothing/uniform = H.w_uniform
 			var/obj/item/clothing/accessory/medal/gold/captain/medal = new()
-			
+
 			if(uniform && uniform.can_attach_accessory(medal))
 				uniform.attach_accessory(null, medal)
 			else
@@ -72,6 +72,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	supervisors = "the captain"
 	selection_color = "#2F2F7F"
 	idtype = /obj/item/weapon/card/id/silver
+	alt_titles = list("Crew Resources Officer")
 	req_admin_notify = 1
 	minimal_player_age = 10
 	economic_modifier = 10
@@ -107,4 +108,5 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_l_hand)
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
-		return 1
+		H.implant_loyalty()
+		return 1

code/game/machinery/adv_med.dm

@@ -9,13 +9,23 @@
 	icon_state = "body_scanner_0"
 	density = 1
 	anchored = 1
+
 	circuit = /obj/item/weapon/circuitboard/body_scanner
 
 	use_power = 1
 	idle_power_usage = 60
 	active_power_usage = 10000	//10 kW. It's a big all-body scanner.
 
+	light_color = "#00FF00"
+
 /obj/machinery/bodyscanner/New()
+	..()
+	spawn( 5 )
+		var/obj/machinery/body_scanconsole/C = locate(/obj/machinery/body_scanconsole) in range(2,src)
+		if(C)
+			C.connected = src
+
+/obj/machinery/bodyscanner/map/New()
 	..()
 	circuit = new circuit(src)
 	component_parts = list()
@@ -23,81 +33,14 @@
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
 	component_parts += new /obj/item/stack/material/glass/reinforced(src, 2)
-
-	spawn( 5 )
-		var/obj/machinery/body_scanconsole/C = locate(/obj/machinery/body_scanconsole) in range(2,src)
-		if(C)
-			C.connected = src
-		return
-
 	RefreshParts()
 
-/obj/machinery/bodyscanner/relaymove(mob/user as mob)
-	if (user.stat)
-		return
-	src.go_out()
-	return
-
-/obj/machinery/bodyscanner/verb/eject()
-	set src in oview(1)
-	set category = "Object"
-	set name = "Eject Body Scanner"
-
-	if (usr.stat != 0)
-		return
-	src.go_out()
-	add_fingerprint(usr)
-	return
-
-/obj/machinery/bodyscanner/verb/move_inside()
-	set src in oview(1)
-	set category = "Object"
-	set name = "Enter Body Scanner"
-
-	if (usr.stat != 0)
-		return
-	if (src.occupant)
-		usr << "<span class='warning'>The scanner is already occupied!</span>"
-		return
-	if (usr.abiotic())
-		usr << "<span class='warning'>The subject cannot have abiotic items on.</span>"
-		return
-	usr.pulling = null
-	usr.client.perspective = EYE_PERSPECTIVE
-	usr.client.eye = src
-	usr.loc = src
-	src.occupant = usr
-	update_use_power(2)
-	src.icon_state = "body_scanner_1"
-	for(var/obj/O in src)
-		//O = null
-		if(O in component_parts)
-			continue
-		if(O == circuit)
-			continue
-		qdel(O)
-		//Foreach goto(124)
-	src.add_fingerprint(usr)
-	return
-
-/obj/machinery/bodyscanner/proc/go_out()
-	if ((!( src.occupant ) || src.locked))
-		return
-	for(var/obj/O in src)
-		if(O in component_parts)
-			continue
-		if(O == circuit)
-			continue
-		O.loc = src.loc
-		//Foreach goto(30)
-	if (src.occupant.client)
-		src.occupant.client.eye = src.occupant.client.mob
-		src.occupant.client.perspective = MOB_PERSPECTIVE
-	src.occupant.loc = src.loc
-	src.occupant = null
-	update_use_power(1)
-	src.icon_state = "body_scanner_0"
-	return
+/obj/machinery/bodyscanner/power_change()
+	..()
+	if(!(stat & (BROKEN|NOPOWER)))
+		set_light(2)
+	else
+		set_light(0)
 
 /obj/machinery/bodyscanner/attackby(var/obj/item/G, user as mob)
 	if(default_deconstruction_screwdriver(user, G))
@@ -107,42 +50,96 @@
 
 	if(istype(G, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/H = G
-		if(!(ismob(H.affecting)))
+		if(panel_open)
+			user << "<span class='notice'>Close the maintenance panel first.</span>"
 			return
-		if (src.occupant)
-			user << "<span class='warning'>The scanner is already occupied!</span>"
+		if(!ismob(H.affecting))
 			return
-		if (H.affecting.abiotic())
-			user << "<span class='warning'>Subject cannot have abiotic items on.</span>"
+		if(occupant)
+			user << "<span class='notice'>The scanner is already occupied!</span>"
 			return
+		for(var/mob/living/carbon/slime/M in range(1, H.affecting))
+			if(M.Victim == H.affecting)
+				user << "<span class='danger'>[H.affecting.name] has a fucking slime attached to them, deal with that first.</span>"
+				return
 		var/mob/M = H.affecting
-		if (M.client)
-			M.client.perspective = EYE_PERSPECTIVE
-			M.client.eye = src
-		M.loc = src
-		src.occupant = M
-		update_use_power(2)
-		src.icon_state = "body_scanner_1"
-		for(var/obj/O in src)
-			if(O in component_parts)
-				continue
-			if(O == circuit)
-				continue
-			O.loc = src.loc
-			//Foreach goto(154)
-		src.add_fingerprint(user)
-		//G = null
+		if(M.abiotic())
+			user << "<span class='notice'>Subject cannot have abiotic items on.</span>"
+			return
+		M.forceMove(src)
+		occupant = M
+		icon_state = "body_scanner_1"
+		add_fingerprint(user)
 		qdel(G)
+
+/obj/machinery/bodyscanner/MouseDrop_T(mob/living/carbon/O, mob/user as mob)
+	if(!istype(O))
+		return 0 //not a mob
+	if(user.incapacitated())
+		return 0 //user shouldn't be doing things
+	if(O.anchored)
+		return 0 //mob is anchored???
+	if(get_dist(user, src) > 1 || get_dist(user, O) > 1)
+		return 0 //doesn't use adjacent() to allow for non-cardinal (fuck my life)
+	if(!ishuman(user) && !isrobot(user))
+		return 0 //not a borg or human
+	if(panel_open)
+		user << "<span class='notice'>Close the maintenance panel first.</span>"
+		return 0 //panel open
+	if(occupant)
+		user << "<span class='notice'>\The [src] is already occupied.</span>"
+		return 0 //occupied
+
+	if(O.buckled)
+		return 0
+	if(O.abiotic())
+		user << "<span class='notice'>Subject cannot have abiotic items on.</span>"
+		return 0
+	for(var/mob/living/carbon/slime/M in range(1, O))
+		if(M.Victim == O)
+			user << "<span class='danger'>[O] has a fucking slime attached to them, deal with that first.</span>"
+			return 0
+
+	if(O == user)
+		visible_message("[user] climbs into \the [src].")
+	else
+		visible_message("[user] puts [O] into the body scanner.")
+
+	O.forceMove(src)
+	occupant = O
+	icon_state = "body_scanner_1"
+	add_fingerprint(user)
+
+/obj/machinery/bodyscanner/relaymove(mob/user as mob)
+	if(user.incapacitated())
+		return 0 //maybe they should be able to get out with cuffs, but whatever
+	go_out()
+
+/obj/machinery/bodyscanner/verb/eject()
+	set src in oview(1)
+	set category = "Object"
+	set name = "Eject Body Scanner"
+
+	if(usr.incapacitated())
+		return
+	go_out()
+	add_fingerprint(usr)
+
+/obj/machinery/bodyscanner/proc/go_out()
+	if ((!( src.occupant ) || src.locked))
+		return
+	if (src.occupant.client)
+		src.occupant.client.eye = src.occupant.client.mob
+		src.occupant.client.perspective = MOB_PERSPECTIVE
+	src.occupant.loc = src.loc
+	src.occupant = null
+	src.icon_state = "body_scanner_0"
 	return
 
 /obj/machinery/bodyscanner/ex_act(severity)
 	switch(severity)
 		if(1.0)
 			for(var/atom/movable/A as mob|obj in src)
-				if(A in component_parts)
-					continue
-				if(A == circuit)
-					continue
 				A.loc = src.loc
 				ex_act(severity)
 				//Foreach goto(35)
@@ -152,10 +149,6 @@
 		if(2.0)
 			if (prob(50))
 				for(var/atom/movable/A as mob|obj in src)
-					if(A in component_parts)
-						continue
-					if(A == circuit)
-						continue
 					A.loc = src.loc
 					ex_act(severity)
 					//Foreach goto(108)
@@ -165,10 +158,6 @@
 		if(3.0)
 			if (prob(25))
 				for(var/atom/movable/A as mob|obj in src)
-					if(A in component_parts)
-						continue
-					if(A == circuit)
-						continue
 					A.loc = src.loc
 					ex_act(severity)
 					//Foreach goto(181)
@@ -178,32 +167,7 @@
 		else
 	return
 
-/obj/machinery/body_scanconsole/ex_act(severity)
-
-	switch(severity)
-		if(1.0)
-			//SN src = null
-			qdel(src)
-			return
-		if(2.0)
-			if (prob(50))
-				//SN src = null
-				qdel(src)
-				return
-		else
-	return
-
-/obj/machinery/body_scanconsole/power_change()
-	..()
-	if(stat & BROKEN)
-		icon_state = "body_scannerconsole-p"
-	else
-		if (stat & NOPOWER)
-			spawn(rand(0, 15))
-				src.icon_state = "body_scannerconsole-p"
-		else
-			icon_state = initial(icon_state)
-
+//Body Scan Console
 /obj/machinery/body_scanconsole
 	var/obj/machinery/bodyscanner/connected
 	var/known_implants = list(/obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking)
@@ -216,67 +180,12 @@
 	density = 0
 	anchored = 1
 	circuit = /obj/item/weapon/circuitboard/scanner_console
+	var/printing = null
+	var/printing_text = null
 
 /obj/machinery/body_scanconsole/New()
 	..()
-	spawn( 5 )
-		src.connected = locate(/obj/machinery/bodyscanner) in range(2,src)
-		return
-	return
-
-/*
-
-/obj/machinery/body_scanconsole/process() //not really used right now
-	if(stat & (NOPOWER|BROKEN))
-		return
-	//use_power(250) // power stuff
-
-//	var/mob/M //occupant
-//	if (!( src.status )) //remove this
-//		return
-//	if ((src.connected && src.connected.occupant)) //connected & occupant ok
-//		M = src.connected.occupant
-//	else
-//		if (istype(M, /mob))
-//		//do stuff
-//		else
-///			src.temphtml = "Process terminated due to lack of occupant in scanning chamber."
-//			src.status = null
-//	src.updateDialog()
-//	return
-
-*/
-
-/obj/machinery/body_scanconsole/attack_ai(user as mob)
-	return src.attack_hand(user)
-
-/obj/machinery/body_scanconsole/attack_hand(user as mob)
-	if(..())
-		return
-	if(stat & (NOPOWER|BROKEN))
-		return
-	if(!connected || (connected.stat & (NOPOWER|BROKEN)))
-		user << "<span class='warning'>This console is not connected to a functioning body scanner.</span>"
-		return
-	if(!ishuman(connected.occupant))
-		user << "<span class='warning'>This device can only scan compatible lifeforms.</span>"
-		return
-
-	var/dat
-	if (src.delete && src.temphtml) //Window in buffer but its just simple message, so nothing
-		src.delete = src.delete
-	else if (!src.delete && src.temphtml) //Window in buffer - its a menu, dont add clear message
-		dat = text("[]<BR><BR><A href='?src=\ref[];clear=1'>Main Menu</A>", src.temphtml, src)
-	else
-		if (src.connected) //Is something connected?
-			dat = format_occupant_data(src.connected.get_occupant_data())
-			dat += "<HR><A href='?src=\ref[src];print=1'>Print</A><BR>"
-		else
-			dat = "<span class='warning'>Error: No Body Scanner connected.</span>"
-
-	dat += text("<BR><A href='?src=\ref[];mach_close=scanconsole'>Close</A>", user)
-	user << browse(dat, "window=scanconsole;size=430x600")
-	return
+	findscanner()
 
 /obj/machinery/body_scanconsole/attackby(var/obj/item/I, var/mob/user)
 	if(istype(I, /obj/item/weapon/screwdriver) && circuit)
@@ -309,207 +218,365 @@
 		src.attack_hand(user)
 	return
 
-/obj/machinery/body_scanconsole/Topic(href, href_list)
-	if (..())
-		return
+/obj/machinery/body_scanconsole/power_change()
+	if(stat & BROKEN)
+		icon_state = "body_scannerconsole-p"
+	else if(powered() && !panel_open)
+		icon_state = initial(icon_state)
+		stat &= ~NOPOWER
+	else
+		spawn(rand(0, 15))
+			src.icon_state = "body_scannerconsole-p"
+			stat |= NOPOWER
 
-	if (href_list["print"])
-		if (!src.connected)
-			usr << "\icon[src]<span class='warning'>Error: No body scanner connected.</span>"
+/obj/machinery/body_scanconsole/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			//SN src = null
+			qdel(src)
 			return
-		var/mob/living/carbon/human/occupant = src.connected.occupant
-		if (!src.connected.occupant)
-			usr << "\icon[src]<span class='warning'>The body scanner is empty.</span>"
-			return
-		if (!istype(occupant,/mob/living/carbon/human))
-			usr << "\icon[src]<span class='warning'>The body scanner cannot scan that lifeform.</span>"
-			return
-		var/obj/item/weapon/paper/R = new(src.loc)
-		R.name = "Body scan report"
-		R.info = format_occupant_data(src.connected.get_occupant_data())
-
-
-/obj/machinery/bodyscanner/proc/get_occupant_data()
-	if (!occupant || !istype(occupant, /mob/living/carbon/human))
-		return
-	var/mob/living/carbon/human/H = occupant
-	var/list/occupant_data = list(
-		"stationtime" = worldtime2text(),
-		"stat" = H.stat,
-		"health" = round(H.health/H.maxHealth)*100,
-		"virus_present" = H.virus2.len,
-		"bruteloss" = H.getBruteLoss(),
-		"fireloss" = H.getFireLoss(),
-		"oxyloss" = H.getOxyLoss(),
-		"toxloss" = H.getToxLoss(),
-		"rads" = H.radiation,
-		"cloneloss" = H.getCloneLoss(),
-		"brainloss" = H.getBrainLoss(),
-		"paralysis" = H.paralysis,
-		"bodytemp" = H.bodytemperature,
-		"borer_present" = H.has_brain_worms(),
-		"inaprovaline_amount" = H.reagents.get_reagent_amount("inaprovaline"),
-		"dexalin_amount" = H.reagents.get_reagent_amount("dexalin"),
-		"stoxin_amount" = H.reagents.get_reagent_amount("stoxin"),
-		"bicaridine_amount" = H.reagents.get_reagent_amount("bicaridine"),
-		"dermaline_amount" = H.reagents.get_reagent_amount("dermaline"),
-		"blood_amount" = round((H.vessel.get_reagent_amount("blood") / H.species.blood_volume)*100),
-		"disabilities" = H.sdisabilities,
-		"lung_ruptured" = H.is_lung_ruptured(),
-		"external_organs" = H.organs.Copy(),
-		"internal_organs" = H.internal_organs.Copy(),
-		"species_organs" = H.species.has_organ //Just pass a reference for this, it shouldn't ever be modified outside of the datum.
-		)
-	occupant_data = attempt_vr(src,"get_occupant_data_vr",list(occupant_data,H))
-	return occupant_data
-
-
-/obj/machinery/body_scanconsole/proc/format_occupant_data(var/list/occ)
-	var/dat = "<font color='blue'><b>Scan performed at [occ["stationtime"]]</b></font><br>"
-	dat += "<font color='blue'><b>Occupant Statistics:</b></font><br>"
-	var/aux
-	switch (occ["stat"])
-		if(0)
-			aux = "Conscious"
-		if(1)
-			aux = "Unconscious"
+		if(2.0)
+			if (prob(50))
+				//SN src = null
+				qdel(src)
+				return
 		else
-			aux = "Dead"
-	dat += text("[]\tHealth %: [] ([])</font><br>", ("<font color='[occ["health"] > 50 ? "blue" : "red"]>"), occ["health"], aux)
-	if (occ["virus_present"])
-		dat += "<font color='red'>Viral pathogen detected in blood stream.</font><br>"
-	dat += text("[]\t-Brute Damage %: []</font><br>", ("<font color='[occ["bruteloss"] < 60  ? "blue" : "red"]'>"), occ["bruteloss"])
-	dat += text("[]\t-Respiratory Damage %: []</font><br>", ("<font color='[occ["oxyloss"] < 60  ? "blue'" : "red"]'>"), occ["oxyloss"])
-	dat += text("[]\t-Toxin Content %: []</font><br>", ("<font color='[occ["toxloss"] < 60  ? "blue" : "red"]'>"), occ["toxloss"])
-	dat += text("[]\t-Burn Severity %: []</font><br><br>", ("<font color='[occ["fireloss"] < 60  ? "blue" : "red"]'>"), occ["fireloss"])
+	return
 
-	dat += text("[]\tRadiation Level %: []</font><br>", ("<font color='[occ["rads"] < 10  ? "blue" : "red"]'>"), occ["rads"])
-	dat += text("[]\tGenetic Tissue Damage %: []</font><br>", ("<font color='[occ["cloneloss"] < 1  ? "blue" : "red"]'>"), occ["cloneloss"])
-	dat += text("[]\tApprox. Brain Damage %: []</font><br>", ("<font color='[occ["brainloss"] < 1  ? "blue" : "red"]'>"), occ["brainloss"])
-	dat += text("Paralysis Summary %: [] ([] seconds left!)<br>", occ["paralysis"], round(occ["paralysis"] / 4))
-	dat += text("Body Temperature: [occ["bodytemp"]-T0C]&deg;C ([occ["bodytemp"]*1.8-459.67]&deg;F)<br><HR>")
-	dat += attempt_vr(src,"format_occupant_data_vr",list(occ))
-	if(occ["borer_present"])
-		dat += "Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.<br>"
+/obj/machinery/body_scanconsole/proc/findscanner()
+	spawn( 5 )
+		var/obj/machinery/bodyscanner/bodyscannernew = null
+		// Loop through every direction
+		for(dir in list(NORTH,EAST,SOUTH,WEST))
+			// Try to find a scanner in that direction
+			bodyscannernew = locate(/obj/machinery/bodyscanner, get_step(src, dir))
+		src.connected = bodyscannernew
+		return
 
-	dat += text("[]\tBlood Level %: [] ([] units)</FONT><BR>", ("<font color='[occ["blood_amount"] > 80  ? "blue" : "red"]'>"), occ["blood_amount"], occ["blood_amount"])
+/obj/machinery/body_scanconsole/attack_ai(user as mob)
+	return attack_hand(user)
 
-	dat += text("Inaprovaline: [] units<BR>", occ["inaprovaline_amount"])
-	dat += text("Soporific: [] units<BR>", occ["stoxin_amount"])
-	dat += text("[]\tDermaline: [] units</FONT><BR>", ("<font color='[occ["dermaline_amount"] < 30  ? "black" : "red"]'>"), occ["dermaline_amount"])
-	dat += text("[]\tBicaridine: [] units</font><BR>", ("<font color='[occ["bicaridine_amount"] < 30  ? "black" : "red"]'>"), occ["bicaridine_amount"])
-	dat += text("[]\tDexalin: [] units</font><BR>", ("<font color='[occ["dexalin_amount"] < 30  ? "black" : "red"]'>"), occ["dexalin_amount"])
+/obj/machinery/body_scanconsole/attack_ghost(user as mob)
+	return attack_hand(user)
 
-	dat += "<HR><table border='1'>"
-	dat += "<tr>"
-	dat += "<th>Organ</th>"
-	dat += "<th>Burn Damage</th>"
-	dat += "<th>Brute Damage</th>"
-	dat += "<th>Other Wounds</th>"
-	dat += "</tr>"
+/obj/machinery/body_scanconsole/attack_hand(user as mob)
+	if(stat & (NOPOWER|BROKEN))
+		return
 
-	for(var/obj/item/organ/external/e in occ["external_organs"])
-		var/AN = ""
-		var/open = ""
-		var/infected = ""
-		var/imp = ""
-		var/bled = ""
-		var/robot = ""
-		var/splint = ""
-		var/internal_bleeding = ""
-		var/lung_ruptured = ""
+	if (panel_open)
+		user << "<span class='notice'>Close the maintenance panel first.</span>"
+		return
 
-		dat += "<tr>"
+	if(!src.connected)
+		findscanner()
 
-		for(var/datum/wound/W in e.wounds) if(W.internal)
-			internal_bleeding = "<br>Internal bleeding"
-			break
-		if(istype(e, /obj/item/organ/external/chest) && occ["lung_ruptured"])
-			lung_ruptured = "Lung ruptured:"
-		if(e.status & ORGAN_SPLINTED)
-			splint = "Splinted:"
-		if(e.status & ORGAN_BLEEDING)
-			bled = "Bleeding:"
-		if(e.status & ORGAN_BROKEN)
-			AN = "[e.broken_description]:"
-		switch(e.robotic)
-			if(ORGAN_ROBOT) robot = "Prosthetic:"
-			if(ORGAN_ASSISTED) robot = "Augmented:"
-		if(e.open)
-			open = "Open:"
+	ui_interact(user)
 
-		switch (e.germ_level)
-			if (INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
-				infected = "Mild Infection:"
-			if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
-				infected = "Mild Infection+:"
-			if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
-				infected = "Mild Infection++:"
-			if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
-				infected = "Acute Infection:"
-			if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
-				infected = "Acute Infection+:"
-			if (INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
-				infected = "Acute Infection++:"
-			if (INFECTION_LEVEL_THREE to INFINITY)
-				infected = "Septic:"
-		if(e.rejecting)
-			infected += "(being rejected)"
-		if (e.implants.len)
-			var/unknown_body = 0
-			for(var/I in e.implants)
-				if(is_type_in_list(I,known_implants))
-					imp += "[I] implanted:"
+/obj/machinery/body_scanconsole/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
+
+	data["connected"] = connected ? 1 : 0
+
+	if(connected)
+		data["occupied"] = connected.occupant ? 1 : 0
+
+		var/occupantData[0]
+		if(connected.occupant && ishuman(connected.occupant))
+			var/mob/living/carbon/human/H = connected.occupant
+			occupantData["name"] = H.name
+			occupantData["stat"] = H.stat
+			occupantData["health"] = H.health
+
+			occupantData["hasVirus"] = H.virus2.len
+
+			occupantData["bruteLoss"] = H.getBruteLoss()
+			occupantData["oxyLoss"] = H.getOxyLoss()
+			occupantData["toxLoss"] = H.getToxLoss()
+			occupantData["fireLoss"] = H.getFireLoss()
+
+			occupantData["radLoss"] = H.radiation
+			occupantData["cloneLoss"] = H.getCloneLoss()
+			occupantData["brainLoss"] = H.getBrainLoss()
+			occupantData["paralysis"] = H.paralysis
+			occupantData["paralysisSeconds"] = round(H.paralysis / 4)
+			occupantData["bodyTempC"] = H.bodytemperature-T0C
+			occupantData["bodyTempF"] = (((H.bodytemperature-T0C) * 1.8) + 32)
+
+			occupantData["hasBorer"] = H.has_brain_worms()
+
+			var/bloodData[0]
+			if(H.vessel)
+				var/blood_volume = round(H.vessel.get_reagent_amount("blood"))
+				bloodData["volume"] = blood_volume
+				bloodData["percent"] = round(((blood_volume / 560)*100))
+
+			occupantData["blood"] = bloodData
+
+			var/reagentData[0]
+			if(H.reagents.reagent_list.len >= 1)
+				for(var/datum/reagent/R in H.reagents.reagent_list)
+					reagentData[++reagentData.len] = list("name" = R.name, "amount" = R.volume)
+			else
+				reagentData = null
+
+			occupantData["reagents"] = reagentData
+
+			var/extOrganData[0]
+			for(var/obj/item/organ/external/E in H.organs)
+				var/organData[0]
+				organData["name"] = E.name
+				organData["open"] = E.open
+				organData["germ_level"] = E.germ_level
+				organData["bruteLoss"] = E.brute_dam
+				organData["fireLoss"] = E.burn_dam
+
+				var/implantData[0]
+				for(var/obj/I in E.implants)
+					var/implantSubData[0]
+					implantSubData["name"] = I.name
+					if(is_type_in_list(I, known_implants))
+						implantSubData["known"] = 1
+
+					implantData.Add(list(implantSubData))
+
+				organData["implants"] = implantData
+				organData["implants_len"] = implantData.len
+
+				var/organStatus[0]
+				if(E.status & ORGAN_DESTROYED)
+					organStatus["destroyed"] = 1
+				if(E.status & ORGAN_BROKEN)
+					organStatus["broken"] = E.broken_description
+				if(E.status & ORGAN_ROBOT)
+					organStatus["robotic"] = 1
+				if(E.status & ORGAN_SPLINTED)
+					organStatus["splinted"] = 1
+				if(E.status & ORGAN_BLEEDING)
+					organStatus["bleeding"] = 1
+
+				organData["status"] = organStatus
+
+				if(istype(E, /obj/item/organ/external/chest) && H.is_lung_ruptured())
+					organData["lungRuptured"] = 1
+
+				for(var/datum/wound/W in E.wounds)
+					if(W.internal)
+						organData["internalBleeding"] = 1
+						break
+
+				extOrganData.Add(list(organData))
+
+			occupantData["extOrgan"] = extOrganData
+
+			var/intOrganData[0]
+			for(var/obj/item/organ/I in H.internal_organs)
+				var/organData[0]
+				organData["name"] = I.name
+				if(I.status & ORGAN_ASSISTED)
+					organData["desc"] = "Assisted"
+				else if(I.robotic >= ORGAN_ROBOT)
+					organData["desc"] = "Mechanical"
 				else
-					unknown_body++
-			if(unknown_body)
-				imp += "Unknown body present:"
+					organData["desc"] = null
+				organData["germ_level"] = I.germ_level
+				organData["damage"] = I.damage
 
-		if(!AN && !open && !infected & !imp)
-			AN = "None:"
-		if(!e.is_stump())
-			dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured]</td>"
+				intOrganData.Add(list(organData))
+
+			occupantData["intOrgan"] = intOrganData
+
+			occupantData["blind"] = (H.sdisabilities & BLIND)
+			occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED)
+			occupantData = attempt_vr(connected,"get_occupant_data_vr",list(occupantData,H)) //VOREStation Insert
+		data["occupant"] = occupantData
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "adv_med.tmpl", "Body Scanner", 690, 800)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+
+/obj/machinery/body_scanconsole/Topic(href, href_list)
+	if(..())
+		return 1
+
+	if (href_list["print_p"])
+		generate_printing_text()
+
+		if (!(printing) && printing_text)
+			printing = 1
+			visible_message("<span class='notice'>\The [src] rattles and prints out a sheet of paper.</span>")
+			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc)
+			P.info = "<CENTER><B>Body Scan - [href_list["name"]]</B></CENTER><BR>"
+			P.info += "<b>Time of scan:</b> [worldtime2text(world.time)]<br><br>"
+			P.info += "[printing_text]"
+			P.info += "<br><br><b>Notes:</b><br>"
+			P.name = "Body Scan - [href_list["name"]]"
+			printing = null
+			printing_text = null
+
+/obj/machinery/body_scanconsole/proc/generate_printing_text()
+	var/dat = ""
+
+	if(connected)
+		var/mob/living/carbon/human/occupant = connected.occupant
+		dat = "<font color='blue'><b>Occupant Statistics:</b></font><br>" //Blah obvious
+		if(istype(occupant)) //is there REALLY someone in there?
+			var/t1
+			switch(occupant.stat) // obvious, see what their status is
+				if(0)
+					t1 = "Conscious"
+				if(1)
+					t1 = "Unconscious"
+				else
+					t1 = "*dead*"
+			dat += "<font color=[occupant.health > 50 ? "blue" : "red"]>\tHealth %: [occupant.health], ([t1])</font><br>"
+
+			if(occupant.virus2.len)
+				dat += "<font color='red'>Viral pathogen detected in blood stream.</font><BR>"
+
+			var/extra_font = null
+			extra_font = "<font color=[occupant.getBruteLoss() < 60 ? "blue" : "red"]>"
+			dat += "[extra_font]\t-Brute Damage %: [occupant.getBruteLoss()]</font><br>"
+
+			extra_font = "<font color=[occupant.getOxyLoss() < 60 ? "blue" : "red"]>"
+			dat += "[extra_font]\t-Respiratory Damage %: [occupant.getOxyLoss()]</font><br>"
+
+			extra_font = "<font color=[occupant.getToxLoss() < 60 ? "blue" : "red"]>"
+			dat += "[extra_font]\t-Toxin Content %: [occupant.getToxLoss()]</font><br>"
+
+			extra_font = "<font color=[occupant.getFireLoss() < 60 ? "blue" : "red"]>"
+			dat += "[extra_font]\t-Burn Severity %: [occupant.getFireLoss()]</font><br>"
+
+			extra_font = "<font color=[occupant.radiation < 10 ? "blue" : "red"]>"
+			dat += "[extra_font]\tRadiation Level %: [occupant.radiation]</font><br>"
+
+			extra_font = "<font color=[occupant.getCloneLoss() < 1 ? "blue" : "red"]>"
+			dat += "[extra_font]\tGenetic Tissue Damage %: [occupant.getCloneLoss()]</font><br>"
+
+			extra_font = "<font color=[occupant.getBrainLoss() < 1 ? "blue" : "red"]>"
+			dat += "[extra_font]\tApprox. Brain Damage %: [occupant.getBrainLoss()]</font><br>"
+
+			dat += "Paralysis Summary %: [occupant.paralysis] ([round(occupant.paralysis / 4)] seconds left!)<br>"
+			dat += "Body Temperature: [occupant.bodytemperature-T0C]&deg;C ([occupant.bodytemperature*1.8-459.67]&deg;F)<br>"
+
+			dat += "<hr>"
+
+			if(occupant.has_brain_worms())
+				dat += "Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.<br>"
+
+			if(occupant.vessel)
+				var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
+				var/blood_percent =  blood_volume / 560
+				blood_percent *= 100
+
+				extra_font = "<font color=[blood_volume > 448 ? "blue" : "red"]>"
+				dat += "[extra_font]\tBlood Level %: [blood_percent] ([blood_volume] units)</font><br>"
+
+			if(occupant.reagents)
+				for(var/datum/reagent/R in occupant.reagents)
+					dat += "Reagent: [R.name], Amount: [R.volume]<br>"
+
+			dat += "<hr><table border='1'>"
+			dat += "<tr>"
+			dat += "<th>Organ</th>"
+			dat += "<th>Burn Damage</th>"
+			dat += "<th>Brute Damage</th>"
+			dat += "<th>Other Wounds</th>"
+			dat += "</tr>"
+
+			for(var/obj/item/organ/external/e in occupant.organs)
+				dat += "<tr>"
+				var/AN = ""
+				var/open = ""
+				var/infected = ""
+				var/robot = ""
+				var/imp = ""
+				var/bled = ""
+				var/splint = ""
+				var/internal_bleeding = ""
+				var/lung_ruptured = ""
+				for(var/datum/wound/W in e.wounds) if(W.internal)
+					internal_bleeding = "<br>Internal bleeding"
+					break
+				if(istype(e, /obj/item/organ/external/chest) && occupant.is_lung_ruptured())
+					lung_ruptured = "Lung ruptured:"
+				if(e.status & ORGAN_SPLINTED)
+					splint = "Splinted:"
+				if(e.status & ORGAN_BLEEDING)
+					bled = "Bleeding:"
+				if(e.status & ORGAN_BROKEN)
+					AN = "[e.broken_description]:"
+				if(e.status & ORGAN_ROBOT)
+					robot = "Prosthetic:"
+				if(e.open)
+					open = "Open:"
+				switch (e.germ_level)
+					if (INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
+						infected = "Mild Infection:"
+					if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+						infected = "Mild Infection+:"
+					if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+						infected = "Mild Infection++:"
+					if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+						infected = "Acute Infection:"
+					if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+						infected = "Acute Infection+:"
+					if (INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
+						infected = "Acute Infection++:"
+					if (INFECTION_LEVEL_THREE to INFINITY)
+						infected = "Septic:"
+
+				var/unknown_body = 0
+				for(var/I in e.implants)
+					if(is_type_in_list(I,known_implants))
+						imp += "[I] implanted:"
+					else
+						unknown_body++
+
+				if(unknown_body)
+					imp += "Unknown body present:"
+				if(!AN && !open && !infected & !imp)
+					AN = "None:"
+				if(!(e.status & ORGAN_DESTROYED))
+					dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[e.brute_dam]</td><td>[robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured]</td>"
+				else
+					dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not Found</td>"
+				dat += "</tr>"
+			for(var/obj/item/organ/i in occupant.internal_organs)
+				var/mech = ""
+				if(i.status & ORGAN_ASSISTED)
+					mech = "Assisted:"
+				if(i.robotic >= ORGAN_ROBOT)
+					mech = "Mechanical:"
+				var/infection = "None"
+				switch (i.germ_level)
+					if (1 to INFECTION_LEVEL_ONE + 200)
+						infection = "Mild Infection:"
+					if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+						infection = "Mild Infection+:"
+					if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+						infection = "Mild Infection++:"
+					if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+						infection = "Acute Infection:"
+					if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+						infection = "Acute Infection+:"
+					if (INFECTION_LEVEL_TWO + 300 to INFINITY)
+						infection = "Acute Infection++:"
+
+				dat += "<tr>"
+				dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech]</td><td></td>"
+				dat += "</tr>"
+			dat += "</table>"
+			if(occupant.sdisabilities & BLIND)
+				dat += "<font color='red'>Cataracts detected.</font><BR>"
+			if(occupant.disabilities & NEARSIGHTED)
+				dat += "<font color='red'>Retinal misalignment detected.</font><BR>"
 		else
-			dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not [e.is_stump() ? "Found" : "Attached Completely"]</td>"
-		dat += "</tr>"
+			dat += "\The [src] is empty."
+	else
+		dat = "<font color='red'> Error: No Body Scanner connected.</font>"
 
-	for(var/obj/item/organ/i in occ["internal_organs"])
-
-		var/mech = ""
-		if(i.status & ORGAN_ASSISTED)
-			mech = "Assisted:"
-		if(i.robotic >= ORGAN_ROBOT)
-			mech = "Mechanical:"
-
-		var/infection = "None"
-		switch (i.germ_level)
-			if (1 to INFECTION_LEVEL_ONE + 200)
-				infection = "Mild Infection:"
-			if (INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
-				infection = "Mild Infection+:"
-			if (INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
-				infection = "Mild Infection++:"
-			if (INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
-				infection = "Acute Infection:"
-			if (INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
-				infection = "Acute Infection+:"
-			if (INFECTION_LEVEL_TWO + 300 to INFINITY)
-				infection = "Acute Infection++:"
-		if(i.rejecting)
-			infection += "(being rejected)"
-
-		dat += "<tr>"
-		dat += "<td>[i.name]</td><td>N/A</td><td>[i.damage]</td><td>[infection]:[mech]</td><td></td>"
-		dat += "</tr>"
-	dat += "</table>"
-
-	var/list/species_organs = occ["species_organs"]
-	for(var/organ_name in species_organs)
-		if(!locate(species_organs[organ_name]) in occ["internal_organs"])
-			dat += text("<font color='red'>No [organ_name] detected.</font><BR>")
-
-	if(occ["sdisabilities"] & BLIND)
-		dat += text("<font color='red'>Cataracts detected.</font><BR>")
-	if(occ["sdisabilities"] & NEARSIGHTED)
-		dat += text("<font color='red'>Retinal misalignment detected.</font><BR>")
-	return dat
+	printing_text = dat

code/game/machinery/adv_med_vr.dm

@@ -13,19 +13,9 @@
 			else
 				objectprey++
 
-	incoming["livingprey"] = livingprey
-	incoming["humanprey"] = humanprey
-	incoming["objectprey"] = objectprey
+	incoming["livingPrey"] = livingprey
+	incoming["humanPrey"] = humanprey
+	incoming["objectPrey"] = objectprey
 	incoming["weight"] = H.weight
 
 	return incoming
-
-/obj/machinery/body_scanconsole/proc/format_occupant_data_vr(list/incoming)
-	var/message = ""
-
-	message += text("Body Weight (to scale): [incoming["weight"]]lbs / [incoming["weight"] / 2.20463]kg<br><HR>")
-
-	if(incoming["livingprey"] || incoming["humanprey"] || incoming["objectprey"])
-		message += text("<font color='red'>Foreign bodies detected:<br>[incoming["humanprey"] ? "- [incoming["humanprey"]] humanoid(s)<br>" : ""][incoming["livingprey"] ? "- [incoming["humanprey"]] non-humanoid(s)<br>" : ""][incoming["objectprey"] ? "- [incoming["humanprey"]] object(s)<br>" : ""]</font><hr>")
-
-	return message

code/game/machinery/atmo_control.dm

@@ -94,13 +94,8 @@ obj/machinery/computer/general_air_control/Destroy()
 /obj/machinery/computer/general_air_control/attack_hand(mob/user)
 	if(..(user))
 		return
-	user << browse(return_text(),"window=computer")
-	user.set_machine(src)
-	onclose(user, "computer")
 
-/obj/machinery/computer/general_air_control/process()
-	..()
-	src.updateUsrDialog()
+	ui_interact(user)
 
 /obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption) return
@@ -110,43 +105,27 @@ obj/machinery/computer/general_air_control/Destroy()
 
 	sensor_information[id_tag] = signal.data
 
-/obj/machinery/computer/general_air_control/proc/return_text()
-	var/sensor_data
+/obj/machinery/computer/general_air_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
+
+	var/list/data = list()
+	var/sensors_ui[0]
 	if(sensors.len)
 		for(var/id_tag in sensors)
 			var/long_name = sensors[id_tag]
-			var/list/data = sensor_information[id_tag]
-			var/sensor_part = "<B>[long_name]</B>:<BR>"
-
-			if(data)
-				if(data["pressure"])
-					sensor_part += "   <B>Pressure:</B> [data["pressure"]] kPa<BR>"
-				if(data["temperature"])
-					sensor_part += "   <B>Temperature:</B> [data["temperature"]] K<BR>"
-				if(data["oxygen"]||data["phoron"]||data["nitrogen"]||data["carbon_dioxide"])
-					sensor_part += "   <B>Gas Composition :</B>"
-					if(data["oxygen"])
-						sensor_part += "[data["oxygen"]]% O2; "
-					if(data["nitrogen"])
-						sensor_part += "[data["nitrogen"]]% N; "
-					if(data["carbon_dioxide"])
-						sensor_part += "[data["carbon_dioxide"]]% CO2; "
-					if(data["phoron"])
-						sensor_part += "[data["phoron"]]% TX; "
-				sensor_part += "<HR>"
-
-			else
-				sensor_part = "<FONT color='red'>[long_name] can not be found!</FONT><BR>"
-
-			sensor_data += sensor_part
-
+			var/list/sensor_data = sensor_information[id_tag]
+			sensors_ui[++sensors_ui.len] = list("long_name" = long_name, "sensor_data" = sensor_data)
 	else
-		sensor_data = "No sensors connected."
+		sensors_ui = null
 
-	var/output = {"<B>[name]</B><HR>
-<B>Sensor Data:</B><HR><HR>[sensor_data]"}
+	data["sensors"] = sensors_ui
 
-	return output
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 525, 600)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(5)
 
 /obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency)
 	radio_controller.remove_object(src, frequency)
@@ -156,7 +135,6 @@ obj/machinery/computer/general_air_control/Destroy()
 /obj/machinery/computer/general_air_control/initialize()
 	set_frequency(frequency)
 
-
 /obj/machinery/computer/general_air_control/large_tank_control
 	icon = 'icons/obj/computer.dmi'
 
@@ -171,39 +149,41 @@ obj/machinery/computer/general_air_control/Destroy()
 	var/pressure_setting = ONE_ATMOSPHERE * 45
 	circuit = /obj/item/weapon/circuitboard/air_management/tank_control
 
+/obj/machinery/computer/general_air_control/large_tank_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
-/obj/machinery/computer/general_air_control/large_tank_control/return_text()
-	var/output = ..()
-	//if(signal.data)
-	//	input_info = signal.data // Attempting to fix intake control -- TLE
-
-	output += "<B>Tank Control System</B><BR><BR>"
-	if(input_info)
-		var/power = (input_info["power"])
-		var/volume_rate = round(input_info["volume_rate"], 0.1)
-		output += "<B>Input</B>: [power?("Injecting"):("On Hold")] <A href='?src=\ref[src];in_refresh_status=1'>Refresh</A><BR>Flow Rate Limit: [volume_rate] L/s<BR>"
-		output += "Command: <A href='?src=\ref[src];in_toggle_injector=1'>Toggle Power</A> <A href='?src=\ref[src];in_set_flowrate=1'>Set Flow Rate</A><BR>"
-
+	var/list/data = list()
+	var/sensors_ui[0]
+	if(sensors.len)
+		for(var/id_tag in sensors)
+			var/long_name = sensors[id_tag]
+			var/list/sensor_data = sensor_information[id_tag]
+			sensors_ui[++sensors_ui.len] = list("long_name" = long_name, "sensor_data" = sensor_data)
 	else
-		output += "<FONT color='red'>ERROR: Can not find input port</FONT> <A href='?src=\ref[src];in_refresh_status=1'>Search</A><BR>"
+		sensors_ui = null
 
-	output += "Flow Rate Limit: <A href='?src=\ref[src];adj_input_flow_rate=-100'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-10'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-1'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-0.1'>-</A> [round(input_flow_setting, 0.1)] L/s <A href='?src=\ref[src];adj_input_flow_rate=0.1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=10'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=100'>+</A><BR>"
+	data["sensors"] = sensors_ui
+	data["tanks"] = 1
 
-	output += "<BR>"
+	if(input_info)
+		data["input_info"] = list("power" = input_info["power"], "volume_rate" = round(input_info["volume_rate"], 0.1))
+	else
+		data["input_info"] = null
 
 	if(output_info)
-		var/power = (output_info["power"])
-		var/output_pressure = output_info["internal"]
-		output += {"<B>Output</B>: [power?("Open"):("On Hold")] <A href='?src=\ref[src];out_refresh_status=1'>Refresh</A><BR>
-Max Output Pressure: [output_pressure] kPa<BR>"}
-		output += "Command: <A href='?src=\ref[src];out_toggle_power=1'>Toggle Power</A> <A href='?src=\ref[src];out_set_pressure=1'>Set Pressure</A><BR>"
-
+		data["output_info"] = list("power" = output_info["power"], "output_pressure" = output_info["internal"])
 	else
-		output += "<FONT color='red'>ERROR: Can not find output port</FONT> <A href='?src=\ref[src];out_refresh_status=1'>Search</A><BR>"
+		data["output_info"] = null
 
-	output += "Max Output Pressure Set: <A href='?src=\ref[src];adj_pressure=-1000'>-</A> <A href='?src=\ref[src];adj_pressure=-100'>-</A> <A href='?src=\ref[src];adj_pressure=-10'>-</A> <A href='?src=\ref[src];adj_pressure=-1'>-</A> [pressure_setting] kPa <A href='?src=\ref[src];adj_pressure=1'>+</A> <A href='?src=\ref[src];adj_pressure=10'>+</A> <A href='?src=\ref[src];adj_pressure=100'>+</A> <A href='?src=\ref[src];adj_pressure=1000'>+</A><BR>"
+	data["input_flow_setting"] = round(input_flow_setting, 0.1)
+	data["pressure_setting"] = pressure_setting
 
-	return output
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 660, 500)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(5)
 
 /obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption) return
@@ -224,15 +204,11 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 	if(href_list["adj_pressure"])
 		var/change = text2num(href_list["adj_pressure"])
 		pressure_setting = between(0, pressure_setting + change, 50*ONE_ATMOSPHERE)
-		spawn(1)
-			src.updateUsrDialog()
 		return 1
 
 	if(href_list["adj_input_flow_rate"])
 		var/change = text2num(href_list["adj_input_flow_rate"])
 		input_flow_setting = between(0, input_flow_setting + change, ATMOS_DEFAULT_VOLUME_PUMP + 500) //default flow rate limit for air injectors
-		spawn(1)
-			src.updateUsrDialog()
 		return 1
 
 	if(!radio_connection)
@@ -273,9 +249,6 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 	signal.data["sigtype"]="command"
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
-	spawn(5)
-		src.updateUsrDialog()
-
 /obj/machinery/computer/general_air_control/supermatter_core
 	icon = 'icons/obj/computer.dmi'
 
@@ -290,39 +263,40 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 	var/pressure_setting = 100
 	circuit = /obj/item/weapon/circuitboard/air_management/supermatter_core
 
+/obj/machinery/computer/general_air_control/supermatter_core/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
-/obj/machinery/computer/general_air_control/supermatter_core/return_text()
-	var/output = ..()
-	//if(signal.data)
-	//	input_info = signal.data // Attempting to fix intake control -- TLE
+	var/list/data = list()
+	var/sensors_ui[0]
+	if(sensors.len)
+		for(var/id_tag in sensors)
+			var/long_name = sensors[id_tag]
+			var/list/sensor_data = sensor_information[id_tag]
+			sensors_ui[++sensors_ui.len] = list("long_name" = long_name, "sensor_data" = sensor_data)
+	else
+		sensors_ui = null
+
+	data["sensors"] = sensors_ui
+	data["core"] = 1
 
-	output += "<B>Core Cooling Control System</B><BR><BR>"
 	if(input_info)
-		var/power = (input_info["power"])
-		var/volume_rate = round(input_info["volume_rate"], 0.1)
-		output += "<B>Coolant Input</B>: [power?("Injecting"):("On Hold")] <A href='?src=\ref[src];in_refresh_status=1'>Refresh</A><BR>Flow Rate Limit: [volume_rate] L/s<BR>"
-		output += "Command: <A href='?src=\ref[src];in_toggle_injector=1'>Toggle Power</A> <A href='?src=\ref[src];in_set_flowrate=1'>Set Flow Rate</A><BR>"
-
+		data["input_info"] = list("power" = input_info["power"], "volume_rate" = round(input_info["volume_rate"], 0.1))
 	else
-		output += "<FONT color='red'>ERROR: Can not find input port</FONT> <A href='?src=\ref[src];in_refresh_status=1'>Search</A><BR>"
-
-	output += "Flow Rate Limit: <A href='?src=\ref[src];adj_input_flow_rate=-100'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-10'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-1'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-0.1'>-</A> [round(input_flow_setting, 0.1)] L/s <A href='?src=\ref[src];adj_input_flow_rate=0.1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=10'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=100'>+</A><BR>"
-
-	output += "<BR>"
-
+		data["input_info"] = null
 	if(output_info)
-		var/power = (output_info["power"])
-		var/pressure_limit = output_info["external"]
-		output += {"<B>Core Outpump</B>: [power?("Open"):("On Hold")] <A href='?src=\ref[src];out_refresh_status=1'>Refresh</A><BR>
-Min Core Pressure: [pressure_limit] kPa<BR>"}
-		output += "Command: <A href='?src=\ref[src];out_toggle_power=1'>Toggle Power</A> <A href='?src=\ref[src];out_set_pressure=1'>Set Pressure</A><BR>"
-
+		data["output_info"] = list("power" = output_info["power"], "pressure_limit" = output_info["external"])
 	else
-		output += "<FONT color='red'>ERROR: Can not find output port</FONT> <A href='?src=\ref[src];out_refresh_status=1'>Search</A><BR>"
+		data["output_info"] = null
 
-	output += "Min Core Pressure Set: <A href='?src=\ref[src];adj_pressure=-100'>-</A> <A href='?src=\ref[src];adj_pressure=-50'>-</A> <A href='?src=\ref[src];adj_pressure=-10'>-</A> <A href='?src=\ref[src];adj_pressure=-1'>-</A> [pressure_setting] kPa <A href='?src=\ref[src];adj_pressure=1'>+</A> <A href='?src=\ref[src];adj_pressure=10'>+</A> <A href='?src=\ref[src];adj_pressure=50'>+</A> <A href='?src=\ref[src];adj_pressure=100'>+</A><BR>"
+	data["input_flow_setting"] = round(input_flow_setting, 0.1)
+	data["pressure_setting"] = pressure_setting
 
-	return output
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 650, 500)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(5)
 
 /obj/machinery/computer/general_air_control/supermatter_core/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption) return
@@ -343,15 +317,11 @@ Min Core Pressure: [pressure_limit] kPa<BR>"}
 	if(href_list["adj_pressure"])
 		var/change = text2num(href_list["adj_pressure"])
 		pressure_setting = between(0, pressure_setting + change, 10*ONE_ATMOSPHERE)
-		spawn(1)
-			src.updateUsrDialog()
 		return 1
 
 	if(href_list["adj_input_flow_rate"])
 		var/change = text2num(href_list["adj_input_flow_rate"])
 		input_flow_setting = between(0, input_flow_setting + change, ATMOS_DEFAULT_VOLUME_PUMP + 500) //default flow rate limit for air injectors
-		spawn(1)
-			src.updateUsrDialog()
 		return 1
 
 	if(!radio_connection)
@@ -392,9 +362,6 @@ Min Core Pressure: [pressure_limit] kPa<BR>"}
 	signal.data["sigtype"]="command"
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
-	spawn(5)
-		src.updateUsrDialog()
-
 /obj/machinery/computer/general_air_control/fuel_injection
 	icon = 'icons/obj/computer.dmi'
 	icon_screen = "alert:0"
@@ -437,27 +404,34 @@ Min Core Pressure: [pressure_limit] kPa<BR>"}
 
 	..()
 
-/obj/machinery/computer/general_air_control/fuel_injection/return_text()
-	var/output = ..()
-
-	output += "<B>Fuel Injection System</B><BR>"
-	if(device_info)
-		var/power = device_info["power"]
-		var/volume_rate = device_info["volume_rate"]
-		output += {"Status: [power?("Injecting"):("On Hold")] <A href='?src=\ref[src];refresh_status=1'>Refresh</A><BR>
-Rate: [volume_rate] L/sec<BR>"}
-
-		if(automation)
-			output += "Automated Fuel Injection: <A href='?src=\ref[src];toggle_automation=1'>Engaged</A><BR>"
-			output += "Injector Controls Locked Out<BR>"
-		else
-			output += "Automated Fuel Injection: <A href='?src=\ref[src];toggle_automation=1'>Disengaged</A><BR>"
-			output += "Injector: <A href='?src=\ref[src];toggle_injector=1'>Toggle Power</A> <A href='?src=\ref[src];injection=1'>Inject (1 Cycle)</A><BR>"
+/obj/machinery/computer/general_air_control/fuel_injection/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
+	var/list/data = list()
+	var/sensors_ui[0]
+	if(sensors.len)
+		for(var/id_tag in sensors)
+			var/long_name = sensors[id_tag]
+			var/list/sensor_data = sensor_information[id_tag]
+			sensors_ui[++sensors_ui.len] = list("long_name" = long_name, "sensor_data" = sensor_data)
 	else
-		output += "<FONT color='red'>ERROR: Can not find device</FONT> <A href='?src=\ref[src];refresh_status=1'>Search</A><BR>"
+		sensors_ui = null
 
-	return output
+	data["sensors"] = sensors_ui
+	data["fuel"] = 1
+	data["automation"] = automation
+
+	if(device_info)
+		data["device_info"] = list("power" = device_info["power"], "volume_rate" = device_info["volume_rate"])
+	else
+		data["device_info"] = null
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "atmo_control.tmpl", src.name, 650, 500)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(5)
 
 /obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption) return

code/game/machinery/computer/Operating.dm

@@ -22,62 +22,51 @@
 	add_fingerprint(user)
 	if(stat & (BROKEN|NOPOWER))
 		return
-	interact(user)
+	ui_interact(user)
 
 
 /obj/machinery/computer/operating/attack_hand(mob/user)
 	add_fingerprint(user)
 	if(stat & (BROKEN|NOPOWER))
 		return
-	interact(user)
-
-
-/obj/machinery/computer/operating/interact(mob/user)
-	if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
-		if (!istype(user, /mob/living/silicon))
-			user.unset_machine()
-			user << browse(null, "window=op")
-			return
+	ui_interact(user)
 
+/**
+ *  Display the NanoUI window for the operating computer.
+ *
+ *  See NanoUI documentation for details.
+ */
+/obj/machinery/computer/operating/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 	user.set_machine(src)
-	var/dat = "<HEAD><TITLE>Operating Computer</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
-	dat += "<A HREF='?src=\ref[user];mach_close=op'>Close</A><br><br>" //| <A HREF='?src=\ref[user];update=1'>Update</A>"
-	if(src.table && (src.table.check_victim()))
-		src.victim = src.table.victim
-		dat += {"
-<B>Patient Information:</B><BR>
-<BR>
-<B>Name:</B> [src.victim.real_name]<BR>
-<B>Age:</B> [src.victim.age]<BR>
-<B>Blood Type:</B> [src.victim.b_type]<BR>
-<BR>
-<B>Health:</B> [src.victim.health]<BR>
-<B>Brute Damage:</B> [src.victim.getBruteLoss()]<BR>
-<B>Toxins Damage:</B> [src.victim.getToxLoss()]<BR>
-<B>Fire Damage:</B> [src.victim.getFireLoss()]<BR>
-<B>Suffocation Damage:</B> [src.victim.getOxyLoss()]<BR>
-<B>Patient Status:</B> [src.victim.stat ? "Non-Responsive" : "Stable"]<BR>
-<B>Heartbeat rate:</B> [victim.get_pulse(GETPULSE_TOOL)]<BR>
-"}
-	else
-		src.victim = null
-		dat += {"
-<B>Patient Information:</B><BR>
-<BR>
-<B>No Patient Detected</B>
-"}
-	user << browse(dat, "window=op")
-	onclose(user, "op")
 
+	var/list/data = list()
+	var/list/victim_ui = list()
+
+	if(table && (table.check_victim()))
+		victim = table.victim
+
+		victim_ui = list("real_name" = victim.real_name, "age" = victim.age, "b_type" = victim.b_type, "health" = victim.health,
+						"brute" = victim.getBruteLoss(), "tox" = src.victim.getToxLoss(), "burn" = victim.getFireLoss(), "oxy" = victim.getOxyLoss(),
+						"stat" = (victim.stat ? "Non-Responsive" : "Stable"), "pulse" = victim.get_pulse(GETPULSE_TOOL))
+	else
+		victim = null
+		victim_ui = null
+
+	data["table"] = table
+	data["victim"] = victim_ui
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "operating.tmpl", src.name, 380, 400)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(5)
 
 /obj/machinery/computer/operating/Topic(href, href_list)
 	if(..())
 		return 1
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 		usr.set_machine(src)
-	return
 
-
-/obj/machinery/computer/operating/process()
-	if(..())
-		src.updateDialog()
+	src.add_fingerprint(usr)
+	nanomanager.update_uis(src)

code/game/machinery/computer/arcade.dm

@@ -53,7 +53,7 @@
 		prize.loc = src.loc
 
 /obj/machinery/computer/arcade/attack_ai(mob/user as mob)
-	return src.attack_hand(user)
+	return attack_hand(user)
 
 
 /obj/machinery/computer/arcade/emp_act(severity)
@@ -84,6 +84,7 @@
 	circuit = /obj/item/weapon/circuitboard/arcade/battle
 	var/enemy_name = "Space Villian"
 	var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc
+	var/enemy_action = ""
 	var/player_hp = 30 //Player health/attack points
 	var/player_mp = 10
 	var/enemy_hp = 45 //Enemy health/attack points
@@ -103,81 +104,80 @@
 	name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ")
 	name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn", "Bloopers")
 
-	src.enemy_name = replacetext((name_part1 + name_part2), "the ", "")
-	src.name = (name_action + name_part1 + name_part2)
+	enemy_name = replacetext((name_part1 + name_part2), "the ", "")
+	name = (name_action + name_part1 + name_part2)
 
 
 /obj/machinery/computer/arcade/battle/attack_hand(mob/user as mob)
 	if(..())
 		return
 	user.set_machine(src)
-	var/dat = "<a href='byond://?src=\ref[src];close=1'>Close</a>"
-	dat += "<center><h4>[src.enemy_name]</h4></center>"
+	ui_interact(user)
 
-	dat += "<br><center><h3>[src.temp]</h3></center>"
-	dat += "<br><center>Health: [src.player_hp] | Magic: [src.player_mp] | Enemy Health: [src.enemy_hp]</center>"
+/**
+ *  Display the NanoUI window for the arcade machine.
+ *
+ *  See NanoUI documentation for details.
+ */
+/obj/machinery/computer/arcade/battle/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
-	dat += "<center><b>"
-	if (src.gameover)
-		dat += "<a href='byond://?src=\ref[src];newgame=1'>New Game</a>"
-	else
-		dat += "<a href='byond://?src=\ref[src];attack=1'>Attack</a> | "
-		dat += "<a href='byond://?src=\ref[src];heal=1'>Heal</a> | "
-		dat += "<a href='byond://?src=\ref[src];charge=1'>Recharge Power</a>"
+	var/list/data = list()
+	data["temp"] = temp
+	data["enemyAction"] = enemy_action
+	data["enemyName"] = enemy_name
+	data["playerHP"] = player_hp
+	data["playerMP"] = player_mp
+	data["enemyHP"] = enemy_hp
+	data["gameOver"] = gameover
 
-	dat += "</b></center>"
-
-	user << browse(dat, "window=arcade")
-	onclose(user, "arcade")
-	return
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "arcade_battle.tmpl", src.name, 400, 300)
+		ui.set_initial_data(data)
+		ui.open()
+		//ui.set_auto_update(2)
 
 /obj/machinery/computer/arcade/battle/Topic(href, href_list)
 	if(..())
 		return 1
 
-	if (!src.blocked && !src.gameover)
+	if (!blocked && !gameover)
 		if (href_list["attack"])
-			src.blocked = 1
+			blocked = 1
 			var/attackamt = rand(2,6)
-			src.temp = "You attack for [attackamt] damage!"
-			src.updateUsrDialog()
+			temp = "You attack for [attackamt] damage!"
 			if(turtle > 0)
 				turtle--
 
 			sleep(10)
-			src.enemy_hp -= attackamt
-			src.arcade_action()
+			enemy_hp -= attackamt
+			arcade_action()
 
 		else if (href_list["heal"])
-			src.blocked = 1
+			blocked = 1
 			var/pointamt = rand(1,3)
 			var/healamt = rand(6,8)
-			src.temp = "You use [pointamt] magic to heal for [healamt] damage!"
-			src.updateUsrDialog()
+			temp = "You use [pointamt] magic to heal for [healamt] damage!"
 			turtle++
 
 			sleep(10)
-			src.player_mp -= pointamt
-			src.player_hp += healamt
-			src.blocked = 1
-			src.updateUsrDialog()
-			src.arcade_action()
+			player_mp -= pointamt
+			player_hp += healamt
+			blocked = 1
+			arcade_action()
 
 		else if (href_list["charge"])
-			src.blocked = 1
+			blocked = 1
 			var/chargeamt = rand(4,7)
-			src.temp = "You regain [chargeamt] points"
-			src.player_mp += chargeamt
+			temp = "You regain [chargeamt] points"
+			player_mp += chargeamt
 			if(turtle > 0)
 				turtle--
 
-			src.updateUsrDialog()
 			sleep(10)
-			src.arcade_action()
+			arcade_action()
 
-	if (href_list["close"])
-		usr.unset_machine()
-		usr << browse(null, "window=arcade")
 
 	else if (href_list["newgame"]) //Reset everything
 		temp = "New Round"
@@ -193,14 +193,14 @@
 			emagged = 0
 
 	src.add_fingerprint(usr)
-	src.updateUsrDialog()
+	nanomanager.update_uis(src)
 	return
 
 /obj/machinery/computer/arcade/battle/proc/arcade_action()
-	if ((src.enemy_mp <= 0) || (src.enemy_hp <= 0))
+	if ((enemy_mp <= 0) || (enemy_hp <= 0))
 		if(!gameover)
-			src.gameover = 1
-			src.temp = "[src.enemy_name] has fallen! Rejoice!"
+			gameover = 1
+			temp = "[enemy_name] has fallen! Rejoice!"
 
 			if(emagged)
 				feedback_inc("arcade_win_emagged")
@@ -212,53 +212,52 @@
 				emagged = 0
 			else if(!contents.len)
 				feedback_inc("arcade_win_normal")
-				src.prizevend()
+				prizevend()
 
 			else
 				feedback_inc("arcade_win_normal")
-				src.prizevend()
+				prizevend()
 
 	else if (emagged && (turtle >= 4))
 		var/boomamt = rand(5,10)
-		src.temp = "[src.enemy_name] throws a bomb, exploding you for [boomamt] damage!"
-		src.player_hp -= boomamt
+		enemy_action = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
+		player_hp -= boomamt
 
-	else if ((src.enemy_mp <= 5) && (prob(70)))
+	else if ((enemy_mp <= 5) && (prob(70)))
 		var/stealamt = rand(2,3)
-		src.temp = "[src.enemy_name] steals [stealamt] of your power!"
-		src.player_mp -= stealamt
-		src.updateUsrDialog()
+		enemy_action = "[enemy_name] steals [stealamt] of your power!"
+		player_mp -= stealamt
 
-		if (src.player_mp <= 0)
-			src.gameover = 1
+		if (player_mp <= 0)
+			gameover = 1
 			sleep(10)
-			src.temp = "You have been drained! GAME OVER"
+			temp = "You have been drained! GAME OVER"
 			if(emagged)
 				feedback_inc("arcade_loss_mana_emagged")
 				usr.gib()
 			else
 				feedback_inc("arcade_loss_mana_normal")
 
-	else if ((src.enemy_hp <= 10) && (src.enemy_mp > 4))
-		src.temp = "[src.enemy_name] heals for 4 health!"
-		src.enemy_hp += 4
-		src.enemy_mp -= 4
+	else if ((enemy_hp <= 10) && (enemy_mp > 4))
+		enemy_action = "[enemy_name] heals for 4 health!"
+		enemy_hp += 4
+		enemy_mp -= 4
 
 	else
 		var/attackamt = rand(3,6)
-		src.temp = "[src.enemy_name] attacks for [attackamt] damage!"
-		src.player_hp -= attackamt
+		enemy_action = "[enemy_name] attacks for [attackamt] damage!"
+		player_hp -= attackamt
 
-	if ((src.player_mp <= 0) || (src.player_hp <= 0))
-		src.gameover = 1
-		src.temp = "You have been crushed! GAME OVER"
+	if ((player_mp <= 0) || (player_hp <= 0))
+		gameover = 1
+		temp = "You have been crushed! GAME OVER"
 		if(emagged)
 			feedback_inc("arcade_loss_hp_emagged")
 			usr.gib()
 		else
 			feedback_inc("arcade_loss_hp_normal")
 
-	src.blocked = 0
+	blocked = 0
 	return
 
 
@@ -276,7 +275,6 @@
 		enemy_name = "Cuban Pete"
 		name = "Outbomb Cuban Pete"
 
-		src.updateUsrDialog()
 		return 1
 
 

code/game/machinery/computer/cloning.dm

@@ -16,6 +16,7 @@
 	var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything.
 	var/loading = 0 // Nice loading text
 
+
 /obj/machinery/computer/cloning/initialize()
 	..()
 	updatemodules()
@@ -25,7 +26,7 @@
 	..()
 
 /obj/machinery/computer/cloning/proc/updatemodules()
-	src.scanner = findscanner()
+	scanner = findscanner()
 	releasecloner()
 	findcloner()
 
@@ -63,12 +64,12 @@
 
 /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
-		if (!src.diskette)
+		if (!diskette)
 			user.drop_item()
 			W.loc = src
-			src.diskette = W
+			diskette = W
 			user << "You insert [W]."
-			src.updateUsrDialog()
+			updateUsrDialog()
 			return
 	else if(istype(W, /obj/item/device/multitool))
 		var/obj/item/device/multitool/M = W
@@ -78,6 +79,15 @@
 			P.connected = src
 			P.name = "[initial(P.name)] #[pods.len]"
 			user << "<span class='notice'>You connect [P] to [src].</span>"
+
+	else if (menu == 4 && (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)))
+		if(check_access(W))
+			records.Remove(active_record)
+			qdel(active_record)
+			temp = "Record deleted."
+			menu = 2
+		else
+			temp = "Access Denied."
 	else
 		..()
 	return
@@ -94,109 +104,55 @@
 
 	updatemodules()
 
-	var/dat = "<h3>Cloning System Control</h3>"
-	dat += "<font size=-1><a href='byond://?src=\ref[src];refresh=1'>Refresh</a></font>"
+	ui_interact(user)
 
-	dat += "<br><tt>[temp]</tt><br>"
+/obj/machinery/computer/cloning/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
-	switch(src.menu)
-		if(1)
-			// Modules
-			dat += "<h4>Modules</h4>"
-			//dat += "<a href='byond://?src=\ref[src];relmodules=1'>Reload Modules</a>"
-			if (isnull(src.scanner))
-				dat += " <font color=red>DNA scanner not found.</font><br>"
-			else
-				dat += " <font color=green>DNA scanner found.</font><br>"
-			if (pods.len)
-				dat += " <font color=green>[pods.len] cloning vat\s found.</font><br>"
-			else
-				dat += " <font color=red>No cloning vats found.</font><br>"
+	var/data[0]
 
-			// Scanner
-			dat += "<h4>Scanner Functions</h4>"
+	var/records_list_ui[0]
+	for(var/datum/dna2/record/R in records)
+		records_list_ui[++records_list_ui.len] = list("ckey" = R.ckey, "name" = R.dna.real_name)
 
-			if(loading)
-				dat += "<b>Scanning...</b><br>"
-			else
-				dat += "<b>[scantemp]</b><br>"
+	var/pods_list_ui[0]
+	for(var/obj/machinery/clonepod/pod in pods)
+		pods_list_ui[++pods_list_ui.len] = list("pod" = pod, "biomass" = pod.biomass)
 
-			if (isnull(src.scanner))
-				dat += "No scanner connected!<br>"
-			else
-				if (src.scanner.occupant)
-					if(scantemp == "Scanner unoccupied") scantemp = "" // Stupid check to remove the text
+	if(pods)
+		data["pods"] = pods_list_ui
+	else
+		data["pods"] = null
 
-					dat += "<a href='byond://?src=\ref[src];scan=1'>Scan - [src.scanner.occupant]</a><br>"
-				else
-					scantemp = "Scanner unoccupied"
+	if(records)
+		data["records"] = records_list_ui
+	else
+		data["records"] = null
 
-				dat += "Lock status: <a href='byond://?src=\ref[src];lock=1'>[src.scanner.locked ? "Locked" : "Unlocked"]</a><br>"
+	if(active_record)
+		data["activeRecord"] = list("ckey" = active_record.ckey, "real_name" = active_record.dna.real_name, \
+									"ui" = active_record.dna.uni_identity, "se" = active_record.dna.struc_enzymes)
+	else
+		data["activeRecord"] = null
 
-			if (pods.len)
-				for (var/obj/machinery/clonepod/pod in pods)
-					dat += "[pod] biomass: <i>[pod.biomass]</i><br>"
+	data["menu"] = menu
+	data["connected"] = scanner
+	data["podsLen"] = pods.len
+	data["loading"] = loading
+	if(!scanner.occupant)
+		scantemp = ""
+	data["scantemp"] = scantemp
+	data["occupant"] = scanner.occupant
+	data["locked"] = scanner.locked
+	data["diskette"] = diskette
+	data["temp"] = temp
 
-			// Database
-			dat += "<h4>Database Functions</h4>"
-			dat += "<a href='byond://?src=\ref[src];menu=2'>View Records</a><br>"
-			if (src.diskette)
-				dat += "<a href='byond://?src=\ref[src];disk=eject'>Eject Disk</a>"
-
-
-		if(2)
-			dat += "<h4>Current records</h4>"
-			dat += "<a href='byond://?src=\ref[src];menu=1'>Back</a><br><br>"
-			for(var/datum/dna2/record/R in src.records)
-				dat += "<li><a href='byond://?src=\ref[src];view_rec=\ref[R]'>[R.dna.real_name]</a></li>"
-
-		if(3)
-			dat += "<h4>Selected Record</h4>"
-			dat += "<a href='byond://?src=\ref[src];menu=2'>Back</a><br>"
-
-			if (!src.active_record)
-				dat += "<font color=red>ERROR: Record not found.</font>"
-			else
-				dat += {"<br><font size=1><a href='byond://?src=\ref[src];del_rec=1'>Delete Record</a></font><br>
-					<b>Name:</b> [src.active_record.dna.real_name]<br>"}
-				var/obj/item/weapon/implant/health/H = null
-				if(src.active_record.implant)
-					H=locate(src.active_record.implant)
-
-				if ((H) && (istype(H)))
-					dat += "<b>Health:</b> [H.sensehealth()] | OXY-BURN-TOX-BRUTE<br>"
-				else
-					dat += "<font color=red>Unable to locate implant.</font><br>"
-
-				if (!isnull(src.diskette))
-					dat += "<a href='byond://?src=\ref[src];disk=load'>Load from disk.</a>"
-
-					dat += " | Save: <a href='byond://?src=\ref[src];save_disk=ue'>UI + UE</a>"
-					dat += " | Save: <a href='byond://?src=\ref[src];save_disk=ui'>UI</a>"
-					dat += " | Save: <a href='byond://?src=\ref[src];save_disk=se'>SE</a>"
-					dat += "<br>"
-				else
-					dat += "<br>" //Keeping a line empty for appearances I guess.
-
-				dat += {"<b>UI:</b> [src.active_record.dna.uni_identity]<br>
-				<b>SE:</b> [src.active_record.dna.struc_enzymes]<br><br>"}
-
-				if(pods.len)
-					dat += {"<a href='byond://?src=\ref[src];clone=\ref[src.active_record]'>Clone</a><br>"}
-
-		if(4)
-			if (!src.active_record)
-				src.menu = 2
-			dat = "[src.temp]<br>"
-			dat += "<h4>Confirm Record Deletion</h4>"
-
-			dat += "<b><a href='byond://?src=\ref[src];del_rec=1'>Scan card to confirm.</a></b><br>"
-			dat += "<b><a href='byond://?src=\ref[src];menu=3'>No</a></b>"
-
-
-	user << browse(dat, "window=cloning")
-	onclose(user, "cloning")
-	return
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "cloning.tmpl", src.name, 400, 450)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(5)
 
 /obj/machinery/computer/cloning/Topic(href, href_list)
 	if(..())
@@ -205,101 +161,87 @@
 	if(loading)
 		return
 
-	if ((href_list["scan"]) && (!isnull(src.scanner)))
+	if ((href_list["scan"]) && (!isnull(scanner)))
 		scantemp = ""
 
 		loading = 1
-		src.updateUsrDialog()
 
 		spawn(20)
-			src.scan_mob(src.scanner.occupant)
+			scan_mob(scanner.occupant)
 
 			loading = 0
-			src.updateUsrDialog()
-
 
 		//No locking an open scanner.
-	else if ((href_list["lock"]) && (!isnull(src.scanner)))
-		if ((!src.scanner.locked) && (src.scanner.occupant))
-			src.scanner.locked = 1
+	else if ((href_list["lock"]) && (!isnull(scanner)))
+		if ((!scanner.locked) && (scanner.occupant))
+			scanner.locked = 1
 		else
-			src.scanner.locked = 0
+			scanner.locked = 0
+
+	else if ((href_list["eject"]) && (!isnull(scanner)))
+		if ((!scanner.locked) && (scanner.occupant))
+			scanner.eject_occupant()
 
 	else if (href_list["view_rec"])
-		src.active_record = locate(href_list["view_rec"])
-		if(istype(src.active_record,/datum/dna2/record))
-			if ((isnull(src.active_record.ckey)))
-				qdel(src.active_record)
-				src.temp = "ERROR: Record Corrupt"
+		active_record = find_record(href_list["view_rec"])
+		if(istype(active_record,/datum/dna2/record))
+			if ((isnull(active_record.ckey)))
+				qdel(active_record)
+				temp = "ERROR: Record Corrupt"
 			else
-				src.menu = 3
+				menu = 3
 		else
-			src.active_record = null
-			src.temp = "Record missing."
+			active_record = null
+			temp = "Record missing."
 
 	else if (href_list["del_rec"])
-		if ((!src.active_record) || (src.menu < 3))
+		if ((!active_record) || (menu < 3))
 			return
-		if (src.menu == 3) //If we are viewing a record, confirm deletion
-			src.temp = "Delete record?"
-			src.menu = 4
-
-		else if (src.menu == 4)
-			var/obj/item/weapon/card/id/C = usr.get_active_hand()
-			if (istype(C)||istype(C, /obj/item/device/pda))
-				if(src.check_access(C))
-					src.records.Remove(src.active_record)
-					qdel(src.active_record)
-					src.temp = "Record deleted."
-					src.menu = 2
-				else
-					src.temp = "Access Denied."
+		if (menu == 3) //If we are viewing a record, confirm deletion
+			temp = "Delete record?"
+			menu = 4
 
 	else if (href_list["disk"]) //Load or eject.
 		switch(href_list["disk"])
 			if("load")
-				if ((isnull(src.diskette)) || isnull(src.diskette.buf))
-					src.temp = "Load error."
-					src.updateUsrDialog()
+				if ((isnull(diskette)) || isnull(diskette.buf))
+					temp = "Load error."
 					return
-				if (isnull(src.active_record))
-					src.temp = "Record error."
-					src.menu = 1
-					src.updateUsrDialog()
+				if (isnull(active_record))
+					temp = "Record error."
+					menu = 1
 					return
 
-				src.active_record = src.diskette.buf
+				active_record = diskette.buf
 
-				src.temp = "Load successful."
+				temp = "Load successful."
 			if("eject")
-				if (!isnull(src.diskette))
-					src.diskette.loc = src.loc
-					src.diskette = null
+				if (!isnull(diskette))
+					diskette.loc = loc
+					diskette = null
 
 	else if (href_list["save_disk"]) //Save to disk!
-		if ((isnull(src.diskette)) || (src.diskette.read_only) || (isnull(src.active_record)))
-			src.temp = "Save error."
-			src.updateUsrDialog()
-			return
+		if ((isnull(diskette)) || (diskette.read_only) || (isnull(active_record)))
+			temp = "Save error."
 
 		// DNA2 makes things a little simpler.
-		src.diskette.buf=src.active_record
-		src.diskette.buf.types=0
+		diskette.buf = active_record
+		diskette.buf.types = 0
 		switch(href_list["save_disk"]) //Save as Ui/Ui+Ue/Se
 			if("ui")
-				src.diskette.buf.types=DNA2_BUF_UI
+				diskette.buf.types = DNA2_BUF_UI
 			if("ue")
-				src.diskette.buf.types=DNA2_BUF_UI|DNA2_BUF_UE
+				diskette.buf.types = DNA2_BUF_UI | DNA2_BUF_UE
 			if("se")
-				src.diskette.buf.types=DNA2_BUF_SE
-		src.diskette.name = "data disk - '[src.active_record.dna.real_name]'"
-		src.temp = "Save \[[href_list["save_disk"]]\] successful."
+				diskette.buf.types = DNA2_BUF_SE
+		diskette.name = "data disk - '[active_record.dna.real_name]'"
+		temp = "Save \[[href_list["save_disk"]]\] successful."
 
 	else if (href_list["refresh"])
-		src.updateUsrDialog()
+		updateUsrDialog()
 
 	else if (href_list["clone"])
-		var/datum/dna2/record/C = locate(href_list["clone"])
+		var/datum/dna2/record/C = find_record(href_list["clone"])
 		//Look for that player! They better be dead!
 		if(istype(C))
 			//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
@@ -340,11 +282,12 @@
 			temp = "Error: Data corruption."
 
 	else if (href_list["menu"])
-		src.menu = text2num(href_list["menu"])
+		menu = href_list["menu"]
+		temp = ""
+		scantemp = ""
 
-	src.add_fingerprint(usr)
-	src.updateUsrDialog()
-	return
+	nanomanager.update_uis(src)
+	add_fingerprint(usr)
 
 /obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob)
 	if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna))
@@ -381,13 +324,13 @@
 	subject.dna.check_integrity()
 
 	var/datum/dna2/record/R = new /datum/dna2/record()
-	R.dna=subject.dna
+	R.dna = subject.dna
 	R.ckey = subject.ckey
-	R.id= copytext(md5(subject.real_name), 2, 6)
-	R.name=R.dna.real_name
-	R.types=DNA2_BUF_UI|DNA2_BUF_UE|DNA2_BUF_SE
-	R.languages=subject.languages
-	R.flavor=subject.flavor_texts.Copy()
+	R.id = copytext(md5(subject.real_name), 2, 6)
+	R.name = R.dna.real_name
+	R.types = DNA2_BUF_UI|DNA2_BUF_UE|DNA2_BUF_SE
+	R.languages = subject.languages
+	R.flavor = subject.flavor_texts.Copy()
 
 	//Add an implant if needed
 	var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject)
@@ -402,13 +345,13 @@
 	if (!isnull(subject.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.mind = "\ref[subject.mind]"
 
-	src.records += R
+	records += R
 	scantemp = "Subject successfully scanned."
 
 //Find a specific record by key.
 /obj/machinery/computer/cloning/proc/find_record(var/find_key)
 	var/selected_record = null
-	for(var/datum/dna2/record/R in src.records)
+	for(var/datum/dna2/record/R in records)
 		if (R.ckey == find_key)
 			selected_record = R
 			break

code/game/machinery/computer/guestpass.dm

@@ -88,7 +88,7 @@
 		if(!giver && user.unEquip(I))
 			I.forceMove(src)
 			giver = I
-			updateUsrDialog()
+			nanomanager.update_uis(src)
 		else if(giver)
 			user << "<span class='warning'>There is already ID card inside.</span>"
 		return
@@ -102,40 +102,51 @@
 		return
 
 	user.set_machine(src)
-	var/dat
 
-	if (mode == 1) //Logs
-		dat += "<h3>Activity log</h3><br>"
-		for (var/entry in internal_log)
-			dat += "[entry]<br><hr>"
-		dat += "<a href='?src=\ref[src];action=print'>Print</a><br>"
-		dat += "<a href='?src=\ref[src];mode=0'>Back</a><br>"
-	else
-		dat += "<h3>Guest pass terminal #[uid]</h3><br>"
-		dat += "<a href='?src=\ref[src];mode=1'>View activity log</a><br><br>"
-		dat += "Issuing ID: <a href='?src=\ref[src];action=id'>[giver]</a><br>"
-		dat += "Issued to: <a href='?src=\ref[src];choice=giv_name'>[giv_name]</a><br>"
-		dat += "Reason:  <a href='?src=\ref[src];choice=reason'>[reason]</a><br>"
-		dat += "Duration (minutes):  <a href='?src=\ref[src];choice=duration'>[duration] m</a><br>"
-		dat += "Access to areas:<br>"
-		if (giver && giver.access)
-			for (var/A in giver.access)
-				var/area = get_access_desc(A)
-				if (A in accesses)
-					area = "<b>[area]</b>"
-				dat += "<a href='?src=\ref[src];choice=access;access=[A]'>[area]</a><br>"
-		dat += "<br><a href='?src=\ref[src];action=issue'>Issue pass</a><br>"
+	ui_interact(user)
 
-	user << browse(dat, "window=guestpass;size=400x520")
-	onclose(user, "guestpass")
+/**
+ *  Display the NanoUI window for the guest pass console.
+ *
+ *  See NanoUI documentation for details.
+ */
+/obj/machinery/computer/guestpass/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
+	var/list/data = list()
+
+	var/area_list[0]
+
+	if (giver && giver.access)
+		data["access"] = giver.access
+		for (var/A in giver.access)
+			if(A in accesses)
+				area_list[++area_list.len] = list("area" = A, "area_name" = get_access_desc(A), "on" = 1)
+			else
+				area_list[++area_list.len] = list("area" = A, "area_name" = get_access_desc(A), "on" = null)
+
+	data["giver"] = giver
+	data["giveName"] = giv_name
+	data["reason"] = reason
+	data["duration"] = duration
+	data["area"] = area_list
+	data["mode"] = mode
+	data["log"] = internal_log
+	data["uid"] = uid
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "guest_pass.tmpl", src.name, 400, 520)
+		ui.set_initial_data(data)
+		ui.open()
+		//ui.set_auto_update(5)
 
 /obj/machinery/computer/guestpass/Topic(href, href_list)
 	if(..())
 		return 1
 	usr.set_machine(src)
 	if (href_list["mode"])
-		mode = text2num(href_list["mode"])
+		mode = href_list["mode"]
 
 	if (href_list["choice"])
 		switch(href_list["choice"])
@@ -182,7 +193,6 @@
 					if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
 						I.loc = src
 						giver = I
-				updateUsrDialog()
 
 			if ("print")
 				var/dat = "<h3>Activity log of guest pass terminal #[uid]</h3><br>"
@@ -214,5 +224,6 @@
 					pass.name = "guest pass #[number]"
 				else
 					usr << "<span class='warning'>Cannot issue pass without issuing ID.</span>"
-	updateUsrDialog()
-	return
+
+	src.add_fingerprint(usr)
+	nanomanager.update_uis(src)

code/game/machinery/computer3/lapvend.dm

@@ -6,12 +6,10 @@
 	layer = 2.9
 	anchored = 1
 	density = 1
-	var/datum/browser/popup = null
 	var/obj/machinery/computer3/laptop/vended/newlap = null
 	var/obj/item/device/laptop/relap = null
 	var/vendmode = 0
 
-
 	var/cardreader = 0
 	var/floppy = 0
 	var/radionet = 0
@@ -34,9 +32,11 @@
 	if(vendmode == 1 && I)
 		scan_id(I, W)
 		vendmode = 0
-	if(vendmode == 3 && I)
+		nanomanager.update_uis(src)
+	if(vendmode == 2 && I)
 		if(reimburse_id(I, W))
 			vendmode = 0
+			nanomanager.update_uis(src)
 	if(vendmode == 0)
 		if(istype(W, /obj/item/device/laptop))
 			var/obj/item/device/laptop/L = W
@@ -44,84 +44,49 @@
 			calc_reimburse(L)
 			usr.drop_item()
 			L.loc = src
-			vendmode = 3
+			vendmode = 2
 			usr << "<span class='notice'>You slot your [L.name] into \The [src.name]</span>"
+			nanomanager.update_uis(src)
 	else
 		..()
 
 
 /obj/machinery/lapvend/attack_hand(mob/user as mob)
+	if(stat & (BROKEN|NOPOWER))
+		return
+
+	ui_interact(user)
+
+/**
+ *  Display the NanoUI window for the vending machine.
+ *
+ *  See NanoUI documentation for details.
+ */
+/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
 	user.set_machine(src)
-	var/vendorname = (src.name)  //import the machine's name
-	var/dat = "<TT><center><b>[vendorname]</b></center><hr /><br>" //display the name, and added a horizontal rule
-	if(vendmode == 0)
-		dat += "<center><b>Please choose your laptop customization options</b></center><br>"
-		dat += "<center>Your comptuer will automatically be loaded with any programs you can use after the transaction is complete.</center>"
-		dat += "<center><b>Some programs will require additional components to be installed!</center></b><hr /><br>"
-		dat += "<center><b>HDD (Required)</b> : Added</center><br>"
-		dat += "<center><b>Card Reader</b> : <A href='?src=\ref[src];choice=single_add'>Single (50)</a> | <A href='?src=\ref[src];choice=dual_add'>Dual (125)</a></center><br>"
-		dat += "<center><b>Floppy Drive</b>: <A href='?src=\ref[src];choice=floppy_add'>Add (50)</a></center><br>"
-		dat += "<center><b>Radio Network card</b> <A href='?src=\ref[src];choice=radio_add'>Add (50)</a></center><br>"
-		dat += "<center><b>Camera Card</b> <A href='?src=\ref[src];choice=camnet_add'>Add (100)</a></center><br>"
-		dat += "<center><b> Network card</b> <A href='?src=\ref[src];choice=area_add'>Area (75)</a> <A href='?src=\ref[src];choice=prox_add'>Adjacent (50)</a><A href='?src=\ref[src];choice=cable_add'>Powernet (25)</a></center><br>"
-		dat += "<hr /><center> Power source upgrade</center> <A href='?src=\ref[src];choice=high_add'>Extended (175)</a> <A href='?src=\ref[src];choice=super_add'>Unreal (250)</a>"
 
-	if(vendmode == 0 || vendmode == 1)
-		dat += "<hr /><br><center>Cart</center><br>"
-		dat += "<b>Total: [total()]</b><br>"
-		if(cardreader == 1)
-			dat += "<A href='?src=\ref[src];choice=single_rem'>Card Reader: (single) (50)</a><br>"
-		else if (cardreader == 2)
-			dat += "<A href='?src=\ref[src];choice=dual_rem'>Card Reader: (double) (125)</a><br>"
-		else
-			dat += "Card Reader: None<br>"
-		if(floppy == 0)
-			dat += "Floppy Drive: None<br>"
-		else
-			dat += "<A href='?src=\ref[src];choice=floppy_rem'>Floppy Drive: Added (50)</a><br>"
-		if(radionet == 1)
-			dat += "<A href='?src=\ref[src];choice=radio_rem'>Radio Card: Added (50)</a><br>"
-		else
-			dat += "Radio Card: None<br>"
-		if(camera == 1)
-			dat += "<A href='?src=\ref[src];choice=camnet_rem'>Camera Card: Added (100)</a><br>"
-		else
-			dat += "Camera Card: None<br>"
-		if(network == 1)
-			dat += "<A href='?src=\ref[src];choice=area_rem'>Network card: Area (75)</a><br>"
-		else if(network == 2)
-			dat += "<A href='?src=\ref[src];choice=prox_rem'>Network card: Adjacent (50)</a><br>"
-		else if(network == 3)
-			dat += "<A href='?src=\ref[src];choice=cable_rem'>Network card: Powernet (25)</a><br>"
-		else
-			dat += "Network card: None"
-		if (power == 0)
-			dat += "Power source: Regular"
-		else if (power == 1)
-			dat += "<A href='?src=\ref[src];choice=high_rem'>Power source: Extended (175)</a><br>"
-		else
-			dat += "<A href='?src=\ref[src];choice=super_rem'>Power source: Unreal (250)</a><br>"
-
-	if(vendmode == 0)
-		dat += "<br><A href='?src=\ref[src];choice=vend'>Vend Laptop</a>"
-
-	if(vendmode == 1)
-		dat += "Please swipe your card and enter your PIN to complete the transaction"
-
-	if(vendmode == 3)
-		dat += "Please swipe your card and enter your PIN to be finish returning your computer<br>"
-		dat += "<a href='?src=\ref[src];choice=cancel'>Cancel</a>"
-
-
-
-
-	popup = new(user, "lapvend", name, 450, 500)
-	popup.set_content(dat)
-	popup.open()
-	return
+	var/list/data = list()
+	data["mode"] = vendmode
+	data["cardreader"] = cardreader
+	data["floppy"] = floppy
+	data["radionet"] = radionet
+	data["camera"] = camera
+	data["network"] = network
+	data["power"] = power
+	data["total"] = total()
 
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "laptop_vendor.tmpl", src.name, 480, 425)
+		ui.set_initial_data(data)
+		ui.open()
+		//ui.set_auto_update(5)
 
 /obj/machinery/lapvend/Topic(href, href_list)
+	if(stat & (BROKEN|NOPOWER))
+		return
+	if(usr.stat || usr.restrained())
+		return
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
 		usr.set_machine(src)
 	switch(href_list["choice"])
@@ -146,7 +111,7 @@
 		if ("super_add")
 			power = 2
 
-		if ("single_rem" || "dual_rem")
+		if ("cardreader_rem")
 			cardreader = 0
 		if ("floppy_rem")
 			floppy = 0
@@ -154,9 +119,9 @@
 			radionet = 0
 		if ("camnet_rem")
 			camera = 0
-		if ("area_rem" || "prox_rem" || "cable_rem")
+		if ("network_rem")
 			network = 0
-		if ("high_rem" || "super_rem")
+		if ("power_rem")
 			power = 0
 
 		if("vend")
@@ -168,9 +133,8 @@
 				relap = null
 			vendmode = 0
 
-	src.updateUsrDialog()
-	return
-
+	src.add_fingerprint(usr)
+	nanomanager.update_uis(src)
 
 /obj/machinery/lapvend/proc/vend()
 	if(cardreader > 0)
@@ -253,7 +217,6 @@
 
 		choose_progs(C)
 		vend()
-		popup.close()
 		newlap.close_laptop()
 		newlap = null
 		cardreader = 0

code/game/machinery/flasher.dm

@@ -77,11 +77,12 @@
 			if(!E)
 				return
 			if(E.is_bruised() && prob(E.damage + 50))
-				flick("e_flash", O:flash)
+				H.flash_eyes()
 				E.damage += rand(1, 5)
 		else
-			if(!O.blinded)
-				flick("flash", O:flash)
+			if(!O.blinded && isliving(O))
+				var/mob/living/L = O
+				L.flash_eyes()
 		O.Weaken(flash_time)
 
 /obj/machinery/flasher/emp_act(severity)

code/game/machinery/kitchen/cooking_machines/_cooker.dm

@@ -0,0 +1,242 @@
+// This folder contains code that was originally ported from Apollo Station and then refactored/optimized/changed.
+
+// Tracks precooked food to stop deep fried baked grilled grilled grilled diona nymph cereal.
+/obj/item/weapon/reagent_containers/food/snacks/var/list/cooked
+
+// Root type for cooking machines. See following files for specific implementations.
+/obj/machinery/cooker
+	name = "cooker"
+	desc = "You shouldn't be seeing this!"
+	icon = 'icons/obj/cooking_machines.dmi'
+	density = 1
+	anchored = 1
+	use_power = 1
+	idle_power_usage = 5
+
+	var/on_icon						// Icon state used when cooking.
+	var/off_icon					// Icon state used when not cooking.
+	var/cooking						// Whether or not the machine is currently operating.
+	var/cook_type					// A string value used to track what kind of food this machine makes.
+	var/cook_time = 200				// How many ticks the cooking will take.
+	var/can_cook_mobs				// Whether or not this machine accepts grabbed mobs.
+	var/food_color					// Colour of resulting food item.
+	var/cooked_sound				// Sound played when cooking completes.
+	var/can_burn_food				// Can the object burn food that is left inside?
+	var/burn_chance = 10			// How likely is the food to burn?
+	var/obj/item/cooking_obj		// Holder for the currently cooking object.
+
+	// If the machine has multiple output modes, define them here.
+	var/selected_option
+	var/list/output_options = list()
+
+/obj/machinery/cooker/Destroy()
+	if(cooking_obj)
+		qdel(cooking_obj)
+		cooking_obj = null
+	return ..()
+
+/obj/machinery/cooker/examine()
+	..()
+	if(cooking_obj && Adjacent(usr))
+		usr << "You can see \a [cooking_obj] inside."
+
+/obj/machinery/cooker/attackby(var/obj/item/I, var/mob/user)
+
+	if(!cook_type || (stat & (NOPOWER|BROKEN)))
+		user << "<span class='warning'>\The [src] is not working.</span>"
+		return
+
+	if(cooking)
+		user << "<span class='warning'>\The [src] is running!</span>"
+		return
+
+	// We are trying to cook a grabbed mob.
+	var/obj/item/weapon/grab/G = I
+	if(istype(G))
+
+		if(!can_cook_mobs)
+			user << "<span class='warning'>That's not going to fit.</span>"
+			return
+
+		if(!isliving(G.affecting))
+			user << "<span class='warning'>You can't cook that.</span>"
+			return
+
+		cook_mob(G.affecting, user)
+		return
+
+	// We're trying to cook something else. Check if it's valid.
+	var/obj/item/weapon/reagent_containers/food/snacks/check = I
+	if(istype(check) && islist(check.cooked) && (cook_type in check.cooked))
+		user << "<span class='warning'>\The [check] has already been [cook_type].</span>"
+		return 0
+	else if(istype(check, /obj/item/weapon/reagent_containers/glass))
+		user << "<span class='warning'>That would probably break [src].</span>"
+		return 0
+	else if(istype(check, /obj/item/weapon/disk/nuclear))
+		user << "Central Command would kill you if you [cook_type] that."
+		return 0
+	else if(!istype(check) && !istype(check, /obj/item/weapon/holder) && !istype(check, /obj/item/organ))
+		user << "<span class='warning'>That's not edible.</span>"
+		return 0
+		
+	if(istype(I, /obj/item/organ))
+		var/obj/item/organ/O = I
+		if(O.robotic)
+			user << "<span class='warning'>That would probably break [src].</span>"
+			return
+
+	// Gotta hurt.
+	if(istype(cooking_obj, /obj/item/weapon/holder))
+		for(var/mob/living/M in cooking_obj.contents)
+			M.apply_damage(rand(30,40), BURN, "chest")
+
+	// Not sure why a food item that passed the previous checks would fail to drop, but safety first.
+	if(!user.unEquip(I))
+		return
+
+	// We can actually start cooking now.
+	user.visible_message("<span class='notice'>\The [user] puts \the [I] into \the [src].</span>")
+	cooking_obj = I
+	cooking_obj.forceMove(src)
+	cooking = 1
+	icon_state = on_icon
+
+	// Doop de doo. Jeopardy theme goes here.
+	sleep(cook_time)
+
+	// Sanity checks.
+	if(!cooking_obj || cooking_obj.loc != src)
+		cooking_obj = null
+		icon_state = off_icon
+		cooking = 0
+		return
+
+	// RIP slow-moving held mobs.
+	if(istype(cooking_obj, /obj/item/weapon/holder))
+		for(var/mob/living/M in cooking_obj.contents)
+			M.death()
+
+	// Cook the food.
+	var/cook_path
+	if(selected_option && output_options.len)
+		cook_path = output_options[selected_option]
+	if(!cook_path)
+		cook_path = /obj/item/weapon/reagent_containers/food/snacks/variable
+	var/obj/item/weapon/reagent_containers/food/snacks/result = new cook_path(src) //Holy typepaths, Batman.
+
+	// Set icon and appearance.
+	change_product_appearance(result)
+
+	// Update strings.
+	change_product_strings(result)
+
+	// Copy reagents over. trans_to_obj must be used, as trans_to fails for snacks due to is_open_container() failing.
+	if(cooking_obj.reagents && cooking_obj.reagents.total_volume)
+		cooking_obj.reagents.trans_to_obj(result, cooking_obj.reagents.total_volume)
+		
+	// Set cooked data.
+	var/obj/item/weapon/reagent_containers/food/snacks/food_item = cooking_obj
+	if(istype(food_item) && islist(food_item.cooked))
+		result.cooked = food_item.cooked.Copy()
+	else
+		result.cooked = list()
+	result.cooked |= cook_type
+
+	// Reset relevant variables.
+	qdel(cooking_obj)
+	src.visible_message("<span class='notice'>\The [src] pings!</span>")
+	if(cooked_sound)
+		playsound(get_turf(src), cooked_sound, 50, 1)
+
+	if(!can_burn_food)
+		icon_state = off_icon
+		cooking = 0
+		result.forceMove(get_turf(src))
+		cooking_obj = null
+	else
+		var/failed
+		var/overcook_period = max(Floor(cook_time/5),1)
+		cooking_obj = result
+		var/count = overcook_period
+		while(1)
+			sleep(overcook_period)
+			count += overcook_period
+			if(!cooking || !result || result.loc != src)
+				failed = 1
+			else if(prob(burn_chance) || count == cook_time)	//Fail before it has a chance to cook again.
+				// You dun goofed.
+				qdel(cooking_obj)
+				cooking_obj = new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
+				// Produce nasty smoke.
+				visible_message("<span class='danger'>\The [src] vomits a gout of rancid smoke!</span>")
+				var/datum/effect/effect/system/smoke_spread/bad/smoke = PoolOrNew(/datum/effect/effect/system/smoke_spread/bad)
+				smoke.attach(src)
+				smoke.set_up(10, 0, usr.loc)
+				smoke.start()
+				failed = 1
+
+			if(failed)
+				cooking = 0
+				icon_state = off_icon
+				break
+
+/obj/machinery/cooker/attack_hand(var/mob/user)
+
+	if(cooking_obj)
+		user << "<span class='notice'>You grab \the [cooking_obj] from \the [src].</span>"
+		user.put_in_hands(cooking_obj)
+		cooking = 0
+		cooking_obj = null
+		icon_state = off_icon
+		return
+
+	if(output_options.len)
+
+		if(cooking)
+			user << "<span class='warning'>\The [src] is in use!</span>"
+			return
+
+		var/choice = input("What specific food do you wish to make with \the [src]?") as null|anything in output_options+"Default"
+		if(!choice)
+			return
+		if(choice == "Default")
+			selected_option = null
+			user << "<span class='notice'>You decide not to make anything specific with \the [src].</span>"
+		else
+			selected_option = choice
+			user << "<span class='notice'>You prepare \the [src] to make \a [selected_option].</span>"
+
+	..()
+
+/obj/machinery/cooker/proc/cook_mob(var/mob/living/victim, var/mob/user)
+	return
+
+/obj/machinery/cooker/proc/change_product_strings(var/obj/item/weapon/reagent_containers/food/snacks/product)
+	if(product.type == /obj/item/weapon/reagent_containers/food/snacks/variable) // Base type, generic.
+		product.name = "[cook_type] [cooking_obj.name]"
+		product.desc = "[cooking_obj.desc] It has been [cook_type]."
+	else
+		product.name = "[cooking_obj.name] [product.name]"
+
+/obj/machinery/cooker/proc/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/product)
+	if(product.type == /obj/item/weapon/reagent_containers/food/snacks/variable) // Base type, generic.
+		product.appearance = cooking_obj
+		product.color = food_color
+		product.filling_color = food_color
+
+		// Make 'em into a corpse.
+		if(istype(cooking_obj, /obj/item/weapon/holder))
+			var/matrix/M = matrix()
+			M.Turn(90)
+			M.Translate(1,-6)
+			product.transform = M
+	else
+		var/image/I = image(product.icon, "[product.icon_state]_filling")
+		if(istype(cooking_obj, /obj/item/weapon/reagent_containers/food/snacks))
+			var/obj/item/weapon/reagent_containers/food/snacks/S = cooking_obj
+			I.color = S.filling_color
+		if(!I.color)
+			I.color = food_color
+		product.overlays += I
+

code/game/machinery/kitchen/cooking_machines/_cooker_output.dm

@@ -0,0 +1,72 @@
+// Wrapper obj for cooked food. Appearance is set in the cooking code, not on spawn.
+/obj/item/weapon/reagent_containers/food/snacks/variable
+	name = "cooked food"
+	icon = 'icons/obj/food_custom.dmi'
+	desc = "If you can see this description then something is wrong. Please report the bug on the tracker."
+	nutriment_amt = 5
+	bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/pizza
+	name = "personal pizza"
+	desc = "A personalized pan pizza meant for only one person."
+	icon_state = "personal_pizza"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/bread
+	name = "bread"
+	desc = "Tasty bread."
+	icon_state = "breadcustom"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/pie
+	name = "pie"
+	desc = "Tasty pie."
+	icon_state = "piecustom"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/cake
+	name = "cake"
+	desc = "A popular band."
+	icon_state = "cakecustom"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/pocket
+	name = "hot pocket"
+	desc = "You wanna put a bangin- oh, nevermind."
+	icon_state = "donk"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/kebab
+	name = "kebab"
+	desc = "Remove this!"
+	icon_state = "kabob"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/waffles
+	name = "waffles"
+	desc = "Made with love."
+	icon_state = "waffles"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/cookie
+	name = "cookie"
+	desc = "Sugar snap!"
+	icon_state = "cookie"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/donut
+	name = "filled donut"
+	desc = "Donut eat this!" // kill me
+	icon_state = "donut"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker
+	name = "flavored jawbreaker"
+	desc = "It's like cracking a molar on a rainbow."
+	icon_state = "jawbreaker"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/candybar
+	name = "flavored chocolate bar"
+	desc = "Made in a factory downtown."
+	icon_state = "bar"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/sucker
+	name = "flavored sucker"
+	desc = "Suck, suck, suck."
+	icon_state = "sucker"
+
+/obj/item/weapon/reagent_containers/food/snacks/variable/jelly
+	name = "jelly"
+	desc = "All your friends will be jelly."
+	icon_state = "jellycustom"

code/game/machinery/kitchen/cooking_machines/candy.dm

@@ -0,0 +1,18 @@
+/obj/machinery/cooker/candy
+	name = "candy machine"
+	desc = "Get yer candied cheese wheels here!"
+	icon_state = "mixer_off"
+	off_icon = "mixer_off"
+	on_icon = "mixer_on"
+	cook_type = "candied"
+
+	output_options = list(
+		"Jawbreaker" = /obj/item/weapon/reagent_containers/food/snacks/variable/jawbreaker,
+		"Candy Bar" = /obj/item/weapon/reagent_containers/food/snacks/variable/candybar,
+		"Sucker" = /obj/item/weapon/reagent_containers/food/snacks/variable/sucker,
+		"Jelly" = /obj/item/weapon/reagent_containers/food/snacks/variable/jelly
+		)
+
+/obj/machinery/cooker/candy/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/cooked/product)
+	food_color = get_random_colour(1)
+	. = ..()

code/game/machinery/kitchen/cooking_machines/cereal.dm

@@ -0,0 +1,25 @@
+/obj/machinery/cooker/cereal
+	name = "cereal maker"
+	desc = "Now with Dann O's available!"
+	icon = 'icons/obj/cooking_machines.dmi'
+	icon_state = "cereal_off"
+	cook_type = "cerealized"
+	on_icon = "cereal_on"
+	off_icon = "cereal_off"
+
+/obj/machinery/cooker/cereal/change_product_strings(var/obj/item/weapon/reagent_containers/food/snacks/product)
+	. = ..()
+	product.name = "box of [cooking_obj.name] cereal"
+
+/obj/machinery/cooker/cereal/change_product_appearance(var/obj/item/weapon/reagent_containers/food/snacks/product)
+	product.icon = 'icons/obj/food.dmi'
+	product.icon_state = "cereal_box"
+	product.filling_color = cooking_obj.color
+
+	var/image/food_image = image(cooking_obj.icon, cooking_obj.icon_state)
+	food_image.color = cooking_obj.color
+	food_image.overlays += cooking_obj.overlays
+	food_image.transform *= 0.7
+
+	product.overlays += food_image
+

code/game/machinery/kitchen/cooking_machines/fryer.dm

@@ -0,0 +1,67 @@
+/obj/machinery/cooker/fryer
+	name = "deep fryer"
+	desc = "Deep fried <i>everything</i>."
+	icon_state = "fryer_off"
+	can_cook_mobs = 1
+	cook_type = "deep fried"
+	on_icon = "fryer_on"
+	off_icon = "fryer_off"
+	food_color = "#FFAD33"
+	cooked_sound = 'sound/machines/ding.ogg'
+
+/obj/machinery/cooker/fryer/cook_mob(var/mob/living/victim, var/mob/user)
+
+	if(!istype(victim))
+		return
+
+	user.visible_message("<span class='danger'>\The [user] starts pushing \the [victim] into \the [src]!</span>")
+	icon_state = on_icon
+	cooking = 1
+
+	if(!do_mob(user, victim, 20))
+		cooking = 0
+		icon_state = off_icon
+		return
+
+	if(!victim || !victim.Adjacent(user))
+		user << "<span class='danger'>Your victim slipped free!</span>"
+		cooking = 0
+		icon_state = off_icon
+		return
+
+	var/obj/item/organ/external/E
+	var/nopain
+	if(ishuman(victim) && user.zone_sel.selecting != "groin" && user.zone_sel.selecting != "chest")
+		var/mob/living/carbon/human/H = victim
+		if(H.species.flags & NO_PAIN)
+			nopain = 2
+		E = H.get_organ(user.zone_sel.selecting)
+		if(E.status & ORGAN_ROBOT)
+			nopain = 1
+
+	user.visible_message("<span class='danger'>\The [user] shoves \the [victim][E ? "'s [E.name]" : ""] into \the [src]!</span>")
+
+	if(E)
+		E.take_damage(0, rand(20,30))
+		if(E.children && E.children.len)
+			for(var/obj/item/organ/external/child in E.children)
+				if(nopain && nopain < 2 && !(child.status & ORGAN_ROBOT))
+					nopain = 0
+				child.take_damage(0, rand(20,30))
+	else
+		victim.apply_damage(rand(30,40), BURN, user.zone_sel.selecting)
+
+	if(!nopain)
+		victim << "<span class='danger'>Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!</span>"
+		victim.emote("scream")
+	else
+		victim << "<span class='danger'>Searing hot oil scorches your [E ? E.name : "flesh"]!</span>"
+
+	if(victim.client)
+		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has [cook_type] \the [victim] ([victim.ckey]) in \a [src]</font>")
+		victim.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [cook_type] in \a [src] by [user.name] ([user.ckey])</font>")
+		msg_admin_attack("[user] ([user.ckey]) [cook_type] \the [victim] ([victim.ckey]) in \a [src]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+
+	icon_state = off_icon
+	cooking = 0
+	return

code/game/machinery/kitchen/cooking_machines/grill.dm

@@ -0,0 +1,10 @@
+/obj/machinery/cooker/grill
+	name = "grill"
+	desc = "Backyard grilling, IN SPACE."
+	icon_state = "grill_off"
+	cook_type = "grilled"
+	cook_time = 100
+	food_color = "#A34719"
+	on_icon = "grill_on"
+	off_icon = "grill_off"
+	can_burn_food = 1

code/game/machinery/kitchen/cooking_machines/oven.dm

@@ -0,0 +1,23 @@
+/obj/machinery/cooker/oven
+	name = "oven"
+	desc = "Cookies are ready, dear."
+	icon = 'icons/obj/cooking_machines.dmi'
+	icon_state = "oven_off"
+	on_icon = "oven_on"
+	off_icon = "oven_off"
+	cook_type = "baked"
+	cook_time = 300
+	food_color = "#A34719"
+	can_burn_food = 1
+
+	output_options = list(
+		"Personal Pizza" = /obj/item/weapon/reagent_containers/food/snacks/variable/pizza,
+		"Bread" = /obj/item/weapon/reagent_containers/food/snacks/variable/bread,
+		"Pie" = /obj/item/weapon/reagent_containers/food/snacks/variable/pie,
+		"Small Cake" = /obj/item/weapon/reagent_containers/food/snacks/variable/cake,
+		"Hot Pocket" = /obj/item/weapon/reagent_containers/food/snacks/variable/pocket,
+		"Kebab" = /obj/item/weapon/reagent_containers/food/snacks/variable/kebab,
+		"Waffles" = /obj/item/weapon/reagent_containers/food/snacks/variable/waffles,
+		"Cookie" = /obj/item/weapon/reagent_containers/food/snacks/variable/cookie,
+		"Donut" = /obj/item/weapon/reagent_containers/food/snacks/variable/donut,
+		)

code/game/machinery/kitchen/icecream.dm

@@ -0,0 +1,196 @@
+#define ICECREAM_VANILLA 1
+#define ICECREAM_CHOCOLATE 2
+#define ICECREAM_STRAWBERRY 3
+#define ICECREAM_BLUE 4
+#define CONE_WAFFLE 5
+#define CONE_CHOC 6
+
+// Ported wholesale from Apollo Station.
+
+/obj/machinery/icecream_vat
+	name = "icecream vat"
+	desc = "Ding-aling ding dong. Get your NanoTrasen-approved ice cream!"
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "icecream_vat"
+	density = 1
+	anchored = 0
+	use_power = 0
+	flags = OPENCONTAINER | NOREACT
+
+	var/list/product_types = list()
+	var/dispense_flavour = ICECREAM_VANILLA
+	var/flavour_name = "vanilla"
+
+/obj/machinery/icecream_vat/proc/get_ingredient_list(var/type)
+	switch(type)
+		if(ICECREAM_CHOCOLATE)
+			return list("milk", "ice", "coco")
+		if(ICECREAM_STRAWBERRY)
+			return list("milk", "ice", "berryjuice")
+		if(ICECREAM_BLUE)
+			return list("milk", "ice", "singulo")
+		if(CONE_WAFFLE)
+			return list("flour", "sugar")
+		if(CONE_CHOC)
+			return list("flour", "sugar", "coco")
+		else
+			return list("milk", "ice")
+
+/obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type)
+	switch(flavour_type)
+		if(ICECREAM_CHOCOLATE)
+			return "chocolate"
+		if(ICECREAM_STRAWBERRY)
+			return "strawberry"
+		if(ICECREAM_BLUE)
+			return "blue"
+		if(CONE_WAFFLE)
+			return "waffle"
+		if(CONE_CHOC)
+			return "chocolate"
+		else
+			return "vanilla"
+
+/obj/machinery/icecream_vat/initialize()
+	..()
+	create_reagents(100)
+	while(product_types.len < 6)
+		product_types.Add(5)
+	reagents.add_reagent("milk", 5)
+	reagents.add_reagent("flour", 5)
+	reagents.add_reagent("sugar", 5)
+	reagents.add_reagent("ice", 5)
+
+/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
+	user.set_machine(src)
+	interact(user)
+
+/obj/machinery/icecream_vat/interact(mob/user as mob)
+	var/dat
+	dat += "<b>ICECREAM</b><br><div class='statusDisplay'>"
+	dat += "<b>Dispensing: [flavour_name] icecream </b> <br><br>"
+	dat += "<b>Vanilla icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_VANILLA]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=5'><b>x5</b></a> [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)<br>"
+	dat += "<b>Strawberry icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_STRAWBERRY]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=5'><b>x5</b></a> [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)<br>"
+	dat += "<b>Chocolate icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_CHOCOLATE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=5'><b>x5</b></a> [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)<br>"
+	dat += "<b>Blue icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_BLUE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=5'><b>x5</b></a> [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)<br></div>"
+	dat += "<br><b>CONES</b><br><div class='statusDisplay'>"
+	dat += "<b>Waffle cones:</b> <a href='?src=\ref[src];cone=[CONE_WAFFLE]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=5'><b>x5</b></a> [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)<br>"
+	dat += "<b>Chocolate cones:</b> <a href='?src=\ref[src];cone=[CONE_CHOC]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=5'><b>x5</b></a> [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)<br></div>"
+	dat += "<br>"
+	dat += "<b>VAT CONTENT</b><br>"
+	for(var/datum/reagent/R in reagents.reagent_list)
+		dat += "[R.name]: [R.volume]"
+		dat += "<A href='?src=\ref[src];disposeI=[R.id]'>Purge</A><BR>"
+	dat += "<a href='?src=\ref[src];refresh=1'>Refresh</a> <a href='?src=\ref[src];close=1'>Close</a>"
+
+	var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src)
+	popup.set_content(dat)
+	popup.open()
+
+/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream))
+		var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O
+		if(!I.ice_creamed)
+			if(product_types[dispense_flavour] > 0)
+				src.visible_message("\icon[src] <span class='info'>[user] scoops delicious [flavour_name] icecream into [I].</span>")
+				product_types[dispense_flavour] -= 1
+				I.add_ice_cream(flavour_name)
+			//	if(beaker)
+			//		beaker.reagents.trans_to(I, 10)
+				if(I.reagents.total_volume < 10)
+					I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume)
+			else
+				user << "<span class='warning'>There is not enough icecream left!</span>"
+		else
+			user << "<span class='notice'>[O] already has icecream in it.</span>"
+		return 1
+	else if(O.is_open_container())
+		return
+	else
+		..()
+
+/obj/machinery/icecream_vat/proc/make(var/mob/user, var/make_type, var/amount)
+	for(var/R in get_ingredient_list(make_type))
+		if(reagents.has_reagent(R, amount))
+			continue
+		amount = 0
+		break
+	if(amount)
+		for(var/R in get_ingredient_list(make_type))
+			reagents.remove_reagent(R, amount)
+		product_types[make_type] += amount
+		var/flavour = get_flavour_name(make_type)
+		if(make_type > 4)
+			src.visible_message("<span class='info'>[user] cooks up some [flavour] cones.</span>")
+		else
+			src.visible_message("<span class='info'>[user] whips up some [flavour] icecream.</span>")
+	else
+		user << "<span class='warning'>You don't have the ingredients to make this.</span>"
+
+/obj/machinery/icecream_vat/Topic(href, href_list)
+
+	if(..())
+		return
+
+	if(href_list["select"])
+		dispense_flavour = text2num(href_list["select"])
+		flavour_name = get_flavour_name(dispense_flavour)
+		src.visible_message("<span class='notice'>[usr] sets [src] to dispense [flavour_name] flavoured icecream.</span>")
+
+	if(href_list["cone"])
+		var/dispense_cone = text2num(href_list["cone"])
+		var/cone_name = get_flavour_name(dispense_cone)
+		if(product_types[dispense_cone] >= 1)
+			product_types[dispense_cone] -= 1
+			var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(src.loc)
+			I.cone_type = cone_name
+			I.icon_state = "icecream_cone_[cone_name]"
+			I.desc = "Delicious [cone_name] cone, but no ice cream."
+			src.visible_message("<span class='info'>[usr] dispenses a crunchy [cone_name] cone from [src].</span>")
+		else
+			usr << "<span class='warning'>There are no [cone_name] cones left!</span>"
+
+	if(href_list["make"])
+		var/amount = (text2num(href_list["amount"]))
+		var/C = text2num(href_list["make"])
+		make(usr, C, amount)
+
+	if(href_list["disposeI"])
+		reagents.del_reagent(href_list["disposeI"])
+
+	updateDialog()
+
+	if(href_list["refresh"])
+		updateDialog()
+
+	if(href_list["close"])
+		usr.unset_machine()
+		usr << browse(null,"window=icecreamvat")
+	return
+
+/obj/item/weapon/reagent_containers/food/snacks/icecream
+	name = "ice cream cone"
+	desc = "Delicious waffle cone, but no ice cream."
+	icon_state = "icecream_cone_waffle" //default for admin-spawned cones, href_list["cone"] should overwrite this all the time
+	layer = 3.1
+	bitesize = 3
+
+	var/ice_creamed = 0
+	var/cone_type
+
+/obj/item/weapon/reagent_containers/food/snacks/icecream/New()
+	create_reagents(20)
+	reagents.add_reagent("nutriment", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name)
+	name = "[flavour_name] icecream"
+	src.overlays += "icecream_[flavour_name]"
+	desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream."
+	ice_creamed = 1
+
+#undef ICECREAM_VANILLA
+#undef FLAVOUR_CHOCOLATE
+#undef FLAVOUR_STRAWBERRY
+#undef FLAVOUR_BLUE
+#undef CONE_WAFFLE
+#undef CONE_CHOC

code/game/machinery/pipe/construction.dm

@@ -476,7 +476,7 @@ Buildable meters
 
 		if(PIPE_SUPPLY_STRAIGHT, PIPE_SUPPLY_BENT)
 			var/obj/machinery/atmospherics/pipe/simple/hidden/supply/P = new( src.loc )
-			P.color = color
+			P.pipe_color = color
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
@@ -495,7 +495,7 @@ Buildable meters
 
 		if(PIPE_SCRUBBERS_STRAIGHT, PIPE_SCRUBBERS_BENT)
 			var/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers/P = new( src.loc )
-			P.color = color
+			P.pipe_color = color
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
@@ -514,7 +514,7 @@ Buildable meters
 
 		if(PIPE_UNIVERSAL)
 			var/obj/machinery/atmospherics/pipe/simple/hidden/universal/P = new( src.loc )
-			P.color = color
+			P.pipe_color = color
 			P.set_dir(src.dir)
 			P.initialize_directions = pipe_dir
 			var/turf/T = P.loc
@@ -588,7 +588,7 @@ Buildable meters
 
 		if(PIPE_SUPPLY_MANIFOLD)		//manifold
 			var/obj/machinery/atmospherics/pipe/manifold/hidden/supply/M = new( src.loc )
-			M.color = color
+			M.pipe_color = color
 			M.set_dir(dir)
 			M.initialize_directions = pipe_dir
 			//M.New()
@@ -611,7 +611,7 @@ Buildable meters
 
 		if(PIPE_SCRUBBERS_MANIFOLD)		//manifold
 			var/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers/M = new( src.loc )
-			M.color = color
+			M.pipe_color = color
 			M.set_dir(dir)
 			M.initialize_directions = pipe_dir
 			//M.New()
@@ -660,7 +660,7 @@ Buildable meters
 
 		if(PIPE_SUPPLY_MANIFOLD4W)		//4-way manifold
 			var/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply/M = new( src.loc )
-			M.color = color
+			M.pipe_color = color
 			M.set_dir(dir)
 			M.initialize_directions = pipe_dir
 			M.connect_types = src.connect_types
@@ -687,7 +687,7 @@ Buildable meters
 
 		if(PIPE_SCRUBBERS_MANIFOLD4W)		//4-way manifold
 			var/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers/M = new( src.loc )
-			M.color = color
+			M.pipe_color = color
 			M.set_dir(dir)
 			M.initialize_directions = pipe_dir
 			M.connect_types = src.connect_types

code/game/objects/effects/overlays.dm

@@ -73,27 +73,9 @@
 	icon_state = "snowairlock"
 	layer = 3.2 //Just above airlocks
 
-/obj/effect/overlay/snow/floor/north
-	icon_state = "snowfloor_n"
+/obj/effect/overlay/snow/floor/pointy
+	icon_state = "snowfloorpointy"
 
-/obj/effect/overlay/snow/floor/south
-	icon_state = "snowfloor_s"
-
-/obj/effect/overlay/snow/floor/east
-	icon_state = "snowfloor_e"
-
-/obj/effect/overlay/snow/floor/west
-	icon_state = "snowfloor_w"
-
-/obj/effect/overlay/snow/wall/north
-	icon_state = "snowwall_n"
+/obj/effect/overlay/snow/wall
+	icon_state = "snowwall"
 	layer = 5 //Same as lights so humans can stand under it
-
-/obj/effect/overlay/snow/wall/south
-	icon_state = "snowwall_s"
-
-/obj/effect/overlay/snow/wall/east
-	icon_state = "snowwall_e"
-
-/obj/effect/overlay/snow/wall/west
-	icon_state = "snowwall_w"

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

@@ -80,7 +80,7 @@
 					flash_strength *= H.species.flash_mod
 				if(flash_strength > 0)
 					M.Weaken(flash_strength)
-					flick("e_flash", M.flash)
+					M.flash_eyes()
 			else
 				flashfail = 1
 
@@ -158,7 +158,7 @@
 		var/safety = M:eyecheck()
 		if(!safety)
 			if(!M.blinded)
-				flick("flash", M.flash)
+				M.flash_eyes()
 
 	return
 
@@ -177,7 +177,7 @@
 				var/safety = M.eyecheck()
 				if(safety <= 0)
 					M.Weaken(10)
-					flick("e_flash", M.flash)
+					M.flash_eyes()
 					for(var/mob/O in viewers(M, null))
 						O.show_message("<span class='disarm'>[M] is blinded by the flash!</span>")
 	..()

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

@@ -79,9 +79,9 @@
 					user << "<span class='notice'>\The [M]'s pupils narrow slightly, but are still very dilated.</span>"
 				else
 					user << "<span class='notice'>\The [M]'s pupils narrow.</span>"
-			
+
 			user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) //can be used offensively
-			flick("flash", M.flash)
+			M.flash_eyes()
 	else
 		return ..()
 

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

@@ -24,8 +24,16 @@ REAGENT SCANNER
 	origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 1)
 	var/mode = 1;
 
+/obj/item/device/healthanalyzer/do_surgery(mob/living/M, mob/living/user)
+	if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
+		return ..()
+	scan_mob(M, user) //default surgery behaviour is just to scan as usual
+	return 1
 
-/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
+/obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/user)
+	scan_mob(M, user)
+
+/obj/item/device/healthanalyzer/proc/scan_mob(mob/living/M, mob/living/user)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << text("<span class='warning'>You try to analyze the floor's vitals!</span>")
 		for(var/mob/O in viewers(M, null))
@@ -168,8 +176,7 @@ REAGENT SCANNER
 			else
 				user.show_message("<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span>")
 		user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")
-	src.add_fingerprint(user)
-	return
+
 
 /obj/item/device/healthanalyzer/verb/toggle_mode()
 	set name = "Switch Verbosity"

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

@@ -6,6 +6,7 @@
 	var/list/nanoui_items				// List of items for NanoUI use
 	var/nanoui_menu = 0					// The current menu we are in
 	var/list/nanoui_data = new 			// Additional data for NanoUI use
+	var/faction = ""					//Antag faction holder.
 
 	var/list/purchase_log = new
 	var/datum/mind/uplink_owner = null
@@ -96,6 +97,9 @@
 	var/title = "Remote Uplink"
 	var/data[0]
 	uses = user.mind.tcrystals
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		faction = H.antag_faction
 
 	data["welcome"] = welcome
 	data["crystals"] = uses
@@ -188,7 +192,10 @@
 				nanoui_data["exploit"]["faction"] =  html_encode(L.fields["faction"])
 				nanoui_data["exploit"]["religion"] =  html_encode(L.fields["religion"])
 				nanoui_data["exploit"]["fingerprint"] =  html_encode(L.fields["fingerprint"])
-
+				if(L.fields["antagvis"] == ANTAG_KNOWN || (faction == L.fields["antagfac"] && (L.fields["antagvis"] == ANTAG_SHARED)))
+					nanoui_data["exploit"]["antagfaction"] = html_encode(L.fields["antagfac"])
+				else
+					nanoui_data["exploit"]["antagfaction"] = html_encode("None")
 				nanoui_data["exploit_exists"] = 1
 				break
 

code/game/objects/items/stacks/medical.dm

@@ -73,50 +73,47 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(affecting.open == 0)
-			if(affecting.is_bandaged())
-				user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been bandaged.</span>"
-				return 1
-			else
-				user.visible_message("<span class='notice'>\The [user] starts treating [M]'s [affecting.name].</span>", \
-						             "<span class='notice'>You start treating [M]'s [affecting.name].</span>" )
-				var/used = 0
-				for (var/datum/wound/W in affecting.wounds)
-					if (W.internal)
-						continue
-					if(W.bandaged)
-						continue
-					if(used == amount)
-						break
-					if(!do_mob(user, M, W.damage/5))
-						user << "<span class='notice'>You must stand still to bandage wounds.</span>"
-						break
+		if(affecting.open)
+			user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			return
 
-					if (W.current_stage <= W.max_bleeding_stage)
-						user.visible_message("<span class='notice'>\The [user] bandages \a [W.desc] on [M]'s [affecting.name].</span>", \
-						                              "<span class='notice'>You bandage \a [W.desc] on [M]'s [affecting.name].</span>" )
-						//H.add_side_effect("Itch")
-					else if (W.damage_type == BRUISE)
-						user.visible_message("<span class='notice'>\The [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].</span>", \
-						                              "<span class='notice'>You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].</span>" )
-					else
-						user.visible_message("<span class='notice'>\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>", \
-						                              "<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" )
-					W.bandage()
-					used++
-				affecting.update_damages()
-				if(used == amount)
-					if(affecting.is_bandaged())
-						user << "<span class='warning'>\The [src] is used up.</span>"
-					else
-						user << "<span class='warning'>\The [src] is used up, but there are more wounds to treat on \the [affecting.name].</span>"
-				use(used)
+		if(affecting.is_bandaged())
+			user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been bandaged.</span>"
+			return 1
 		else
-			if (can_operate(H))        //Checks if mob is lying down on table for surgery
-				if (do_surgery(H,user,src))
-					return
-			else
-				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			user.visible_message("<span class='notice'>\The [user] starts treating [M]'s [affecting.name].</span>", \
+					             "<span class='notice'>You start treating [M]'s [affecting.name].</span>" )
+			var/used = 0
+			for (var/datum/wound/W in affecting.wounds)
+				if (W.internal)
+					continue
+				if(W.bandaged)
+					continue
+				if(used == amount)
+					break
+				if(!do_mob(user, M, W.damage/5))
+					user << "<span class='notice'>You must stand still to bandage wounds.</span>"
+					break
+
+				if (W.current_stage <= W.max_bleeding_stage)
+					user.visible_message("<span class='notice'>\The [user] bandages \a [W.desc] on [M]'s [affecting.name].</span>", \
+					                              "<span class='notice'>You bandage \a [W.desc] on [M]'s [affecting.name].</span>" )
+					//H.add_side_effect("Itch")
+				else if (W.damage_type == BRUISE)
+					user.visible_message("<span class='notice'>\The [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].</span>", \
+					                              "<span class='notice'>You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].</span>" )
+				else
+					user.visible_message("<span class='notice'>\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>", \
+					                              "<span class='notice'>You place a bandaid over \a [W.desc] on [M]'s [affecting.name].</span>" )
+				W.bandage()
+				used++
+			affecting.update_damages()
+			if(used == amount)
+				if(affecting.is_bandaged())
+					user << "<span class='warning'>\The [src] is used up.</span>"
+				else
+					user << "<span class='warning'>\The [src] is used up, but there are more wounds to treat on \the [affecting.name].</span>"
+			use(used)
 
 /obj/item/stack/medical/ointment
 	name = "ointment"
@@ -135,26 +132,23 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(affecting.open == 0)
-			if(affecting.is_salved())
-				user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been salved.</span>"
-				return 1
-			else
-				user.visible_message("<span class='notice'>\The [user] starts salving wounds on [M]'s [affecting.name].</span>", \
-						             "<span class='notice'>You start salving the wounds on [M]'s [affecting.name].</span>" )
-				if(!do_mob(user, M, 10))
-					user << "<span class='notice'>You must stand still to salve wounds.</span>"
-					return 1
-				user.visible_message("<span class='notice'>[user] salved wounds on [M]'s [affecting.name].</span>", \
-				                         "<span class='notice'>You salved wounds on [M]'s [affecting.name].</span>" )
-				use(1)
-				affecting.salve()
+		if(affecting.open)
+			user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			return
+
+		if(affecting.is_salved())
+			user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been salved.</span>"
+			return 1
 		else
-			if (can_operate(H))        //Checks if mob is lying down on table for surgery
-				if (do_surgery(H,user,src))
-					return
-			else
-				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			user.visible_message("<span class='notice'>\The [user] starts salving wounds on [M]'s [affecting.name].</span>", \
+					             "<span class='notice'>You start salving the wounds on [M]'s [affecting.name].</span>" )
+			if(!do_mob(user, M, 10))
+				user << "<span class='notice'>You must stand still to salve wounds.</span>"
+				return 1
+			user.visible_message("<span class='notice'>[user] salved wounds on [M]'s [affecting.name].</span>", \
+			                         "<span class='notice'>You salved wounds on [M]'s [affecting.name].</span>" )
+			use(1)
+			affecting.salve()
 
 /obj/item/stack/medical/advanced/bruise_pack
 	name = "advanced trauma kit"
@@ -172,50 +166,47 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(affecting.open == 0)
-			if(affecting.is_bandaged() && affecting.is_disinfected())
-				user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been treated.</span>"
-				return 1
-			else
-				user.visible_message("<span class='notice'>\The [user] starts treating [M]'s [affecting.name].</span>", \
-						             "<span class='notice'>You start treating [M]'s [affecting.name].</span>" )
-				var/used = 0
-				for (var/datum/wound/W in affecting.wounds)
-					if (W.internal)
-						continue
-					if (W.bandaged && W.disinfected)
-						continue
-					if(used == amount)
-						break
-					if(!do_mob(user, M, W.damage/5))
-						user << "<span class='notice'>You must stand still to bandage wounds.</span>"
-						break
-					if (W.current_stage <= W.max_bleeding_stage)
-						user.visible_message("<span class='notice'>\The [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.</span>", \
-						                     "<span class='notice'>You clean and seal \a [W.desc] on [M]'s [affecting.name].</span>" )
-					else if (W.damage_type == BRUISE)
-						user.visible_message("<span class='notice'>\The [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].</span>", \
-						                              "<span class='notice'>You place a medical patch over \a [W.desc] on [M]'s [affecting.name].</span>" )
-					else
-						user.visible_message("<span class='notice'>\The [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].</span>", \
-						                              "<span class='notice'>You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].</span>" )
-					W.bandage()
-					W.disinfect()
-					W.heal_damage(heal_brute)
-					used++
-				affecting.update_damages()
-				if(used == amount)
-					if(affecting.is_bandaged())
-						user << "<span class='warning'>\The [src] is used up.</span>"
-					else
-						user << "<span class='warning'>\The [src] is used up, but there are more wounds to treat on \the [affecting.name].</span>"
-				use(used)
+		if(affecting.open)
+			user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			return
+
+		if(affecting.is_bandaged() && affecting.is_disinfected())
+			user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been treated.</span>"
+			return 1
 		else
-			if (can_operate(H))        //Checks if mob is lying down on table for surgery
-				if (do_surgery(H,user,src))
-					return
-			else
-				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			user.visible_message("<span class='notice'>\The [user] starts treating [M]'s [affecting.name].</span>", \
+					             "<span class='notice'>You start treating [M]'s [affecting.name].</span>" )
+			var/used = 0
+			for (var/datum/wound/W in affecting.wounds)
+				if (W.internal)
+					continue
+				if (W.bandaged && W.disinfected)
+					continue
+				if(used == amount)
+					break
+				if(!do_mob(user, M, W.damage/5))
+					user << "<span class='notice'>You must stand still to bandage wounds.</span>"
+					break
+				if (W.current_stage <= W.max_bleeding_stage)
+					user.visible_message("<span class='notice'>\The [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.</span>", \
+					                     "<span class='notice'>You clean and seal \a [W.desc] on [M]'s [affecting.name].</span>" )
+				else if (W.damage_type == BRUISE)
+					user.visible_message("<span class='notice'>\The [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].</span>", \
+					                              "<span class='notice'>You place a medical patch over \a [W.desc] on [M]'s [affecting.name].</span>" )
+				else
+					user.visible_message("<span class='notice'>\The [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].</span>", \
+					                              "<span class='notice'>You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].</span>" )
+				W.bandage()
+				W.disinfect()
+				W.heal_damage(heal_brute)
+				used++
+			affecting.update_damages()
+			if(used == amount)
+				if(affecting.is_bandaged())
+					user << "<span class='warning'>\The [src] is used up.</span>"
+				else
+					user << "<span class='warning'>\The [src] is used up, but there are more wounds to treat on \the [affecting.name].</span>"
+			use(used)
 
 /obj/item/stack/medical/advanced/ointment
 	name = "advanced burn kit"
@@ -234,27 +225,23 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
-		if(affecting.open == 0)
-			if(affecting.is_salved())
-				user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been salved.</span>"
-				return 1
-			else
-				user.visible_message("<span class='notice'>\The [user] starts salving wounds on [M]'s [affecting.name].</span>", \
-						             "<span class='notice'>You start salving the wounds on [M]'s [affecting.name].</span>" )
-				if(!do_mob(user, M, 10))
-					user << "<span class='notice'>You must stand still to salve wounds.</span>"
-					return 1
-				user.visible_message( 	"<span class='notice'>[user] covers wounds on [M]'s [affecting.name] with regenerative membrane.</span>", \
-										"<span class='notice'>You cover wounds on [M]'s [affecting.name] with regenerative membrane.</span>" )
-				affecting.heal_damage(0,heal_burn)
-				use(1)
-				affecting.salve()
+		if(affecting.open)
+			user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+
+		if(affecting.is_salved())
+			user << "<span class='warning'>The wounds on [M]'s [affecting.name] have already been salved.</span>"
+			return 1
 		else
-			if (can_operate(H))        //Checks if mob is lying down on table for surgery
-				if (do_surgery(H,user,src))
-					return
-			else
-				user << "<span class='notice'>The [affecting.name] is cut open, you'll need more than a bandage!</span>"
+			user.visible_message("<span class='notice'>\The [user] starts salving wounds on [M]'s [affecting.name].</span>", \
+					             "<span class='notice'>You start salving the wounds on [M]'s [affecting.name].</span>" )
+			if(!do_mob(user, M, 10))
+				user << "<span class='notice'>You must stand still to salve wounds.</span>"
+				return 1
+			user.visible_message( 	"<span class='notice'>[user] covers wounds on [M]'s [affecting.name] with regenerative membrane.</span>", \
+									"<span class='notice'>You cover wounds on [M]'s [affecting.name] with regenerative membrane.</span>" )
+			affecting.heal_damage(0,heal_burn)
+			use(1)
+			affecting.salve()
 
 /obj/item/stack/medical/splint
 	name = "medical splints"

code/game/objects/items/stacks/nanopaste.dm

@@ -18,7 +18,7 @@
 			R.adjustFireLoss(-15)
 			R.updatehealth()
 			use(1)
-			user.visible_message("<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>",\
+			user.visible_message("<span class='notice'>\The [user] applied some [src] on [R]'s damaged areas.</span>",\
 				"<span class='notice'>You apply some [src] at [R]'s damaged areas.</span>")
 		else
 			user << "<span class='notice'>All [R]'s systems are nominal.</span>"
@@ -27,12 +27,14 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
 
-		if (S && (S.robotic >= ORGAN_ROBOT))
-			if(S.robo_repair(15, "omni", 0, src, user))
-				use(1)
-				user.visible_message("<span class='notice'>\The [user] applies some nanite paste on [user != M ? "\the [M]'s" : "their"] [S.name].</span>",\
-				"<span class='notice'>You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].</span>")
-		else
-			if (can_operate(H))
-				if (do_surgery(H,user,src))
-					return
+		if(S.open >= 2)
+			if (S && (S.robotic >= ORGAN_ROBOT))
+				if(!S.get_damage())
+					user << "<span class='notice'>Nothing to fix here.</span>"
+				else if(can_use(1))
+					user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+					S.heal_damage(15, 15, robo_repair = 1)
+					H.updatehealth()
+					use(1)
+					user.visible_message("<span class='notice'>\The [user] applies some nanite paste on [user != M ? "[M]'s [S.name]" : "[S]"] with [src].</span>",\
+					"<span class='notice'>You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].</span>")

code/game/objects/items/stacks/stack.dm

@@ -298,14 +298,16 @@
 
 /obj/item/stack/attack_hand(mob/user as mob)
 	if (user.get_inactive_hand() == src)
-		var/obj/item/stack/F = src.split(1)
-		if (F)
-			user.put_in_hands(F)
-			src.add_fingerprint(user)
-			F.add_fingerprint(user)
-			spawn(0)
-				if (src && usr.machine==src)
-					src.interact(usr)
+		var/N = input("How many stacks of [src] would you like to split off?", "Split stacks", 1) as num|null
+		if(N)
+			var/obj/item/stack/F = src.split(N)
+			if (F)
+				user.put_in_hands(F)
+				src.add_fingerprint(user)
+				F.add_fingerprint(user)
+				spawn(0)
+					if (src && usr.machine==src)
+						src.interact(usr)
 	else
 		..()
 	return
@@ -313,10 +315,7 @@
 /obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/stack))
 		var/obj/item/stack/S = W
-		if (user.get_inactive_hand()==src)
-			src.transfer_to(S, 1)
-		else
-			src.transfer_to(S)
+		src.transfer_to(S)
 
 		spawn(0) //give the stacks a chance to delete themselves if necessary
 			if (S && usr.machine==S)

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

@@ -162,19 +162,16 @@
 	if(istype(usr,/mob/living/carbon))
 		usr.put_in_hands(src)
 
-/obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M as mob, mob/living/carbon/user as mob)
+/obj/item/weapon/autopsy_scanner/do_surgery(mob/living/carbon/human/M, mob/living/user)
 	if(!istype(M))
-		return
-
-	if(!can_operate(M))
-		return
+		return 0
 
 	if(target_name != M.name)
 		target_name = M.name
 		src.wdata = list()
 		src.chemtraces = list()
 		src.timeofdeath = null
-		user << "<span class='notice'>A new patient has been registered.. Purging data for previous patient.</span>"
+		user << "<span class='notice'>A new patient has been registered. Purging data for previous patient.</span>"
 
 	src.timeofdeath = M.timeofdeath
 
@@ -183,10 +180,9 @@
 		usr << "<span class='warning'>You can't scan this body part.</span>"
 		return
 	if(!S.open)
-		usr << "<span class='warning'>You have to cut the limb open first!</span>"
+		usr << "<span class='warning'>You have to cut [S] open first!</span>"
 		return
-	for(var/mob/O in viewers(M))
-		O.show_message("<span class='notice'>\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]</span>", 1)
+	M.visible_message("<span class='notice'>\The [user] scans the wounds on [M]'s [S.name] with [src]</span>")
 
 	src.add_data(S)
 

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

@@ -10,12 +10,42 @@
 /obj/item/weapon/dice/New()
 	icon_state = "[name][rand(1,sides)]"
 
+/obj/item/weapon/dice/d4
+	name = "d4"
+	desc = "A dice with four sides."
+	icon_state = "d44"
+	sides = 4
+
+/obj/item/weapon/dice/d8
+	name = "d8"
+	desc = "A dice with eight sides."
+	icon_state = "d88"
+	sides = 8
+
+/obj/item/weapon/dice/d10
+	name = "d10"
+	desc = "A dice with ten sides."
+	icon_state = "d1010"
+	sides = 10
+
+/obj/item/weapon/dice/d12
+	name = "d12"
+	desc = "A dice with twelve sides."
+	icon_state = "d1212"
+	sides = 12
+
 /obj/item/weapon/dice/d20
 	name = "d20"
 	desc = "A dice with twenty sides."
 	icon_state = "d2020"
 	sides = 20
 
+/obj/item/weapon/dice/d100
+	name = "d100"
+	desc = "A dice with ten sides. This one is for the tens digit."
+	icon_state = "d10010"
+	sides = 10
+
 /obj/item/weapon/dice/attack_self(mob/user as mob)
 	var/result = rand(1, sides)
 	var/comment = ""

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

@@ -40,7 +40,7 @@
 
 //Flashing everyone
 		if(eye_safety < 1)
-			flick("e_flash", M.flash)
+			M.flash_eyes()
 			M.Stun(2)
 			M.Weaken(10)
 

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

@@ -18,7 +18,7 @@
 		playsound(T, 'sound/effects/phasein.ogg', 100, 1)
 		for(var/mob/living/carbon/human/M in viewers(T, null))
 			if(M:eyecheck() <= 0)
-				flick("e_flash", M.flash)
+				M.flash_eyes()
 
 		// Spawn some hostile syndicate critters
 		for(var/i=1, i<=deliveryamt, i++)

code/game/objects/items/weapons/implants/implant.dm

@@ -15,43 +15,44 @@
 	var/malfunction = 0
 	show_messages = 1
 
-	proc/trigger(emote, source as mob)
-		return
+/obj/item/weapon/implant/proc/trigger(emote, source as mob)
+	return
 
-	proc/activate()
-		return
+/obj/item/weapon/implant/proc/activate()
+	return
 
 	// What does the implant do upon injection?
 	// return 0 if the implant fails (ex. Revhead and loyalty implant.)
 	// return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.)
-	proc/implanted(var/mob/source)
-		return 1
+/obj/item/weapon/implant/proc/implanted(var/mob/source)
+	listening_objects |= src
+	return 1
 
-	proc/get_data()
-		return "No information available"
+/obj/item/weapon/implant/proc/get_data()
+	return "No information available"
 
-	proc/hear(message, source as mob)
-		return
+/obj/item/weapon/implant/proc/hear(message, source as mob)
+	return
 
-	proc/islegal()
-		return 0
+/obj/item/weapon/implant/proc/islegal()
+	return 0
 
-	proc/meltdown()	//breaks it down, making implant unrecongizible
-		imp_in << "<span class='warning'>You feel something melting inside [part ? "your [part.name]" : "you"]!</span>"
-		if (part)
-			part.take_damage(burn = 15, used_weapon = "Electronics meltdown")
-		else
-			var/mob/living/M = imp_in
-			M.apply_damage(15,BURN)
-		name = "melted implant"
-		desc = "Charred circuit in melted plastic case. Wonder what that used to be..."
-		icon_state = "implant_melted"
-		malfunction = MALFUNCTION_PERMANENT
+/obj/item/weapon/implant/proc/meltdown()	//breaks it down, making implant unrecongizible
+	imp_in << "<span class='warning'>You feel something melting inside [part ? "your [part.name]" : "you"]!</span>"
+	if (part)
+		part.take_damage(burn = 15, used_weapon = "Electronics meltdown")
+	else
+		var/mob/living/M = imp_in
+		M.apply_damage(15,BURN)
+	name = "melted implant"
+	desc = "Charred circuit in melted plastic case. Wonder what that used to be..."
+	icon_state = "implant_melted"
+	malfunction = MALFUNCTION_PERMANENT
 
-	Destroy()
-		if(part)
-			part.implants.Remove(src)
-		..()
+/obj/item/weapon/implant/Destroy()
+	if(part)
+		part.implants.Remove(src)
+	..()
 
 /obj/item/weapon/implant/tracking
 	name = "tracking implant"
@@ -59,8 +60,8 @@
 	var/id = 1.0
 
 
-	get_data()
-		var/dat = {"<b>Implant Specifications:</b><BR>
+/obj/item/weapon/implant/tracking/get_data()
+	var/dat = {"<b>Implant Specifications:</b><BR>
 <b>Name:</b> Tracking Beacon<BR>
 <b>Life:</b> 10 minutes after death of host<BR>
 <b>Important Notes:</b> None<BR>
@@ -74,23 +75,23 @@ disintegrate into bio-safe elements.<BR>
 <b>Integrity:</b> Gradient creates slight risk of being overcharged and frying the
 circuitry. As a result neurotoxins can cause massive damage.<HR>
 Implant Specifics:<BR>"}
-		return dat
+	return dat
 
-	emp_act(severity)
-		if (malfunction)	//no, dawg, you can't malfunction while you are malfunctioning
-			return
-		malfunction = MALFUNCTION_TEMPORARY
+/obj/item/weapon/implant/tracking/emp_act(severity)
+	if (malfunction)	//no, dawg, you can't malfunction while you are malfunctioning
+		return
+	malfunction = MALFUNCTION_TEMPORARY
 
-		var/delay = 20
-		switch(severity)
-			if(1)
-				if(prob(60))
-					meltdown()
-			if(2)
-				delay = rand(5*60*10,15*60*10)	//from 5 to 15 minutes of free time
+	var/delay = 20
+	switch(severity)
+		if(1)
+			if(prob(60))
+				meltdown()
+		if(2)
+			delay = rand(5*60*10,15*60*10)	//from 5 to 15 minutes of free time
 
-		spawn(delay)
-			malfunction--
+	spawn(delay)
+		malfunction--
 
 
 /obj/item/weapon/implant/dexplosive
@@ -98,8 +99,8 @@ Implant Specifics:<BR>"}
 	desc = "And boom goes the weasel."
 	icon_state = "implant_evil"
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/dexplosive/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> Robust Corp RX-78 Employee Management Implant<BR>
 <b>Life:</b> Activates upon death.<BR>
@@ -109,23 +110,23 @@ Implant Specifics:<BR>"}
 <b>Function:</b> Contains a compact, electrically detonated explosive that detonates upon receiving a specially encoded signal or upon host death.<BR>
 <b>Special Features:</b> Explodes<BR>
 <b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
-		return dat
+	return dat
 
 
-	trigger(emote, source as mob)
-		if(emote == "deathgasp")
-			src.activate("death")
-		return
+/obj/item/weapon/implant/dexplosive/trigger(emote, source as mob)
+	if(emote == "deathgasp")
+		src.activate("death")
+	return
 
 
-	activate(var/cause)
-		if((!cause) || (!src.imp_in))	return 0
-		explosion(src, -1, 0, 2, 3, 0)//This might be a bit much, dono will have to see.
-		if(src.imp_in)
-			src.imp_in.gib()
+/obj/item/weapon/implant/dexplosive/activate(var/cause)
+	if((!cause) || (!src.imp_in))	return 0
+	explosion(src, -1, 0, 2, 3, 0)//This might be a bit much, dono will have to see.
+	if(src.imp_in)
+		src.imp_in.gib()
 
-	islegal()
-		return 0
+/obj/item/weapon/implant/dexplosive/islegal()
+	return 0
 
 //BS12 Explosive
 /obj/item/weapon/implant/explosive
@@ -135,8 +136,8 @@ Implant Specifics:<BR>"}
 	var/phrase = "supercalifragilisticexpialidocious"
 	icon_state = "implant_evil"
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/explosive/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> Robust Corp RX-78 Intimidation Class Implant<BR>
 <b>Life:</b> Activates upon codephrase.<BR>
@@ -146,120 +147,121 @@ Implant Specifics:<BR>"}
 <b>Function:</b> Contains a compact, electrically detonated explosive that detonates upon receiving a specially encoded signal or upon host death.<BR>
 <b>Special Features:</b> Explodes<BR>
 <b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
-		return dat
+	return dat
 
-	hear_talk(mob/M as mob, msg)
-		hear(msg)
+/obj/item/weapon/implant/explosive/hear_talk(mob/M as mob, msg)
+	hear(msg)
+	return
+
+/obj/item/weapon/implant/explosive/hear(var/msg)
+	var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
+	msg = replace_characters(msg, replacechars)
+	if(findtext(msg,phrase))
+		activate()
+		qdel(src)
+
+/obj/item/weapon/implant/explosive/activate()
+	if (malfunction == MALFUNCTION_PERMANENT)
 		return
 
-	hear(var/msg)
-		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
-		msg = replace_characters(msg, replacechars)
-		if(findtext(msg,phrase))
-			activate()
-			qdel(src)
+	var/need_gib = null
+	if(istype(imp_in, /mob/))
+		var/mob/T = imp_in
+		message_admins("Explosive implant triggered in [T] ([T.key]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>) ")
+		log_game("Explosive implant triggered in [T] ([T.key]).")
+		need_gib = 1
 
-	activate()
-		if (malfunction == MALFUNCTION_PERMANENT)
-			return
-
-		var/need_gib = null
-		if(istype(imp_in, /mob/))
-			var/mob/T = imp_in
-			message_admins("Explosive implant triggered in [T] ([T.key]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>) ")
-			log_game("Explosive implant triggered in [T] ([T.key]).")
-			need_gib = 1
-
-			if(ishuman(imp_in))
-				if (elevel == "Localized Limb")
-					if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste.
-						imp_in.visible_message("<span class='warning'>Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!</span>")
-						playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
-						sleep(25)
-						if (istype(part,/obj/item/organ/external/chest) ||	\
-							istype(part,/obj/item/organ/external/groin) ||	\
-							istype(part,/obj/item/organ/external/head))
-							part.createwound(BRUISE, 60)	//mangle them instead
-							explosion(get_turf(imp_in), -1, -1, 2, 3)
-							qdel(src)
-						else
-							explosion(get_turf(imp_in), -1, -1, 2, 3)
-							part.droplimb(0,DROPLIMB_BLUNT)
-							qdel(src)
-				if (elevel == "Destroy Body")
-					explosion(get_turf(T), -1, 0, 1, 6)
-					T.gib()
-				if (elevel == "Full Explosion")
-					explosion(get_turf(T), 0, 1, 3, 6)
-					T.gib()
-
-			else
-				explosion(get_turf(imp_in), 0, 1, 3, 6)
-
-		if(need_gib)
-			imp_in.gib()
-
-		var/turf/t = get_turf(imp_in)
-
-		if(t)
-			t.hotspot_expose(3500,125)
-
-	implanted(mob/source as mob)
-		elevel = alert("What sort of explosion would you prefer?", "Implant Intent", "Localized Limb", "Destroy Body", "Full Explosion")
-		phrase = input("Choose activation phrase:") as text
-		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
-		phrase = replace_characters(phrase, replacechars)
-		usr.mind.store_memory("Explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate.", 0, 0)
-		usr << "The implanted explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate."
-		return 1
-
-	emp_act(severity)
-		if (malfunction)
-			return
-		malfunction = MALFUNCTION_TEMPORARY
-		switch (severity)
-			if (2.0)	//Weak EMP will make implant tear limbs off.
-				if (prob(50))
-					small_boom()
-			if (1.0)	//strong EMP will melt implant either making it go off, or disarming it
-				if (prob(70))
-					if (prob(50))
-						small_boom()
-					else
-						if (prob(50))
-							activate()		//50% chance of bye bye
-						else
-							meltdown()		//50% chance of implant disarming
-		spawn (20)
-			malfunction--
-
-	islegal()
-		return 0
-
-	proc/small_boom()
-		if (ishuman(imp_in) && part)
-			imp_in.visible_message("<span class='warning'>Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!</span>")
-			playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
-			spawn(25)
-				if (ishuman(imp_in) && part)
-					//No tearing off these parts since it's pretty much killing
-					//and you can't replace groins
+		if(ishuman(imp_in))
+			if (elevel == "Localized Limb")
+				if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste.
+					imp_in.visible_message("<span class='warning'>Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!</span>")
+					playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
+					sleep(25)
 					if (istype(part,/obj/item/organ/external/chest) ||	\
 						istype(part,/obj/item/organ/external/groin) ||	\
 						istype(part,/obj/item/organ/external/head))
 						part.createwound(BRUISE, 60)	//mangle them instead
+						explosion(get_turf(imp_in), -1, -1, 2, 3)
+						qdel(src)
 					else
+						explosion(get_turf(imp_in), -1, -1, 2, 3)
 						part.droplimb(0,DROPLIMB_BLUNT)
-				explosion(get_turf(imp_in), -1, -1, 2, 3)
-				qdel(src)
+						qdel(src)
+			if (elevel == "Destroy Body")
+				explosion(get_turf(T), -1, 0, 1, 6)
+				T.gib()
+			if (elevel == "Full Explosion")
+				explosion(get_turf(T), 0, 1, 3, 6)
+				T.gib()
+
+		else
+			explosion(get_turf(imp_in), 0, 1, 3, 6)
+
+	if(need_gib)
+		imp_in.gib()
+
+	var/turf/t = get_turf(imp_in)
+
+	if(t)
+		t.hotspot_expose(3500,125)
+
+/obj/item/weapon/implant/explosive/implanted(mob/source as mob)
+	elevel = alert("What sort of explosion would you prefer?", "Implant Intent", "Localized Limb", "Destroy Body", "Full Explosion")
+	phrase = input("Choose activation phrase:") as text
+	var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
+	phrase = replace_characters(phrase, replacechars)
+	usr.mind.store_memory("Explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate.", 0, 0)
+	usr << "The implanted explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate."
+	listening_objects |= src
+	return 1
+
+/obj/item/weapon/implant/explosive/emp_act(severity)
+	if (malfunction)
+		return
+	malfunction = MALFUNCTION_TEMPORARY
+	switch (severity)
+		if (2.0)	//Weak EMP will make implant tear limbs off.
+			if (prob(50))
+				small_boom()
+		if (1.0)	//strong EMP will melt implant either making it go off, or disarming it
+			if (prob(70))
+				if (prob(50))
+					small_boom()
+				else
+					if (prob(50))
+						activate()		//50% chance of bye bye
+					else
+						meltdown()		//50% chance of implant disarming
+	spawn (20)
+		malfunction--
+
+/obj/item/weapon/implant/explosive/islegal()
+	return 0
+
+/obj/item/weapon/implant/explosive/proc/small_boom()
+	if (ishuman(imp_in) && part)
+		imp_in.visible_message("<span class='warning'>Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!</span>")
+		playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
+		spawn(25)
+			if (ishuman(imp_in) && part)
+				//No tearing off these parts since it's pretty much killing
+				//and you can't replace groins
+				if (istype(part,/obj/item/organ/external/chest) ||	\
+					istype(part,/obj/item/organ/external/groin) ||	\
+					istype(part,/obj/item/organ/external/head))
+					part.createwound(BRUISE, 60)	//mangle them instead
+				else
+					part.droplimb(0,DROPLIMB_BLUNT)
+			explosion(get_turf(imp_in), -1, -1, 2, 3)
+			qdel(src)
 
 /obj/item/weapon/implant/chem
 	name = "chemical implant"
 	desc = "Injects things."
 	allow_reagents = 1
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/chem/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> Robust Corp MJ-420 Prisoner Management Implant<BR>
 <b>Life:</b> Deactivates upon death but remains within the body.<BR>
@@ -274,55 +276,55 @@ the implant releases the chemicals directly into the blood stream.<BR>
 Can only be loaded while still in its original case.<BR>
 <b>Integrity:</b> Implant will last so long as the subject is alive. However, if the subject suffers from malnutrition,<BR>
 the implant may become unstable and either pre-maturely inject the subject or simply break."}
-		return dat
+	return dat
 
 
-	New()
-		..()
-		var/datum/reagents/R = new/datum/reagents(50)
-		reagents = R
-		R.my_atom = src
+/obj/item/weapon/implant/chem/New()
+	..()
+	var/datum/reagents/R = new/datum/reagents(50)
+	reagents = R
+	R.my_atom = src
 
 
-	trigger(emote, source as mob)
-		if(emote == "deathgasp")
-			src.activate(src.reagents.total_volume)
+/obj/item/weapon/implant/chem/trigger(emote, source as mob)
+	if(emote == "deathgasp")
+		src.activate(src.reagents.total_volume)
+	return
+
+
+/obj/item/weapon/implant/chem/activate(var/cause)
+	if((!cause) || (!src.imp_in))	return 0
+	var/mob/living/carbon/R = src.imp_in
+	src.reagents.trans_to_mob(R, cause, CHEM_BLOOD)
+	R << "You hear a faint *beep*."
+	if(!src.reagents.total_volume)
+		R << "You hear a faint click from your chest."
+		spawn(0)
+			qdel(src)
+	return
+
+/obj/item/weapon/implant/chem/emp_act(severity)
+	if (malfunction)
 		return
+	malfunction = MALFUNCTION_TEMPORARY
 
+	switch(severity)
+		if(1)
+			if(prob(60))
+				activate(20)
+		if(2)
+			if(prob(30))
+				activate(5)
 
-	activate(var/cause)
-		if((!cause) || (!src.imp_in))	return 0
-		var/mob/living/carbon/R = src.imp_in
-		src.reagents.trans_to_mob(R, cause, CHEM_BLOOD)
-		R << "You hear a faint *beep*."
-		if(!src.reagents.total_volume)
-			R << "You hear a faint click from your chest."
-			spawn(0)
-				qdel(src)
-		return
-
-	emp_act(severity)
-		if (malfunction)
-			return
-		malfunction = MALFUNCTION_TEMPORARY
-
-		switch(severity)
-			if(1)
-				if(prob(60))
-					activate(20)
-			if(2)
-				if(prob(30))
-					activate(5)
-
-		spawn(20)
-			malfunction--
+	spawn(20)
+		malfunction--
 
 /obj/item/weapon/implant/loyalty
 	name = "loyalty implant"
 	desc = "Makes you loyal or such."
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/loyalty/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> [company_name] Employee Management Implant<BR>
 <b>Life:</b> Ten years.<BR>
@@ -332,20 +334,20 @@ the implant may become unstable and either pre-maturely inject the subject or si
 <b>Function:</b> Contains a small pod of nanobots that manipulate the host's mental functions.<BR>
 <b>Special Features:</b> Will prevent and cure most forms of brainwashing.<BR>
 <b>Integrity:</b> Implant will last so long as the nanobots are inside the bloodstream."}
-		return dat
+	return dat
 
 
-	implanted(mob/M)
-		if(!istype(M, /mob/living/carbon/human))	return 0
-		var/mob/living/carbon/human/H = M
-		var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
-		if(antag_data && (antag_data.flags & ANTAG_IMPLANT_IMMUNE))
-			H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of [company_name] try to invade your mind!")
-			return 0
-		else
-			clear_antag_roles(H.mind, 1)
-			H << "<span class='notice'>You feel a surge of loyalty towards [company_name].</span>"
-		return 1
+/obj/item/weapon/implant/loyalty/implanted(mob/M)
+	if(!istype(M, /mob/living/carbon/human))	return 0
+	var/mob/living/carbon/human/H = M
+	var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
+	if(antag_data && (antag_data.flags & ANTAG_IMPLANT_IMMUNE))
+		H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of [company_name] try to invade your mind!")
+		return 0
+	else
+		clear_antag_roles(H.mind, 1)
+		H << "<span class='notice'>You feel a surge of loyalty towards [company_name].</span>"
+	return 1
 
 
 /obj/item/weapon/implant/adrenalin
@@ -353,8 +355,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	desc = "Removes all stuns and knockdowns."
 	var/uses
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/adrenalin/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> Cybersun Industries Adrenalin Implant<BR>
 <b>Life:</b> Five days.<BR>
@@ -364,25 +366,26 @@ the implant may become unstable and either pre-maturely inject the subject or si
 <b>Function:</b> Contains nanobots to stimulate body to mass-produce Adrenalin.<BR>
 <b>Special Features:</b> Will prevent and cure most forms of brainwashing.<BR>
 <b>Integrity:</b> Implant can only be used three times before the nanobots are depleted."}
-		return dat
+	return dat
 
 
-	trigger(emote, mob/source as mob)
-		if (src.uses < 1)	return 0
-		if (emote == "pale")
-			src.uses--
-			source << "<span class='notice'>You feel a sudden surge of energy!</span>"
-			source.SetStunned(0)
-			source.SetWeakened(0)
-			source.SetParalysis(0)
+/obj/item/weapon/implant/adrenalin/trigger(emote, mob/source as mob)
+	if (src.uses < 1)	return 0
+	if (emote == "pale")
+		src.uses--
+		source << "<span class='notice'>You feel a sudden surge of energy!</span>"
+		source.SetStunned(0)
+		source.SetWeakened(0)
+		source.SetParalysis(0)
 
-		return
+	return
 
 
-	implanted(mob/source)
-		source.mind.store_memory("A implant can be activated by using the pale emote, <B>say *pale</B> to attempt to activate.", 0, 0)
-		source << "The implanted freedom implant can be activated by using the pale emote, <B>say *pale</B> to attempt to activate."
-		return 1
+/obj/item/weapon/implant/adrenalin/implanted(mob/source)
+	source.mind.store_memory("A implant can be activated by using the pale emote, <B>say *pale</B> to attempt to activate.", 0, 0)
+	source << "The implanted freedom implant can be activated by using the pale emote, <B>say *pale</B> to attempt to activate."
+	listening_objects |= src
+	return 1
 
 
 /obj/item/weapon/implant/death_alarm
@@ -390,8 +393,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	desc = "An alarm which monitors host vital signs and transmits a radio message upon death."
 	var/mobname = "Will Robinson"
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/death_alarm/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> [company_name] \"Profit Margin\" Class Employee Lifesign Sensor<BR>
 <b>Life:</b> Activates upon death.<BR>
@@ -401,65 +404,65 @@ the implant may become unstable and either pre-maturely inject the subject or si
 <b>Function:</b> Contains a compact radio signaler that triggers when the host's lifesigns cease.<BR>
 <b>Special Features:</b> Alerts crew to crewmember death.<BR>
 <b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
-		return dat
+	return dat
 
-	process()
-		if (!implanted) return
-		var/mob/M = imp_in
+/obj/item/weapon/implant/death_alarm/process()
+	if (!implanted) return
+	var/mob/M = imp_in
 
-		if(isnull(M)) // If the mob got gibbed
-			activate()
-		else if(M.stat == 2)
-			activate("death")
+	if(isnull(M)) // If the mob got gibbed
+		activate()
+	else if(M.stat == 2)
+		activate("death")
 
-	activate(var/cause)
-		var/mob/M = imp_in
-		var/area/t = get_area(M)
-		switch (cause)
-			if("death")
-				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", "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", "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/heads/captain(null)
-				var/name = prob(50) ? t.name : pick(teleportlocs)
-				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)
+/obj/item/weapon/implant/death_alarm/activate(var/cause)
+	var/mob/M = imp_in
+	var/area/t = get_area(M)
+	switch (cause)
+		if("death")
+			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", "Security")
+				a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm", "Medical")
 			else
-				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)
-
-	emp_act(severity)			//for some reason alarms stop going off in case they are emp'd, even without this
-		if (malfunction)		//so I'm just going to add a meltdown chance here
-			return
-		malfunction = MALFUNCTION_TEMPORARY
-
-		activate("emp")	//let's shout that this dude is dead
-		if(severity == 1)
-			if(prob(40))	//small chance of obvious meltdown
-				meltdown()
-			else if (prob(60))	//but more likely it will just quietly die
-				malfunction = MALFUNCTION_PERMANENT
+				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/heads/captain(null)
+			var/name = prob(50) ? t.name : pick(teleportlocs)
+			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/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)
 
-		spawn(20)
-			malfunction--
+/obj/item/weapon/implant/death_alarm/emp_act(severity)			//for some reason alarms stop going off in case they are emp'd, even without this
+	if (malfunction)		//so I'm just going to add a meltdown chance here
+		return
+	malfunction = MALFUNCTION_TEMPORARY
 
-	implanted(mob/source as mob)
-		mobname = source.real_name
-		processing_objects.Add(src)
-		return 1
+	activate("emp")	//let's shout that this dude is dead
+	if(severity == 1)
+		if(prob(40))	//small chance of obvious meltdown
+			meltdown()
+		else if (prob(60))	//but more likely it will just quietly die
+			malfunction = MALFUNCTION_PERMANENT
+		processing_objects.Remove(src)
+
+	spawn(20)
+		malfunction--
+
+/obj/item/weapon/implant/death_alarm/implanted(mob/source as mob)
+	mobname = source.real_name
+	processing_objects.Add(src)
+	return 1
 
 /obj/item/weapon/implant/compressed
 	name = "compressed matter implant"
@@ -468,8 +471,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	var/activation_emote = "sigh"
 	var/obj/item/scanned = null
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/compressed/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> [company_name] \"Profit Margin\" Class Employee Lifesign Sensor<BR>
 <b>Life:</b> Activates upon death.<BR>
@@ -479,30 +482,31 @@ the implant may become unstable and either pre-maturely inject the subject or si
 <b>Function:</b> Contains a compact radio signaler that triggers when the host's lifesigns cease.<BR>
 <b>Special Features:</b> Alerts crew to crewmember death.<BR>
 <b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
-		return dat
+	return dat
 
-	trigger(emote, mob/source as mob)
-		if (src.scanned == null)
-			return 0
-
-		if (emote == src.activation_emote)
-			source << "The air glows as \the [src.scanned.name] uncompresses."
-			activate()
-
-	activate()
-		var/turf/t = get_turf(src)
-		if (imp_in)
-			imp_in.put_in_hands(scanned)
-		else
-			scanned.loc = t
-		qdel(src)
-
-	implanted(mob/source as mob)
-		src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
-		if (source.mind)
-			source.mind.store_memory("Compressed matter implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
-		source << "The implanted compressed matter implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
-		return 1
-
-	islegal()
+/obj/item/weapon/implant/compressed/trigger(emote, mob/source as mob)
+	if (src.scanned == null)
 		return 0
+
+	if (emote == src.activation_emote)
+		source << "The air glows as \the [src.scanned.name] uncompresses."
+		activate()
+
+/obj/item/weapon/implant/compressed/activate()
+	var/turf/t = get_turf(src)
+	if (imp_in)
+		imp_in.put_in_hands(scanned)
+	else
+		scanned.loc = t
+	qdel(src)
+
+/obj/item/weapon/implant/compressed/implanted(mob/source as mob)
+	src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
+	if (source.mind)
+		source.mind.store_memory("Compressed matter implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
+	source << "The implanted compressed matter implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+	listening_objects |= src
+	return 1
+
+/obj/item/weapon/implant/compressed/islegal()
+	return 0

code/game/objects/items/weapons/implants/implantfreedom.dm

@@ -8,53 +8,54 @@
 	var/uses = 1.0
 
 
-	New()
-		src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
-		src.uses = rand(1, 5)
-		..()
-		return
+/obj/item/weapon/implant/freedom/New()
+	src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
+	src.uses = rand(1, 5)
+	..()
+	return
 
 
-	trigger(emote, mob/living/carbon/source as mob)
-		if (src.uses < 1)	return 0
-		if (emote == src.activation_emote)
-			src.uses--
-			source << "You feel a faint click."
-			if (source.handcuffed)
-				var/obj/item/weapon/W = source.handcuffed
-				source.handcuffed = null
-				if(source.buckled && source.buckled.buckle_require_restraints)
-					source.buckled.unbuckle_mob()
-				source.update_inv_handcuffed()
-				if (source.client)
-					source.client.screen -= W
+/obj/item/weapon/implant/freedom/trigger(emote, mob/living/carbon/source as mob)
+	if (src.uses < 1)	return 0
+	if (emote == src.activation_emote)
+		src.uses--
+		source << "You feel a faint click."
+		if (source.handcuffed)
+			var/obj/item/weapon/W = source.handcuffed
+			source.handcuffed = null
+			if(source.buckled && source.buckled.buckle_require_restraints)
+				source.buckled.unbuckle_mob()
+			source.update_inv_handcuffed()
+			if (source.client)
+				source.client.screen -= W
+			if (W)
+				W.loc = source.loc
+				dropped(source)
 				if (W)
-					W.loc = source.loc
-					dropped(source)
-					if (W)
-						W.layer = initial(W.layer)
-			if (source.legcuffed)
-				var/obj/item/weapon/W = source.legcuffed
-				source.legcuffed = null
-				source.update_inv_legcuffed()
-				if (source.client)
-					source.client.screen -= W
+					W.layer = initial(W.layer)
+		if (source.legcuffed)
+			var/obj/item/weapon/W = source.legcuffed
+			source.legcuffed = null
+			source.update_inv_legcuffed()
+			if (source.client)
+				source.client.screen -= W
+			if (W)
+				W.loc = source.loc
+				dropped(source)
 				if (W)
-					W.loc = source.loc
-					dropped(source)
-					if (W)
-						W.layer = initial(W.layer)
-		return
+					W.layer = initial(W.layer)
+	return
 
 
-	implanted(mob/living/carbon/source)
-		source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
-		source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
-		return 1
+/obj/item/weapon/implant/freedom/implanted(mob/living/carbon/source)
+	source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
+	source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+	listening_objects |= src
+	return 1
 
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/freedom/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> Freedom Beacon<BR>
 <b>Life:</b> optimum 5 uses<BR>
@@ -68,4 +69,4 @@ mechanisms<BR>
 <b>Integrity:</b> The battery is extremely weak and commonly after injection its
 life can drive down to only 1 use.<HR>
 No Implant Specifics"}
-		return dat
+	return dat

code/game/objects/items/weapons/implants/implantuplink.dm

@@ -15,6 +15,7 @@
 	activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
 	source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
 	source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+	listening_objects |= src
 	return 1
 
 

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

@@ -1,11 +1,29 @@
-/obj/item/weapon/storage/pill_bottle/dice
-	name = "pack of dice"
-	desc = "It's a small container with dice inside."
+/obj/item/weapon/storage/pill_bottle/dice	//7d6
+	name = "bag of dice"
+	desc = "It's a small bag with dice inside."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "dicebag"
 
-	New()
-		..()
+/obj/item/weapon/storage/pill_bottle/dice/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/dice( src )
-		new /obj/item/weapon/dice/d20( src )
+
+/obj/item/weapon/storage/pill_bottle/dice_nerd	//DnD dice
+	name = "bag of gaming dice"
+	desc = "It's a small bag with gaming dice inside."
+	icon = 'icons/obj/dice.dmi'
+	icon_state = "magicdicebag"
+
+/obj/item/weapon/storage/pill_bottle/dice_nerd/New()
+	..()
+	new /obj/item/weapon/dice/d4( src )
+	new /obj/item/weapon/dice( src )
+	new /obj/item/weapon/dice/d8( src )
+	new /obj/item/weapon/dice/d10( src )
+	new /obj/item/weapon/dice/d12( src )
+	new /obj/item/weapon/dice/d20( src )
+	new /obj/item/weapon/dice/d100( src )
 
 /*
  * Donut Box

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

@@ -122,7 +122,7 @@
 		var/mob/living/carbon/human/H = target
 		affecting = H.get_organ(hit_zone)
 
-	if(user.a_intent == I_HURT)
+	if(user.a_intent == I_HURT || user.a_intent == I_DISARM)
 		. = ..()
 		//whacking someone causes a much poorer electrical contact than deliberately prodding them.
 		agony *= 0.5

code/game/turfs/flooring/flooring.dm

@@ -57,6 +57,12 @@ var/list/flooring_types
 	build_type = null
 
 /decl/flooring/snow
+	name = "snow"
+	desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
+	icon = 'icons/turf/snow_new.dmi'
+	icon_base = "snow"
+
+/decl/flooring/snow/snow2
 	name = "snow"
 	desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
 	icon = 'icons/turf/snow.dmi'

code/game/turfs/flooring/flooring_premade.dm

@@ -45,27 +45,6 @@
 	icon_state = "reinforced"
 	initial_flooring = /decl/flooring/reinforced
 
-/turf/simulated/floor/snow
-	name = "snow"
-	icon = 'icons/turf/snow.dmi'
-	icon_state = "snow"
-	initial_flooring = /decl/flooring/snow
-
-/turf/simulated/floor/snow/gravsnow
-	name = "snow"
-	icon_state = "gravsnow"
-	initial_flooring = /decl/flooring/snow/gravsnow
-
-/turf/simulated/floor/snow/plating
-	name = "snowy playing"
-	icon_state = "snowyplating"
-	initial_flooring = /decl/flooring/snow/plating
-
-/turf/simulated/floor/snow/plating/drift
-	name = "snowy plating"
-	icon_state = "snowyplayingdrift"
-	initial_flooring = /decl/flooring/snow/plating/drift
-
 /turf/simulated/floor/reinforced/airless
 	oxygen = 0
 	nitrogen = 0
@@ -225,4 +204,57 @@
 /turf/simulated/floor/beach/water/ocean
 */
 /turf/simulated/floor/airless/ceiling
-/turf/simulated/floor/plating
+/turf/simulated/floor/plating
+
+
+//**** Here lives snow ****
+/turf/simulated/floor/snow
+	name = "snow"
+	icon = 'icons/turf/snow_new.dmi'
+	icon_state = "snow"
+	var/list/crossed_dirs = list()
+
+/turf/simulated/floor/snow/snow2
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
+	initial_flooring = /decl/flooring/snow
+
+/turf/simulated/floor/snow/gravsnow
+	name = "snow"
+	icon_state = "gravsnow"
+	initial_flooring = /decl/flooring/snow/gravsnow
+
+/turf/simulated/floor/snow/plating
+	name = "snowy playing"
+	icon_state = "snowyplating"
+	initial_flooring = /decl/flooring/snow/plating
+
+/turf/simulated/floor/snow/plating/drift
+	name = "snowy plating"
+	icon_state = "snowyplayingdrift"
+	initial_flooring = /decl/flooring/snow/plating/drift
+
+#define FOOTSTEP_SPRITE_AMT 2
+
+/turf/snow/Entered(atom/A)
+    if(ismob(A))
+        var/mdir = "[A.dir]"
+        if(crossed_dirs[mdir])
+            crossed_dirs[mdir] = min(crossed_dirs[mdir] + 1, FOOTSTEP_SPRITE_AMT)
+        else
+            crossed_dirs[mdir] = 1
+
+        update_icon()
+
+    . = ..()
+
+/turf/snow/update_icon()
+    overlays.Cut()
+    for(var/d in crossed_dirs)
+        var/amt = crossed_dirs[d]
+
+        for(var/i in 1 to amt)
+            overlays += icon(icon, "footprint[i]", text2num(d))
+
+//**** Here ends snow ****

code/game/turfs/snow/snow.dm

@@ -0,0 +1,51 @@
+/turf/snow
+    name = "snow"
+
+    dynamic_lighting = 0
+    icon = 'icons/turf/snow_new.dmi'
+    icon_state = "snow"
+
+    oxygen = MOLES_O2STANDARD * 1.15
+    nitrogen = MOLES_N2STANDARD * 1.15
+
+    temperature = TN60C
+    var/list/crossed_dirs = list()
+
+#define FOOTSTEP_SPRITE_AMT 2
+
+/turf/snow/Entered(atom/A)
+    if(ismob(A))
+        var/mdir = "[A.dir]"
+        if(crossed_dirs[mdir])
+            crossed_dirs[mdir] = min(crossed_dirs[mdir] + 1, FOOTSTEP_SPRITE_AMT)
+        else
+            crossed_dirs[mdir] = 1
+
+        update_icon()
+
+    . = ..()
+
+/turf/snow/update_icon()
+    overlays.Cut()
+    for(var/d in crossed_dirs)
+        var/amt = crossed_dirs[d]
+
+        for(var/i in 1 to amt)
+            overlays += icon(icon, "footprint[i]", text2num(d))
+
+/turf/snow/snow2
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
+
+/turf/snow/gravsnow
+	name = "snow"
+	icon_state = "gravsnow"
+
+/turf/snow/plating
+	name = "snowy playing"
+	icon_state = "snowyplating"
+
+/turf/snow/drift
+	name = "snowy plating"
+	icon_state = "snowyplayingdrift"

code/game/verbs/who.dm

@@ -69,9 +69,11 @@
 
 	var/msg = ""
 	var/modmsg = ""
+	var/devmsg = ""
 	var/mentmsg = ""
 	var/num_mods_online = 0
 	var/num_admins_online = 0
+	var/num_devs_online = 0
 	var/num_mentors_online = 0
 	if(holder)
 		for(var/client/C in admins)
@@ -118,6 +120,23 @@
 				modmsg += "\n"
 				num_mods_online++
 
+			else if(R_SERVER & C.holder.rights)
+				devmsg += "\t[C] is a [C.holder.rank]"
+				if(isobserver(C.mob))
+					devmsg += " - Observing"
+				else if(istype(C.mob,/mob/new_player))
+					devmsg += " - Lobby"
+				else
+					devmsg += " - Playing"
+
+				if(C.is_afk())
+					var/seconds = C.last_activity_seconds()
+					devmsg += "(AFK - "
+					devmsg += "[round(seconds / 60)] minutes, "
+					devmsg += "[seconds % 60] seconds)"
+				devmsg += "\n"
+				num_devs_online++
+
 			else if(R_MENTOR & C.holder.rights)
 				mentmsg += "\t[C] is a [C.holder.rank]"
 				if(isobserver(C.mob))
@@ -144,6 +163,9 @@
 			else if (R_MOD & C.holder.rights)
 				modmsg += "\t[C] is a [C.holder.rank]\n"
 				num_mods_online++
+			else if (R_SERVER & C.holder.rights)
+				devmsg += "\t[C] is a [C.holder.rank]\n"
+				num_devs_online++
 			else if (R_MENTOR & C.holder.rights)
 				mentmsg += "\t[C] is a [C.holder.rank]\n"
 				num_mentors_online++
@@ -155,6 +177,9 @@
 	if(config.show_mods)
 		msg += "\n<b> Current Moderators ([num_mods_online]):</b>\n" + modmsg
 
+	if(config.show_devs)
+		msg += "\n<b> Current Developers ([num_devs_online]):</b>\n" + devmsg
+
 	if(config.show_mentors)
 		msg += "\n<b> Current Mentors ([num_mentors_online]):</b>\n" + mentmsg
 

code/hub.dm

@@ -1,8 +1,10 @@
 /world
 
 	hub = "Exadv1.spacestation13"
-	hub_password = "SORRYNOPASSWORD"
+	hub_password = "kMZy3U5jJHSiBQjr"
+	//hub_password = "SORRYNOPASSWORD"
 	name = "Space Station 13"
+
 /* This is for any host that would like their server to appear on the main SS13 hub.
 To use it, simply replace the password above, with the password found below, and it should work.
 If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstation13 we can help you there.

code/modules/admin/verbs/buildmode.dm

@@ -71,38 +71,61 @@
 	screen_loc = "NORTH,WEST+1"
 	Click()
 		switch(master.cl.buildmode)
-			if(1)
-				usr << "\blue ***********************************************************"
-				usr << "\blue Left Mouse Button        = Construct / Upgrade"
-				usr << "\blue Right Mouse Button       = Deconstruct / Delete / Downgrade"
-				usr << "\blue Left Mouse Button + ctrl = R-Window"
-				usr << "\blue Left Mouse Button + alt  = Airlock"
+			if(1) // Basic Build
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Left Mouse Button        = Construct / Upgrade</span>"
+				usr << "<span class='notice'>Right Mouse Button       = Deconstruct / Delete / Downgrade</span>"
+				usr << "<span class='notice'>Left Mouse Button + ctrl = R-Window</span>"
+				usr << "<span class='notice'>Left Mouse Button + alt  = Airlock</span>"
 				usr << ""
-				usr << "\blue Use the button in the upper left corner to"
-				usr << "\blue change the direction of built objects."
-				usr << "\blue ***********************************************************"
-			if(2)
-				usr << "\blue ***********************************************************"
-				usr << "\blue Right Mouse Button on buildmode button = Set object type"
-				usr << "\blue Middle Mouse Button on buildmode button= On/Off object type saying"
-				usr << "\blue Middle Mouse Button on turf/obj        = Capture object type"
-				usr << "\blue Left Mouse Button on turf/obj          = Place objects"
-				usr << "\blue Right Mouse Button                     = Delete objects"
+				usr << "<span class='notice'>Use the button in the upper left corner to</span>"
+				usr << "<span class='notice'>change the direction of built objects.</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(2) // Adv. Build
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Right Mouse Button on buildmode button = Set object type</span>"
+				usr << "<span class='notice'>Middle Mouse Button on buildmode button= On/Off object type saying</span>"
+				usr << "<span class='notice'>Middle Mouse Button on turf/obj        = Capture object type</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf/obj          = Place objects</span>"
+				usr << "<span class='notice'>Right Mouse Button                     = Delete objects</span>"
+				usr << "<span class='notice'>Mouse Button + ctrl                    = Copy object type</span>"
 				usr << ""
-				usr << "\blue Use the button in the upper left corner to"
-				usr << "\blue change the direction of built objects."
-				usr << "\blue ***********************************************************"
-			if(3)
-				usr << "\blue ***********************************************************"
-				usr << "\blue Right Mouse Button on buildmode button = Select var(type) & value"
-				usr << "\blue Left Mouse Button on turf/obj/mob      = Set var(type) & value"
-				usr << "\blue Right Mouse Button on turf/obj/mob     = Reset var's value"
-				usr << "\blue ***********************************************************"
-			if(4)
-				usr << "\blue ***********************************************************"
-				usr << "\blue Left Mouse Button on turf/obj/mob      = Select"
-				usr << "\blue Right Mouse Button on turf/obj/mob     = Throw"
-				usr << "\blue ***********************************************************"
+				usr << "<span class='notice'>Use the button in the upper left corner to</span>"
+				usr << "<span class='notice'>change the direction of built objects.</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(3) // Edit
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Right Mouse Button on buildmode button = Select var(type) & value</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf/obj/mob      = Set var(type) & value</span>"
+				usr << "<span class='notice'>Right Mouse Button on turf/obj/mob     = Reset var's value</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(4) // Throw
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf/obj/mob      = Select</span>"
+				usr << "<span class='notice'>Right Mouse Button on turf/obj/mob     = Throw</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(5) // Room Build
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf              = Select as point A</span>"
+				usr << "<span class='notice'>Right Mouse Button on turf             = Select as point B</span>"
+				usr << "<span class='notice'>Right Mouse Button on buildmode button = Change floor/wall type</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(6) // Make Ladders
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf              = Set as upper ladder loc</span>"
+				usr << "<span class='notice'>Right Mouse Button on turf             = Set as lower ladder loc</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(7) // Move Into Contents
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf/obj/mob      = Select</span>"
+				usr << "<span class='notice'>Right Mouse Button on turf/obj/mob     = Move into selection</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
+			if(8) // Make Lights
+				usr << "<span class='notice'>***********************************************************</span>"
+				usr << "<span class='notice'>Left Mouse Button on turf/obj/mob      = Make it glow</span>"
+				usr << "<span class='notice'>Right Mouse Button on turf/obj/mob     = Reset glowing</span>"
+				usr << "<span class='notice'>Right Mouse Button on buildmode button = Change glow properties</span>"
+				usr << "<span class='notice'>***********************************************************</span>"
 		return 1
 
 /obj/effect/bmode/buildquit
@@ -144,62 +167,100 @@
 	var/objholder = /obj/structure/closet
 	var/objsay = 1
 
-	Click(location, control, params)
-		var/list/pa = params2list(params)
+	var/wall_holder = /turf/simulated/wall
+	var/floor_holder = /turf/simulated/floor/plating
+	var/turf/coordA = null
+	var/turf/coordB = null
 
-		if(pa.Find("middle"))
-			switch(master.cl.buildmode)
-				if(2)
-					objsay=!objsay
+	var/new_light_color = "#FFFFFF"
+	var/new_light_range = 3
+	var/new_light_intensity = 3
+
+/obj/effect/bmode/buildmode/Click(location, control, params)
+	var/list/pa = params2list(params)
+
+	if(pa.Find("middle"))
+		switch(master.cl.buildmode)
+			if(2)
+				objsay=!objsay
 
 
-		if(pa.Find("left"))
-			switch(master.cl.buildmode)
-				if(1)
-					master.cl.buildmode = 2
-					src.icon_state = "buildmode2"
-				if(2)
-					master.cl.buildmode = 3
-					src.icon_state = "buildmode3"
-				if(3)
-					master.cl.buildmode = 4
-					src.icon_state = "buildmode4"
-				if(4)
-					master.cl.buildmode = 1
-					src.icon_state = "buildmode1"
+	if(pa.Find("left"))
+		switch(master.cl.buildmode)
+			if(1)
+				master.cl.buildmode = 2
+				src.icon_state = "buildmode2"
+			if(2)
+				master.cl.buildmode = 3
+				src.icon_state = "buildmode3"
+			if(3)
+				master.cl.buildmode = 4
+				src.icon_state = "buildmode4"
+			if(4)
+				master.cl.buildmode = 5
+				src.icon_state = "buildmode5"
+			if(5)
+				master.cl.buildmode = 6
+				src.icon_state = "buildmode6"
+			if(6)
+				master.cl.buildmode = 7
+				src.icon_state = "buildmode7"
+			if(7)
+				master.cl.buildmode = 8
+				src.icon_state = "buildmode8"
+			if(8)
+				master.cl.buildmode = 1
+				src.icon_state = "buildmode1"
 
-		else if(pa.Find("right"))
-			switch(master.cl.buildmode)
-				if(1)
+	else if(pa.Find("right"))
+		switch(master.cl.buildmode)
+			if(1) // Basic Build
+				return 1
+			if(2) // Adv. Build
+				objholder = get_path_from_partial_text(/obj/structure/closet)
+
+			if(3) // Edit
+				var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
+
+				master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name")
+				if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0))
 					return 1
-				if(2)
-					objholder = text2path(input(usr,"Enter typepath:" ,"Typepath","/obj/structure/closet"))
-					if(!ispath(objholder))
-						objholder = /obj/structure/closet
-						alert("That path is not allowed.")
-					else
-						if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
-							objholder = /obj/structure/closet
-				if(3)
-					var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
-
-					master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name")
-					if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0))
-						return 1
-					var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
-					if(!thetype) return 1
-					switch(thetype)
-						if("text")
-							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", "value") as text
-						if("number")
-							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", 123) as num
-						if("mob-reference")
-							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as mob in mob_list
-						if("obj-reference")
-							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as obj in world
-						if("turf-reference")
-							master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as turf in world
-    	return 1
+				var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
+				if(!thetype) return 1
+				switch(thetype)
+					if("text")
+						master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", "value") as text
+					if("number")
+						master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value", 123) as num
+					if("mob-reference")
+						master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as mob in mob_list
+					if("obj-reference")
+						master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as obj in world
+					if("turf-reference")
+						master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as turf in world
+			if(5) // Room build
+				var/choice = alert("Would you like to change the floor or wall holders?","Room Builder", "Floor", "Wall")
+				switch(choice)
+					if("Floor")
+						floor_holder = get_path_from_partial_text(/turf/simulated/floor/plating)
+					if("Wall")
+						wall_holder = get_path_from_partial_text(/turf/simulated/wall)
+			if(8) // Lights
+				var/choice = alert("Change the new light range, power, or color?", "Light Maker", "Range", "Power", "Color")
+				switch(choice)
+					if("Range")
+						var/input = input("New light range.","Light Maker",3) as null|num
+						if(input)
+							new_light_range = input
+					if("Power")
+						var/input = input("New light power.","Light Maker",3) as null|num
+						if(input)
+							new_light_intensity = input
+					if("Color")
+						var/input = input("New light color.","Light Maker",3) as null|color
+						if(input)
+							new_light_color = input
+	return 1
 
 /proc/build_click(var/mob/user, buildmode, params, var/obj/object)
 	var/obj/effect/bmode/buildholder/holder = null
@@ -211,7 +272,7 @@
 	var/list/pa = params2list(params)
 
 	switch(buildmode)
-		if(1)
+		if(1) // Basic Build
 			if(istype(object,/turf) && pa.Find("left") && !pa.Find("alt") && !pa.Find("ctrl") )
 				if(istype(object,/turf/space))
 					var/turf/T = object
@@ -260,8 +321,8 @@
 					if(NORTHWEST)
 						var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
 						WIN.set_dir(NORTHWEST)
-		if(2)
-			if(pa.Find("left"))
+		if(2) // Adv. Build
+			if(pa.Find("left") && !pa.Find("ctrl"))
 				if(ispath(holder.buildmode.objholder,/turf))
 					var/turf/T = get_turf(object)
 					T.ChangeTurf(holder.buildmode.objholder)
@@ -269,27 +330,31 @@
 					var/obj/A = new holder.buildmode.objholder (get_turf(object))
 					A.set_dir(holder.builddir.dir)
 			else if(pa.Find("right"))
-				if(isobj(object)) qdel(object)
+				if(isobj(object))
+					qdel(object)
+			else if(pa.Find("ctrl"))
+				holder.buildmode.objholder = object.type
+				user << "<span class='notice'>[object]([object.type]) copied to buildmode.</span>"
 			if(pa.Find("middle"))
 				holder.buildmode.objholder = text2path("[object.type]")
 				if(holder.buildmode.objsay)	usr << "[object.type]"
 
 
-		if(3)
+		if(3) // Edit
 			if(pa.Find("left")) //I cant believe this shit actually compiles.
 				if(object.vars.Find(holder.buildmode.varholder))
 					log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]")
 					object.vars[holder.buildmode.varholder] = holder.buildmode.valueholder
 				else
-					usr << "\red [initial(object.name)] does not have a var called '[holder.buildmode.varholder]'"
+					user << "<span class='danger'>[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'</span>"
 			if(pa.Find("right"))
 				if(object.vars.Find(holder.buildmode.varholder))
 					log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]")
 					object.vars[holder.buildmode.varholder] = initial(object.vars[holder.buildmode.varholder])
 				else
-					usr << "\red [initial(object.name)] does not have a var called '[holder.buildmode.varholder]'"
+					user << "<span class='danger'>[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'</span>"
 
-		if(4)
+		if(4) // Throw
 			if(pa.Find("left"))
 				if(istype(object, /atom/movable))
 					holder.throw_atom = object
@@ -297,3 +362,127 @@
 				if(holder.throw_atom)
 					holder.throw_atom.throw_at(object, 10, 1)
 					log_admin("[key_name(usr)] threw [holder.throw_atom] at [object]")
+		if(5) // Room build
+			if(pa.Find("left"))
+				holder.buildmode.coordA = get_turf(object)
+				user << "<span class='notice'>Defined [object] ([object.type]) as point A.</span>"
+
+			if(pa.Find("right"))
+				holder.buildmode.coordB = get_turf(object)
+				user << "<span class='notice'>Defined [object] ([object.type]) as point B.</span>"
+
+			if(holder.buildmode.coordA && holder.buildmode.coordB)
+				user << "<span class='notice'>A and B set, creating rectangle.</span>"
+				holder.buildmode.make_rectangle(
+					holder.buildmode.coordA,
+					holder.buildmode.coordB,
+					holder.buildmode.wall_holder,
+					holder.buildmode.floor_holder
+					)
+				holder.buildmode.coordA = null
+				holder.buildmode.coordB = null
+		if(6) // Ladders
+			if(pa.Find("left"))
+				holder.buildmode.coordA = get_turf(object)
+				user << "<span class='notice'>Defined [object] ([object.type]) as upper ladder location.</span>"
+
+			if(pa.Find("right"))
+				holder.buildmode.coordB = get_turf(object)
+				user << "<span class='notice'>Defined [object] ([object.type]) as lower ladder location.</span>"
+
+			if(holder.buildmode.coordA && holder.buildmode.coordB)
+				user << "<span class='notice'>Ladder locations set, building ladders.</span>"
+				var/obj/structure/ladder/A = new /obj/structure/ladder(holder.buildmode.coordA)
+				var/obj/structure/ladder/B = new /obj/structure/ladder(holder.buildmode.coordB)
+				A.target = B
+				B.target = A
+				B.icon_state = "ladderup"
+				holder.buildmode.coordA = null
+				holder.buildmode.coordB = null
+		if(7) // Move into contents
+			if(pa.Find("left"))
+				if(istype(object, /atom))
+					holder.throw_atom = object
+			if(pa.Find("right"))
+				if(holder.throw_atom && istype(object, /atom/movable))
+					object.forceMove(holder.throw_atom)
+					log_admin("[key_name(usr)] moved [object] into [holder.throw_atom].")
+		if(8) // Lights
+			if(pa.Find("left"))
+				if(object)
+					object.set_light(holder.buildmode.new_light_range, holder.buildmode.new_light_intensity, holder.buildmode.new_light_color)
+			if(pa.Find("right"))
+				if(object)
+					object.set_light(0, 0, "#FFFFFF")
+
+/obj/effect/bmode/buildmode/proc/get_path_from_partial_text(default_path)
+	var/desired_path = input("Enter full or partial typepath.","Typepath","[default_path]")
+
+	var/list/types = typesof(/atom)
+	var/list/matches = list()
+
+	for(var/path in types)
+		if(findtext("[path]", desired_path))
+			matches += path
+
+	if(matches.len==0)
+		alert("No results found.  Sorry.")
+		return
+
+	var/result = null
+
+	if(matches.len==1)
+		result = matches[1]
+	else
+		result = input("Select an atom type", "Spawn Atom", matches[1]) as null|anything in matches
+		if(!objholder)
+			result = default_path
+	return result
+
+/obj/effect/bmode/buildmode/proc/make_rectangle(var/turf/A, var/turf/B, var/turf/wall_type, var/turf/floor_type)
+	if(!A || !B) // No coords
+		return
+	if(A.z != B.z) // Not same z-level
+		return
+
+	var/height = A.y - B.y
+	var/width = A.x - B.x
+	var/z_level = A.z
+
+	var/turf/lower_left_corner = null
+	// First, try to find the lowest part
+	var/desired_y = 0
+	if(A.y <= B.y)
+		desired_y = A.y
+	else
+		desired_y = B.y
+
+	//Now for the left-most part.
+	var/desired_x = 0
+	if(A.x <= B.x)
+		desired_x = A.x
+	else
+		desired_x = B.x
+
+	lower_left_corner = locate(desired_x, desired_y, z_level)
+
+	// Now we can begin building the actual room.  This defines the boundries for the room.
+	var/low_bound_x = lower_left_corner.x
+	var/low_bound_y = lower_left_corner.y
+
+	var/high_bound_x = lower_left_corner.x + abs(width)
+	var/high_bound_y = lower_left_corner.y + abs(height)
+
+	for(var/i = low_bound_x, i <= high_bound_x, i++)
+		for(var/j = low_bound_y, j <= high_bound_y, j++)
+			var/turf/T = locate(i, j, z_level)
+			if(i == low_bound_x || i == high_bound_x || j == low_bound_y || j == high_bound_y)
+				if(isturf(wall_type))
+					T.ChangeTurf(wall_type)
+				else
+					new wall_type(T)
+			else
+				if(isturf(floor_type))
+					T.ChangeTurf(floor_type)
+				else
+					new floor_type(T)

code/modules/admin/verbs/custom_event.dm

@@ -7,7 +7,7 @@
 		src << "Only administrators may use this command."
 		return
 
-	var/input = sanitize(input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null, MAX_BOOK_MESSAGE_LEN, extra = 0)
+	var/input = sanitize(input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0)
 	if(!input || input == "")
 		custom_event_msg = null
 		log_admin("[usr.key] has cleared the custom event text.")

code/modules/admin/verbs/pray.dm

@@ -21,6 +21,7 @@
 		if(R_ADMIN & C.holder.rights)
 			if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers))
 				C << msg
+				C << 'sound/effects/ding.ogg'
 	usr << "Your prayers have been received by the gods."
 
 	feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -31,9 +32,11 @@
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)
 			C << msg
+			C << 'sound/machines/signal.ogg'
 
 /proc/Syndicate_announce(var/msg, var/mob/Sender)
 	msg = "\blue <b><font color=crimson>ILLEGAL:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)
 		if(R_ADMIN & C.holder.rights)
 			C << msg
+			C << 'sound/machines/signal.ogg'

code/modules/client/client procs.dm

@@ -158,6 +158,7 @@
 
 	if(!void)
 		void = new()
+		void.MakeGreed()
 	screen += void
 
 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.

code/modules/client/preference_setup/antagonism/01_basic.dm

@@ -7,19 +7,29 @@ var/global/list/uplink_locations = list("PDA", "Headset", "None")
 /datum/category_item/player_setup_item/antagonism/basic/load_character(var/savefile/S)
 	S["uplinklocation"] >> pref.uplinklocation
 	S["exploit_record"] >> pref.exploit_record
+	S["antag_faction"]	>> pref.antag_faction
+	S["antag_vis"]		>> pref.antag_vis
 
 /datum/category_item/player_setup_item/antagonism/basic/save_character(var/savefile/S)
 	S["uplinklocation"] << pref.uplinklocation
 	S["exploit_record"] << pref.exploit_record
+	S["antag_faction"]	<< pref.antag_faction
+	S["antag_vis"]		<< pref.antag_vis
 
 /datum/category_item/player_setup_item/antagonism/basic/sanitize_character()
 	pref.uplinklocation	= sanitize_inlist(pref.uplinklocation, uplink_locations, initial(pref.uplinklocation))
+	if(!pref.antag_faction) pref.antag_faction = "None"
+	if(!pref.antag_vis) pref.antag_vis = "Hidden"
 
 // Moved from /datum/preferences/proc/copy_to()
 /datum/category_item/player_setup_item/antagonism/basic/copy_to_mob(var/mob/living/carbon/human/character)
 	character.exploit_record = pref.exploit_record
+	character.antag_faction = pref.antag_faction
+	character.antag_vis = pref.antag_vis
 
 /datum/category_item/player_setup_item/antagonism/basic/content(var/mob/user)
+	. += "Faction: <a href='?src=\ref[src];antagfaction=1'>[pref.antag_faction]</a><br/>"
+	. += "Visibility: <a href='?src=\ref[src];antagvis=1'>[pref.antag_vis]</a><br/>"
 	. +="<b>Uplink Type : <a href='?src=\ref[src];antagtask=1'>[pref.uplinklocation]</a></b>"
 	. +="<br>"
 	. +="<b>Exploitable information:</b><br>"
@@ -34,9 +44,29 @@ var/global/list/uplink_locations = list("PDA", "Headset", "None")
 		return TOPIC_REFRESH
 
 	if(href_list["exploitable_record"])
-		var/exploitmsg = sanitize(input(user,"Set exploitable information about you here.","Exploitable Information", html_decode(pref.exploit_record)) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0)
+		var/exploitmsg = sanitize(input(user,"Set exploitable information about you here.","Exploitable Information", html_decode(pref.exploit_record)) as message|null, MAX_RECORD_LENGTH, extra = 0)
 		if(!isnull(exploitmsg) && !jobban_isbanned(user, "Records") && CanUseTopic(user))
 			pref.exploit_record = exploitmsg
 			return TOPIC_REFRESH
+			
+	if(href_list["antagfaction"])
+		var/choice = input(user, "Please choose an antagonistic faction to work for.", "Character Preference", pref.antag_faction) as null|anything in antag_faction_choices + list("None","Other")
+		if(!choice || !CanUseTopic(user))
+			return TOPIC_NOACTION
+		if(choice == "Other")
+			var/raw_choice = sanitize(input(user, "Please enter a faction.", "Character Preference")  as text|null, MAX_NAME_LEN)
+			if(raw_choice)
+				pref.antag_faction = raw_choice
+		else
+			pref.antag_faction = choice
+		return TOPIC_REFRESH
+		
+	if(href_list["antagvis"])
+		var/choice = input(user, "Please choose an antagonistic visibility level.", "Character Preference", pref.antag_vis) as null|anything in antag_visiblity_choices
+		if(!choice || !CanUseTopic(user))
+			return TOPIC_NOACTION
+		else
+			pref.antag_vis = choice
+		return TOPIC_REFRESH
 
 	return ..()

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

@@ -121,6 +121,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				I.mechassist()
 			else if(status == "mechanical")
 				I.robotize()
+			else if(status == "digital")
+				I.digitize()
 	return
 
 /datum/category_item/player_setup_item/general/body/content(var/mob/user)
@@ -197,6 +199,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 			if(ind > 1)
 				. += ", "
 			. += "\tSynthetic [organ_name]"
+		else if(status == "digital")
+			++ind
+			if(ind > 1)
+				. += ", "
+			. += "\tDigital [organ_name]"
 		else if(status == "assisted")
 			++ind
 			if(ind > 1)
@@ -549,6 +556,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		var/list/organ_choices = list("Normal","Assisted","Mechanical")
 		if(pref.organ_data[BP_TORSO] == "cyborg")
 			organ_choices -= "Normal"
+			if(organ_name == "Brain")
+				organ_choices += "Digital"
 
 		var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in organ_choices
 		if(!new_state) return
@@ -560,6 +569,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				pref.organ_data[organ] = "assisted"
 			if("Mechanical")
 				pref.organ_data[organ] = "mechanical"
+			if("Digital")
+				pref.organ_data[organ] = "digital"
 		return TOPIC_REFRESH
 
 	else if(href_list["disabilities"])

code/modules/client/preference_setup/general/05_background.dm

@@ -115,19 +115,19 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["set_medical_records"])
-		var/new_medical = sanitize(input(user,"Enter medical information here.","Character Preference", html_decode(pref.med_record)) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0)
+		var/new_medical = sanitize(input(user,"Enter medical information here.","Character Preference", html_decode(pref.med_record)) as message|null, MAX_RECORD_LENGTH, extra = 0)
 		if(!isnull(new_medical) && !jobban_isbanned(user, "Records") && CanUseTopic(user))
 			pref.med_record = new_medical
 		return TOPIC_REFRESH
 
 	else if(href_list["set_general_records"])
-		var/new_general = sanitize(input(user,"Enter employment information here.","Character Preference", html_decode(pref.gen_record)) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0)
+		var/new_general = sanitize(input(user,"Enter employment information here.","Character Preference", html_decode(pref.gen_record)) as message|null, MAX_RECORD_LENGTH, extra = 0)
 		if(!isnull(new_general) && !jobban_isbanned(user, "Records") && CanUseTopic(user))
 			pref.gen_record = new_general
 		return TOPIC_REFRESH
 
 	else if(href_list["set_security_records"])
-		var/sec_medical = sanitize(input(user,"Enter security information here.","Character Preference", html_decode(pref.sec_record)) as message|null, MAX_PAPER_MESSAGE_LEN, extra = 0)
+		var/sec_medical = sanitize(input(user,"Enter security information here.","Character Preference", html_decode(pref.sec_record)) as message|null, MAX_RECORD_LENGTH, extra = 0)
 		if(!isnull(sec_medical) && !jobban_isbanned(user, "Records") && CanUseTopic(user))
 			pref.sec_record = sec_medical
 		return TOPIC_REFRESH

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

@@ -3,8 +3,12 @@
 	path = /obj/item/weapon/cane
 
 /datum/gear/dice
-	display_name = "d20"
-	path = /obj/item/weapon/dice/d20
+	display_name = "dice pack"
+	path = /obj/item/weapon/storage/pill_bottle/dice
+
+/datum/gear/dice/nerd
+	display_name = "dice pack (gaming)"
+	path = /obj/item/weapon/storage/pill_bottle/dice_nerd
 
 /datum/gear/cards
 	display_name = "deck of cards"

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

@@ -48,4 +48,12 @@
 
 /datum/gear/gloves/white
 	display_name = "gloves, white"
-	path = /obj/item/clothing/gloves/white
+	path = /obj/item/clothing/gloves/white
+
+/datum/gear/gloves/evening
+	display_name = "evening gloves"
+	path = /obj/item/clothing/gloves/evening
+
+/datum/gear/gloves/evening/New()
+	..()
+	gear_tweaks = list(gear_tweak_free_color_choice)

code/modules/client/preferences.dm

@@ -54,8 +54,10 @@ datum/preferences
 		//Some faction information.
 	var/home_system = "Unset"           //System of birth.
 	var/citizenship = "None"            //Current home system.
-	var/faction = "None"                //Antag faction/general associated faction.
+	var/faction = "None"                //General associated faction.
 	var/religion = "None"               //Religious association.
+	var/antag_faction = "None"			//Antag associated faction.
+	var/antag_vis = "Hidden"			//How visible antag association is to others.
 
 		//Mob preview
 	var/icon/preview_icon = null

code/modules/client/preferences_factions.dm

@@ -1,6 +1,7 @@
 var/global/list/seen_citizenships = list()
 var/global/list/seen_systems = list()
 var/global/list/seen_factions = list()
+var/global/list/seen_antag_factions = list()
 var/global/list/seen_religions = list()
 
 //Commenting this out for now until I work the lists it into the event generator/journalist/chaplain.
@@ -25,6 +26,7 @@ var/global/list/home_system_choices = list(
 	starsys_name,
 	"Nyx",
 	"Tau Ceti",
+	"Qerr'Vallis",
 	"Epsilon Ursae Minoris",
 	"S'randarr"
 	)
@@ -42,6 +44,14 @@ var/global/list/faction_choices = list(
 	"Zeng-Hu Pharmaceuticals",
 	"Hesphaistos Industries"
 	)
+	
+var/global/list/antag_faction_choices = list()	//Should be populated after brainstorming. Leaving as blank in case brainstorming does not occur.
+
+var/global/list/antag_visiblity_choices = list(
+	"Hidden",
+	"Shared",
+	"Known"
+	)
 
 var/global/list/religion_choices = list(
 	"Unitarianism",

code/modules/clothing/gloves/color.dm

@@ -16,7 +16,7 @@
 
 	New()
 		//average of 0.5, somewhat better than regular gloves' 0.75
-		siemens_coefficient = pick(0,0.1,0.3,0.5,0.5,0.75,1.35) 
+		siemens_coefficient = pick(0,0.1,0.3,0.5,0.5,0.75,1.35)
 
 /obj/item/clothing/gloves/black
 	desc = "These work gloves are thick and fire-resistant."
@@ -84,3 +84,14 @@
 	desc = "A pair of gloves, they don't look special in any way."
 	icon_state = "brown"
 	item_state = "browngloves"
+
+/obj/item/clothing/gloves/evening
+	desc = "A pair of gloves that reach past the elbow.  Fancy!"
+	name = "evening gloves"
+	icon_state = "evening_gloves"
+	item_state = "graygloves"
+
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE

code/modules/clothing/spacesuits/rig/modules/computer.dm

@@ -434,6 +434,8 @@
 	holder.spark_system.start()
 	playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1)
 
+	H.break_cloak()
+
 	if(!holder.cell)
 		H << "<span class = 'danger'>Your power sink flashes an error; there is no cell in your rig.</span>"
 		drain_complete(H)

code/modules/clothing/spacesuits/rig/modules/ninja.dm

@@ -42,7 +42,7 @@
 
 	anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
 
-	H.visible_message("[H.name] vanishes into thin air!",1)
+	H.visible_message("[H.name] vanishes into thin air!")
 
 /obj/item/rig_module/stealth_field/deactivate()
 

code/modules/clothing/spacesuits/rig/suits/light.dm

@@ -74,7 +74,7 @@
 /obj/item/weapon/rig/light/ninja
 	name = "ominous suit control module"
 	suit_type = "ominous"
-	desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
+	desc = "A unique suit of nano-enhanced armor designed for covert operations."
 	icon_state = "ninja_rig"
 	armor = list(melee = 50, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 30)
 	emp_protection = 40 //change this to 30 if too high.

code/modules/clothing/under/accessories/accessory.dm

@@ -12,6 +12,8 @@
 	var/image/mob_overlay = null
 	var/overlay_state = null
 
+	sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/ties.dmi') //Teshari can into webbing, too!
+
 /obj/item/clothing/accessory/Destroy()
 	on_removed()
 	return ..()

code/modules/games/cards.dm

@@ -134,7 +134,7 @@
 		if(P.name != "Blank Card")
 			user << "You cannot write on that card."
 			return
-		var/cardtext = sanitize(input(user, "What do you wish to write on the card?", "Card Editing") as text|null, MAX_BOOK_MESSAGE_LEN)
+		var/cardtext = sanitize(input(user, "What do you wish to write on the card?", "Card Editing") as text|null, MAX_PAPER_MESSAGE_LEN)
 		if(!cardtext)
 			return
 		P.name = cardtext

code/modules/holodeck/HolodeckControl.dm

@@ -30,62 +30,60 @@
 	"Snow Field" = "snowfield",	\
 	"Theatre" = "theatre",	\
 	"Meeting Hall" = "meetinghall",	\
-	"Courtroom" = "courtroom"	\
+	"Courtroom" = "courtroom",	\
+	"Turn Off" = "turnoff"	\
 	)
 	var/list/restricted_programs = list("Atmospheric Burn Simulation" = "burntest", "Wildlife Simulation" = "wildlifecarp")
+	var/current_program = "turnoff"
 
 /obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
 /obj/machinery/computer/HolodeckControl/attack_hand(var/mob/user as mob)
-
 	if(..())
 		return
 	user.set_machine(src)
-	var/dat
 
-	dat += "<B>Holodeck Control System</B><BR>"
-	dat += "<HR>Current Loaded Programs:<BR>"
-	for(var/prog in supported_programs)
-		dat += "<A href='?src=\ref[src];program=[supported_programs[prog]]'>([prog])</A><BR>"
+	ui_interact(user)
 
-	dat += "<BR>"
-	dat += "<A href='?src=\ref[src];program=turnoff'>(Turn Off)</A><BR>"
+/**
+ *  Display the NanoUI window for the Holodeck Computer.
+ *
+ *  See NanoUI documentation for details.
+ */
+/obj/machinery/computer/HolodeckControl/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	user.set_machine(src)
 
-	dat += "<BR>"
-	dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.<BR>"
+	var/list/data = list()
+	var/program_list[0]
+	var/restricted_program_list[0]
 
+	for(var/P in supported_programs)
+		program_list[++program_list.len] = list("name" = P, "program" = supported_programs[P])
+
+	for(var/P in restricted_programs)
+		restricted_program_list[++restricted_program_list.len] = list("name" = P, "program" = restricted_programs[P])
+
+	data["supportedPrograms"] = program_list
+	data["restrictedPrograms"] = restricted_program_list
+	data["currentProgram"] = current_program
 	if(issilicon(user))
-		dat += "<BR>"
-		if(safety_disabled)
-			if (emagged)
-				dat += "<font color=red><b>ERROR</b>: Cannot re-enable Safety Protocols.</font><BR>"
-			else
-				dat += "<A href='?src=\ref[src];AIoverride=1'>(<font color=green>Re-Enable Safety Protocols?</font>)</A><BR>"
-		else
-			dat += "<A href='?src=\ref[src];AIoverride=1'>(<font color=red>Override Safety Protocols?</font>)</A><BR>"
-
-	dat += "<BR>"
-
-	if(safety_disabled)
-		for(var/prog in restricted_programs)
-			dat += "<A href='?src=\ref[src];program=[restricted_programs[prog]]'>(<font color=red>Begin [prog]</font>)</A><BR>"
-			dat += "Ensure the holodeck is empty before testing.<BR>"
-			dat += "<BR>"
-		dat += "Safety Protocols are <font color=red> DISABLED </font><BR>"
+		data["isSilicon"] = 1
 	else
-		dat += "Safety Protocols are <font color=green> ENABLED </font><BR>"
-
+		data["isSilicon"] = null
+	data["safetyDisabled"] = safety_disabled
+	data["emagged"] = emagged
 	if(linkedholodeck.has_gravity)
-		dat += "Gravity is <A href='?src=\ref[src];gravity=1'><font color=green>(ON)</font></A><BR>"
+		data["gravity"] = 1
 	else
-		dat += "Gravity is <A href='?src=\ref[src];gravity=1'><font color=blue>(OFF)</font></A><BR>"
-
-	user << browse(dat, "window=computer;size=400x500")
-	onclose(user, "computer")
-
-	return
+		data["gravity"] = null
 
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "holodeck.tmpl", src.name, 400, 550)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(20)
 
 /obj/machinery/computer/HolodeckControl/Topic(href, href_list)
 	if(..())
@@ -97,6 +95,7 @@
 			var/prog = href_list["program"]
 			if(prog in holodeck_programs)
 				loadProgram(holodeck_programs[prog])
+				current_program = href_list["program"]
 
 		else if(href_list["AIoverride"])
 			if(!issilicon(usr))
@@ -118,8 +117,8 @@
 			toggleGravity(linkedholodeck)
 
 		src.add_fingerprint(usr)
-	src.updateUsrDialog()
-	return
+
+	nanomanager.update_uis(src)
 
 /obj/machinery/computer/HolodeckControl/emag_act(var/remaining_charges, var/mob/user as mob)
 	playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
@@ -132,7 +131,6 @@
 		user << "Warning.  Automatic shutoff and derezing protocols have been corrupted.  Please call [company_name] maintenance and do not use the simulator."
 		log_game("[key_name(usr)] emagged the Holodeck Control Computer")
 		return 1
-	src.updateUsrDialog()
 	return
 
 /obj/machinery/computer/HolodeckControl/proc/update_projections()

code/modules/hydroponics/seed_datums.dm

@@ -73,7 +73,7 @@
 	set_trait(TRAIT_PRODUCTION,5)
 	set_trait(TRAIT_YIELD,2)
 	set_trait(TRAIT_POTENCY,10)
-	set_trait(TRAIT_PRODUCT_COLOUR,"c9fa16")
+	set_trait(TRAIT_PRODUCT_COLOUR,"#c9fa16")
 	set_trait(TRAIT_WATER_CONSUMPTION, 3)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25)
 

code/modules/mining/mine_turfs.dm

@@ -450,7 +450,7 @@ var/list/mining_overlay_cache = list()
 				if(prob(50))
 					M.adjustBruteLoss(5)
 			else
-				flick("flash",M.flash)
+				M.flash_eyes()
 				if(prob(50))
 					M.Stun(5)
 			M.apply_effect(25, IRRADIATE)

code/modules/mob/death.dm

@@ -66,9 +66,6 @@
 
 	layer = MOB_LAYER
 
-	if(blind && client)
-		blind.layer = 0
-
 	sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO

code/modules/mob/holder.dm

@@ -114,6 +114,11 @@ var/list/holder_mob_icon_cache = list()
 	if(!holder_type || buckled || pinned.len)
 		return
 
+	if(self_grab)
+		if(src.incapacitated()) return
+	else
+		if(grabber.incapacitated()) return
+
 	var/obj/item/weapon/holder/H = new holder_type(get_turf(src))
 	H.held_mob = src
 	src.forceMove(H)

code/modules/mob/living/carbon/alien/alien_damage.dm

@@ -1,7 +1,7 @@
 /mob/living/carbon/alien/ex_act(severity)
 
 	if(!blinded)
-		flick("flash", flash)
+		flash_eyes()
 
 	var/b_loss = null
 	var/f_loss = null