Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Conflicts:
	code/game/machinery/Sleeper.dm

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

@@ -7,60 +7,6 @@ GAS ANALYZER
 MASS SPECTROMETER
 REAGENT SCANNER
 */
-/obj/item/device/t_scanner
-	name = "\improper T-ray scanner"
-	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	icon_state = "t-ray0"
-	var/on = 0
-	slot_flags = SLOT_BELT
-	w_class = 2
-	item_state = "electronic"
-
-	matter = list(DEFAULT_WALL_MATERIAL = 150)
-
-	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
-
-/obj/item/device/t_scanner/attack_self(mob/user)
-
-	on = !on
-	icon_state = "t-ray[on]"
-
-	if(on)
-		processing_objects.Add(src)
-
-
-/obj/item/device/t_scanner/process()
-	if(!on)
-		processing_objects.Remove(src)
-		return null
-
-	for(var/turf/T in range(1, src.loc) )
-
-		if(!T.intact)
-			continue
-
-		for(var/obj/O in T.contents)
-
-			if(O.level != 1)
-				continue
-
-			if(O.invisibility == 101)
-				O.invisibility = 0
-				O.alpha = 128
-				spawn(10)
-					if(O)
-						var/turf/U = O.loc
-						if(U.intact)
-							O.invisibility = 101
-							O.alpha = 255
-
-		var/mob/living/M = locate() in T
-		if(M && M.invisibility == 2)
-			M.invisibility = 0
-			spawn(2)
-				if(M)
-					M.invisibility = INVISIBILITY_LEVEL_TWO
-
 
 /obj/item/device/healthanalyzer
 	name = "health analyzer"

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

@@ -0,0 +1,135 @@
+#define OVERLAY_CACHE_LEN 50
+
+/obj/item/device/t_scanner
+	name = "\improper T-ray scanner"
+	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
+	icon_state = "t-ray0"
+	slot_flags = SLOT_BELT
+	w_class = 2
+	item_state = "electronic"
+	matter = list(DEFAULT_WALL_MATERIAL = 150)
+	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINERING = 1)
+
+	var/scan_range = 1
+
+	var/on = 0
+	var/list/active_scanned = list() //assoc list of objects being scanned, mapped to their overlay
+	var/client/user_client //since making sure overlays are properly added and removed is pretty important, so we track the current user explicitly
+	var/flicker = 0
+
+	var/global/list/overlay_cache = list() //cache recent overlays
+
+/obj/item/device/t_scanner/update_icon()
+	icon_state = "t-ray[on]"
+
+/obj/item/device/t_scanner/attack_self(mob/user)
+	set_active(!on)
+
+/obj/item/device/t_scanner/proc/set_active(var/active)
+	on = active
+	if(on)
+		processing_objects.Add(src)
+		flicker = 0
+	else
+		processing_objects.Remove(src)
+		set_user_client(null)
+	update_icon()
+
+//If reset is set, then assume the client has none of our overlays, otherwise we only send new overlays.
+/obj/item/device/t_scanner/process()
+	if(!on) return
+
+	//handle clients changing
+	var/client/loc_client = null
+	if(ismob(src.loc))
+		var/mob/M = src.loc
+		loc_client = M.client
+	set_user_client(loc_client)
+
+	//no sense processing if no-one is going to see it.
+	if(!user_client) return
+
+	//get all objects in scan range
+	var/list/scanned = get_scanned_objects(scan_range)
+	var/list/update_add = scanned - active_scanned
+	var/list/update_remove = active_scanned - scanned
+
+	//Add new overlays
+	for(var/obj/O in update_add)
+		var/image/overlay = get_overlay(O)
+		active_scanned[O] = overlay
+		user_client.images += overlay
+
+	//Remove stale overlays
+	for(var/obj/O in update_remove) 
+		user_client.images -= active_scanned[O]
+		active_scanned -= O
+	
+	//Flicker effect
+	for(var/obj/O in active_scanned)
+		var/image/overlay = active_scanned[O]
+		if(flicker)
+			overlay.alpha = 0
+		else
+			overlay.alpha = 128
+	flicker = !flicker
+
+//creates a new overlay for a scanned object
+/obj/item/device/t_scanner/proc/get_overlay(obj/scanned)
+	//Use a cache so we don't create a whole bunch of new images just because someone's walking back and forth in a room. 
+	//Also means that images are reused if multiple people are using t-rays to look at the same objects.
+	if(scanned in overlay_cache)
+		. = overlay_cache[scanned]
+	else
+		var/image/I = image(loc = scanned, icon = scanned.icon, icon_state = scanned.icon_state, layer = HUD_LAYER)
+		
+		//Pipes are special
+		if(istype(scanned, /obj/machinery/atmospherics/pipe))
+			var/obj/machinery/atmospherics/pipe/P = scanned
+			I.color = P.pipe_color
+			I.overlays += P.overlays
+		
+		I.alpha = 128
+		I.mouse_opacity = 0
+		. = I
+
+	// Add it to cache, cutting old entries if the list is too long
+	overlay_cache[scanned] = .
+	if(overlay_cache.len > OVERLAY_CACHE_LEN)
+		overlay_cache.Cut(1, overlay_cache.len-OVERLAY_CACHE_LEN-1)
+
+/obj/item/device/t_scanner/proc/get_scanned_objects(var/scan_dist)
+	. = list()
+	
+	var/turf/center = get_turf(src.loc)
+	if(!center) return
+	
+	for(var/turf/T in range(scan_range, center))
+		if(!T.intact)
+			continue
+
+		for(var/obj/O in T.contents)
+			if(O.level != 1)
+				continue
+			if(!O.invisibility)
+				continue //if it's already visible don't need an overlay for it
+			. += O
+
+/obj/item/device/t_scanner/proc/set_user_client(var/client/new_client)
+	if(new_client == user_client)
+		return
+	if(user_client)
+		for(var/scanned in active_scanned)
+			user_client.images -= active_scanned[scanned]
+	if(new_client)
+		for(var/scanned in active_scanned)
+			new_client.images += active_scanned[scanned]
+	else
+		active_scanned.Cut()
+
+	user_client = new_client
+
+/obj/item/device/t_scanner/dropped(mob/user)
+	set_user_client(null)
+
+#undef OVERLAY_CACHE_LEN

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

