Merge remote-tracking branch 'upstream/master' into revenants

code/datums/helper_datums/teleport.dm

@@ -1,7 +1,9 @@
 //wrapper
 /proc/do_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
-	new /datum/teleport/instant/science(arglist(args))
-	return
+	var/datum/teleport/instant/science/D = new
+	if(D.start(arglist(args)))
+		return 1
+	return 0
 
 /datum/teleport
 	var/atom/movable/teleatom //atom to teleport
@@ -14,192 +16,181 @@
 	var/force_teleport = 1 //if false, teleport will use Move() proc (dense objects will prevent teleportation)
 
 
-	New(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
-		..()
-		if(!Init(arglist(args)))
-			return 0
-		return 1
+/datum/teleport/proc/start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
+	if(!initTeleport(arglist(args)))
+		return 0
+	return 1
 
-	proc/Init(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout)
-		if(!setTeleatom(ateleatom))
-			return 0
-		if(!setDestination(adestination))
-			return 0
-		if(!setPrecision(aprecision))
-			return 0
-		setEffects(aeffectin,aeffectout)
-		setForceTeleport(afteleport)
-		setSounds(asoundin,asoundout)
-		return 1
+/datum/teleport/proc/initTeleport(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout)
+	if(!setTeleatom(ateleatom))
+		return 0
+	if(!setDestination(adestination))
+		return 0
+	if(!setPrecision(aprecision))
+		return 0
+	setEffects(aeffectin,aeffectout)
+	setForceTeleport(afteleport)
+	setSounds(asoundin,asoundout)
+	return 1
 
-	//must succeed
-	proc/setPrecision(aprecision)
-		if(isnum(aprecision))
-			precision = aprecision
-			return 1
+//must succeed
+/datum/teleport/proc/setPrecision(aprecision)
+	if(isnum(aprecision))
+		precision = aprecision
+		return 1
+	return 0
+
+//must succeed
+/datum/teleport/proc/setDestination(atom/adestination)
+	if(istype(adestination))
+		destination = adestination
+		return 1
+	return 0
+
+//must succeed in most cases
+/datum/teleport/proc/setTeleatom(atom/movable/ateleatom)
+	if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon))
+		qdel(ateleatom)
+		return 0
+	if(istype(ateleatom))
+		teleatom = ateleatom
+		return 1
+	return 0
+
+//custom effects must be properly set up first for instant-type teleports
+//optional
+/datum/teleport/proc/setEffects(datum/effect/effect/system/aeffectin=null,datum/effect/effect/system/aeffectout=null)
+	effectin = istype(aeffectin) ? aeffectin : null
+	effectout = istype(aeffectout) ? aeffectout : null
+	return 1
+
+//optional
+/datum/teleport/proc/setForceTeleport(afteleport)
+	force_teleport = afteleport
+	return 1
+
+//optional
+/datum/teleport/proc/setSounds(asoundin=null,asoundout=null)
+	soundin = isfile(asoundin) ? asoundin : null
+	soundout = isfile(asoundout) ? asoundout : null
+	return 1
+
+//placeholder
+/datum/teleport/proc/teleportChecks()
+	return 1
+
+/datum/teleport/proc/playSpecials(atom/location,datum/effect/effect/system/effect,sound)
+	if(location)
+		if(effect)
+			spawn(-1)
+				src = null
+				effect.attach(location)
+				effect.start()
+		if(sound)
+			spawn(-1)
+				src = null
+				playsound(location,sound,60,1)
+	return
+
+//do the monkey dance
+/datum/teleport/proc/doTeleport()
+
+	var/turf/destturf
+	var/turf/curturf = get_turf(teleatom)
+	var/area/destarea = get_area(destination)
+	if(precision)
+		var/list/posturfs = list()
+		var/center = get_turf(destination)
+		if(!center)
+			center = destination
+		for(var/turf/T in range(precision,center))
+			posturfs.Add(T)
+		destturf = safepick(posturfs)
+	else
+		destturf = get_turf(destination)
+
+	if(!destturf || !curturf)
 		return 0
 
