fixed some weird merge issues

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

baystation12.dme

@@ -162,9 +162,11 @@
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/Apples"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
@@ -174,7 +176,6 @@
 #define FILE_DIR "code/WorkInProgress/Ported/Abi79"
 #define FILE_DIR "code/WorkInProgress/Ported/Bureaucracy"
 #define FILE_DIR "code/WorkInProgress/Ported/Spawners"
-#define FILE_DIR "code/WorkInProgress/Ported/ZeroPoint"
 #define FILE_DIR "code/WorkInProgress/SkyMarshal"
 #define FILE_DIR "code/WorkInProgress/Tastyfish"
 #define FILE_DIR "code/WorkInProgress/virus2"
@@ -201,6 +202,7 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
+#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"

code/WorkInProgress/Ported/ZeroPoint/Laser2.dm

@@ -1,128 +0,0 @@
-/obj/machinery/engine/laser
-	name = "Zero-point laser"
-	desc = "A super-powerful laser"
-	var/visible = 1
-	var/state = 1.0
-	var/obj/effect/beam/e_beam/first
-	var/power = 500
-	icon = 'engine.dmi'
-	icon_state = "laser"
-	anchored = 1
-	var/id
-	var/on = 0
-	var/freq = 50000
-	var/phase = 0
-	var/phase_variance = 0
-
-/obj/machinery/engine/laser/process()
-	if(on)
-		if(!first)
-			src.first = new /obj/effect/beam/e_beam(src.loc)
-			src.first.master = src
-			src.first.dir = src.dir
-			src.first.power = src.power
-			src.first.freq = src.freq
-			src.first.phase = src.phase
-			src.first.phase_variance = src.phase_variance
-			step(first, dir)
-			if(first)
-				src.first.updatebeam()
-		else
-			src.first.updatebeam()
-	else
-		if(first)
-			del first
-
-/obj/machinery/engine/laser/proc/setpower(var/powera)
-	src.power = powera
-	if(first)
-		first.setpower(src.power)
-
-
-/obj/effect/beam/e_beam
-	name = "Laser beam"
-	icon = 'projectiles.dmi'
-	icon_state = "u_laser"
-	var/obj/machinery/engine/laser/master = null
-	var/obj/effect/beam/e_beam/next = null
-	var/power
-	var/freq = 50000
-	var/phase = 0
-	var/phase_variance = 0
-	anchored = 1
-
-/obj/effect/beam/e_beam/New()
-	src.sd_SetLuminosity(4)
-
-/obj/effect/beam/e_beam/proc/updatebeam()
-	if(!next)
-		if(get_step(src.loc,src.dir))
-			var/obj/effect/beam/e_beam/e = new /obj/effect/beam/e_beam(src.loc)
-			e.dir = src.dir
-			src.next = e
-			e.master = src.master
-			e.power = src.power
-			e.phase = src.phase
-			src.phase+=src.phase_variance
-			e.freq = src.freq
-			e.phase_variance = src.phase_variance
-			if(src.loc.density == 0)
-				for(var/atom/o in src.loc.contents)
-					if(o.density || o == src.master || (ismob(o) && !istype(o, /mob/dead)) )
-						o.laser_act(src)
-						del src
-						return
-			else
-				src.loc.laser_act(src)
-				del e
-				return
-			step(e,e.dir)
-			if(e)
-				e.updatebeam()
-	else
-		next.updatebeam()
-
-/atom/proc/laser_act(var/obj/effect/beam/e_beam/b)
-	return
-
-/mob/living/carbon/laser_act(var/obj/effect/beam/e_beam/b)
-	for(var/t in organs)
-		var/datum/organ/external/affecting = organs["[t]"]
-		if (affecting.take_damage(0, b.power/400,0,0))
-			UpdateDamageIcon()
-		else
-			UpdateDamage()
-
-/obj/effect/beam/e_beam/Bump(atom/Obstacle)
-	Obstacle.laser_act(src)
-	del(src)
-	return
-
-
-/obj/effect/beam/e_beam/proc/setpower(var/powera)
-	src.power = powera
-	if(src.next)
-		src.next.setpower(powera)
-
-/obj/effect/beam/e_beam/Bumped()
-	src.hit()
-	return
-
-/obj/effect/beam/e_beam/HasEntered(atom/movable/AM as mob|obj)
-	if (istype(AM, /obj/effect/beam))
-		return
-	spawn( 0 )
-		AM.laser_act(src)
-		src.hit()
-		return
-	return
-
-/obj/effect/beam/e_beam/Del()
-	if(next)
-		del(next)
-	..()
-	return
-
-/obj/effect/beam/e_beam/proc/hit()
-	del src
-	return