@@ -131,7 +131,7 @@ datum/uplink_item/dd_SortValue()
 	path = /obj/item/ammo_magazine/a357
 
 /datum/uplink_item/item/ammo/mc9mm
-	name = ".9mm"
+	name = "9mm"
 	path = /obj/item/ammo_magazine/mc9mm
 
 /datum/uplink_item/item/ammo/darts
@@ -142,6 +142,14 @@ datum/uplink_item/dd_SortValue()
 	name = "14.5mm"
 	path = /obj/item/weapon/storage/box/sniperammo
 
+/datum/uplink_item/item/ammo/a10mm
+	name = "10mm"
+	path = /obj/item/ammo_magazine/a10mm
+
+/datum/uplink_item/item/ammo/a762
+	name = "7.62mm"
+	path = /obj/item/ammo_magazine/a762
+
 /***************************************
 * Highly Visible and Dangerous Weapons *
 ***************************************/
@@ -188,6 +196,17 @@ datum/uplink_item/dd_SortValue()
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
 	path = /obj/item/weapon/gun/projectile/heavysniper
 
+//These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear.
+/datum/uplink_item/item/visible_weapons/submachinegun
+	name = "Submachine Gun"
+	item_cost = 6
+	path = /obj/item/weapon/gun/projectile/automatic/c20r
+
+/datum/uplink_item/item/visible_weapons/assaultrifle
+	name = "Assault Rifle"
+	item_cost = 7
+	path = /obj/item/weapon/gun/projectile/automatic/sts35
+
 /*************************************
 * Stealthy and Inconspicuous Weapons *
 *************************************/

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

@@ -68,10 +68,7 @@
 
 		if (istype(E, /datum/stack_recipe_list))
 			var/datum/stack_recipe_list/srl = E
-			if (src.get_amount() >= srl.req_amount)
-				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
-			else
-				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
+			t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title]</a>"
 
 		if (istype(E, /datum/stack_recipe))
 			var/datum/stack_recipe/R = E
@@ -360,8 +357,6 @@
 /datum/stack_recipe_list
 	var/title = "ERROR"
 	var/list/recipes = null
-	var/req_amount = 1
-	New(title, recipes, req_amount = 1)
+	New(title, recipes)
 		src.title = title
 		src.recipes = recipes
-		src.req_amount = req_amount

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

