Merge pull request #5 from comma/wipurge

Wipurge

baystation12.dme

@@ -194,6 +194,7 @@
 #include "code\game\asteroid.dm"
 #include "code\game\atoms.dm"
 #include "code\game\atoms_movable.dm"
+#include "code\game\periodic_news.dm"
 #include "code\game\response_team.dm"
 #include "code\game\shuttle_engines.dm"
 #include "code\game\skincmd.dm"
@@ -372,6 +373,7 @@
 #include "code\game\machinery\computer\aifixer.dm"
 #include "code\game\machinery\computer\arcade.dm"
 #include "code\game\machinery\computer\atmos_alert.dm"
+#include "code\game\machinery\computer\atmos_control.dm"
 #include "code\game\machinery\computer\buildandrepair.dm"
 #include "code\game\machinery\computer\camera.dm"
 #include "code\game\machinery\computer\card.dm"
@@ -398,6 +400,36 @@
 #include "code\game\machinery\computer\station_alert.dm"
 #include "code\game\machinery\computer\supply.dm"
 #include "code\game\machinery\computer\syndicate_specops_shuttle.dm"
+#include "code\game\machinery\computer3\bios.dm"
+#include "code\game\machinery\computer3\buildandrepair.dm"
+#include "code\game\machinery\computer3\component.dm"
+#include "code\game\machinery\computer3\computer.dm"
+#include "code\game\machinery\computer3\computer3_notes.dm"
+#include "code\game\machinery\computer3\file.dm"
+#include "code\game\machinery\computer3\laptop.dm"
+#include "code\game\machinery\computer3\lapvend.dm"
+#include "code\game\machinery\computer3\networking.dm"
+#include "code\game\machinery\computer3\NTOS.dm"
+#include "code\game\machinery\computer3\program.dm"
+#include "code\game\machinery\computer3\program_disks.dm"
+#include "code\game\machinery\computer3\server.dm"
+#include "code\game\machinery\computer3\storage.dm"
+#include "code\game\machinery\computer3\computers\arcade.dm"
+#include "code\game\machinery\computer3\computers\atmos_alert.dm"
+#include "code\game\machinery\computer3\computers\camera.dm"
+#include "code\game\machinery\computer3\computers\card.dm"
+#include "code\game\machinery\computer3\computers\communications.dm"
+#include "code\game\machinery\computer3\computers\crew.dm"
+#include "code\game\machinery\computer3\computers\customs.dm"
+#include "code\game\machinery\computer3\computers\HolodeckControl.dm"
+#include "code\game\machinery\computer3\computers\law.dm"
+#include "code\game\machinery\computer3\computers\medical.dm"
+#include "code\game\machinery\computer3\computers\Operating.dm"
+#include "code\game\machinery\computer3\computers\power.dm"
+#include "code\game\machinery\computer3\computers\prisoner.dm"
+#include "code\game\machinery\computer3\computers\robot.dm"
+#include "code\game\machinery\computer3\computers\security.dm"
+#include "code\game\machinery\computer3\computers\welcome.dm"
 #include "code\game\machinery\doors\airlock.dm"
 #include "code\game\machinery\doors\airlock_control.dm"
 #include "code\game\machinery\doors\airlock_electronics.dm"
@@ -468,6 +500,7 @@
 #include "code\game\objects\effects\bump_teleporter.dm"
 #include "code\game\objects\effects\chemsmoke.dm"
 #include "code\game\objects\effects\effect_system.dm"
+#include "code\game\objects\effects\explosion_particles.dm"
 #include "code\game\objects\effects\gibs.dm"
 #include "code\game\objects\effects\glowshroom.dm"
 #include "code\game\objects\effects\landmarks.dm"
@@ -553,6 +586,7 @@
 #include "code\game\objects\items\stacks\tiles\plasteel.dm"
 #include "code\game\objects\items\stacks\tiles\tile_types.dm"
 #include "code\game\objects\items\weapons\AI_modules.dm"