-	//must succeed
-	proc/setDestination(atom/adestination)
-		if(istype(adestination))
-			destination = adestination
-			return 1
-		return 0
+	playSpecials(curturf,effectin,soundin)
 
-	//must succeed in most cases
-	proc/setTeleatom(atom/movable/ateleatom)
-		if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon))
-			qdel(ateleatom)
-			return 0
-		if(istype(ateleatom))
-			teleatom = ateleatom
-			return 1
-		return 0
-
-	//custom effects must be properly set up first for instant-type teleports
-	//optional
-	proc/setEffects(datum/effect/effect/system/aeffectin=null,datum/effect/effect/system/aeffectout=null)
-		effectin = istype(aeffectin) ? aeffectin : null
-		effectout = istype(aeffectout) ? aeffectout : null
-		return 1
-
-	//optional
-	proc/setForceTeleport(afteleport)
-		force_teleport = afteleport
-		return 1
-
-	//optional
-	proc/setSounds(asoundin=null,asoundout=null)
-		soundin = isfile(asoundin) ? asoundin : null
-		soundout = isfile(asoundout) ? asoundout : null
-		return 1
-
-	//placeholder
-	proc/teleportChecks()
-		return 1
-
-	proc/playSpecials(atom/location,datum/effect/effect/system/effect,sound)
-		if(location)
-			if(effect)
-				spawn(-1)
-					src = null
-					effect.attach(location)
-					effect.start()
-			if(sound)
-				spawn(-1)
-					src = null
-					playsound(location,sound,60,1)
-		return
-
-	//do the monkey dance
-	proc/doTeleport()
-
-		var/turf/destturf
-		var/turf/curturf = get_turf(teleatom)
-		var/area/destarea = get_area(destination)
-		if(precision)
-			var/list/posturfs = circlerangeturfs(destination,precision)
-			destturf = safepick(posturfs)
-		else
-			destturf = get_turf(destination)
-
-		if(!destturf || !curturf)
-			return 0
-
-		playSpecials(curturf,effectin,soundin)
-
-		var/obj/structure/stool/bed/chair/C = null
-		if(isliving(teleatom))
-			var/mob/living/L = teleatom
-			if(L.buckled)
-				C = L.buckled
-		if(force_teleport)
-			teleatom.forceMove(destturf)
+	if(force_teleport)
+		teleatom.forceMove(destturf)
+		playSpecials(destturf,effectout,soundout)
+	else
+		if(teleatom.Move(destturf))
 			playSpecials(destturf,effectout,soundout)
-		else
-			if(teleatom.Move(destturf))
-				playSpecials(destturf,effectout,soundout)
-		if(C)
-			C.forceMove(destturf)
 
-		destarea.Entered(teleatom)
+	if(isliving(teleatom))
+		var/mob/living/L = teleatom
+		if(L.buckled)
+			L.buckled.unbuckle()
 
-		return 1
+	destarea.Entered(teleatom)
 
-	proc/teleport()
-		if(teleportChecks())
-			return doTeleport()
-		return 0
+	return 1
+
+/datum/teleport/proc/teleport()
+	if(teleportChecks())
+		return doTeleport()
+	return 0
 
 /datum/teleport/instant //teleports when datum is created
 