@@ -100,10 +100,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	flags |= NOREACT // so it doesn't react until you light it
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
 
-/obj/item/clothing/mask/smokable/Destroy()
-	..()
-	qdel(reagents)
-
 /obj/item/clothing/mask/smokable/process()
 	var/turf/location = get_turf(src)
 	smoketime--

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

@@ -14,6 +14,7 @@ var/global/list/cached_icons = list()
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(10,20,30,60)
 	volume = 60
+	unacidable = 0
 	flags = OPENCONTAINER
 	var/paint_type = "red"
 

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

@@ -15,8 +15,8 @@
 
 /obj/item/weapon/storage/bible/booze/New()
 	..()
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
+	new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer(src)
+	new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer(src)
 	new /obj/item/weapon/spacecash(src)
 	new /obj/item/weapon/spacecash(src)
 	new /obj/item/weapon/spacecash(src)

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

@@ -146,11 +146,6 @@
 		new /obj/item/clothing/mask/smokable/cigarette(src)
 	create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
 
-/obj/item/weapon/storage/fancy/cigarettes/Destroy()
-	qdel(reagents)
-	..()
-
-
 /obj/item/weapon/storage/fancy/cigarettes/update_icon()
 	icon_state = "[initial(icon_state)][contents.len]"
 	return
@@ -202,10 +197,6 @@
 		new /obj/item/clothing/mask/smokable/cigarette/cigar(src)
 	create_reagents(15 * storage_slots)
 
-/obj/item/weapon/storage/fancy/cigar/Destroy()
-	qdel(reagents)
-	..()
-
 /obj/item/weapon/storage/fancy/cigar/update_icon()
 	icon_state = "[initial(icon_state)][contents.len]"
 	return

code/game/objects/objs.dm

@@ -123,10 +123,6 @@
 	if(istype(M) && M.client && M.machine == src)
 		src.attack_self(M)
 
-
-/obj/proc/alter_health()
-	return 1
-
 /obj/proc/hide(h)
 	return
 

code/game/objects/structures/bedsheet_bin.dm

@@ -25,6 +25,16 @@ LINEN BINS
 	add_fingerprint(user)
 	return
 
+/obj/item/weapon/bedsheet/attackby(obj/item/I, mob/user)
+	if(is_sharp(I))
+		user.visible_message("<span class='notice'>\The [user] begins cutting up [src] with [I].</span>", "<span class='notice'>You begin cutting up [src] with [I].</span>")
+		if(do_after(user, 50))
+			user << "<span class='notice'>You cut [src] into pieces!</span>"
+			for(var/i in 1 to rand(2,5))
+				new /obj/item/weapon/reagent_containers/glass/rag(src.loc)
+			qdel(src)
+		return
+	..()
 
 /obj/item/weapon/bedsheet/blue
 	icon_state = "sheetblue"

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

@@ -53,11 +53,6 @@
 		else
 			user << "It is full."
 
-
-
-/obj/structure/closet/alter_health()
-	return get_turf(src)
-
 /obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0 || wall_mounted)) return 1
 	return (!density)

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

@@ -11,16 +11,16 @@
 
 	New()
 		..()
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
 		return
 
 /obj/structure/closet/secure_closet/bar/update_icon()

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

@@ -42,11 +42,11 @@
 /obj/structure/closet/syndicate/nuclear/New()
 	..()
 
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
-	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
 	new /obj/item/weapon/storage/box/handcuffs(src)
 	new /obj/item/weapon/storage/box/flashbangs(src)
 	new /obj/item/weapon/gun/energy/gun(src)

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -14,7 +14,7 @@
 		new /obj/item/stack/material/wood(src)
 		var/turf/T = get_turf(src)
 		for(var/atom/movable/AM in contents)
-			if(AM.simulated) AM.loc = T
+			if(AM.simulated) AM.forceMove(T)
 		user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
 							 "<span class='notice'>You pry open \the [src].</span>", \
 							 "<span class='notice'>You hear splitting wood.</span>")

code/game/objects/structures/morgue.dm

@@ -60,9 +60,6 @@
 				return
 	return
 
-/obj/structure/morgue/alter_health()
-	return src.loc
-
 /obj/structure/morgue/attack_hand(mob/user as mob)
 	if (src.connected)
 		for(var/atom/movable/A as mob|obj in src.connected.loc)
@@ -230,9 +227,6 @@
 				return
 	return
 