+#include "code\game\objects\items\weapons\autopsy.dm"
 #include "code\game\objects\items\weapons\candle.dm"
 #include "code\game\objects\items\weapons\cards_ids.dm"
 #include "code\game\objects\items\weapons\cigs_lighters.dm"
@@ -570,6 +604,7 @@
 #include "code\game\objects\items\weapons\mop.dm"
 #include "code\game\objects\items\weapons\paint.dm"
 #include "code\game\objects\items\weapons\paiwire.dm"
+#include "code\game\objects\items\weapons\policetape.dm"
 #include "code\game\objects\items\weapons\power_cells.dm"
 #include "code\game\objects\items\weapons\RCD.dm"
 #include "code\game\objects\items\weapons\RSF.dm"
@@ -585,6 +620,7 @@
 #include "code\game\objects\items\weapons\tools.dm"
 #include "code\game\objects\items\weapons\twohanded.dm"
 #include "code\game\objects\items\weapons\weaponry.dm"
+#include "code\game\objects\items\weapons\weldbackpack.dm"
 #include "code\game\objects\items\weapons\wires.dm"
 #include "code\game\objects\items\weapons\circuitboards\broken.dm"
 #include "code\game\objects\items\weapons\circuitboards\circuitboard.dm"
@@ -745,6 +781,7 @@
 #include "code\modules\admin\verbs\adminsay.dm"
 #include "code\modules\admin\verbs\atmosdebug.dm"
 #include "code\modules\admin\verbs\BrokenInhands.dm"
+#include "code\modules\admin\verbs\buildmode.dm"
 #include "code\modules\admin\verbs\check_customitem_activity.dm"
 #include "code\modules\admin\verbs\cinematic.dm"
 #include "code\modules\admin\verbs\custom_event.dm"
@@ -1038,6 +1075,7 @@
 #include "code\modules\mob\living\carbon\human\life.dm"
 #include "code\modules\mob\living\carbon\human\login.dm"
 #include "code\modules\mob\living\carbon\human\logout.dm"
+#include "code\modules\mob\living\carbon\human\MedicalSideEffects.dm"
 #include "code\modules\mob\living\carbon\human\say.dm"
 #include "code\modules\mob\living\carbon\human\unarmed_attack.dm"
 #include "code\modules\mob\living\carbon\human\update_icons.dm"
@@ -1230,6 +1268,23 @@
 #include "code\modules\power\antimatter\containment_jar.dm"
 #include "code\modules\power\antimatter\control.dm"
 #include "code\modules\power\antimatter\shielding.dm"
+#include "code\modules\power\rust\circuits_and_design.dm"
+#include "code\modules\power\rust\core_control.dm"
+#include "code\modules\power\rust\core_field.dm"
+#include "code\modules\power\rust\core_gen.dm"
+#include "code\modules\power\rust\core_monitor.dm"
+#include "code\modules\power\rust\fuel_assembly.dm"
+#include "code\modules\power\rust\fuel_assembly_port.dm"
+#include "code\modules\power\rust\fuel_assembly_port_construction.dm"
+#include "code\modules\power\rust\fuel_compressor.dm"
+#include "code\modules\power\rust\fuel_compressor_construction.dm"
+#include "code\modules\power\rust\fuel_control.dm"
+#include "code\modules\power\rust\fuel_injector.dm"
+#include "code\modules\power\rust\fusion_reactions.dm"
+#include "code\modules\power\rust\gyrotron.dm"
+#include "code\modules\power\rust\gyrotron_controller.dm"
+#include "code\modules\power\rust\radiation.dm"
+#include "code\modules\power\rust\virtual_particle_catcher.dm"
 #include "code\modules\power\sensors\powernet_sensor.dm"
 #include "code\modules\power\sensors\sensor_monitoring.dm"
 #include "code\modules\power\singularity\collector.dm"
