Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge

code/datums/spells/dumbfire.dm

@@ -76,7 +76,7 @@
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
 							spawn(proj_trail_lifespan)
-								del(trail)
+								trail.loc = null
 
 				current_loc = projectile.loc
 

code/datums/spells/projectile.dm

@@ -77,7 +77,7 @@
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
 							spawn(proj_trail_lifespan)
-								del(trail)
+								trail.loc = null
 
 				if(!projectile)
 					break

code/game/machinery/meteldetector.dm

@@ -15,14 +15,19 @@
 	ghost_read=0
 	ghost_write=0
 	density = 1
-	req_access = list(access_security, access_forensics_lockers)
+	var/idmode = 0
+	var/scanmode = 0
+	var/senset = 0
+
+
+	req_access = list(access_security)
 
 
 
 /obj/machinery/detector/proc/assess_perp(mob/living/carbon/human/perp as mob)
 	var/threatcount = 0
 
-	if(src.emagged == 2) return 10 //Everyone is a criminal!
+	if(src.emagged == 2) return 10
 
 	if(!src.allowed(perp))
 
@@ -44,35 +49,103 @@
 			&& !istype(perp:belt, /obj/item/weapon/gun/energy/laser/practice))
 				threatcount += 2
 
+		if(istype(perp:back, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee))
+			if(!istype(perp:back, /obj/item/weapon/gun/energy/laser/bluetag) \
+			&& !istype(perp:back, /obj/item/weapon/gun/energy/laser/redtag) \
+			&& !istype(perp:back, /obj/item/weapon/gun/energy/laser/practice))
+				threatcount += 2
+
+
+
+		if(istype(perp:s_store, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee))
+			if(!istype(perp:s_store, /obj/item/weapon/gun/energy/laser/bluetag) \
+			&& !istype(perp:s_store, /obj/item/weapon/gun/energy/laser/redtag) \
+			&& !istype(perp:s_store, /obj/item/weapon/gun/energy/laser/practice))
+				threatcount += 2
+
+
+		if(scanmode)
+			//
+			if(istype(perp:l_store, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee))
+				if(!istype(perp:l_store, /obj/item/weapon/gun/energy/laser/bluetag) \
+				&& !istype(perp:l_store, /obj/item/weapon/gun/energy/laser/redtag) \
+				&& !istype(perp:l_store, /obj/item/weapon/gun/energy/laser/practice))
+					threatcount += 2
+
+
+			if(istype(perp:r_store, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee))
+				if(!istype(perp:r_store, /obj/item/weapon/gun/energy/laser/bluetag) \
+				&& !istype(perp:r_store, /obj/item/weapon/gun/energy/laser/redtag) \
+				&& !istype(perp:r_store, /obj/item/weapon/gun/energy/laser/practice))
+					threatcount += 2
+
+
+
+			if (perp.back && istype(perp.back, /obj/item/weapon/storage/backpack))
+				//
+				var/obj/item/weapon/storage/backpack/B = perp.back
+							//
+				for(var/things in B.contents)
+					//
+					if(istype(things, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee))
+						if(!istype(things, /obj/item/weapon/gun/energy/laser/bluetag) \
+						&& !istype(things, /obj/item/weapon/gun/energy/laser/redtag) \
+						&& !istype(things, /obj/item/weapon/gun/energy/laser/practice))
+							threatcount += 2
+
+
+
+
+
+		if(idmode)
+			//
+			if(!perp:wear_id)
+				threatcount += 4
+
+		else
+
+			if(!perp:wear_id)
+				threatcount += 2
+
+
 		if(istype(perp:wear_suit, /obj/item/clothing/suit/wizrobe))
 			threatcount += 2
 
 		if(perp.dna && perp.dna.mutantrace && perp.dna.mutantrace != "none")
 			threatcount += 2
 
+
+
+
+
 		//Agent cards lower threatlevel.
