Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm

code/game/objects/items/candle.dm

@@ -54,7 +54,7 @@
 		for(var/mob/O in viewers(usr, null))
 			O.show_message(flavor_text, 1)
 		SetLuminosity(CANDLE_LUMINOSITY)
-		SSobj.processing.Add(src)
+		SSobj.processing |= src
 
 
 /obj/item/candle/process()

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

@@ -283,7 +283,7 @@ obj/item/device/flashlight/lamp/bananalamp
 
 /obj/item/device/flashlight/emp/New()
 		..()
-		SSobj.processing.Add(src)
+		SSobj.processing |= src
 
 /obj/item/device/flashlight/emp/Destroy()
 		SSobj.processing.Remove(src)

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

@@ -186,7 +186,7 @@
 	if(energy <= max_energy)
 		if(!recharging)
 			recharging = 1
-			SSobj.processing.Add(src)
+			SSobj.processing |= src
 		if(energy <= 0)
 			user << "<span class='warning'>You've overused the battery of [src], now it needs time to recharge!</span>"
 			recharge_locked = 1

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

@@ -20,10 +20,10 @@
 	if(!ishuman(user))
 		user << "<span class='warning'>You don't know how to use this!</span>"
 		return
-	if(ishuman(user) && (user.mind.miming)) //Humans get their muteness checked
+	if(user.can_speak())
 		user << "<span class='warning'>You find yourself unable to speak at all.</span>"
 		return
-	if(spamcheck)
+	if(spamcheck > world.time)
 		user << "<span class='warning'>\The [src] needs to recharge!</span>"
 		return
 
@@ -34,19 +34,15 @@
 	if ((src.loc == user && usr.stat == 0))
 		if(emagged)
 			if(insults)
-				for(var/mob/O in (viewers(user)))
-					O.show_message("<B>[user]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>",2) // 2 stands for hearable message
+				user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>", null, 1) // 2 stands for hearable message
 				insults--
 			else
 				user << "<span class='warning'>*BZZZZzzzzzt*</span>"
 		else
-			for(var/mob/O in (viewers(user)))
-				O.show_message("<B>[user]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>",2) // 2 stands for hearable message
+			user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>", null, 1) // 2 stands for hearable message
 
 		playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1)
-		spamcheck = 1
-		spawn(20)
-			spamcheck = 0
+		spamcheck = world.time + 50
 		return
 
 /obj/item/device/megaphone/emag_act(mob/user)

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

@@ -47,7 +47,7 @@
 		if(OPERATING)
 			if(!attached)
 				return
-			SSobj.processing.Add(src)
+			SSobj.processing |= src
 			anchored = 1
 
 	mode = value

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

@@ -25,7 +25,7 @@ MASS SPECTROMETER
 	icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
 
 	if(on)
-		SSobj.processing.Add(src)
+		SSobj.processing |= src
 
 
 /obj/item/device/t_scanner/process()

code/game/objects/items/holotape.dm