@@ -1458,69 +1513,11 @@
 #include "code\TriDimension\Structures.dm"
 #include "code\TriDimension\Structures_presets.dm"
 #include "code\TriDimension\Turfs.dm"
-#include "code\WorkInProgress\autopsy.dm"
-#include "code\WorkInProgress\buildmode.dm"
-#include "code\WorkInProgress\explosion_particles.dm"
-#include "code\WorkInProgress\periodic_news.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_animals.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_plants.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_tribe.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\circuits_and_design.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\core_control.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly_port.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly_port_construction.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor_construction.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_control.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_injector.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fusion_reactions.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron_controller.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\radiation.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\virtual_particle_catcher.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"
-#include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
-#include "code\WorkInProgress\computer3\bios.dm"
-#include "code\WorkInProgress\computer3\buildandrepair.dm"
-#include "code\WorkInProgress\computer3\component.dm"
-#include "code\WorkInProgress\computer3\computer.dm"
-#include "code\WorkInProgress\computer3\computer3_notes.dm"
-#include "code\WorkInProgress\computer3\file.dm"
-#include "code\WorkInProgress\computer3\laptop.dm"
-#include "code\WorkInProgress\computer3\lapvend.dm"
-#include "code\WorkInProgress\computer3\networking.dm"
-#include "code\WorkInProgress\computer3\NTOS.dm"
-#include "code\WorkInProgress\computer3\program.dm"
-#include "code\WorkInProgress\computer3\program_disks.dm"
-#include "code\WorkInProgress\computer3\server.dm"
-#include "code\WorkInProgress\computer3\storage.dm"
-#include "code\WorkInProgress\computer3\computers\arcade.dm"
-#include "code\WorkInProgress\computer3\computers\atmos_alert.dm"
-#include "code\WorkInProgress\computer3\computers\camera.dm"
-#include "code\WorkInProgress\computer3\computers\card.dm"
-#include "code\WorkInProgress\computer3\computers\communications.dm"
-#include "code\WorkInProgress\computer3\computers\crew.dm"
-#include "code\WorkInProgress\computer3\computers\customs.dm"
-#include "code\WorkInProgress\computer3\computers\HolodeckControl.dm"
-#include "code\WorkInProgress\computer3\computers\law.dm"
-#include "code\WorkInProgress\computer3\computers\medical.dm"
-#include "code\WorkInProgress\computer3\computers\Operating.dm"
-#include "code\WorkInProgress\computer3\computers\power.dm"
-#include "code\WorkInProgress\computer3\computers\prisoner.dm"
-#include "code\WorkInProgress\computer3\computers\robot.dm"
-#include "code\WorkInProgress\computer3\computers\security.dm"
-#include "code\WorkInProgress\computer3\computers\welcome.dm"
-#include "code\WorkInProgress\Mini\atmos_control.dm"
-#include "code\WorkInProgress\Ported\policetape.dm"
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
-#include "code\WorkInProgress\Wrongnumber\weldbackpack.dm"
 #include "code\ZAS\_docs.dm"
 #include "code\ZAS\_gas_mixture_xgm.dm"
 #include "code\ZAS\_xgm_gas_data.dm"

code/WorkInProgress/Cael_Aislinn/Supermatter/LaserComputer.dm