-		if(perp.wear_id && istype(perp:wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
-			threatcount -= 2
-
-	if(1)
-		for (var/datum/data/record/E in data_core.general)
-			var/perpname = perp.name
-			if(perp.wear_id)
-				var/obj/item/weapon/card/id/id = perp.wear_id.GetID()
-				if(id)
-					perpname = id.registered_name
-
-			if(E.fields["name"] == perpname)
-				for (var/datum/data/record/R in data_core.security)
-					if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
-						threatcount = 4
-						break
-
-	return threatcount
+		//if(perp.wear_id && istype(perp:wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) ///////////////nah, i dont think so
+		//	threatcount -= 2
 
 
 
 
+	var/passperpname = ""
+	for (var/datum/data/record/E in data_core.general)
+		var/perpname = perp.name
+
+		if(perp.wear_id)
+			var/obj/item/weapon/card/id/id = perp.wear_id.GetID()
+
+			if(id)
+				perpname = id.registered_name
+		else
+			perpname = "Unknown"
+		passperpname = perpname
+		if(E.fields["name"] == perpname)
+			for (var/datum/data/record/R in data_core.security)
+				if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
+					threatcount = 4
+					break
+
+	var/list/retlist = list(threatcount, passperpname)
+
+	return retlist
 
 
 
@@ -85,10 +158,9 @@
 //		src.sd_SetLuminosity(2)
 	else
 		stat |= ~NOPOWER
-		icon_state = "[base_state]1-p"
+		icon_state = "[base_state]1"
 //		src.sd_SetLuminosity(0)
 
-//Don't want to render prison breaks impossible
 /obj/machinery/detector/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wirecutters))
 		add_fingerprint(user)
@@ -98,18 +170,98 @@
 		if (!src.disable)
 			user.visible_message("\red [user] has connected the detector array!", "\red You connect the detector array!")
 
-//Let the AI trigger them directly.
-/obj/machinery/detector/attack_ai()
-	if (src.anchored)
-		return src.flash()
-	else
+
+
+
+
+
+/obj/machinery/detector/Topic(href, href_list)
+	if(..()) return
+
+	if(usr) usr.set_machine(src)
+
+	if (href_list["idmode"])
+
+		if(idmode)
+			idmode = 0
+			//
+
+		else
+			idmode = 1
+
+
+
+	if (href_list["scanmode"])
+
+		if(scanmode)
+			scanmode = 0
+			//
+
+		else
+			scanmode = 1
+
+
+	if (href_list["senmode"])
+
+		if(senset)
+			senset = 0
+			//
+
+		else
+			senset = 1
+
+	src.updateUsrDialog()
+	return
+
+
+
+.
+
+/obj/machinery/detector/attack_hand(mob/user as mob)
+
+	if(src.allowed(user))
+
+
+		user.set_machine(src)
+
+		if(!src.anchored)
+			return
+
+		var/dat = "<h4>"
+
+		if(idmode == 0)
+			dat += "Citizens must carry ID: <A href='?src=\ref[src];idmode=1'>Turn On</A><BR><BR>"
+		else
+			dat += "Citizens must carry ID: <A href='?src=\ref[src];idmode=1'>Turn Off</A><BR><BR>"
+
+
+		if(scanmode == 0)
+			dat += "Intrusive Scan: <A href='?src=\ref[src];scanmode=1'>Turn On</A><BR><BR>"
+		else
+			dat += "Intrusive Scan: <A href='?src=\ref[src];scanmode=1'>Turn Off</A><BR><BR>"
+
+
+
+		if(senset == 0)
+			dat += "DeMil Alerts: <A href='?src=\ref[src];senmode=1'>Turn On</A><BR><BR>"
+		else
+			dat += "DeMil Alerts: <A href='?src=\ref[src];senmode=1'>Turn Off</A><BR><BR>"
+
+
+		user << browse("<TITLE>Mr. V.A.L.I.D. Portable Threat Detector</TITLE><h3>Menu:</h3><BR><BR>[dat]</h4></ul>", "window=detector;size=575x300")
+		onclose(user, "detector")
 		return
 