-	New(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
+	start(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
 		if(..())
-			teleport()
-		return
+			if(teleport())
+				return 1
+		return 0
 
 
 /datum/teleport/instant/science
 
-	setEffects(datum/effect/effect/system/aeffectin,datum/effect/effect/system/aeffectout)
-		if(!aeffectin || !aeffectout)
-			var/datum/effect/effect/system/spark_spread/aeffect = new
-			aeffect.set_up(5, 1, teleatom)
-			effectin = effectin || aeffect
-			effectout = effectout || aeffect
-			return 1
-		else
-			return ..()
-
-	setPrecision(aprecision)
-		..()
-		if(istype(teleatom, /obj/item/weapon/storage/backpack/holding))
-			precision = rand(1,100)
-
-		var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)
-		if(bagholding.len)
-			precision = max(rand(1,100)*bagholding.len,100)
-			if(istype(teleatom, /mob/living))
-				var/mob/living/MM = teleatom
-				MM << "\red The Bluespace interface on your Bag of Holding interferes with the teleport!"
+/datum/teleport/instant/science/setEffects(datum/effect/effect/system/aeffectin,datum/effect/effect/system/aeffectout)
+	if(aeffectin==null || aeffectout==null)
+		var/datum/effect/effect/system/spark_spread/aeffect = new
+		aeffect.set_up(5, 1, teleatom)
+		effectin = effectin || aeffect
+		effectout = effectout || aeffect
 		return 1
+	else
+		return ..()
 
-	teleportChecks()
-		if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
-			teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
-			return 0
+/datum/teleport/instant/science/setPrecision(aprecision)
+	..()
+	if(istype(teleatom, /obj/item/weapon/storage/backpack/holding))
+		precision = rand(1,100)
 
-		if(istype(teleatom, /obj/item/flag/nation)) // Don't let nuke disks get teleported --NeoFite
-			teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
-			return 0
+	var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)
+	if(bagholding.len)
+		precision = max(rand(1,100)*bagholding.len,100)
+		if(istype(teleatom, /mob/living))
+			var/mob/living/MM = teleatom
+			MM << "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>"
+	return 1
 
+/datum/teleport/instant/science/teleportChecks()
+	if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
+		teleatom.visible_message("<span class='warning'>The portal rejects [teleatom]!</span>")
+		return 0
 
-		if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
-			if(istype(teleatom, /mob/living))
-				var/mob/living/MM = teleatom
-				MM.visible_message("\red <B>The [MM] bounces off of the portal!</B>","\red Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.")
-			else
-				teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
-			return 0
+	if(istype(teleatom, /obj/item/flag/nation)) // Don't let nation's flags get teleported either --Fox
+		teleatom.visible_message("<span class='warning'>The portal rejects [teleatom]!</span>")
+		return 0
 
-		if(!isemptylist(teleatom.search_contents_for(/obj/item/flag/nation)))
-			if(istype(teleatom, /mob/living))
-				var/mob/living/MM = teleatom
-				MM.visible_message("\red <B>The [MM] bounces off of the portal!</B>","\red Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.")
-			else
-				teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
-			return 0
+	if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
+		if(istype(teleatom, /mob/living))
+			var/mob/living/MM = teleatom
+			MM.visible_message("<span class='warning'>The portal rejects [MM]!","<span class='warning'>The nuclear disk that you're carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>")
+		else
+			teleatom.visible_message("<span class='warning'>The portal rejects [teleatom]!</span>")
+		return 0
 
-		if((destination.z in config.admin_levels)) //centcomm z-level
-			if(istype(teleatom, /obj/mecha))
-				var/obj/mecha/MM = teleatom
-				MM.occupant << "\red <B>The mech would not survive the jump to a location so far away!</B>"
-				return 0
-			if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
-				teleatom.visible_message("\red <B>The Bag of Holding bounces off of the portal!</B>")
-				return 0
-
-
-		if(!(destination.z in config.player_levels)) //Away mission z-levels
-			return 0
-		return 1
+	if(!isemptylist(teleatom.search_contents_for(/obj/item/flag/nation)))
+		if(istype(teleatom, /mob/living))
+			var/mob/living/MM = teleatom
+			MM.visible_message("<span class='warning'>The portal rejects [MM]!","<span class='warning'>The flag that you're carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>")
+		else
+			teleatom.visible_message("<span class='warning'>The portal rejects [teleatom]!</span>")
+		return 0
+	return 1

code/datums/mixed.dm

@@ -32,16 +32,14 @@
 
 /datum/powernet
 	var/list/cables = list()	// all cables & junctions
-	var/list/nodes = list()		// all APCs & sources
+	var/list/nodes = list()		// all connected machines
 