@@ -1,122 +0,0 @@
-//The laser control computer
-//Used to control the lasers
-/obj/machinery/computer/lasercon
-	name = "Laser control computer"
-	var/list/lasers = new/list
-	icon_state = "atmos"
-	var/id
-	//var/advanced = 0
-
-/obj/machinery/computer/lasercon
-	New()
-		spawn(1)
-			for(var/obj/machinery/zero_point_emitter/las in world)
-				if(las.id == src.id)
-					lasers += las
-
-	process()
-		..()
-		updateDialog()
-
-	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=laser_control")
-				return
-		var/t = "<TT><B>Laser status monitor</B><HR>"
-		for(var/obj/machinery/zero_point_emitter/laser in lasers)
-			t += "Zero Point Laser<br>"
-			t += "Power level: <A href = '?src=\ref[laser];input=-0.005'>-</A> <A href = '?src=\ref[laser];input=-0.001'>-</A> <A href = '?src=\ref[laser];input=-0.0005'>-</A> <A href = '?src=\ref[laser];input=-0.0001'>-</A> [laser.energy]MeV <A href = '?src=\ref[laser];input=0.0001'>+</A> <A href = '?src=\ref[laser];input=0.0005'>+</A> <A href = '?src=\ref[laser];input=0.001'>+</A> <A href = '?src=\ref[laser];input=0.005'>+</A><BR>"
-			t += "Frequency: <A href = '?src=\ref[laser];freq=-10000'>-</A> <A href = '?src=\ref[laser];freq=-1000'>-</A> [laser.freq] <A href = '?src=\ref[laser];freq=1000'>+</A> <A href = '?src=\ref[laser];freq=10000'>+</A><BR>"
-			t += "Output: [laser.active ? "<B>Online</B> <A href = '?src=\ref[laser];online=1'>Offline</A>" : "<A href = '?src=\ref[laser];online=1'>Online</A> <B>Offline</B> "]<BR>"
-		t += "<hr>"
-		t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
-		user << browse(t, "window=laser_control;size=500x800")
-		user.machine = src
-
-/*
-/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=laser_control")
-		usr.machine = null
-		return
-
-	else if( href_list["input"] )
-		var/i = text2num(href_list["input"])
-		var/d = i
-		for(var/obj/machinery/zero_point_emitter/laser in lasers)
-			var/new_power = laser.energy + d
-			new_power = max(new_power,0.0001)	//lowest possible value
-			new_power = min(new_power,0.01)		//highest possible value
-			laser.energy = new_power
-			//
-			src.updateDialog()
-	else if( href_list["online"] )
-		var/obj/machinery/zero_point_emitter/laser = href_list["online"]
-		laser.active = !laser.active
-		src.updateDialog()
-	else if( href_list["freq"] )
-		var/amt = text2num(href_list["freq"])
-		for(var/obj/machinery/zero_point_emitter/laser in lasers)
-			var/new_freq = laser.frequency + amt
-			new_freq = max(new_freq,1)		//lowest possible value
-			new_freq = min(new_freq,20000)	//highest possible value
-			laser.frequency = new_freq
-			//
-			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/Cael_Aislinn/Supermatter/ZeroPointLaser.dm

@@ -1,236 +0,0 @@
-//new supermatter lasers
-
-/obj/machinery/zero_point_emitter
-	name = "Zero-point laser"
-	desc = "A super-powerful laser"
-	icon = 'icons/obj/engine.dmi'
-	icon_state = "laser"
-	anchored = 0
-	density = 1
-	req_access = list(access_research)
-
-	use_power = 1
-	idle_power_usage = 10
-	active_power_usage = 300
-
-	var/active = 0
-	var/fire_delay = 100
-	var/last_shot = 0
-	var/shot_number = 0
-	var/state = 0
-	var/locked = 0
-
-	var/energy = 0.0001
-	var/frequency = 1
-
-	var/freq = 50000
-	var/id
-
-/obj/machinery/zero_point_emitter/verb/rotate()
-	set name = "Rotate"
-	set category = "Object"
-	set src in oview(1)
-
-	if (src.anchored || usr:stat)
-		usr << "It is fastened to the floor!"
-		return 0
-	src.set_dir(turn(src.dir, 90))
-	return 1
-
-/obj/machinery/zero_point_emitter/New()
-	..()
-	return
-
-/obj/machinery/zero_point_emitter/update_icon()
-	if (active && !(stat & (NOPOWER|BROKEN)))
-		icon_state = "laser"//"emitter_+a"
-	else
-		icon_state = "laser"//"emitter"
-
-/obj/machinery/zero_point_emitter/attack_hand(mob/user as mob)
-	src.add_fingerprint(user)
-	if(state == 2)
-		if(!src.locked)
-			if(src.active==1)
-				src.active = 0
-				user << "You turn off the [src]."
-				src.use_power = 1
-			else
-				src.active = 1
-				user << "You turn on the [src]."
-				src.shot_number = 0
-				src.fire_delay = 100
-				src.use_power = 2
-			update_icon()
-		else
-			user << "\red The controls are locked!"
-	else
-		user << "\red The [src] needs to be firmly secured to the floor first."
-		return 1
-
-
-/obj/machinery/zero_point_emitter/emp_act(var/severity)//Emitters are hardened but still might have issues
-	use_power(1000)
-/*	if((severity == 1)&&prob(1)&&prob(1))
-		if(src.active)
-			src.active = 0
-			src.use_power = 1	*/
-	return 1
-
-/obj/machinery/zero_point_emitter/process()
-	if(stat & (NOPOWER|BROKEN))
-		return
-	if(src.state != 2)
-		src.active = 0
-		return
-	if(((src.last_shot + src.fire_delay) <= world.time) && (src.active == 1))
-		src.last_shot = world.time
-		if(src.shot_number < 3)
-			src.fire_delay = 2
-			src.shot_number ++
-		else
-			src.fire_delay = rand(20,100)
-			src.shot_number = 0
-		use_power(1000)
-		var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter( src.loc )
-		playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1)
-		if(prob(35))
-			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-			s.set_up(5, 1, src)
-			s.start()
-		A.set_dir(src.dir)
-		switch(dir)
-			if(NORTH)
-				A.yo = 20
-				A.xo = 0
-			if(EAST)
-				A.yo = 0
-				A.xo = 20
-			if(WEST)
-				A.yo = 0
-				A.xo = -20
-			else // Any other
-				A.yo = -20
-				A.xo = 0
-		A.process()	//TODO: Carn: check this out
-
-
-/obj/machinery/zero_point_emitter/attackby(obj/item/W, mob/user)
-
-	if(istype(W, /obj/item/weapon/wrench))
-		if(active)
-			user << "Turn off the [src] first."
-			return
-		switch(state)
-			if(0)
-				state = 1
-				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
-				user.visible_message("[user.name] secures [src.name] to the floor.", \
-					"You secure the external reinforcing bolts to the floor.", \
-					"You hear a ratchet")
-				src.anchored = 1
-			if(1)
-				state = 0
-				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
-				user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
-					"You undo the external reinforcing bolts.", \
-					"You hear a ratchet")
-				src.anchored = 0
-			if(2)
-				user << "\red The [src.name] needs to be unwelded from the floor."
-		return
-
-	if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
-		if(active)
-			user << "Turn off the [src] first."
-			return
-		switch(state)
-			if(0)
-				user << "\red The [src.name] needs to be wrenched to the floor."
-			if(1)
-				if (WT.remove_fuel(0,user))
-					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
-					user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
-						"You start to weld the [src] to the floor.", \
-						"You hear welding")
-					if (do_after(user,20))
-						if(!src || !WT.isOn()) return
-						state = 2
-						user << "You weld the [src] to the floor."
-				else
-					user << "\red You need more welding fuel to complete this task."
-			if(2)
-				if (WT.remove_fuel(0,user))
-					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
-					user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
-						"You start to cut the [src] free from the floor.", \
-						"You hear welding")
-					if (do_after(user,20))
-						if(!src || !WT.isOn()) return
-						state = 1
-						user << "You cut the [src] free from the floor."
-				else
-					user << "\red You need more welding fuel to complete this task."
-		return
-
-	if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
-		if(emagged)
-			user << "\red The lock seems to be broken"
-			return
-		if(src.allowed(user))
-			if(active)
-				src.locked = !src.locked
-				user << "The controls are now [src.locked ? "locked." : "unlocked."]"
-			else
-				src.locked = 0 //just in case it somehow gets locked
-				user << "\red The controls can only be locked when the [src] is online"
-		else
-			user << "\red Access denied."
-		return
-
-
-	if(istype(W, /obj/item/weapon/card/emag) && !emagged)
-		locked = 0
-		emagged = 1
-		user.visible_message("[user.name] emags the [src.name].","\red You short out the lock.")
-		return
-
-	..()
-	return
-
-
-/obj/machinery/zero_point_emitter/power_change()
-	..()
-	update_icon()
-	return
-
-/obj/machinery/zero_point_emitter/Topic(href, href_list)
-	..()
-	if( href_list["input"] )
-		var/i = text2num(href_list["input"])
-		var/d = i
-		var/new_power = energy + d
-		new_power = max(new_power,0.0001)	//lowest possible value
-		new_power = min(new_power,0.01)		//highest possible value
-		energy = new_power
-		//
-		for(var/obj/machinery/computer/lasercon/comp in world)
-			if(comp.id == src.id)
-				comp.updateDialog()
-	else if( href_list["online"] )
-		active = !active
-		//
-		for(var/obj/machinery/computer/lasercon/comp in world)
-			if(comp.id == src.id)
-				comp.updateDialog()
-	else if( href_list["freq"] )
-		var/amt = text2num(href_list["freq"])
-		var/new_freq = frequency + amt
-		new_freq = max(new_freq,1)		//lowest possible value
-		new_freq = min(new_freq,20000)	//highest possible value
-		frequency = new_freq
-		//
-		for(var/obj/machinery/computer/lasercon/comp in world)
-			if(comp.id == src.id)
-				comp.updateDialog()