+	else:
+
+		src.visible_message("<span class = 'warning'>ACCESS DENIED!</span>")
+
+
 /obj/machinery/detector/proc/flash()
 	if (!(powered()))
 		return
 
-	if ((src.disable) || (src.last_read && world.time < src.last_read + 30))
+	if ((src.disable) || (src.last_read && world.time < src.last_read + 20))
 		return
 
 
@@ -118,15 +270,33 @@
 		if(isobserver(O)) continue
 		if (get_dist(src, O) > src.range)
 			continue
+		var/list/ourretlist = src.assess_perp(O)
 
-		if (src.assess_perp(O) >= 4)
-			src.visible_message("<span class = 'warning'>Theat Detected! Subject: [O.name]</span>")////
+	//	src.visible_message("<span class = 'warning'>Test2! Subject: [src.assess_perp(O)[1]]</span>")////
+		var/dudesthreat = ourretlist[1]
+		var/dudesname = ourretlist[2]
+	//	src.visible_message("<span class = 'warning'>Test3! Subject: [dudesname]</span>")////
+		if (dudesthreat >= 4)
+			src.visible_message("<span class = 'warning'>Theat Detected! Subject: [dudesname]</span>")////
 			playsound(get_turf(src), 'sound/machines/info.ogg', 100, 1)
 			flick("[base_state]_flash", src)
 			src.last_read = world.time
 			use_power(1000)
 			//world << "<font size='1' color='red'><b>Theat Detected! Subject:[O.name]/b></font>" //debugging
+		else if(dudesthreat <= 3 && dudesthreat != 0 && senset)
+			playsound(get_turf(src), 'sound/machines/info.ogg', 100, 1)
+			flick("[base_state]_flash", src)
+			src.last_read = world.time
+			use_power(1000)
+			src.visible_message("<span class = 'warning'>Additional screening required! Subject: [dudesname]</span>")
+			//
 
+		else
+			playsound(get_turf(src), 'sound/machines/info.ogg', 100, 1)
+			flick("[base_state]_flash", src)
+			src.last_read = world.time
+			use_power(1000)
+			src.visible_message("<span class = 'notice'> Subject: [dudesname] clear.</span>")
 
 
 
@@ -145,7 +315,7 @@
 		return
 
 	if(istype(AM, /mob/living/carbon))
-		//var/mob/living/carbon/M = AM
+
 		if ((src.anchored))
 			src.flash()
 
@@ -160,47 +330,6 @@
 
 		else if (src.anchored)
 			user.show_message(text("\red [src] is now secured."))
-		src.overlays += "[base_state]-s"
+			src.overlays += "[base_state]-s"
 
 
-
-
-/*
-/obj/machinery/detector_button/attack_ai(mob/user as mob)
-	src.add_hiddenprint(user)
-	return src.attack_hand(user)
-
-/obj/machinery/detector_button/attack_paw(mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/machinery/detector_button/attackby(obj/item/weapon/W, mob/user as mob)
-	return src.attack_hand(user)
-
-/obj/machinery/detector_button/attack_hand(mob/user as mob)
-
-	if(stat & (NOPOWER|BROKEN))
-		return
-	if(active)
-		return
-
-	use_power(5)
-
-	active = 1
-	icon_state = "launcheract"
-
-	for(var/obj/machinery/detector/M in world)
-		if(M.id_tag == src.id_tag)
-			spawn()
-				M.flash()
-
-	sleep(50)
-
-	icon_state = "launcherbtt"
-	active = 0
-
-	return
-
-
-
-
-*/

code/game/machinery/vending.dm