code/WorkInProgress/Ported/ZeroPoint/LaserComputer.dm

@@ -1,130 +0,0 @@
-//The laser control computer
-//Used to control the lasers
-/obj/machinery/computer/lasercon
-	name = "Laser control computer"
-	var/obj/machinery/engine/laser/laser = null
-	icon_state = "atmos"
-	var/id
-	var/advanced = 0
-
-/obj/machinery/computer/lasercon/New()
-	spawn(1)
-		if(istype(src.id,/list))
-			laser = list()
-			for(var/obj/machinery/engine/laser/las in world)
-				if(las.id in src.id)
-					laser += las
-		else
-			for(var/obj/machinery/engine/laser/las in world)
-				if(las.id == src.id)
-					laser = list(las)
-
-
-
-/obj/machinery/computer/lasercon/attack_ai(mob/user)
-	add_fingerprint(user)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
-	interact(user)
-
-/obj/machinery/computer/lasercon/attack_hand(mob/user)
-	add_fingerprint(user)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
-	interact(user)
-
-
-/obj/machinery/computer/lasercon/proc/interact(mob/user)
-
-	if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
-		if (!istype(user, /mob/living/silicon))
-			user.machine = null
-			user << browse(null, "window=powcomp")
-			return
-
-
-	user.machine = src
-	var/t = "<TT><B>Laser status monitor</B><HR>"
-
-	var/obj/machinery/engine/laser/laser = src.laser[1]
-
-	if(!laser)
-		t += "\red No laser found"
-	else
-
-
-		t += "Power level:  <A href = '?src=\ref[src];input=-4'>-</A> <A href = '?src=\ref[src];input=-3'>-</A> <A href = '?src=\ref[src];input=-2'>-</A> <A href = '?src=\ref[src];input=-1'>-</A> [add_lspace(laser.power,5)] <A href = '?src=\ref[src];input=1'>+</A> <A href = '?src=\ref[src];input=2'>+</A> <A href = '?src=\ref[src];input=3'>+</A> <A href = '?src=\ref[src];input=4'>+</A><BR>"
-		if(advanced)
-			t += "Frequency:  <A href = '?src=\ref[src];freq=-10000'>-</A> <A href = '?src=\ref[src];freq=-1000'>-</A> [add_lspace(laser.freq,5)] <A href = '?src=\ref[src];freq=1000'>+</A> <A href = '?src=\ref[src];freq=10000'>+</A><BR>"
-
-		t += "Output: [laser.on ? "<B>Online</B> <A href = '?src=\ref[src];online=1'>Offline</A>" : "<A href = '?src=\ref[src];online=1'>Online</A> <B>Offline</B> "]<BR>"
-
-		t += "<BR><HR><A href='?src=\ref[src];close=1'>Close</A></TT>"
-
-	user << browse(t, "window=lascomp;size=420x700")
-	onclose(user, "lascomp")
-
-
-/obj/machinery/computer/lasercon/Topic(href, href_list)
-	..()
-	if( href_list["close"] )
-		usr << browse(null, "window=lascomp")
-		usr.machine = null
-		return
-
-	else if( href_list["input"] )
-		var/i = text2num(href_list["input"])
-		var/d = 0
-		switch(i)
-			if(-4)
-				d = -1000
-			if(4)
-				d = 1000
-			if(1)
-				d = 1
-			if(-1)
-				d = -1
-			if(2)
-				d = 10
-			if(-2)
-				d = -10
-			if(3)
-				d = 100
-			if(-3)
-				d = -100
-		for(var/obj/machinery/engine/laser/laser in src.laser)
-			laser.power += d
-			laser.setpower(max(1, min(3000, laser.power)))// clamp to range
-			src.updateDialog()
-	else if( href_list["online"] )
-		for(var/obj/machinery/engine/laser/laser in src.laser)
-			laser.on = !laser.on
-			src.updateDialog()
-	else if( href_list["freq"] )
-		var/amt = text2num(href_list["freq"])
-		for(var/obj/machinery/engine/laser/laser in src.laser)
-			if(laser.freq+amt>0)
-				laser.freq+=amt
-				src.updateDialog()
-/obj/machinery/computer/lasercon/process()
-	if(!(stat & (NOPOWER|BROKEN)) )
-		use_power(250)
-
-	//src.updateDialog()
-
-
-/obj/machinery/computer/lasercon/power_change()
-
-	if(stat & BROKEN)
-		icon_state = "broken"
-	else
-		if( powered() )
-			icon_state = initial(icon_state)
-			stat &= ~NOPOWER
-		else
-			spawn(rand(0, 15))
-				src.icon_state = "c_unpowered"
-				stat |= NOPOWER
-