code/__HELPERS/global_lists.dm

@@ -87,12 +87,6 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
 		surgery_steps += S
 	sort_surgeries()
 
-	//Medical side effects. List all effects by their names
-	paths = typesof(/datum/medical_effect)-/datum/medical_effect
-	for(var/T in paths)
-		var/datum/medical_effect/M = new T
-		side_effects[M.name] = T
-
 	//List of job. I can't believe this was calculated multiple times per tick!
 	paths = typesof(/datum/job) -list(/datum/job,/datum/job/ai,/datum/job/cyborg)
 	for(var/T in paths)

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

@@ -90,7 +90,6 @@
 		/obj/machinery/suspension_gen,
 		/obj/machinery/shield_capacitor,
 		/obj/machinery/shield_gen,
-		/obj/machinery/zero_point_emitter,
 		/obj/machinery/clonepod,
 		/obj/machinery/deployable,
 		/obj/machinery/door_control,

code/modules/mob/living/carbon/human/chem_side_effects.dm

@@ -0,0 +1,149 @@
+// MEDICAL SIDE EFFECT BASE
+// ========================
+/datum/medical_effect
+	var/name = "None"
+	var/strength = 0
+	var/start = 0
+	var/list/triggers
+	var/list/cures
+	var/cure_message
+
+/datum/medical_effect/proc/manifest(mob/living/carbon/human/H)
+	for(var/R in cures)
+		if(H.reagents.has_reagent(R))
+			return 0
+	for(var/R in triggers)
+		if(H.reagents.get_reagent_amount(R) >= triggers[R])
+			return 1
+	return 0
+
+/datum/medical_effect/proc/on_life(mob/living/carbon/human/H, strength)
+	return
+
+/datum/medical_effect/proc/cure(mob/living/carbon/human/H)
+	for(var/R in cures)
+		if(H.reagents.has_reagent(R))
+			if (cure_message)
+				H <<"\blue [cure_message]"
+			return 1
+	return 0
+
+
+// MOB HELPERS
+// ===========
+/mob/living/carbon/human/var/list/datum/medical_effect/side_effects = list()
+/mob/proc/add_side_effect(name, strength = 0)
+/mob/living/carbon/human/add_side_effect(name, strength = 0)
+	for(var/datum/medical_effect/M in src.side_effects)
+		if(M.name == name)
+			M.strength = max(M.strength, 10)
+			M.start = life_tick
+			return
+
+
+	var/T = side_effects[name]
+	if (!T)
+		return
+
+	var/datum/medical_effect/M = new T
+	if(M.name == name)
+		M.strength = strength
+		M.start = life_tick
+		side_effects += M
+
+/mob/living/carbon/human/proc/handle_medical_side_effects()
+	//Going to handle those things only every few ticks.
+	if(life_tick % 15 != 0)
+		return 0
+
+	var/list/L = typesof(/datum/medical_effect)-/datum/medical_effect
+	for(var/T in L)
+		var/datum/medical_effect/M = new T
+		if (M.manifest(src))
+			src.add_side_effect(M.name)
+
+	// One full cycle(in terms of strength) every 10 minutes
+	for (var/datum/medical_effect/M in side_effects)
+		if (!M) continue
+		var/strength_percent = sin((life_tick - M.start) / 2)
+
+		// Only do anything if the effect is currently strong enough
+		if(strength_percent >= 0.4)
+			if (M.cure(src) || M.strength > 50)
+				side_effects -= M
+				M = null
+			else
+				if(life_tick % 45 == 0)
+					M.on_life(src, strength_percent*M.strength)
+				// Effect slowly growing stronger
+				M.strength+=0.08
+
+// HEADACHE
+// ========
+/datum/medical_effect/headache
+	name = "Headache"
+	triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
+	cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
+	cure_message = "Your head stops throbbing..."
+
+/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
+	switch(strength)
+		if(1 to 10)
+			H.custom_pain("You feel a light pain in your head.",0)
+		if(11 to 30)
+			H.custom_pain("You feel a throbbing pain in your head!",1)
+		if(31 to INFINITY)
+			H.custom_pain("You feel an excrutiating pain in your head!",1)
+
+// BAD STOMACH
+// ===========
+/datum/medical_effect/bad_stomach
+	name = "Bad Stomach"
+	triggers = list("kelotane" = 30, "dermaline" = 15)
+	cures = list("anti_toxin")
+	cure_message = "Your stomach feels a little better now..."
+
+/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
+	switch(strength)
+		if(1 to 10)
+			H.custom_pain("You feel a bit light around the stomach.",0)
+		if(11 to 30)
+			H.custom_pain("Your stomach hurts.",0)
+		if(31 to INFINITY)
+			H.custom_pain("You feel sick.",1)
+
+// CRAMPS
+// ======
+/datum/medical_effect/cramps
+	name = "Cramps"
+	triggers = list("anti_toxin" = 30, "tramadol" = 15)
+	cures = list("inaprovaline")
+	cure_message = "The cramps let up..."
+
+/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
+	switch(strength)
+		if(1 to 10)
+			H.custom_pain("The muscles in your body hurt a little.",0)
+		if(11 to 30)
+			H.custom_pain("The muscles in your body cramp up painfully.",0)
+		if(31 to INFINITY)
+			H.emote("me",1,"flinches as all the muscles in their body cramp up.")
+			H.custom_pain("There's pain all over your body.",1)
+
+// ITCH
+// ====
+/datum/medical_effect/itch
+	name = "Itch"
+	triggers = list("space_drugs" = 10)
+	cures = list("inaprovaline")
+	cure_message = "The itching stops..."
+
+/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
+	switch(strength)
+		if(1 to 10)
+			H.custom_pain("You feel a slight itch.",0)
+		if(11 to 30)
+			H.custom_pain("You want to scratch your itch badly.",0)
+		if(31 to INFINITY)
+			H.emote("me",1,"shivers slightly.")
+			H.custom_pain("This itch makes it really hard to concentrate.",1)