-	var/newload = 0
-	var/load = 0
-	var/newavail = 0
-	var/avail = 0
-	var/viewload = 0
-	var/number = 0
-	var/perapc = 0			// per-apc avilability
-	var/netexcess = 0
+	var/load = 0				// the current load on the powernet, increased by each machine at processing
+	var/newavail = 0			// what available power was gathered last tick, then becomes...
+	var/avail = 0				//...the current available power in the powernet
+	var/viewload = 0			// the load as it appears on the power console (gradually updated)
+	var/number = 0				// Unused //TODEL
+	var/netexcess = 0			// excess power on the powernet (typically avail-load)
 
 
 

code/datums/pizza_bomb.dm

@@ -54,7 +54,7 @@
 		return
 	src.audible_message("\icon[src] <b>[src]</b> beeps, \"Enjoy the pizza!\"")
 	src.visible_message("<span class='userdanger'>\The [src] violently explodes!</span>")
-	explosion(src.loc,1,2,4) //Identical to a minibomb
+	explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
 	qdel(src)
 
 /obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params)

code/datums/spell.dm

@@ -196,6 +196,10 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 				var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
 				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
 				smoke.start()
+			else if(smoke_spread == 3)
+				var/datum/effect/effect/system/sleep_smoke_spread/smoke = new /datum/effect/effect/system/sleep_smoke_spread()
+				smoke.set_up(smoke_amt, 0, location) // same here
+				smoke.start()
 
 /obj/effect/proc_holder/spell/wizard/proc/cast(list/targets)
 	return

code/datums/spells/explosion.dm

@@ -5,10 +5,11 @@
 	var/ex_severe = 1
 	var/ex_heavy = 2
 	var/ex_light = 3
+	var/ex_flash = 4
 
 /obj/effect/proc_holder/spell/wizard/targeted/explosion/cast(list/targets)
 
 	for(var/mob/living/target in targets)
-		explosion(target.loc,ex_severe,ex_heavy,ex_light)
+		explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
 
 	return

code/datums/spells/trigger.dm

@@ -16,7 +16,7 @@
 	for(var/spell in contents)
 		del(spell)
 
-	..()
+	return ..()
 
 /obj/effect/proc_holder/spell/wizard/targeted/trigger/cast(list/targets)
 	for(var/mob/living/target in targets)

code/datums/spells/wizard.dm

@@ -272,7 +272,7 @@
 	action_icon_state = "fireball"
 
 /obj/effect/proc_holder/spell/wizard/turf/fireball/cast(var/turf/T)
-	explosion(T, -1, 0, 2, 3, 0)
+	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
 
 
 /obj/effect/proc_holder/spell/wizard/targeted/inflict_handler/fireball

code/datums/supplypacks.dm

@@ -891,6 +891,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	containername = "butterflies crate"
 	contraband = 1
 
+/datum/supply_packs/organic/deer
+	name = "Deer Crate"
+	cost = 56 //Deer are best.
+	containertype = /obj/structure/closet/critter/deer
+	containername = "deer crate"
+
 ////// hippy gear
 
 /datum/supply_packs/organic/hydroponics // -- Skie

code/datums/uplink_item.dm

@@ -293,10 +293,10 @@ var/list/uplink_items = list()
 	gamemodes = list("nuclear emergency")
 	surplus = 35
 
-/datum/uplink_item/dangerous/saringrenades
-	name = "Sarin Gas Grenades"
-	desc = "A box of four (4) grenades filled with sarin, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintaind with team to avoid accidental gassings."
-	item = /obj/item/weapon/storage/box/syndie_kit/sarin
+/datum/uplink_item/dangerous/tabungrenades
+	name = "Tabun Gas Grenades"
+	desc = "A box of four (4) grenades filled with tabun, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintaind with team to avoid accidental gassings."
+	item = /obj/item/weapon/storage/box/syndie_kit/tabun
 	cost = 15
 	gamemodes = list("nuclear emergency")
 	surplus = 0