merge

code/WorkInProgress/Mini/atmos_control.dm

@@ -10,6 +10,7 @@
 	anchored = 1.0
 	circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
 	var/obj/machinery/alarm/current = ""
+	var/overridden = 0 //not set yet, can't think of a good way to do it
 
 /obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
 	if(..())
@@ -36,7 +37,7 @@
 		return ""
 	var/dat = "<h3>[current.name]</h3><hr>"
 	dat += current.return_status()
-	if(current.remote_control)
+	if(current.remote_control || overridden && current.rcon_setting)
 		dat += "<hr>[src.return_controls()]"
 	return dat
 

code/WorkInProgress/Mini/customitems.dm

@@ -6,7 +6,9 @@
 var/list/CustomItemList = list(
 		//    ckey        real_name   item path
 	//	list("miniature","Dave Booze",/obj/item/toy/crayonbox)	//screw this i dont want crayons, it's an example okay
-	list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver)	//Phillip likes to chew on cigars.  Just unlit cigars, don't ask me why.  Must be a clone thing.  (Cigarette machines dispense cigars if they have a coin in them)  --SkyMarshal
+	list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver),	//Phillip likes to chew on cigars.  Just unlit cigars, don't ask me why.  Must be a clone thing.  (Cigarette machines dispense cigars if they have a coin in them)  --SkyMarshal
+	list("spaceman96", "Trenna Seber", /obj/item/weapon/pen/multi),	//For Spesss.
+	list("asanadas", "Book Berner", /obj/item/clothing/under/chameleon/psyche)
 	)
 
 /proc/EquipCustomItems(mob/living/carbon/human/M)

code/WorkInProgress/SkyMarshal/eraser.dm

@@ -1,9 +0,0 @@
-/obj/item/weapon/stamperaser
-	name = "Eraser"
-	desc = "Some type of eraser, you guess."
-	flags = FPRINT | TABLEPASS
-	icon = 'items.dmi'
-	icon_state = "zippo"
-	item_state = "zippo"
-	w_class = 1.0
-	m_amt = 80

code/WorkInProgress/SkyMarshal/traitoritems.dm

@@ -0,0 +1,74 @@
+/obj/item/weapon/stamperaser
+	name = "Eraser"
+	desc = "Some type of eraser, you guess."
+	flags = FPRINT | TABLEPASS
+	icon = 'items.dmi'
+	icon_state = "zippo"
+	item_state = "zippo"
+	w_class = 1.0
+	m_amt = 80
+
+/obj/item/device/jammer
+	name = "strange device"
+	desc = "It blinks and has an antenna on it.  Weird."
+	icon_state = "t-ray0"
+	var/on = 0
+	flags = FPRINT|TABLEPASS
+	w_class = 1
+	var
+		list/obj/item/device/radio/Old = list()
+		list/obj/item/device/radio/Curr = list()
+		time_remaining = 5
+
+/obj/item/device/jammer/New()
+	..()
+	time_remaining = rand(10,20) // ~2-4 BYOND seconds of use.
+	return
+
+/obj/item/device/jammer/attack_self(mob/user)
+
+	if(time_remaining > 0)
+		on = !on
+		icon_state = "t-ray[on]"
+
+		if(on)
+			processing_objects.Add(src)
+	else
+		on = 0
+		icon_state = "t-ray0"
+		user << "It's fried itself from overuse!"
+		if(Old)
+			for(var/obj/item/device/radio/T in Old)
+				T.scrambleoverride = 0
+			Old = null
+			Curr = null
+
+
+/obj/item/device/jammer/process()
+	if(!on)
+		processing_objects.Remove(src)
+		return null
+
+	Old = Curr
+	Curr = list()
+
+	for(var/obj/item/device/radio/T in range(3, src.loc) )
+
+		T.scrambleoverride = 1
+		Curr |= T
+		for(var/obj/item/device/radio/V in Old)
+			if(V == T)
+				Old -= V
+				break
+
+	for(var/obj/item/device/radio/T in Old)
+		T.scrambleoverride = 0
+
+	time_remaining--
+	if(time_remaining <= 0)
+		for(var/mob/O in viewers(src))
+			O.show_message("\red You hear a loud pop, like circuits frying.", 1)
+		on = 0
+		icon_state = "t-ray0"
+
+	sleep(2)

code/WorkInProgress/virus2/base.dm

@@ -239,7 +239,7 @@ proc/airborne_can_reach(turf/source, turf/target)
 			e.runeffect(mob,stage)
 		clicks+=speed
 
-		if(prob(5)) spread_airborne(mob)
+		if(prob(50)) spread_airborne(mob)
 
 	proc/cure(var/mob/living/carbon/mob)
 		var/datum/disease2/effectholder/E

code/WorkInProgress/virus2/curer.dm

@@ -3,7 +3,7 @@
 	icon = 'computer.dmi'
 	icon_state = "dna"
 	var/curing
-	var/virusing
+	var/virusing = 0
 
 	var/obj/item/weapon/reagent_containers/container = null
 
@@ -40,6 +40,20 @@
 			container = I
 			C.drop_item()
 			I.loc = src
+	if(istype(I,/obj/item/weapon/virusdish))
+		if(virusing)
+			user << "<b>The pathogen materializer is still recharging.."
+			return
+		var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc)
+
+		var/list/data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"virus2"=null,"antibodies"=0)
+		data["virus2"] = I:virus2
+		product.reagents.add_reagent("blood",30,data)
+
+		virusing = 1
+		spawn(1200) virusing = 0
+
+	state("The [src.name] Buzzes", "blue")
 
 	//else
 	src.attack_hand(user)