code/modules/power/rust/circuits_and_design.dm

@@ -1,4 +1,4 @@
-
+#define	IMPRINTER	1	//For circuits. Uses glass/chemicals.
 //////////////////////////////////////
 // RUST Core Control computer
 

code/modules/power/rust/core_control.dm

@@ -1,7 +1,7 @@
 
 /obj/machinery/computer/rust_core_control
 	name = "RUST Core Control"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "core_control"
 	var/list/connected_devices = list()
 	var/id_tag = "allan remember to update this before you leave"

code/modules/power/rust/core_field.dm

@@ -9,7 +9,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 /obj/effect/rust_em_field
 	name = "EM Field"
 	desc = "A coruscating, barely visible field of energy. It is shaped like a slightly flattened torus."
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "emfield_s1"
 	//
 	var/major_radius = 0	//longer radius in meters = field_strength * 0.21875, max = 8.75
@@ -265,7 +265,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 	switch(newsize)
 		if(1)
 			size = 1
-			icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+			icon = 'icons/rust.dmi'
 			icon_state = "emfield_s1"
 			pixel_x = 0
 			pixel_y = 0

code/modules/power/rust/core_gen.dm

@@ -48,7 +48,7 @@ max volume of phoron storeable by the field = the total volume of a number of ti
 /obj/machinery/power/rust_core
 	name = "RUST Tokamak core"
 	desc = "Enormous solenoid for generating extremely high power electromagnetic fields"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "core0"
 	density = 1
 	var/obj/effect/rust_em_field/owned_field