@@ -0,0 +1,247 @@
+#define MAX_TAPE_RANGE 3
+//The max length of a line of hazard tape by tile range
+
+//Define all tape types in hazardtape.dm
+/obj/item/tapeproj
+	icon = 'icons/obj/holotape.dmi'
+	icon_state = "rollstart"
+	w_class = 2.0
+	var/turf/start
+	var/turf/end
+	var/tape_type = /obj/item/holotape
+	var/icon_base
+	var/charging = 0
+
+/obj/item/holotape
+	icon = 'icons/obj/holotape.dmi'
+	anchored = 1
+	density = 1
+	var/icon_base
+	var/health = 10
+
+/obj/item/tapeproj/security
+	name = "security holotape projector"
+	desc = "A security hard-light holotape projector used to create holotape. It can be placed in segments along hallways or on airlocks to signify crime scenes."
+	icon_state = "security_start"
+	tape_type = /obj/item/holotape/security
+	icon_base = "security"
+
+/obj/item/holotape/security
+	name = "security holotape"
+	desc = "A length of security hard-light holotape. It reads: SECURITY LINE | DO NOT CROSS."
+	icon_base = "security"
+
+/obj/item/tapeproj/engineering
+	name = "engineering holotape projector"
+	desc = "An engineering hard-light holotape projector used to create holotape. It can be placed in segments along hallways or on airlocks to show hazardous areas."
+	icon_state = "engineering_start"
+	tape_type = /obj/item/holotape/engineering
+	icon_base = "engineering"
+
+/obj/item/holotape/engineering
+	name = "engineering holotape"
+	desc = "A length of engineering hard-light holotape. It reads: HAZARD AHEAD // DO NOT CROSS."
+	icon_base = "engineering"
+
+/obj/item/tapeproj/dropped()
+	reset()
+
+/obj/item/tapeproj/equipped()
+	reset()
+
+/obj/item/tapeproj/proc/reset()
+	if(icon_state == "[icon_base]_stop")
+		icon_state = "[icon_base]_start"
+		start = null
+		return
+
+/obj/item/tapeproj/attack_self(var/mob/user)
+	if(charging)
+		usr << "<span class='warning'>[src] is recharging!</span>"
+		return
+	if(icon_state == "[icon_base]_start")
+		start = get_turf(src)
+		usr << "<span class='notice'>You project the start of the [icon_base] holotape.</span>"
+		icon_state = "[icon_base]_stop"
+	else
+		icon_state = "[icon_base]_start"
+		end = get_turf(src)
+		if(start.y != end.y && start.x != end.x || start.z != end.z)
+			usr << "<span class='warning'>[src] can only be projected horizontally or vertically.</span>"
+			return
+		if(get_dist(start,end) >= MAX_TAPE_RANGE)
+			usr << "<span class='warning'>Your holotape segment is too long! It must be [MAX_TAPE_RANGE] tiles long or shorter!</span>"
+			return
+
+		var/turf/cur = start
+		var/dir
+		if(start.x == end.x)
+			var/d = end.y-start.y
+			if(d) d = d/abs(d)
+			end = get_turf(locate(end.x,end.y+d,end.z))
+			dir = "v"
+		else
+			var/d = end.x-start.x
+			if(d) d = d/abs(d)
+			end = get_turf(locate(end.x+d,end.y,end.z))
+			dir = "h"
+
+		var/can_place = 1
+		while (cur!=end && can_place)
+			if(cur.density == 1)
+				can_place = 0
+			else if(istype(cur, /turf/space))
+				can_place = 0
+			else
+				for(var/obj/O in cur)
+					if(!istype(O, /obj/item/holotape) && O.density)
+						can_place = 0
+						break
+			cur = get_step_towards(cur,end)
+		if(!can_place)
+			usr << "<span class='warning'>You can't project the [icon_base] holotape through that!</span>"
+			return
+
+		cur = start
+		var/tapetest = 0
+		while (cur!=end)
+			for(var/obj/item/holotape/Ptest in cur)
+				if(Ptest.icon_state == "[Ptest.icon_base]_[dir]")
+					tapetest = 1
+			if(tapetest != 1)
+				var/obj/item/holotape/P = new tape_type(cur)
+				P.icon_state = "[P.icon_base]_[dir]"
+			cur = get_step_towards(cur,end)
+
+		usr << "<span class='notice'>You finish project the legnth of [icon_base] holotape.</span>"
+		user.visible_message("<span class='warning'>[user] finishes projecting the length of [icon_base] holotape.</span>")
+
+		charging = 1
+		spawn(40)
+			charging = 0
+
+/obj/item/tapeproj/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	if(charging)
+		return
+
+	if(proximity_flag == 0) // not adjacent
+		return
+
+	if(istype(target, /obj/machinery/door/airlock) || istype(target, /obj/machinery/door/firedoor) || istype(target, /obj/structure/window))
+		var/turf = get_turf(target)
+
+		if(locate(tape_type) in turf) //Don't you dare stack tape
+			return
+
+		if(istype(target, /obj/structure/window))
+			var/obj/structure/window/W = target
+			if(!(W.dir == 5) || !(W.fulltile == 1))
+				return
+
+		user << "<span class='notice'>You start projecting the [icon_base] holotape onto [target].</span>"
+
+		if(!do_mob(user, target, 30))
+			return
+
+		var/atom/tape = new tape_type(turf)
+		tape.icon_state = "[icon_base]_door"
+		tape.layer = 3.2
+
+		user << "<span class='notice'>You project the [icon_base] holotape onto [target].</span>"
+
+		charging = 1
+		spawn(40)
+			charging = 0
+
+/obj/item/holotape/Bumped(var/mob/living/carbon/C)
+	if(C.m_intent == "walk")
+		var/turf/T = get_turf(src)
+		C.loc = T
+
+/obj/item/holotape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(!density) return 1
+	if(air_group || (height==0)) return 1
+
+	if((mover.flags & PASSGLASS || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
+		return 1
+	else
+		return 0
+
+/obj/item/holotape/attack_hand(mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
+	playsound(loc, 'sound/weapons/Egloves.ogg', 80, 1)
+	user.visible_message("<span class='warning'>[user] hits [src].</span>", \
+						 "<span class='warning'>You hit [src].</span>" )
+
+	health -= rand(1,2)
+	healthcheck()
+
+/obj/item/holotape/proc/healthcheck()
+	if(health <= 0)
+		breaktape()
+
+/obj/item/holotape/ex_act(severity, target)
+	breaktape()
+
+/obj/item/holotape/blob_act()
+	breaktape()
+
+/obj/item/holotape/attack_paw(mob/living/user)
+	attack_hand(user)
+
+/obj/item/holotape/bullet_act(var/obj/item/projectile/Proj)
+	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+		health -= Proj.damage
+	..()
+	if(health <= 0)
+		breaktape()
+	return
+
+/obj/item/holotape/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	user.changeNext_move(CLICK_CD_MELEE)
+	add_fingerprint(user)
+	health -= W.force * 0.3
+
+	healthcheck()
+	..()
+	return
+
+/obj/item/holotape/hitby(AM as mob|obj)
+	..()
+	visible_message("<span class='danger'>[src] was hit by [AM].</span>")
+	var/tforce = 0
+	if(ismob(AM))
+		tforce = 5
+	else if(isobj(AM))
+		var/obj/item/I = AM
+		tforce = max(0, I.throwforce * 0.5)
+	playsound(loc, 'sound/weapons/Egloves.ogg', 80, 1)
+	health = max(0, health - tforce)
+	healthcheck()
+
+/obj/item/holotape/proc/breaktape()
+	var/dir[2]
+	var/icon_dir = src.icon_state
+	if(icon_dir == "[src.icon_base]_h")
+		dir[1] = EAST
+		dir[2] = WEST
+	if(icon_dir == "[src.icon_base]_v")
+		dir[1] = NORTH
+		dir[2] = SOUTH
+
+	for(var/i=1;i<3;i++)
+		var/N = 0
+		var/turf/cur = get_step(src,dir[i])
+		while(N != 1)
+			N = 1
+			for (var/obj/item/holotape/P in cur)
+				if(P.icon_state == icon_dir)
+					N = 0
+					del(P)
+			cur = get_step(cur,dir[i])
+
+	del(src)
+	return
+
+#undef MAX_TAPE_RANGE

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

@@ -101,6 +101,11 @@
 	desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds."
 	stop_bleeding = 900
 
+/obj/item/stack/medical/gauze/cyborg/
+	m_amt = 0
+	is_cyborg = 1
+	cost = 250
+
 /obj/item/stack/medical/ointment
 	name = "ointment"
 	desc = "Used to treat those nasty burn wounds."

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

@@ -176,7 +176,7 @@
 		update_icon()
 
 		desc = initial(desc) + "<br><span class='info'>It appears to contain [target.name].</span>"
-	SSobj.processing.Add(src)
+	SSobj.processing |= src
 
 /obj/effect/chrono_field/Destroy()
 	if(gun && gun.field_check(src))

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

@@ -50,7 +50,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		name = "lit match"
 		desc = "A match. This one is lit."
 		attack_verb = list("burnt","singed")
-		SSobj.processing.Add(src)
+		SSobj.processing |= src
 		update_icon()
 	return
 
@@ -185,7 +185,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(flavor_text)
 			var/turf/T = get_turf(src)
 			T.visible_message(flavor_text)
-		SSobj.processing.Add(src)
+		SSobj.processing |= src
 
 		//can't think of any other way to update the overlays :<
 		if(ismob(loc))
@@ -475,7 +475,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 					user.visible_message("<span class='notice'>After a few attempts, [user] manages to light [src], they however burn their finger in the process.</span>")
 
 			user.AddLuminosity(1)
-			SSobj.processing.Add(src)
+			SSobj.processing |= src
 		else
 			lit = 0
 			icon_state = icon_off

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

@@ -140,7 +140,7 @@
 		if(!status)	return
 		lit = !lit
 		if(lit)
-			SSobj.processing.Add(src)
+			SSobj.processing |= src
 	if(href_list["amount"])
 		throw_amount = throw_amount + text2num(href_list["amount"])
 		throw_amount = max(50, min(5000, throw_amount))

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

@@ -69,7 +69,7 @@
 	desc = "Lets you shoot your guns"
 	icon_state = "auth"
 
-/obj/item/weapon/implant/tracking/get_data()
+/obj/item/weapon/implant/weapons_auth/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>
 				<b>Name:</b> Firearms Authentication Implant<BR>
 				<b>Life:</b> 4 hours after death of host<BR>

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

@@ -29,6 +29,7 @@
 		var/obj/effect/overlay/holograph/H = locate() in T
 		if(H)
 			user << "<span class='notice'>You use [src] to destroy [H].</span>"
+			signs.Remove(H)
 			qdel(H)
 		else
 			if(signs.len < max_signs)

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

@@ -700,7 +700,7 @@
 				- metal rod (kebab)
 
 				<h2>Table Craft:</h2>
-				Put ingredients on table, then click and drag the table onto yourself to prepare recipes.
+				Put ingredients on table, then click and drag the table onto yourself to see what recipes you can prepare.
 
 				<h2>Microwave:</h2>
 				Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
@@ -718,14 +718,14 @@
 
 				<h2>Example recipes:</h2>
 				<b>Vanilla Cake</b>: Microwave cake batter.<br>
-				<b>Burger:</b> 1 bun + 1 meat<br>
+				<b>Burger:</b> 1 bun + 1 meat steak<br>
 				<b>Bread:</b> Microwave dough.<br>
-				<b>Waffles:</b> 2 doughslices<br>
+				<b>Waffles:</b> 2 pastry base<br>
 				<b>Popcorn:</b> Microwave corn.<br>
 				<b>Meat Steak:</b> Microwave meat.<br>
-				<b>Meat Pie:</b> 1 plain pie + 1u black pepper + 1u salt + 1 meat<br>
+				<b>Meat Pie:</b> 1 plain pie + 1u black pepper + 1u salt + 2 meat cutlets<br>
 				<b>Boiled Spagetti:</b> Microwave spaghetti.<br>
-				<b>Donuts:</b> 1u sugar + 1 doughslice<br>
+				<b>Donuts:</b> 1u sugar + 1 pastry base<br>
 				<b>Fries:</b> Process potato.
 
 				</body>

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

@@ -17,7 +17,7 @@
 
 /obj/item/weapon/twohanded/singularityhammer/New()
 	..()
-	SSobj.processing.Add(src)
+	SSobj.processing |= src
 
 
 /obj/item/weapon/twohanded/singularityhammer/Destroy()

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

@@ -13,6 +13,7 @@
 	var/status = 0
 	var/obj/item/weapon/stock_parts/cell/high/bcell = null
 	var/hitcost = 1000
+	var/losspertick = 5
 
 /obj/item/weapon/melee/baton/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.</span>")
@@ -44,6 +45,25 @@
 		else
 			return 0
 
+/obj/item/weapon/melee/baton/proc/update_process()
+	if(status)
+		SSobj.processing |= src
+	else
+		SSobj.processing.Remove(src)
+
+/obj/item/weapon/melee/baton/process()
+	if(bcell)
+		if(bcell.charge < hitcost)
+			status = 0
+			update_icon()
+		if(status)
+			if(isrobot(loc))
+				var/mob/living/silicon/robot/R = loc
+				if(R && R.cell)
+					R.cell.use(losspertick)
+			else
+				bcell.use(losspertick)
+
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
 		icon_state = "[initial(name)]_active"
@@ -51,6 +71,7 @@
 		icon_state = "[initial(name)]_nocell"
 	else
 		icon_state = "[initial(name)]"
+	update_process()
 
 /obj/item/weapon/melee/baton/examine(mob/user)
 	..()

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

@@ -24,7 +24,7 @@
 	src.air_contents.volume = volume //liters
 	src.air_contents.temperature = T20C
 
-	SSobj.processing.Add(src)
+	SSobj.processing |= src
 
 	return
 

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

@@ -317,7 +317,7 @@
 			damtype = "fire"
 			hitsound = 'sound/items/welder.ogg'
 			icon_state = "welder1"
-			SSobj.processing.Add(src)
+			SSobj.processing |= src
 		else
 			user << "<span class='notice'>You need more fuel.</span>"
 			welding = 0