-/obj/structure/crematorium/alter_health()
-	return src.loc
-
 /obj/structure/crematorium/attack_hand(mob/user as mob)
 //	if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH
 //		user.show_message("<span class='warning'>Uh-oh, that was a bad idea.</span>", 1)

code/game/objects/structures/watercloset.dm

@@ -395,7 +395,7 @@
 	if (istype(RG) && RG.is_open_container())
 		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		user.visible_message("<span class='notice'>[user] fills \the [RG] using \the [src].</span>","<span class='notice'>You fill \the [RG] using \the [src].</span>")
-		return
+		return 1
 
 	else if (istype(O, /obj/item/weapon/melee/baton))
 		var/obj/item/weapon/melee/baton/B = O
@@ -413,7 +413,7 @@
 				user.visible_message( \
 					"<span class='danger'>[user] was stunned by \his wet [O]!</span>", \
 					"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
-				return
+				return 1
 	// Short of a rewrite, this is necessary to stop monkeycubes being washed.
 	else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
 		return

code/game/objects/structures/window.dm

@@ -239,6 +239,7 @@
 	if(istype(W, /obj/item/weapon/screwdriver))
 		if(reinf && state >= 1)
 			state = 3 - state
+			update_nearby_icons()
 			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
 			user << (state == 1 ? "<span class='notice'>You have unfastened the window from the frame.</span>" : "<span class='notice'>You have fastened the window to the frame.</span>")
 		else if(reinf && state == 0)
@@ -337,7 +338,11 @@
 /obj/structure/window/Destroy()
 	density = 0
 	update_nearby_tiles()
-	update_nearby_icons()
+	var/turf/location = loc
+	loc = null
+	for(var/obj/structure/window/W in orange(location, 1))
+		W.update_icon()
+	loc = location
 	..()
 
 
@@ -357,35 +362,31 @@
 //This proc is used to update the icons of nearby windows. It should not be confused with update_nearby_tiles(), which is an atmos proc!
 /obj/structure/window/proc/update_nearby_icons()
 	update_icon()
-	for(var/direction in cardinal)
-		for(var/obj/structure/window/W in get_step(src,direction) )
-			W.update_icon()
+	for(var/obj/structure/window/W in orange(src, 1))
+		W.update_icon()
 
 //merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm)
 /obj/structure/window/update_icon()
 	//A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong.
 	//this way it will only update full-tile ones
-	//This spawn is here so windows get properly updated when one gets deleted.
-	spawn(2)
-		if(!src) return
-		if(!is_fulltile())
-			icon_state = "[basestate]"
-			return
-		var/junction = 0 //will be used to determine from which side the window is connected to other windows
-		if(anchored)
-			for(var/obj/structure/window/W in orange(src,1))
-				if(W.anchored && W.density	&& W.is_fulltile()) //Only counts anchored, not-destroyed fill-tile windows.
-					if(abs(x-W.x)-abs(y-W.y) ) 		//doesn't count windows, placed diagonally to src
-						junction |= get_dir(src,W)
-		if(opacity)
-			icon_state = "[basestate][junction]"
-		else
-			if(reinf)
-				icon_state = "[basestate][junction]"
-			else
-				icon_state = "[basestate][junction]"
-
+	overlays.Cut()
+	if(!is_fulltile())
+		icon_state = "[basestate]"
 		return
+	var/list/dirs = list()
+	if(anchored)
+		for(var/obj/structure/window/W in orange(src,1))
+			if(W.anchored && W.density && W.type == src.type && W.is_fulltile()) //Only counts anchored, not-destroyed fill-tile windows.
+				dirs += get_dir(src, W)
+
+	var/list/connections = dirs_to_corner_states(dirs)
+
+	icon_state = ""
+	for(var/i = 1 to 4)
+		var/image/I = image(icon, "[basestate][connections[i]]", dir = 1<<(i-1))
+		overlays += I
+
+	return
 
 /obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > T0C + 800)
@@ -466,11 +467,9 @@
 	basestate = "window"
 	maxhealth = 40
 	reinf = 1
+	basestate = "w"
 	dir = 5
 
-	update_icon() //icon_state has to be set manually
-		return
-
 /obj/structure/window/reinforced/polarized
 	name = "electrochromic window"
 	desc = "Adjusts its tint with voltage. Might take a few good hits to shatter it."