code/modules/power/rust/fuel_assembly.dm

@@ -1,6 +1,6 @@
 
 /obj/item/weapon/fuel_assembly
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "fuel_assembly"
 	name = "Fuel Rod Assembly"
 	var/list/rod_quantities

code/modules/power/rust/fuel_assembly_port.dm

@@ -2,7 +2,7 @@
 
 /obj/machinery/rust_fuel_assembly_port
 	name = "Fuel Assembly Port"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "port2"
 	density = 0
 	var/obj/item/weapon/fuel_assembly/cur_assembly

code/modules/power/rust/fuel_assembly_port_construction.dm

@@ -3,7 +3,7 @@
 
 /obj/item/rust_fuel_assembly_port_frame
 	name = "Fuel Assembly Port frame"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "port2"
 	w_class = 4
 	flags = CONDUCT

code/modules/power/rust/fuel_compressor.dm

@@ -1,7 +1,7 @@
 var/const/max_assembly_amount = 300
 
 /obj/machinery/rust_fuel_compressor
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "fuel_compressor1"
 	name = "Fuel Compressor"
 	var/list/new_assembly_quantities = list("Deuterium" = 150,"Tritium" = 150,"Rodinium-6" = 0,"Stravium-7" = 0, "Pergium" = 0, "Dilithium" = 0)