@@ -872,7 +872,7 @@
 	products = list(/obj/item/clothing/under/color/black = 10,/obj/item/clothing/under/color/blue = 10,/obj/item/clothing/under/color/green = 10,/obj/item/clothing/under/color/grey = 10,/obj/item/clothing/under/color/pink = 10,/obj/item/clothing/under/color/red = 10,
 					/obj/item/clothing/under/color/white = 10, /obj/item/clothing/under/color/yellow = 10,/obj/item/clothing/under/lightblue = 10,/obj/item/clothing/under/aqua = 10,/obj/item/clothing/under/purple = 10,/obj/item/clothing/under/lightgreen = 10,
 					/obj/item/clothing/under/lightblue = 10,/obj/item/clothing/under/lightbrown = 10,/obj/item/clothing/under/brown = 10,/obj/item/clothing/under/yellowgreen = 10,/obj/item/clothing/under/darkblue = 10,/obj/item/clothing/under/lightred = 10, /obj/item/clothing/under/darkred = 10,
-					/obj/item/clothing/under/color/bluepants = 10,/obj/item/clothing/under/color/blackpants = 10,/obj/item/clothing/under/color/redpants = 10,/obj/item/clothing/under/color/greypants = 10)
+					/obj/item/clothing/under/bluepants = 10,/obj/item/clothing/under/blackpants = 10,/obj/item/clothing/under/redpants = 10,/obj/item/clothing/under/greypants = 10)
 	contraband = list(/obj/item/clothing/under/syndicate/tacticool = 5,/obj/item/clothing/under/color/orange = 5,/obj/item/clothing/under/psyche = 5)
 	premium = list(/obj/item/clothing/under/rainbow = 1)
 

code/modules/clothing/under/color.dm

@@ -144,30 +144,25 @@
 	_color = "darkred"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/blackpants
+/obj/item/clothing/under/blackpants
 	name = "black pants"
-	icon_state = "blackpants"
-	item_state = "blackpants"
-	_color = "black"
+	icon_state = "blpants"
+	_color = "blpants"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/redpants
+/obj/item/clothing/under/redpants
 	name = "red pants"
-	icon_state = "redpants"
-	item_state = "redpants"
-	_color = "red"
+	icon_state = "rpants"
+	_color = "rpants"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/bluepants
+/obj/item/clothing/under/bluepants
 	name = "blue pants"
-	icon_state = "bluepants"
-	item_state = "bluepants"
-	_color = "blue"
+	icon_state = "bpants"
+	_color = "bpants"
 	flags = FPRINT | TABLEPASS
 
-/obj/item/clothing/under/color/greypants
+/obj/item/clothing/under/greypants
 	name = "grey pants"
-	icon_state = "greypants"
-	item_state = "greypants"
-	_color = "grey"
-	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	icon_state = "gpants"
+	_color = "gpants"

code/modules/mining/equipment_locker.dm

@@ -49,7 +49,7 @@
 		var/datum/material/mat = materials.getMaterial(O.material)
 		mat.stored += processed_sheet.amount //Stack the sheets
 		credits += mat.value * processed_sheet.amount // Gimme my fucking credits
-		qdel(O)
+	qdel(O)
 
 /obj/machinery/mineral/ore_redemption/process()
 	var/turf/T = get_turf(input)
@@ -77,7 +77,6 @@
 		var/obj/item/stack/sheet/M = new mat.sheettype(src)
 		//credits += mat.value // Old behavior
 		return M
-	del(O)//No refined type? Purge it.
 	return
 
 /obj/machinery/mineral/ore_redemption/attack_hand(user as mob)

code/modules/mining/machine_stacking.dm

@@ -112,10 +112,10 @@
 					stack=stacks["[O.type]"]
 					stack.amount += O:amount
 				stacks["[O.type]"]=stack
-				del(O)
+				qdel(O)
 				continue
 			if (istype(O,/obj/item/weapon/ore/slag))
-				del(O)
+				qdel(O)
 				continue
 			O.loc = src.output.loc
 		for(var/typepath in stacks)

code/modules/projectiles/projectile/beams.dm

@@ -306,6 +306,7 @@ var/list/beam_master = list()
 				var/list/turfs = turf_master[laser_state]
 				for(var/turf/T in turfs)
 					T.overlays -= beam_master[laser_state]
+				turfs.Cut()
 		return
 
 /obj/item/projectile/beam/practice