code/WorkInProgress/Ported/ZeroPoint/SuperMatter.dm

@@ -1,120 +0,0 @@
-#define NITROGEN_RETARDATION_FACTOR 4	//Higher == N2 slows reaction more
-#define THERMAL_RELEASE_MODIFIER 50		//Higher == less heat released during reaction
-#define PLASMA_RELEASE_MODIFIER 750		//Higher == less plasma released by reaction
-#define OXYGEN_RELEASE_MODIFIER 1500	//Higher == less oxygen released at high temperature/power
-#define REACTION_POWER_MODIFIER 1.1		//Higher == more overall power
-
-/obj/machinery/engine/supermatter
-	name = "Supermatter"
-	desc = "A strangely translucent and iridescent crystal.  \red You get headaches just from looking at it."
-	icon = 'engine.dmi'
-	icon_state = "darkmatter"
-	density = 1
-	anchored = 1
-
-	var/gasefficency = 0.25
-
-	var/det = 0
-	var/previousdet = 0
-	var/const/explosiondet = 3500
-
-	var/const/warningtime = 50 	// Make the CORE OVERLOAD message repeat only every aprox. ?? seconds
-	var/lastwarning = 0			// Time in 1/10th of seconds since the last sent warning
-
-/obj/machinery/engine/klaxon
-	name = "Emergency Klaxon"
-	icon = 'engine.dmi'
-	icon_state = "darkmatter"
-	density = 1
-	anchored = 1
-	var/obj/machinery/engine/supermatter/sup
-
-/obj/machinery/engine/klaxon/process()
-	if(!sup)
-		for(var/obj/machinery/engine/supermatter/T in world)
-			sup = T
-			break
-	if(sup.det >= 1)
-		return
-
-/obj/machinery/engine/supermatter/process()
-
-	var/turf/simulated/L = loc
-
-	//Ok, get the air from the turf
-	var/datum/gas_mixture/env = L.return_air()
-
-	//Remove gas from surrounding area
-	var/transfer_moles = gasefficency * env.total_moles()
-	var/datum/gas_mixture/removed = env.remove(transfer_moles)
-
-	previousdet = det
-	det += (removed.temperature - 1000) / 150
-	det = max(det, 0)
-
-	if(det > 0 && removed.temperature > 1000) // while the core is still damaged and it's still worth noting its status
-		if((world.realtime - lastwarning) / 10 >= warningtime)
-			lastwarning = world.realtime
-			if(explosiondet - det <= 300)
-				radioalert("CORE EXPLOSION IMMINENT","Core control computer")
-			else if(det >= previousdet)   // The damage is still going up
-				radioalert("CORE OVERLOAD","Core control computer")
-			else						  // Phew, we're safe
-				radioalert("Core returning to safe operating levels.","Core control computer")
-
-	if(det > explosiondet)
-		roundinfo.core = 1
-		//proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, force = 0)
-		explosion(src.loc,8,15,20,30,1)
-		det = 0
-
-	if (!removed)
-		return 1
-
-	var/power = max(round((removed.temperature - T0C) / 20), 0) //Total laser power plus an overload factor
-
-	//Get the collective laser power
-	for(var/dir in cardinal)
-		var/turf/T = get_step(L, dir)
-		for(var/obj/effect/beam/e_beam/item in T)
-			power += item.power
-
-	//Ok, 100% oxygen atmosphere = best reaction
-	//Maxes out at 100% oxygen pressure
-	var/oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
-
-	var/device_energy = oxygen * power
-
-	device_energy *= removed.temperature / T0C
-
-	device_energy = round(device_energy * REACTION_POWER_MODIFIER)
-
-	//To figure out how much temperature to add each tick, consider that at one atmosphere's worth
-	//of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature
-	//that the device energy is around 2140.  At that stage, we don't want too much heat to be put out
-	//Since the core is effectively "cold"
-
-	//Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
-	//is on.  An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
-	removed.temperature += max((device_energy / THERMAL_RELEASE_MODIFIER), 0)
-
-	removed.temperature = min(removed.temperature, 1500)
-
-	//Calculate how much gas to release
-	removed.toxins += max(round(device_energy / PLASMA_RELEASE_MODIFIER), 0)
-
-	removed.oxygen += max(round((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER), 0)
-
-	env.merge(removed)
-
-//Not functional currently. -- SkyMarshal
-/*
-	for(var/mob/living/carbon/l in view(src, 6)) // you have to be seeing the core to get hallucinations
-		if(prob(10) && !(l.glasses && istype(l.glasses, /obj/item/clothing/glasses/meson)))
-			l.hallucination = 50
-*/
-	for(var/mob/living/l in view(src,3))
-		l.bruteloss += 50
-		l.updatehealth()
-
-	return 1

code/defines/obj/machinery.dm

@@ -113,6 +113,7 @@
 	idle_power_usage = 2
 	active_power_usage = 6
 	power_channel = ENVIRON
+	var/network
 
 	New()
 		if(z == 1)

code/defines/turf.dm

@@ -117,6 +117,15 @@
 
 	var/walltype = "wall"
 
+/turf/simulated/wall/heatshield
+	thermal_conductivity = 0
+	opacity = 0
+	name = "Heat Shielding"
+	icon = 'thermal.dmi'
+	icon_state = "thermal"
+	heat_capacity = 625000 //twice the cap of a normal wall
+	walltype = "heatshield"
+
 /turf/simulated/wall/cult
 	name = "wall"
 	desc = "The patterns engraved on the wall seem to shift as you try to focus on them. You feel sick"

code/game/machinery/alarm.dm

@@ -1191,8 +1191,17 @@ table tr:first-child th:first-child { border: none;}
 	A = A.loc
 	if (!( istype(A, /area) ))
 		return
-	for(var/area/RA in A.related)
-		RA.firereset()
+	if(network)
+		for(var/obj/machinery/door/firedoor/D in world)
+			if(!D.blocked && D.net_id == src.network)
+				if(D.operating)
+					D.nextstate = CLOSED
+				else if(!D.density)
+					spawn(0)
+						D.close()
+	else
+		for(var/area/RA in A.related)
+			RA.firereset()
 	return
 
 /obj/machinery/firealarm/proc/alarm()
@@ -1202,8 +1211,17 @@ table tr:first-child th:first-child { border: none;}
 	A = A.loc
 	if (!( istype(A, /area) ))
 		return
-	for(var/area/RA in A.related)
-		RA.firealert()
+	if(network)
+		for(var/obj/machinery/door/firedoor/D in world)
+			if(!D.blocked && D.net_id == src.network)
+				if(D.operating)
+					D.nextstate = OPEN
+				else if(!D.density)
+					spawn(0)
+						D.open()
+	else
+		for(var/area/RA in A.related)
+			RA.firealert()
 	//playsound(src.loc, 'signal.ogg', 75, 0)
 	return
 

code/game/machinery/computer/id.dm

@@ -188,7 +188,10 @@
 		if ("modify")
 			if (modify)
 				data_core.manifest_modify(modify.registered_name, modify.assignment)
-				modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
+				if(istype(modify,/obj/item/weapon/card/id/fluff/lifetime))
+					modify.name = text("[modify.registered_name]'s Lifetime ID Card ([modify.assignment])")
+				else
+					modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
 				if(ishuman(usr))
 					modify.loc = usr.loc
 					if(!usr.get_active_hand())

code/game/machinery/doors/firedoor.dm

@@ -11,7 +11,7 @@
 	opacity = 0
 	density = 0
 	var/nextstate = null
-
+	var/net_id
 
 	Bumped(atom/AM)
 		if(p_open || operating)	return

config/custom_items.txt

@@ -30,13 +30,4 @@ tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
 whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
-
-
-
-
-
-
-
-
-
-
+fastler: Fastler Greay: /obj/item/weapon/card/id/fluff/lifetimeid