code/modules/power/rust/fuel_compressor_construction.dm

@@ -3,7 +3,7 @@
 
 /obj/item/rust_fuel_compressor_frame
 	name = "Fuel Compressor frame"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "fuel_compressor0"
 	w_class = 4
 	flags = CONDUCT

code/modules/power/rust/fuel_control.dm

@@ -1,7 +1,7 @@
 
 /obj/machinery/computer/rust_fuel_control
 	name = "RUST Fuel Injection Control"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "fuel"
 	var/list/connected_injectors = list()
 	var/list/active_stages = list()

code/modules/power/rust/fuel_injector.dm

@@ -1,7 +1,7 @@
 
 /obj/machinery/power/rust_fuel_injector
 	name = "Fuel Injector"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "injector0"
 
 	density = 1

code/modules/power/rust/gyrotron.dm

@@ -3,7 +3,7 @@
 /obj/item/projectile/beam/ehf_beam
 
 /obj/machinery/rust/gyrotron
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "emitter-off"
 	name = "Gyrotron"
 	anchored = 1

code/modules/power/rust/gyrotron_controller.dm

@@ -1,7 +1,7 @@
 
 /obj/machinery/computer/rust_gyrotron_controller
 	name = "Gyrotron Remote Controller"
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon = 'icons/rust.dmi'
 	icon_state = "engine"
 	var/updating = 1