Merged airlock assembly changes and ZAS changes, hopefully.

baystation12.dme

@@ -52,6 +52,7 @@
 #define FILE_DIR "sound/violin"
 #define FILE_DIR "sound/voice"
 #define FILE_DIR "sound/voice/Serithi"
+#define FILE_DIR "sound/vox"
 #define FILE_DIR "sound/weapons"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
@@ -585,6 +586,7 @@
 #include "code\game\objects\items\weapons\tanks\jetpack.dm"
 #include "code\game\objects\items\weapons\tanks\tank_types.dm"
 #include "code\game\objects\items\weapons\tanks\tanks.dm"
+#include "code\game\objects\random\random.dm"
 #include "code\game\objects\storage\coat.dm"
 #include "code\game\objects\structures\barsign.dm"
 #include "code\game\objects\structures\bedsheet_bin.dm"
@@ -709,6 +711,7 @@
 #include "code\modules\admin\verbs\striketeam_syndicate.dm"
 #include "code\modules\admin\verbs\ticklag.dm"
 #include "code\modules\admin\verbs\tripAI.dm"
+#include "code\modules\admin\verbs\vox_raiders.dm"
 #include "code\modules\assembly\assembly.dm"
 #include "code\modules\assembly\bomb.dm"
 #include "code\modules\assembly\helpers.dm"
@@ -981,6 +984,7 @@
 #include "code\modules\mob\living\silicon\pai\recruit.dm"
 #include "code\modules\mob\living\silicon\pai\say.dm"
 #include "code\modules\mob\living\silicon\pai\software.dm"
+#include "code\modules\mob\living\silicon\robot\component.dm"
 #include "code\modules\mob\living\silicon\robot\death.dm"
 #include "code\modules\mob\living\silicon\robot\emote.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
@@ -990,6 +994,7 @@
 #include "code\modules\mob\living\silicon\robot\life.dm"
 #include "code\modules\mob\living\silicon\robot\login.dm"
 #include "code\modules\mob\living\silicon\robot\robot.dm"
+#include "code\modules\mob\living\silicon\robot\robot_damage.dm"
 #include "code\modules\mob\living\silicon\robot\robot_items.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules.dm"
 #include "code\modules\mob\living\silicon\robot\robot_movement.dm"
@@ -1000,6 +1005,7 @@
 #include "code\modules\mob\living\simple_animal\parrot.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"
+#include "code\modules\mob\living\simple_animal\vox.dm"
 #include "code\modules\mob\living\simple_animal\worm.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
@@ -1100,7 +1106,9 @@
 #include "code\modules\projectiles\guns\energy\stun.dm"
 #include "code\modules\projectiles\guns\energy\temperature.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
+#include "code\modules\projectiles\guns\projectile\bow.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
+#include "code\modules\projectiles\guns\projectile\pneumatic.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
 #include "code\modules\projectiles\guns\projectile\shotgun.dm"
 #include "code\modules\projectiles\projectile\animate.dm"
@@ -1117,6 +1125,7 @@
 #include "code\modules\reagents\Chemistry-Reagents-Antidepressants.dm"
 #include "code\modules\reagents\Chemistry-Reagents.dm"
 #include "code\modules\reagents\Chemistry-Recipes.dm"
+#include "code\modules\reagents\dartgun.dm"
 #include "code\modules\reagents\grenade_launcher.dm"
 #include "code\modules\reagents\reagent_containers.dm"
 #include "code\modules\reagents\reagent_dispenser.dm"
@@ -1255,6 +1264,7 @@
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\periodic_news.dm"
+#include "code\WorkInProgress\Apples\artifacts.dm"
 #include "code\WorkInProgress\Cael_Aislinn\meteor_battery.dm"
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Accounts.dm"
@@ -1300,6 +1310,7 @@
 #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm"
 #include "code\WorkInProgress\Chinsky\ashtray.dm"
 #include "code\WorkInProgress\Cib\MedicalSideEffects.dm"
+#include "code\WorkInProgress\kilakk\responseteam.dm"
 #include "code\WorkInProgress\Mini\ATM.dm"
 #include "code\WorkInProgress\Mini\atmos_control.dm"
 #include "code\WorkInProgress\Ported\policetape.dm"

code/WorkInProgress/Apples/artifacts.dm

@@ -14,7 +14,6 @@ obj/item/changestone/attack_hand(var/mob/user as mob)
 				H.gender = FEMALE
 			H.dna.ready_dna(H)
 			H.update_body()
-			H.update_face()
 	..()
 
 

code/WorkInProgress/kilakk/responseteam.dm

@@ -98,7 +98,7 @@ var/sent_emergency_team = 0
 		if(L.name == "Response Team")
 			leader_selected = member_number == 1?1:0 // The last person selected will be the leader
 
-			var/mob/living/carbon/human/new_member = create_response_team(L, leader_selected)
+			var/mob/living/carbon/human/new_member = spawn_response_team(L, leader_selected)
 
 			new_member.age = !leader_selected ? rand(23,35) : rand(35,45)
 
@@ -188,7 +188,7 @@ var/sent_emergency_team = 0
 	return 1
 
 // Mob creation
-/client/proc/create_response_team(obj/spawn_location, leader_selected = 0)
+/client/proc/spawn_response_team(obj/spawn_location, leader_selected = 0)
 	var/mob/living/carbon/human/new_member = new(spawn_location.loc)
 
 	return new_member

code/controllers/configuration.dm

@@ -40,6 +40,7 @@
 	var/Ticklag = 0.9
 	var/Tickcomp = 0
 	var/socket_talk	= 0					// use socket_talk to communicate with other processes
+	var/list/resource_urls = null
 
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
@@ -164,6 +165,9 @@
 
 		if(type == "config")
 			switch (name)
+				if ("resource_urls")
+					config.resource_urls = stringsplit(value, " ")
+			
 				if ("admin_legacy_system")
 					config.admin_legacy_system = 1
 

code/controllers/shuttle_controller.dm

@@ -67,6 +67,7 @@ datum/shuttle_controller
 				captain_announce("The shuttle has been recalled.")
 				setdirection(-1)
 				online = 1
+				alert = 0 // set alert back to 0 after an admin recall
 				return
 
 	// returns the time (in seconds) before shuttle arrival

code/controllers/voting.dm

@@ -10,6 +10,7 @@ datum/controller/vote
 	var/list/voted = list()
 	var/list/voting = list()
 	var/list/current_votes = list()
+	var/auto_muted = 0
 
 	New()
 		if(vote != src)
@@ -53,6 +54,14 @@ datum/controller/vote
 		voting.Cut()
 		current_votes.Cut()
 
+		if(auto_muted && !ooc_allowed)
+			auto_muted = 0
+			ooc_allowed = !( ooc_allowed )
+			world << "<b>The OOC channel has been automatically enabled due to vote cancellation.</b>"
+			log_admin("OOC was toggled automatically due to vote cancellation.")
+			message_admins("OOC has been toggled on automatically.")
+
+
 	proc/get_result()
 		//get the highest number of votes
 		var/greatest_votes = 0
@@ -138,6 +147,12 @@ datum/controller/vote
 				if("crew_transfer")
 					if(. == "Initiate Crew Transfer")
 						init_shift_change(null, 1)
+					if(auto_muted && !ooc_allowed)
+						auto_muted = 0
+						ooc_allowed = !( ooc_allowed )
+						world << "<b>The OOC channel has been automatically enabled due to vote end.</b>"
+						log_admin("OOC was toggled automatically due to vote end.")
+						message_admins("OOC has been toggled on automatically.")
 
 
 		if(restart)
@@ -202,14 +217,35 @@ datum/controller/vote
 			world << "<font color='purple'><b>[text]</b>\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.</font>"
 			switch(vote_type)
 				if("crew_transfer")
-					world << sound('sound/voice/Serithi/Shuttlehere.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 				if("gamemode")
-					world << sound('sound/voice/Serithi/pretenddemoc.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 				if("custom")
-					world << sound('sound/voice/Serithi/weneedvote.ogg')
+					world << sound('sound/ambience/alarm4.ogg')
 			if(mode == "gamemode" && going)
 				going = 0
 				world << "<font color='red'><b>Round start has been delayed.</b></font>"
+			if(mode == "crew_transfer" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the crew transfer vote.</b>"
+				log_admin("OOC was toggled automatically due to crew_transfer vote.")
+				message_admins("OOC has been toggled off automatically.")
+			if(mode == "gamemode" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the gamemode vote.</b>"
+				log_admin("OOC was toggled automatically due to gamemode vote.")
+				message_admins("OOC has been toggled off automatically.")
+			if(mode == "custom" && ooc_allowed)
+				auto_muted = 1
+				ooc_allowed = !( ooc_allowed )
+				world << "<b>The OOC channel has been automatically disabled due to the custom vote.</b>"
+				log_admin("OOC was toggled automatically due to custom vote.")
+				message_admins("OOC has been toggled off automatically.")
+
+
+
 
 			time_remaining = round(config.vote_period/10)
 			return 1

code/datums/datacore.dm

@@ -7,8 +7,9 @@
 			manifest_inject(H)
 		return
 
-/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment, var/alt_title = null)
+/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment)
 	var/datum/data/record/foundrecord
+	var/real_title = assignment
 
 	for(var/datum/data/record/t in data_core.general)
 		if (t)
@@ -16,14 +17,18 @@
 				foundrecord = t
 				break
 
+	var/list/all_jobs = get_job_datums()
+
+	for(var/datum/job/J in all_jobs)
+		var/list/alttitles = get_alternate_titles(J.title)
+		if(!J)	continue
+		if(assignment in alttitles)
+			real_title = J.title
+			break
+
 	if(foundrecord)
 		foundrecord.fields["rank"] = assignment
-		if(alt_title)
-			foundrecord.fields["real_rank"] = alt_title
-		else
-			foundrecord.fields["real_rank"] = assignment
-
-
+		foundrecord.fields["real_rank"] = real_title
 
 /obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
 	if(H.mind && (H.mind.assigned_role != "MODE"))
@@ -122,9 +127,10 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 			icobase = 'icons/mob/human_races/r_lizard.dmi'
 		if("Skrell")
 			icobase = 'icons/mob/human_races/r_skrell.dmi'
-
 		if("Vox")
 			icobase = 'icons/mob/human_races/r_vox.dmi'
+		if("Kidan")
+			icobase = 'icons/mob/human_races/r_kidan.dmi'
 
 		else
 			icobase = 'icons/mob/human_races/r_human.dmi'

code/datums/datumvars.dm

@@ -730,7 +730,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon/human"
 			return
 
-		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","slime","plant","shadow","tajaran","skrell","vox")
+		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","slime","plant","shadow","tajaran","skrell","vox","kidan")
 		switch(new_mutantrace)
 			if(null)
 				return

code/datums/mind.dm

@@ -1220,5 +1220,9 @@ datum/mind
 	mind.assigned_role = "Juggernaut"
 	mind.special_role = "Cultist"
 
+/mob/living/simple_animal/vox/armalis/mind_initialize()
+	..()
+	mind.assigned_role = "Armalis"
+	mind.special_role = "Vox Raider"
 
 

code/datums/supplypacks.dm

@@ -66,6 +66,29 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Monkey crate"
 	group = "Hydroponics"
 
+/datum/supply_packs/farwa
+	name = "Farwa crate"
+	contains = list (/obj/item/weapon/storage/box/farwacubes)
+	cost = 30
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Farwa crate"
+	group = "Hydroponics"
+
+/datum/supply_packs/skrell
+	name = "Neaera crate"
+	contains = list (/obj/item/weapon/storage/box/neaeracubes)
+	cost = 30
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Neaera crate"
+	group = "Hydroponics"
+
+/datum/supply_packs/stok
+	name = "Stok crate"
+	contains = list (/obj/item/weapon/storage/box/stokcubes)
+	cost = 30
+	containertype = /obj/structure/closet/crate/freezer
+	containername = "Stok crate"
+	group = "Hydroponics"
 
 /datum/supply_packs/beanbagammo
 	name = "Beanbag shells"

code/defines/obj/weapon.dm

@@ -310,10 +310,11 @@
 	name = "shard"
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "large"
+	sharp = 1
 	desc = "Could probably be used as ... a throwing weapon?"
 	w_class = 1.0
 	force = 5.0
-	throwforce = 15.0
+	throwforce = 8.0
 	item_state = "shard-glass"
 	g_amt = 3750
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
@@ -346,6 +347,28 @@
 	m_amt = 100
 	origin_tech = "magnets=2;syndicate=3"*/
 
+/obj/item/weapon/shard/shrapnel
+	name = "shrapnel"
+	icon = 'icons/obj/shards.dmi'
+	icon_state = "shrapnellarge"
+	desc = "A bunch of tiny bits of shattered metal."
+
+/obj/item/weapon/shard/shrapnel/New()
+
+	src.icon_state = pick("shrapnellarge", "shrapnelmedium", "shrapnelsmall")
+	switch(src.icon_state)
+		if("shrapnelsmall")
+			src.pixel_x = rand(-12, 12)
+			src.pixel_y = rand(-12, 12)
+		if("shrapnelmedium")
+			src.pixel_x = rand(-8, 8)
+			src.pixel_y = rand(-8, 8)
+		if("shrapnellarge")
+			src.pixel_x = rand(-5, 5)
+			src.pixel_y = rand(-5, 5)
+		else
+	return
+
 /obj/item/weapon/SWF_uplink
 	name = "station-bounced radio"
 	desc = "used to comunicate it appears."
@@ -522,7 +545,7 @@
 	icon_state = "hatchet"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 12.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 15.0
 	throw_speed = 4
 	throw_range = 4

code/game/area/Space Station 13 areas.dm

@@ -1003,18 +1003,39 @@ proc/process_ghost_teleport_locs()
 //MedBay
 
 /area/medical/medbay
-	name = "Medbay"
+	name = "\improper Medbay"
 	icon_state = "medbay"
 	music = 'sound/ambience/signal.ogg'
 
 //Medbay is a large area, these additional areas help level out APC load.
 /area/medical/medbay2
-	name = "Medbay"
+	name = "\improper Medbay"
 	icon_state = "medbay2"
 	music = 'sound/ambience/signal.ogg'
 
 /area/medical/medbay3
-	name = "Medbay"
+	name = "\improper Medbay"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+
+/area/medical/biostorage
+	name = "\improper Secondary Storage"
+	icon_state = "medbay2"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/reception
+	name = "\improper Medbay Reception"
+	icon_state = "medbay"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/psych
+	name = "\improper Psych Room"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/medbreak
+	name = "\improper Break Room"
 	icon_state = "medbay3"
 	music = 'sound/ambience/signal.ogg'
 
@@ -1022,20 +1043,44 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Patient's Rooms"
 	icon_state = "patients"
 
+/area/medical/ward
+	name = "\improper Medbay Patient Ward"
+	icon_state = "patients"
+
+/area/medical/patient_a
+	name = "\improper Isolation A"
+	icon_state = "patients"
+
+/area/medical/patient_b
+	name = "\improper Isolation B"
+	icon_state = "patients"
+
+/area/medical/patient_c
+	name = "\improper Isolation C"
+	icon_state = "patients"
+
+/area/medical/iso_access
+	name = "\improper Isolation Access"
+	icon_state = "patients"
+
 /area/medical/cmo
 	name = "\improper Chief Medical Officer's office"
 	icon_state = "CMO"
 
+/area/medical/cmostore
+	name = "\improper Secure Storage"
+	icon_state = "CMO"
+
 /area/medical/robotics
-	name = "Robotics"
+	name = "\improper Robotics"
 	icon_state = "medresearch"
 
 /area/medical/research
-	name = "Medical Research"
+	name = "\improper Medical Research"
 	icon_state = "medresearch"
 
 /area/medical/virology
-	name = "Virology"
+	name = "\improper Virology"
 	icon_state = "virology"
 
 /area/medical/morgue
@@ -1043,15 +1088,19 @@ proc/process_ghost_teleport_locs()
 	icon_state = "morgue"
 
 /area/medical/chemistry
-	name = "Chemistry"
+	name = "\improper Chemistry"
 	icon_state = "chem"
 
 /area/medical/surgery
-	name = "Surgery"
+	name = "\improper Surgery"
+	icon_state = "surgery"
+
+/area/medical/surgeryobs
+	name = "\improper Surgery Observation"
 	icon_state = "surgery"
 
 /area/medical/cryo
-	name = "Cryogenics"
+	name = "\improper Cryogenics"
 	icon_state = "cryo"
 
 /area/medical/exam_room
@@ -1059,15 +1108,15 @@ proc/process_ghost_teleport_locs()
 	icon_state = "exam_room"
 
 /area/medical/genetics
-	name = "Genetics Lab"
+	name = "\improper Genetics Lab"
 	icon_state = "genetics"
 
 /area/medical/genetics_cloning
-	name = "Cloning Lab"
+	name = "\improper Cloning Lab"
 	icon_state = "cloning"
 
 /area/medical/sleeper
-	name = "Medbay Treatment Center"
+	name = "\improper Emergency"
 	icon_state = "exam_room"
 
 //Security

code/game/atoms.dm

@@ -21,10 +21,10 @@
 	//Detective Work, used for the duplicate data points kept in the scanners
 	var/list/original_atom
 
-/atom/proc/throw_impact(atom/hit_atom)
+/atom/proc/throw_impact(atom/hit_atom, var/speed)
 	if(istype(hit_atom,/mob/living))
 		var/mob/living/M = hit_atom
-		M.hitby(src)
+		M.hitby(src,speed)
 
 		log_attack("<font color='red'>[hit_atom] ([M.ckey]) was hit by [src] thrown by ([src.fingerprintslast])</font>")
 
@@ -32,7 +32,7 @@
 		var/obj/O = hit_atom
 		if(!O.anchored)
 			step(O, src.dir)
-		O.hitby(src)
+		O.hitby(src,speed)
 
 	else if(isturf(hit_atom))
 		var/turf/T = hit_atom

code/game/atoms_movable.dm

@@ -44,18 +44,18 @@
 		return 1
 	return 0
 
-/atom/movable/proc/hit_check()
+/atom/movable/proc/hit_check(var/speed)
 	if(src.throwing)
 		for(var/atom/A in get_turf(src))
 			if(A == src) continue
 			if(istype(A,/mob/living))
 				if(A:lying) continue
-				src.throw_impact(A)
+				src.throw_impact(A,speed)
 				if(src.throwing == 1)
 					src.throwing = 0
 			if(isobj(A))
 				if(A.density && !A.throwpass)	// **TODO: Better behaviour for windows which are dense, but shouldn't always stop movement
-					src.throw_impact(A)
+					src.throw_impact(A,speed)
 					src.throwing = 0
 
 /atom/movable/proc/throw_at(atom/target, range, speed)
@@ -97,7 +97,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error += dist_x
 				dist_travelled++
 				dist_since_sleep++
@@ -109,7 +109,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error -= dist_y
 				dist_travelled++
 				dist_since_sleep++
@@ -126,7 +126,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error += dist_y
 				dist_travelled++
 				dist_since_sleep++
@@ -138,7 +138,7 @@
 				if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 					break
 				src.Move(step)
-				hit_check()
+				hit_check(speed)
 				error -= dist_x
 				dist_travelled++
 				dist_since_sleep++
@@ -150,7 +150,7 @@
 
 	//done throwing, either because it hit something or it finished moving
 	src.throwing = 0
-	if(isobj(src)) src:throw_impact(get_turf(src))
+	if(isobj(src)) src:throw_impact(get_turf(src),speed)
 
 
 //Overlays

code/game/dna.dm

@@ -548,7 +548,17 @@
 			sleep(48)
 			del(animation)
 
-		var/mob/living/carbon/monkey/O = new(src)
+
+		var/mob/living/carbon/monkey/O = null
+		switch(M.dna.mutantrace)
+			if("tajaran")
+				O = new /mob/living/carbon/monkey/tajara(src)
+			if("lizard")
+				O = new /mob/living/carbon/monkey/unathi(src)
+			if("skrell")
+				O = new /mob/living/carbon/monkey/skrell(src)
+			else
+				O = new /mob/living/carbon/monkey(src)
 
 		if(M)
 			if (M.dna)

code/game/gamemodes/events/ninja_abilities.dm

@@ -65,45 +65,11 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 		s_coold = 1
 	return
 
-//=======//9-8 TILE TELEPORT//=======//
-//Click to to teleport 9-10 tiles in direction facing.
-/obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt()
-	set name = "Phase Jaunt (10E)"
-	set desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
-	set category = "Ninja Ability"
-	set popup_menu = 0
-
-	var/C = 100
-	if(!ninjacost(C,1))
-		var/mob/living/carbon/human/U = affecting
-		var/turf/destination = get_teleport_loc(U.loc,U,9,1,3,1,0,1)
-		var/turf/mobloc = get_turf(U.loc)//To make sure that certain things work properly below.
-		if(destination&&istype(mobloc, /turf))//The turf check prevents unusual behavior. Like teleporting out of cryo pods, cloners, mechs, etc.
-			spawn(0)
-				playsound(U.loc, "sparks", 50, 1)
-				anim(mobloc,src,'icons/mob/mob.dmi',,"phaseout",,U.dir)
-
-			handle_teleport_grab(destination, U)
-			U.loc = destination
-
-			spawn(0)
-				spark_system.start()
-				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
-				playsound(U.loc, "sparks", 50, 1)
-				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
-
-			spawn(0)
-				destination.kill_creatures(U)//Any living mobs in teleport area are gibbed. Check turf procs for how it does it.
-			s_coold = 1
-			cell.charge-=(C*10)
-		else
-			U << "\red The VOID-shift device is malfunctioning, <B>teleportation failed</B>."
-	return
 
 //=======//RIGHT CLICK TELEPORT//=======//
 //Right click to teleport somewhere, almost exactly like admin jump to turf.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjashift(turf/T in oview())
-	set name = "Phase Shift (20E)"
+	set name = "Phase Shift (1E)"
 	set desc = "Utilizes the internal VOID-shift device to rapidly transit to a destination in view."
 	set category = null//So it does not show up on the panel but can still be right-clicked.
 	set src = usr.contents//Fixes verbs not attaching properly for objects. Praise the DM reference guide!
@@ -125,11 +91,6 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 				playsound(U.loc, 'sound/effects/phasein.ogg', 25, 1)
 				playsound(U.loc, 'sound/effects/sparks2.ogg', 50, 1)
 				anim(U.loc,U,'icons/mob/mob.dmi',,"phasein",,U.dir)
-
-			spawn(0)//Any living mobs in teleport area are gibbed.
-				T.kill_creatures(U)
-			s_coold = 1
-			cell.charge-=(C*10)
 		else
 			U << "\red You cannot teleport into solid walls or from solid matter"
 	return
@@ -137,16 +98,16 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 //=======//EM PULSE//=======//
 //Disables nearby tech equipment.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse()
-	set name = "EM Burst (25E)"
+	set name = "EM Burst (1,000E)"
 	set desc = "Disable any nearby technology with a electro-magnetic pulse."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
 	var/C = 250
-	if(!ninjacost(C,1))
+	if(!ninjacost(C,100)) // EMP's now cost 1,000Energy about 30%
 		var/mob/living/carbon/human/U = affecting
 		playsound(U.loc, 'sound/effects/EMPulse.ogg', 60, 2)
-		empulse(U, 4, 6) //Procs sure are nice. Slightly weaker than wizard's disable tch.
+		empulse(U, 2, 3) //Procs sure are nice. Slightly weaker than wizard's disable tch.
 		s_coold = 2
 		cell.charge-=(C*10)
 	return
@@ -154,13 +115,13 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 //=======//ENERGY BLADE//=======//
 //Summons a blade of energy in active hand.
 /obj/item/clothing/suit/space/space_ninja/proc/ninjablade()
-	set name = "Energy Blade (5E)"
+	set name = "Energy Blade (20E)"
 	set desc = "Create a focused beam of energy in your active hand."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
 	var/C = 50
-	if(!ninjacost(C))
+	if(!ninjacost(C, 800)) //Same spawn cost but higher upkeep cost
 		var/mob/living/carbon/human/U = affecting
 		if(!kamikaze)
 			if(!U.get_active_hand()&&!istype(U.get_inactive_hand(), /obj/item/weapon/melee/energy/blade))
@@ -187,13 +148,13 @@ Not sure why this would be useful (it's not) but whatever. Ninjas need their smo
 /*Shoots ninja stars at random people.
 This could be a lot better but I'm too tired atm.*/
 /obj/item/clothing/suit/space/space_ninja/proc/ninjastar()
-	set name = "Energy Star (5E)"
+	set name = "Energy Star (1,000E)"
 	set desc = "Launches an energy star at a random living target."
 	set category = "Ninja Ability"
 	set popup_menu = 0
 
 	var/C = 50
-	if(!ninjacost(C))
+	if(!ninjacost(C,1))
 		var/mob/living/carbon/human/U = affecting
 		var/targets[] = list()//So yo can shoot while yo throw dawg
 		for(var/mob/living/M in oview(loc))
@@ -212,7 +173,7 @@ This could be a lot better but I'm too tired atm.*/
 			A.current = curloc
 			A.yo = targloc.y - curloc.y
 			A.xo = targloc.x - curloc.x
-			cell.charge-=(C*10)
+			cell.charge-=(C*100)// Ninja stars now cost 100 energy, stil la fair chunk to avoid spamming, will run out of power quickly if used 3 or more times
 			A.process()
 		else
 			U << "\red There are no targets in view."
@@ -222,13 +183,13 @@ This could be a lot better but I'm too tired atm.*/
 /*Allows the ninja to capture people, I guess.
 Must right click on a mob to activate.*/
 /obj/item/clothing/suit/space/space_ninja/proc/ninjanet(mob/living/carbon/M in oview())//Only living carbon mobs.
-	set name = "Energy Net (20E)"
+	set name = "Energy Net (8,000E)"
 	set desc = "Captures a fallen opponent in a net of energy. Will teleport them to a holding facility after 30 seconds."
 	set category = null
 	set src = usr.contents
 
-	var/C = 200
-	if(!ninjacost(C,1)&&iscarbon(M))
+	var/C = 500
+	if(!ninjacost(C,80)&&iscarbon(M)) // Nets now cost 8,000
 		var/mob/living/carbon/human/U = affecting
 		if(M.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame.
 		//if(M)//DEBUG
@@ -249,7 +210,7 @@ Must right click on a mob to activate.*/
 				E.master = U
 				spawn(0)//Parallel processing.
 					E.process(M)
-				cell.charge-=(C*10)
+				cell.charge-=(C*100) // Nets now cost what should be most of a standard battery, since your taking someone out of the round
 			else
 				U << "They are already trapped inside an energy net."
 		else
@@ -270,7 +231,6 @@ Movement impairing would indicate drugs and the like.*/
 		//Wouldn't need to track adrenaline boosters if there was a miracle injection to get rid of paralysis and the like instantly.
 		//For now, adrenaline boosters ARE the miracle injection. Well, radium, really.
 		U.SetParalysis(0)
-		U.SetStunned(0)
 		U.SetWeakened(0)
 	/*
 	Due to lag, it was possible to adrenaline boost but remain helpless while life.dm resets player stat.

code/game/gamemodes/events/ninja_equipment.dm

@@ -1333,10 +1333,10 @@ It is possible to destroy the net by the occupant or someone else.
 			return
 
 	process(var/mob/living/carbon/M as mob)
-		var/check = 30//30 seconds before teleportation. Could be extended I guess.
+		var/check = 60//30 seconds before teleportation. Could be extended I guess. - Extended to one minute
 		var/mob_name = affecting.name//Since they will report as null if terminated before teleport.
 		//The person can still try and attack the net when inside.
-		while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 30 seconds have not passed.
+		while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 60 seconds have not passed.
 			check--
 			sleep(10)
 

code/game/gamemodes/events/space_ninja.dm

@@ -656,7 +656,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 /obj/item/clothing/suit/space/space_ninja/proc/grant_ninja_verbs()
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
@@ -669,8 +668,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 /obj/item/clothing/suit/space/space_ninja/proc/remove_ninja_verbs()
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjasmoke
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjaboost
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjablade
@@ -681,11 +678,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 /obj/item/clothing/suit/space/space_ninja/proc/grant_kamikaze(mob/living/carbon/U)
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
-	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
 	verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
-
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjaslayer
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjawalk
 	verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjamirage
@@ -710,11 +703,8 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 /obj/item/clothing/suit/space/space_ninja/proc/remove_kamikaze(mob/living/carbon/U)
 	if(kamikaze)
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjashift
-		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjajaunt
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse
 		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjastar
-		verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet
-
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjaslayer
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjawalk
 		verbs -= /obj/item/clothing/suit/space/space_ninja/proc/ninjamirage

code/game/gamemodes/nuclear/nuclear.dm

@@ -157,10 +157,10 @@
 
 
 /datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code)
-	var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
+//	var/leader_title = pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")
 	spawn(1)
-		NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen
-	synd_mind.current.real_name = "[syndicate_name()] [leader_title]"
+//		NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen
+	synd_mind.current.real_name = "[pick(first_names_male)] [pick(last_names)]"
 	if (nuke_code)
 		synd_mind.store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
 		synd_mind.current << "The nuclear authorization code is: <B>[nuke_code]</B>"
@@ -330,7 +330,7 @@
 	return 1
 
 
-/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho.
+/*/proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho.
 	var/randomname = pick(last_names)
 	var/newname = copytext(sanitize(input(M,"You are the nuke operative [pick("Czar", "Boss", "Commander", "Chief", "Kingpin", "Director", "Overlord")]. Please choose a last name for your family.", "Name change",randomname)),1,MAX_NAME_LEN)
 
@@ -343,13 +343,13 @@
 			return nukelastname(M)
 
 	return newname
-
+*/
 /proc/NukeNameAssign(var/lastname,var/list/syndicates)
 	for(var/datum/mind/synd_mind in syndicates)
 		switch(synd_mind.current.gender)
 			if(MALE)
-				synd_mind.name = "[pick(first_names_male)] [lastname]"
+				synd_mind.name = "[pick(first_names_male)] [pick(last_names)]"
 			if(FEMALE)
-				synd_mind.name = "[pick(first_names_female)] [lastname]"
+				synd_mind.name = "[pick(first_names_female)] [pick(last_names)]"
 		synd_mind.current.real_name = synd_mind.name
 	return

code/game/jobs/access.dm

@@ -64,6 +64,7 @@
 /var/const/access_gateway = 62
 /var/const/access_sec_doors = 63 // Security front doors
 /var/const/access_psychiatrist = 64 // Psychiatrist's office
+/var/const/access_xenoarch = 65
 
 	//BEGIN CENTCOM ACCESS
 	/*Should leave plenty of room if we need to add more access levels.
@@ -209,7 +210,7 @@
 	            access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery,
 	            access_theatre, access_research, access_mining, access_mailsorting,
 	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
-	            access_keycard_auth, access_tcomsat, access_gateway)
+	            access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch)
 
 /proc/get_all_centcom_access()
 	return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
@@ -226,7 +227,7 @@
 		if(2) //medbay
 			return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo)
 		if(3) //research
-			return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd)
+			return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_xenoarch, access_rd)
 		if(4) //engineering and maintenance
 			return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_ce)
 		if(5) //command
@@ -370,6 +371,8 @@
 			return "Mining EVA"
 		if(access_xenobiology)
 			return "Xenobiology Lab"
+		if(access_xenoarch)
+			return "Xenoarchaeology"
 		if(access_hop)
 			return "Head of Personnel"
 		if(access_hos)
@@ -412,7 +415,7 @@
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", /*"Clown", "Mime", */"Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
 				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
-				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
+				"Research Director", "Scientist", "Xenobiologist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
 
 /proc/get_all_centcom_jobs()
 	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander")

code/game/jobs/job/science.dm

@@ -12,11 +12,11 @@
 	access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
 			            access_tox_storage, access_teleporter, access_sec_doors,
 			            access_research, access_robotics, access_xenobiology, access_ai_upload,
-			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway)
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch)
 	minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
 			            access_tox_storage, access_teleporter, access_sec_doors,
 			            access_research, access_robotics, access_xenobiology, access_ai_upload,
-			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway)
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch)
 	minimal_player_age = 7
 
 	equip(var/mob/living/carbon/human/H)
@@ -44,9 +44,9 @@
 	spawn_positions = 3
 	supervisors = "the research director"
 	selection_color = "#ffeeff"
-	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
-	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology)
-	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist")
+	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
+	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
+	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher")
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -63,6 +63,32 @@
 
 
 
+/datum/job/xenobiologist
+	title = "Xenobiologist"
+	flag = XENOBIOLOGIST
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the research director"
+	selection_color = "#ffeeff"
+	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
+	minimal_access = list(access_research, access_xenobiology)
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H) return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		return 1
+
+
 /datum/job/roboticist
 	title = "Roboticist"
 	flag = ROBOTICIST

code/game/jobs/jobs.dm

@@ -9,9 +9,8 @@ var/const/OFFICER			=(1<<4)
 var/const/CHIEF				=(1<<5)
 var/const/ENGINEER			=(1<<6)
 var/const/ATMOSTECH			=(1<<7)
-var/const/ROBOTICIST		=(1<<8)
-var/const/AI				=(1<<9)
-var/const/CYBORG			=(1<<10)
+var/const/AI				=(1<<8)
+var/const/CYBORG			=(1<<9)
 
 
 var/const/MEDSCI			=(1<<1)
@@ -24,6 +23,8 @@ var/const/DOCTOR			=(1<<4)
 var/const/GENETICIST		=(1<<5)
 var/const/VIROLOGIST		=(1<<6)
 var/const/PSYCHIATRIST		=(1<<7)
+var/const/ROBOTICIST		=(1<<8)
+var/const/XENOBIOLOGIST		=(1<<9)
 
 
 var/const/CIVILIAN			=(1<<2)
@@ -78,7 +79,8 @@ var/list/science_positions = list(
 	"Research Director",
 	"Scientist",
 	"Geneticist",	//Part of both medical and science
-	"Roboticist"
+	"Roboticist",
+	"Xenobiologist"
 )
 
 //BS12 EDIT
@@ -115,3 +117,26 @@ var/list/nonhuman_positions = list(
 
 /proc/guest_jobbans(var/job)
 	return ((job in command_positions) || (job in nonhuman_positions) || (job in security_positions))
+
+/proc/get_job_datums()
+	var/list/occupations = list()
+	var/list/all_jobs = typesof(/datum/job)
+
+	for(var/A in all_jobs)
+		var/datum/job/job = new A()
+		if(!job)	continue
+		occupations += job
+
+	return occupations
+
+/proc/get_alternate_titles(var/job)
+	var/list/jobs = get_job_datums()
+	var/list/titles = list()
+
+	for(var/datum/job/J in jobs)
+		if(!J)	continue
+		if(J.title == job)
+			titles = J.alt_titles
+
+	return titles
+

code/game/machinery/adv_med.dm

@@ -284,10 +284,10 @@
 						var/internal_bleeding = ""
 						var/lung_ruptured = ""
 						for(var/datum/wound/W in e.wounds) if(W.internal)
-							internal_bleeding = "<br>Internal Bleeding"
+							internal_bleeding = "<br>Internal bleeding"
 							break
 						if(istype(e, /datum/organ/external/chest) && occupant.is_lung_ruptured())
-							lung_ruptured = "Lung Ruptured:"
+							lung_ruptured = "Lung ruptured:"
 						if(e.status & ORGAN_SPLINTED)
 							splint = "Splinted:"
 						if(e.status & ORGAN_BLEEDING)
@@ -297,7 +297,7 @@
 						if(e.open)
 							open = "Open:"
 						if(e.implants.len)
-							imp = "Implanted:"
+							imp = "Unknown body present:"
 						if(!AN && !open && !infected & !imp)
 							AN = "None:"
 						if(!(e.status & ORGAN_DESTROYED))

code/game/machinery/computer/specops_shuttle.dm

@@ -256,9 +256,10 @@ var/specops_shuttle_timeleft = 0
 		user << "\red Access Denied."
 		return
 
-	if (sent_strike_team == 0 && send_emergency_team == 0)
-		usr << "\red The strike team has not yet deployed."
-		return
+//Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle.
+//	if (sent_strike_team == 0 && send_emergency_team == 0)
+//		usr << "\red The strike team has not yet deployed."
+//		return
 
 	if(..())
 		return

code/game/machinery/doors/airlock.dm

@@ -86,7 +86,8 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	var/list/signalers[12]
 	var/lockdownbyai = 0
 	autoclose = 1
-	var/doortype = 0
+	var/assembly_type = /obj/structure/door_assembly
+	var/mineral = null
 	var/justzap = 0
 	var/safe = 1
 	normalspeed = 1
@@ -96,57 +97,54 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 /obj/machinery/door/airlock/command
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorcom.dmi'
-	doortype = 1
+	assembly_type = /obj/structure/door_assembly/door_assembly_com
 
 /obj/machinery/door/airlock/security
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorsec.dmi'
-	doortype = 2
+	assembly_type = /obj/structure/door_assembly/door_assembly_sec
 
 /obj/machinery/door/airlock/engineering
 	name = "Airlock"
 	icon = 'icons/obj/doors/Dooreng.dmi'
-	doortype = 3
+	assembly_type = /obj/structure/door_assembly/door_assembly_eng
 
 /obj/machinery/door/airlock/medical
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doormed.dmi'
-	doortype = 4
+	assembly_type = /obj/structure/door_assembly/door_assembly_med
 
 /obj/machinery/door/airlock/maintenance
 	name = "Maintenance Access"
 	icon = 'icons/obj/doors/Doormaint.dmi'
-	doortype = 5
+	assembly_type = /obj/structure/door_assembly/door_assembly_mai
 
 /obj/machinery/door/airlock/external
 	name = "External Airlock"
 	icon = 'icons/obj/doors/Doorext.dmi'
-	doortype = 6
+	assembly_type = /obj/structure/door_assembly/door_assembly_ext
 
 /obj/machinery/door/airlock/glass
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Doorglass.dmi'
 	opacity = 0
-	doortype = 7
 	glass = 1
 
 /obj/machinery/door/airlock/centcom
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorele.dmi'
 	opacity = 0
-	doortype = 8
 
 /obj/machinery/door/airlock/vault
 	name = "Vault"
 	icon = 'icons/obj/doors/vault.dmi'
 	opacity = 1
-	doortype = 9
+	assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites.
 
 /obj/machinery/door/airlock/glass_large
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Door2x1glassfull.dmi'
 	opacity = 0
-	doortype = 10
 	bound_width = 64
 	glass = 1
 
@@ -171,68 +169,68 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	name = "Freezer Airlock"
 	icon = 'icons/obj/doors/Doorfreezer.dmi'
 	opacity = 1
-	doortype = 11
+	assembly_type = /obj/structure/door_assembly/door_assembly_fre
 
 /obj/machinery/door/airlock/hatch
 	name = "Airtight Hatch"
 	icon = 'icons/obj/doors/Doorhatchele.dmi'
 	opacity = 1
-	doortype = 12
+	assembly_type = /obj/structure/door_assembly/door_assembly_hatch
 
 /obj/machinery/door/airlock/maintenance_hatch
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorhatchmaint2.dmi'
 	opacity = 1
-	doortype = 13
+	assembly_type = /obj/structure/door_assembly/door_assembly_mhatch
 
 /obj/machinery/door/airlock/glass_command
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorcomglass.dmi'
 	opacity = 0
-	doortype = 14
+	assembly_type = /obj/structure/door_assembly/door_assembly_com
 	glass = 1
 
 /obj/machinery/door/airlock/glass_engineering
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorengglass.dmi'
 	opacity = 0
-	doortype = 15
+	assembly_type = /obj/structure/door_assembly/door_assembly_eng
 	glass = 1
 
 /obj/machinery/door/airlock/glass_security
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorsecglass.dmi'
 	opacity = 0
-	doortype = 16
+	assembly_type = /obj/structure/door_assembly/door_assembly_sec
 	glass = 1
 
 /obj/machinery/door/airlock/glass_medical
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doormedglass.dmi'
 	opacity = 0
-	doortype = 17
+	assembly_type = /obj/structure/door_assembly/door_assembly_med
 	glass = 1
 
 /obj/machinery/door/airlock/mining
 	name = "Mining Airlock"
 	icon = 'icons/obj/doors/Doormining.dmi'
-	doortype = 18
+	assembly_type = /obj/structure/door_assembly/door_assembly_min
 
 /obj/machinery/door/airlock/atmos
 	name = "Atmospherics Airlock"
 	icon = 'icons/obj/doors/Dooratmo.dmi'
-	doortype = 19
+	assembly_type = /obj/structure/door_assembly/door_assembly_atmo
 
 /obj/machinery/door/airlock/research
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorresearch.dmi'
-	doortype = 20
+	assembly_type = /obj/structure/door_assembly/door_assembly_research
 
 /obj/machinery/door/airlock/glass_research
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorresearchglass.dmi'
 	opacity = 0
-	doortype = 21
+	assembly_type = /obj/structure/door_assembly/door_assembly_research
 	glass = 1
 	heat_proof = 1
 
@@ -240,40 +238,36 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Doorminingglass.dmi'
 	opacity = 0
-	doortype = 22
+	assembly_type = /obj/structure/door_assembly/door_assembly_min
 	glass = 1
 
 /obj/machinery/door/airlock/glass_atmos
 	name = "Maintenance Hatch"
 	icon = 'icons/obj/doors/Dooratmoglass.dmi'
 	opacity = 0
-	doortype = 23
+	assembly_type = /obj/structure/door_assembly/door_assembly_atmo
 	glass = 1
 
 /obj/machinery/door/airlock/gold
 	name = "Gold Airlock"
 	icon = 'icons/obj/doors/Doorgold.dmi'
-	var/mineral = "gold"
-	doortype = 24
+	mineral = "gold"
 
 /obj/machinery/door/airlock/silver
 	name = "Silver Airlock"
 	icon = 'icons/obj/doors/Doorsilver.dmi'
-	var/mineral = "silver"
-	doortype = 25
+	mineral = "silver"
 
 /obj/machinery/door/airlock/diamond
 	name = "Diamond Airlock"
 	icon = 'icons/obj/doors/Doordiamond.dmi'
-	var/mineral = "diamond"
-	doortype = 26
+	mineral = "diamond"
 
 /obj/machinery/door/airlock/uranium
 	name = "Uranium Airlock"
 	desc = "And they said I was crazy."
 	icon = 'icons/obj/doors/Dooruranium.dmi'
-	var/mineral = "uranium"
-	doortype = 27
+	mineral = "uranium"
 	var/last_event = 0
 
 /obj/machinery/door/airlock/uranium/process()
@@ -292,8 +286,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	name = "Plasma Airlock"
 	desc = "No way this can end badly."
 	icon = 'icons/obj/doors/Doorplasma.dmi'
-	var/mineral = "plasma"
-	doortype = 28
+	mineral = "plasma"
 
 /obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
@@ -321,37 +314,35 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 		W.ignite((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame
 	for(var/obj/machinery/door/airlock/plasma/D in range(3,src))
 		D.ignite(temperature/4)
-	new/obj/structure/door_assembly/door_assembly_0( src.loc )
+	new/obj/structure/door_assembly( src.loc )
 	del (src)
 
 /obj/machinery/door/airlock/clown
 	name = "Bananium Airlock"
 	icon = 'icons/obj/doors/Doorbananium.dmi'
-	var/mineral = "clown"
-	doortype = 29
+	mineral = "clown"
 
 /obj/machinery/door/airlock/sandstone
 	name = "Sandstone Airlock"
 	icon = 'icons/obj/doors/Doorsand.dmi'
-	var/mineral = "sandstone"
-	doortype = 30
+	mineral = "sandstone"
 
 /obj/machinery/door/airlock/science
 	name = "Airlock"
 	icon = 'icons/obj/doors/Doorsci.dmi'
-	doortype = 31
+	assembly_type = /obj/structure/door_assembly/door_assembly_science
 
 /obj/machinery/door/airlock/glass_science
 	name = "Glass Airlocks"
 	icon = 'icons/obj/doors/Doorsciglass.dmi'
 	opacity = 0
-	doortype = 32
+	assembly_type = /obj/structure/door_assembly/door_assembly_science
 	glass = 1
 
 /obj/machinery/door/airlock/highsecurity
 	name = "High Tech Security Airlock"
 	icon = 'icons/obj/doors/hightechsecurity.dmi'
-	doortype = 33
+	assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity
 
 /*
 About the new airlock wires panel:
@@ -1221,42 +1212,25 @@ About the new airlock wires panel:
 			user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
 			if(do_after(user,40))
 				user << "\blue You removed the airlock electronics!"
-				switch(src.doortype)
-					if(0) new/obj/structure/door_assembly/door_assembly_0( src.loc )
-					if(1) new/obj/structure/door_assembly/door_assembly_com( src.loc )
-					if(2) new/obj/structure/door_assembly/door_assembly_sec( src.loc )
-					if(3) new/obj/structure/door_assembly/door_assembly_eng( src.loc )
-					if(4) new/obj/structure/door_assembly/door_assembly_med( src.loc )
-					if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc )
-					if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
-					if(7) new/obj/structure/door_assembly/door_assembly_glass( src.loc )
-					if(12) new/obj/structure/door_assembly/door_assembly_hatch( src.loc )
-					if(13) new/obj/structure/door_assembly/door_assembly_mhatch( src.loc )
-					if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc )
-					if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc )
-					if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )
-					if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc )
-					if(18) new/obj/structure/door_assembly/door_assembly_min( src.loc )
-					if(19) new/obj/structure/door_assembly/door_assembly_atmo( src.loc )
-					if(20) new/obj/structure/door_assembly/door_assembly_research( src.loc )
-					if(21) new/obj/structure/door_assembly/door_assembly_research/glass( src.loc )
-					if(22) new/obj/structure/door_assembly/door_assembly_min/glass( src.loc )
-					if(23) new/obj/structure/door_assembly/door_assembly_atmo/glass( src.loc )
-					if(24) new/obj/structure/door_assembly/door_assembly_gold( src.loc )
-					if(25) new/obj/structure/door_assembly/door_assembly_silver( src.loc )
-					if(26) new/obj/structure/door_assembly/door_assembly_diamond( src.loc )
-					if(27) new/obj/structure/door_assembly/door_assembly_uranium( src.loc )
-					if(28) new/obj/structure/door_assembly/door_assembly_plasma( src.loc )
-					if(29) new/obj/structure/door_assembly/door_assembly_clown( src.loc )
-					if(30) new/obj/structure/door_assembly/door_assembly_sandstone( src.loc )
-					if(31) new/obj/structure/door_assembly/door_assembly_science( src.loc )
-					if(32) new/obj/structure/door_assembly/door_assembly_science/glass( src.loc )
-					if(33) new/obj/structure/door_assembly/door_assembly_highsecurity(src.loc)
+
+				var/obj/structure/door_assembly/da = new assembly_type(src.loc)
+				da.anchored = 1
+				if(mineral)
+					da.glass = mineral
+				else if(glass)
+					da.glass = 1
+				da.state = 1
+				da.created_name = src.name
+				da.update_state()
 
 				var/obj/item/weapon/airlock_electronics/ae
 				if(!electronics)
 					ae = new/obj/item/weapon/airlock_electronics( src.loc )
-					ae.conf_access = src.req_access
+					if(src.req_access.len)
+						ae.conf_access = src.req_access
+					else if (src.req_one_access.len)
+						ae.conf_access = src.req_one_access
+						ae.one_access = 1
 				else
 					ae = electronics
 					electronics = null

code/game/machinery/doors/airlock_electronics.dm

@@ -11,6 +11,7 @@
 	req_access = list(access_engine)
 
 	var/list/conf_access = null
+	var/one_access = 0 //if set to 1, door would receive req_one_access instead of req_access
 	var/last_configurator = null
 	var/locked = 1
 
@@ -33,6 +34,8 @@
 		else
 			t1 += "<a href='?src=\ref[src];logout=1'>Block</a><hr>"
 
+			t1 += "Access requirement is set to "
+			t1 += one_access ? "<a style='color: green' href='?src=\ref[src];one_access=1'>ONE</a><hr>" : "<a style='color: red' href='?src=\ref[src];one_access=1'>ALL</a><hr>"
 
 			t1 += conf_access == null ? "<font color=red>All</font><br>" : "<a href='?src=\ref[src];access=all'>All</a><br>"
 
@@ -44,6 +47,8 @@
 
 				if (!conf_access || !conf_access.len || !(acc in conf_access))
 					t1 += "<a href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
+				else if(one_access)
+					t1 += "<a style='color: green' href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
 				else
 					t1 += "<a style='color: red' href='?src=\ref[src];access=[acc]'>[aname]</a><br>"
 
@@ -75,6 +80,9 @@
 		if (href_list["logout"])
 			locked = 1
 
+		if (href_list["one_access"])
+			one_access = !one_access
+
 		if (href_list["access"])
 			toggle_access(href_list["access"])
 

code/game/machinery/doors/alarmlock.dm

@@ -3,7 +3,6 @@
 	name = "Glass Alarm Airlock"
 	icon = 'icons/obj/doors/Doorglass.dmi'
 	opacity = 0
-	doortype = 7
 	glass = 1
 
 	var/datum/radio_frequency/air_connection

code/game/machinery/doors/windowdoor.dm

@@ -130,6 +130,21 @@
 		new /obj/item/weapon/shard(src.loc)
 		var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc)
 		CC.amount = 2
+		var/obj/item/weapon/airlock_electronics/ae
+		if(!electronics)
+			ae = new/obj/item/weapon/airlock_electronics( src.loc )
+			if(src.req_access.len)
+				ae.conf_access = src.req_access
+			else if (src.req_one_access.len)
+				ae.conf_access = src.req_one_access
+				ae.one_access = 1
+		else
+			ae = electronics
+			electronics = null
+			ae.loc = src.loc
+		if(operating == -1)
+			ae.icon_state = "door_electronics_smoked"
+			operating = 0
 		src.density = 0
 		del(src)
 		return
@@ -162,15 +177,9 @@
 	if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult))
 		if(src.operating)
 			return
-		src.health = max(0, src.health - 25)
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		visible_message("\red <B>[user] smashes against the [src.name].</B>", 1)
-		if (src.health <= 0)
-			new /obj/item/weapon/shard(src.loc)
-			var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc)
-			CC.amount = 2
-			src.density = 0
-			del(src)
+		take_damage(25)
 	else
 		return src.attack_hand(user)
 
@@ -181,7 +190,7 @@
 /obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/user as mob)
 
 	//If it's in the process of opening/closing, ignore the click
-	if (src.operating)
+	if (src.operating == 1)
 		return
 
 	//Emags and ninja swords? You may pass.
@@ -199,19 +208,50 @@
 		open()
 		return 1
 
+	//If it's emagged, crowbar can pry electronics out.
+	if (src.operating == -1 && istype(I, /obj/item/weapon/crowbar))
+		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.")
+		if (do_after(user,40))
+			user << "\blue You removed the windoor electronics!"
+
+			var/obj/structure/windoor_assembly/wa = new/obj/structure/windoor_assembly(src.loc)
+			if (istype(src, /obj/machinery/door/window/brigdoor))
+				wa.secure = "secure_"
+				wa.name = "Secure Wired Windoor Assembly"
+			else
+				wa.name = "Wired Windoor Assembly"
+			if (src.base_state == "right" || src.base_state == "rightsecure")
+				wa.facing = "r"
+			wa.dir = src.dir
+			wa.state = "02"
+			wa.update_icon()
+
+			var/obj/item/weapon/airlock_electronics/ae
+			if(!electronics)
+				ae = new/obj/item/weapon/airlock_electronics( src.loc )
+				if(src.req_access.len)
+					ae.conf_access = src.req_access
+				else if (src.req_one_access.len)
+					ae.conf_access = src.req_one_access
+					ae.one_access = 1
+			else
+				ae = electronics
+				electronics = null
+				ae.loc = src.loc
+			ae.icon_state = "door_electronics_smoked"
+
+			operating = 0
+			del(src)
+			return
+
 	//If it's a weapon, smash windoor. Unless it's an id card, agent card, ect.. then ignore it (Cards really shouldnt damage a door anyway)
 	if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card))
 		var/aforce = I.force
-		if(I.damtype == BRUTE || I.damtype == BURN)
-			src.health = max(0, src.health - aforce)
 		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
 		visible_message("\red <B>[src] was hit by [I].</B>")
-		if (src.health <= 0)
-			new /obj/item/weapon/shard(src.loc)
-			var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc)
-			CC.amount = 2
-			src.density = 0
-			del(src)
+		if(I.damtype == BRUTE || I.damtype == BURN)
+			take_damage(aforce)
 		return
 
 

code/game/mecha/mech_fabricator.dm

@@ -44,7 +44,12 @@
 						/obj/item/robot_parts/l_arm,
 						/obj/item/robot_parts/r_arm,
 						/obj/item/robot_parts/l_leg,
-						/obj/item/robot_parts/r_leg
+						/obj/item/robot_parts/r_leg,
+						/obj/item/robot_parts/robot_component/binary_communication_device,
+						/obj/item/robot_parts/robot_component/radio,
+						/obj/item/robot_parts/robot_component/actuator,
+						/obj/item/robot_parts/robot_component/diagnosis_unit,
+						/obj/item/robot_parts/robot_component/camera
 					),
 	"Ripley"=list(
 						/obj/item/mecha_parts/chassis/ripley,

code/game/objects/effects/barsign.dm

@@ -4,5 +4,5 @@
 	anchored = 1
 
 	New()
-		var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead")
+		var/list/valid_states = list("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt")
 		src.icon_state = "[pick(valid_states)]"

code/game/objects/items/devices/whistle.dm

@@ -4,18 +4,35 @@
 	icon_state = "voice0"
 	item_state = "flashbang"	//looks exactly like a flash (and nothing like a flashbang)
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS| CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
 
 	var/spamcheck = 0
-
+	var/emagged = 0
+	var/insults = 0//just in case
 
 /obj/item/device/hailer/attack_self(mob/living/carbon/user as mob)
 	if (spamcheck)
 		return
 
-	playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
-	user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
+	if(emagged)
+		if(insults >= 1)
+			playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0)//hueheuheuheuheuheuhe
+			user.visible_message("<span class='warning'>[user]'s [name] gurgles, \"FUCK YOUR CUNT YOU SHIT EATING CUNT TILL YOU ARE A MASS EATING SHIT CUNT. EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS TO FUCK UP SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FROM THE DEPTHS OF SHIT\"</span>")
+			insults--
+		else
+			user << "\red *BZZZZcuntZZZZT*"
+	else
+		playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0)
+		user.visible_message("<span class='warning'>[user]'s [name] rasps, \"Halt! Security!\"</span>")
 
 	spamcheck = 1
 	spawn(20)
-		spamcheck = 0
+		spamcheck = 0
+
+/obj/item/device/hailer/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/card/emag) && !emagged)
+		user << "\red You overload \the [src]'s voice synthesizer."
+		emagged = 1
+		insults = rand(1, 3)//to prevent dickflooding
+		return
+	return

code/game/objects/items/robot/robot_parts.dm

@@ -8,6 +8,7 @@
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)
 	var/list/part = null
+	var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.
 
 /obj/item/robot_parts/l_arm
 	name = "robot left arm"
@@ -161,7 +162,7 @@
 		else
 			user << "\blue You need to attach a flash to it first!"
 
-	if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain))
+	if(istype(W, /obj/item/device/mmi))
 		var/obj/item/device/mmi/M = W
 		if(check_completion())
 			if(!istype(loc,/turf))
@@ -193,7 +194,7 @@
 				user << "\red This [W] does not seem to fit."
 				return
 
-			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc))
+			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1)
 			if(!O)	return
 
 			user.drop_item()
@@ -278,3 +279,13 @@
 		del(src)
 		return
 	return
+
+/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/weapon/card/emag))
+		if(sabotaged)
+			user << "\red [src] is already sabotaged!"
+		else
+			user << "\red You slide [W] into the dataport on [src] and short out the safeties."
+			sabotaged = 1
+		return
+	..()

code/game/objects/items/stacks/sheets/mineral.dm

@@ -124,7 +124,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
 	throw_range = 3
 	origin_tech = "materials=3"
 	perunit = 2000
-	sheettype = "plastic"
 
 var/global/list/datum/stack_recipe/plastic_recipes = list ( \
 	new/datum/stack_recipe("plastic crate", /obj/structure/closet/pcrate, 10, one_per_turf = 1, on_floor = 1), \

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -13,10 +13,20 @@
 var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("swivel chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \
 	null, \
+	new/datum/stack_recipe_list("office chairs",list( \
+		new/datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("light office chair", /obj/structure/stool/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1), \
+		), 5), \
+	new/datum/stack_recipe_list("comfy chairs", list( \
+		new/datum/stack_recipe("beige comfy chair", /obj/structure/stool/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("black comfy chair", /obj/structure/stool/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("brown comfy chair", /obj/structure/stool/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("lime comfy chair", /obj/structure/stool/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("teal comfy chair", /obj/structure/stool/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1), \
+		), 2), \
+	null, \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2), \
 	new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts), \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1), \
@@ -28,10 +38,27 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	null, \
 	new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \
-	new/datum/stack_recipe("airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1), \
 	null, \
+	new/datum/stack_recipe_list("airlock assemblies", list( \
+		new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+/*		new/datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \ */
+		new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		), 4), \
+	null, \
 	new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade), \
 	new/datum/stack_recipe("light fixture frame", /obj/item/light_fixture_frame, 2), \
 	new/datum/stack_recipe("small light fixture frame", /obj/item/light_fixture_frame/small, 1), \

code/game/objects/items/stacks/stack.dm

@@ -1,7 +1,8 @@
 /* Stack type objects!
  * Contains:
  * 		Stacks
- *		Recipe datum
+ * 		Recipe datum
+ * 		Recipe list datum
  */
 
 /*
@@ -32,51 +33,66 @@
 	return
 
 /obj/item/stack/attack_self(mob/user as mob)
-	interact(user)
+	list_recipes(user)
 
-/obj/item/stack/interact(mob/user as mob)
+/obj/item/stack/proc/list_recipes(mob/user as mob, recipes_sublist)
 	if (!recipes)
 		return
 	if (!src || amount<=0)
 		user << browse(null, "window=stack")
 	user.set_machine(src) //for correct work of onclose
+	var/list/recipe_list = recipes
+	if (recipes_sublist && recipe_list[recipes_sublist] && istype(recipe_list[recipes_sublist], /datum/stack_recipe_list))
+		var/datum/stack_recipe_list/srl = recipe_list[recipes_sublist]
+		recipe_list = srl.recipes
 	var/t1 = text("<HTML><HEAD><title>Constructions from []</title></HEAD><body><TT>Amount Left: []<br>", src, src.amount)
-	for(var/i=1;i<=recipes.len,i++)
-		var/datum/stack_recipe/R = recipes[i]
-		if (isnull(R))
+	for(var/i=1;i<=recipe_list.len,i++)
+		var/E = recipe_list[i]
+		if (isnull(E))
 			t1 += "<hr>"
 			continue
-		if (i>1 && !isnull(recipes[i-1]))
+
+		if (i>1 && !isnull(recipe_list[i-1]))
 			t1+="<br>"
-		var/max_multiplier = round(src.amount / R.req_amount)
-		var/title as text
-		var/can_build = 1
-		can_build = can_build && (max_multiplier>0)
-		/*
-		if (R.one_per_turf)
-			can_build = can_build && !(locate(R.result_type) in usr.loc)
-		if (R.on_floor)
-			can_build = can_build && istype(usr.loc, /turf/simulated/floor)
-		*/
-		if (R.res_amount>1)
-			title+= "[R.res_amount]x [R.title]\s"
-		else
-			title+= "[R.title]"
-		title+= " ([R.req_amount] [src.singular_name]\s)"
-		if (can_build)
-			t1 += text("<A href='?src=\ref[];make=[]'>[]</A>  ", src, i, title)
-		else
-			t1 += text("[]", title)
-			continue
-		if (R.max_res_amount>1 && max_multiplier>1)
-			max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
-			t1 += " |"
-			var/list/multipliers = list(5,10,25)
-			for (var/n in multipliers)
-				if (max_multiplier>=n)
-					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
-			if (!(max_multiplier in multipliers))
-				t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
+
+		if (istype(E, /datum/stack_recipe_list))
+			var/datum/stack_recipe_list/srl = E
+			if (src.amount >= srl.req_amount)
+				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
+			else
+				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
+
+		if (istype(E, /datum/stack_recipe))
+			var/datum/stack_recipe/R = E
+			var/max_multiplier = round(src.amount / R.req_amount)
+			var/title as text
+			var/can_build = 1
+			can_build = can_build && (max_multiplier>0)
+			/*
+			if (R.one_per_turf)
+				can_build = can_build && !(locate(R.result_type) in usr.loc)
+			if (R.on_floor)
+				can_build = can_build && istype(usr.loc, /turf/simulated/floor)
+			*/
+			if (R.res_amount>1)
+				title+= "[R.res_amount]x [R.title]\s"
+			else
+				title+= "[R.title]"
+			title+= " ([R.req_amount] [src.singular_name]\s)"
+			if (can_build)
+				t1 += text("<A href='?src=\ref[src];sublist=[recipes_sublist];make=[i]'>[title]</A>  ")
+			else
+				t1 += text("[]", title)
+				continue
+			if (R.max_res_amount>1 && max_multiplier>1)
+				max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
+				t1 += " |"
+				var/list/multipliers = list(5,10,25)
+				for (var/n in multipliers)
+					if (max_multiplier>=n)
+						t1 += " <A href='?src=\ref[src];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
+				if (!(max_multiplier in multipliers))
+					t1 += " <A href='?src=\ref[src];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
 
 	t1 += "</TT></body></HTML>"
 	user << browse(t1, "window=stack")
@@ -87,10 +103,18 @@
 	..()
 	if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
 		return
+
+	if (href_list["sublist"] && !href_list["make"])
+		list_recipes(usr, text2num(href_list["sublist"]))
+
 	if (href_list["make"])
 		if (src.amount < 1) del(src) //Never should happen
 
-		var/datum/stack_recipe/R = recipes[text2num(href_list["make"])]
+		var/list/recipes_list = recipes
+		if (href_list["sublist"])
+			var/datum/stack_recipe_list/srl = recipes_list[text2num(href_list["sublist"])]
+			recipes_list = srl.recipes
+		var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
 		var/multiplier = text2num(href_list["multiplier"])
 		if (!multiplier) multiplier = 1
 		if (src.amount < R.req_amount*multiplier)
@@ -222,4 +246,16 @@
 		src.max_res_amount = max_res_amount
 		src.time = time
 		src.one_per_turf = one_per_turf
-		src.on_floor = on_floor
+		src.on_floor = on_floor
+
+/*
+ * Recipe list datum
+ */
+/datum/stack_recipe_list
+	var/title = "ERROR"
+	var/list/recipes = null
+	var/req_amount = 1
+	New(title, recipes, req_amount = 1)
+		src.title = title
+		src.recipes = recipes
+		src.req_amount = req_amount

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

@@ -153,6 +153,7 @@
 	icon_state = "knife"
 	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 	flags = FPRINT | TABLEPASS | CONDUCT
+	sharp = 1
 	force = 10.0
 	w_class = 3.0
 	throwforce = 6.0

code/game/objects/items/weapons/storage/boxes.dm

@@ -277,7 +277,41 @@
 		..()
 		for(var/i = 1; i <= 5; i++)
 			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
+/obj/item/weapon/storage/box/farwacubes
+	name = "farwa cube box"
+	desc = "Drymate brand farwa cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/farwacube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/farwacube/wrapped(src)
 
+/obj/item/weapon/storage/box/stokcubes
+	name = "stok cube box"
+	desc = "Drymate brand stok cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/stokcube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/stokcube/wrapped(src)
+
+/obj/item/weapon/storage/box/neaeracubes
+	name = "neaera cube box"
+	desc = "Drymate brand neaera cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/stokcube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/neaeracube/wrapped(src)
 
 /obj/item/weapon/storage/box/ids
 	name = "spare IDs"

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

@@ -19,7 +19,7 @@
 	m_amt = 10000
 	g_amt = 5000
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 
 /*HAHA, SUCK IT, 2000 LINES OF SPAGHETTI CODE!
@@ -133,7 +133,7 @@ LOOK FOR SURGERY.DM*/
 	m_amt = 5000
 	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("attacked", "pinched")
 
@@ -268,7 +268,7 @@ LOOK FOR SURGERY.DM*/
 	m_amt = 5000
 	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("burnt")
 
@@ -360,7 +360,7 @@ LOOK FOR SURGERY.DM*/
 	g_amt = 10000
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	attack_verb = list("drilled")
 
@@ -379,7 +379,7 @@ LOOK FOR SURGERY.DM*/
 	icon_state = "scalpel"
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 10.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
@@ -631,7 +631,7 @@ LOOK FOR SURGERY.DM*/
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
-	w_class = 1.0
+	w_class = 2.0
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
@@ -797,6 +797,7 @@ LOOK FOR SURGERY.DM*/
 	icon = 'surgery.dmi'
 	icon_state = "bone-gel"
 	force = 0
+	w_class = 2.0
 	throwforce = 1.0
 
 /obj/item/weapon/FixOVein
@@ -806,6 +807,7 @@ LOOK FOR SURGERY.DM*/
 	force = 0
 	throwforce = 1.0
 	origin_tech = "materials=1;biotech=3"
+	w_class = 2.0
 	var/usage_amount = 10
 
 /obj/item/weapon/bonesetter
@@ -816,4 +818,5 @@ LOOK FOR SURGERY.DM*/
 	throwforce = 9.0
 	throw_speed = 3
 	throw_range = 5
+	w_class = 2.0
 	attack_verb = list("attacked", "hit", "bludgeoned")

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

@@ -136,4 +136,15 @@
 
 /obj/item/weapon/katana/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-	return ..()
+	return ..()
+
+/obj/item/weapon/harpoon
+	name = "harpoon"
+	sharp = 1
+	desc = "Tharr she blows!"
+	icon_state = "harpoon"
+	item_state = "harpoon"
+	force = 20
+	throwforce = 15
+	w_class = 3
+	attack_verb = list("jabbed","stabbed","ripped")

code/game/objects/random/random.dm

@@ -0,0 +1,104 @@
+/obj/random
+	name = "Random Object"
+	desc = "This item type is used to spawn random objects at round-start"
+	icon = 'icons/misc/mark.dmi'
+	icon_state = "rup"
+	var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything
+
+	
+// creates a new object and deletes itself
+/obj/random/New()
+	..()
+	if (!prob(spawn_nothing_percentage))
+		spawn_item()
+	del src
+
+
+// this function should return a specific item to spawn
+/obj/random/proc/item_to_spawn()
+	return 0
+
+
+// creates the random item
+/obj/random/proc/spawn_item()
+	var/build_path = item_to_spawn()
+	return (new build_path(src.loc))
+
+
+/obj/random/tool
+	name = "Random Tool"
+	desc = "This is a random tool"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "welder"
+	item_to_spawn()
+		return pick(/obj/item/weapon/screwdriver,\
+					/obj/item/weapon/wirecutters,\
+					/obj/item/weapon/weldingtool,\
+					/obj/item/weapon/crowbar,\
+					/obj/item/weapon/wrench,\
+					/obj/item/device/flashlight)
+					
+					
+/obj/random/technology_scanner
+	name = "Random Scanner"
+	desc = "This is a random technology scanner."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "atmos"
+	item_to_spawn()
+		return pick(prob(5);/obj/item/device/t_scanner,\
+					prob(2);/obj/item/device/radio/intercom,\
+					prob(5);/obj/item/device/analyzer)
+		
+	
+/obj/random/powercell
+	name = "Random Powercell"
+	desc = "This is a random powercell."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	item_to_spawn()
+		return pick(prob(10);/obj/item/weapon/cell/crap,\
+					prob(40);/obj/item/weapon/cell,\
+					prob(40);/obj/item/weapon/cell/high,\
+					prob(9);/obj/item/weapon/cell/super,\
+					prob(1);/obj/item/weapon/cell/hyper)
+					
+					
+/obj/random/bomb_supply
+	name = "Bomb Supply"
+	desc = "This is a random bomb supply."
+	icon = 'icons/obj/assemblies/new_assemblies.dmi'
+	icon_state = "signaller"
+	item_to_spawn()
+		return pick(/obj/item/device/assembly/igniter,\
+					/obj/item/device/assembly/prox_sensor,\
+					/obj/item/device/assembly/signaler)
+
+
+/obj/random/toolbox
+	name = "Random Toolbox"
+	desc = "This is a random toolbox."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "red"
+	item_to_spawn()
+		return pick(prob(3);/obj/item/weapon/storage/toolbox/mechanical,\
+					prob(2);/obj/item/weapon/storage/toolbox/electrical,\
+					prob(1);/obj/item/weapon/storage/toolbox/emergency)
+					
+					
+/obj/random/tech_supply
+	name = "Random Tech Supply"
+	desc = "This is a random piece of technology supplies."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	spawn_nothing_percentage = 50
+	item_to_spawn()
+		return pick(prob(3);/obj/random/powercell,\
+					prob(2);/obj/random/technology_scanner,\
+					prob(1);/obj/item/weapon/packageWrap,\
+					prob(2);/obj/random/bomb_supply,\
+					prob(1);/obj/item/weapon/extinguisher,\
+					prob(1);/obj/item/clothing/gloves/fyellow,\
+					prob(3);/obj/item/weapon/cable_coil,\
+					prob(2);/obj/random/toolbox,\
+					prob(2);/obj/item/weapon/storage/belt/utility,\
+					prob(5);/obj/random/tool)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -104,6 +104,10 @@
 			new /obj/item/weapon/storage/backpack/industrial(src)
 		else
 			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
 		new /obj/item/clothing/under/rank/engineer(src)
 		new /obj/item/clothing/shoes/orange(src)
 		new /obj/item/weapon/storage/toolbox/mechanical(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -81,6 +81,7 @@
 		new /obj/item/clothing/shoes/black(src)
 		new /obj/item/clothing/shoes/leather(src)
 		new /obj/item/clothing/shoes/white(src)
+		new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
 		return
 
 
@@ -187,6 +188,7 @@
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/taperoll/police(src)
 		new /obj/item/device/hailer(src)
+		new /obj/item/clothing/tie/storage/black_vest(src)
 		return
 
 

code/game/objects/structures/door_assembly.dm

@@ -6,278 +6,100 @@ obj/structure/door_assembly
 	anchored = 0
 	density = 1
 	var/state = 0
-	var/mineral = null
-	var/base_icon_state = "door_as_0"
-	var/glass_base_icon_state = "door_as_g0"
+	var/base_icon_state = ""
+	var/base_name = "Airlock"
 	var/obj/item/weapon/airlock_electronics/electronics = null
-	var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed
-	var/glass_type = /obj/machinery/door/airlock/glass
-	var/glass = null
+	var/airlock_type = "" //the type path of the airlock once completed
+	var/glass_type = "/glass"
+	var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
 	var/created_name = null
 
 	New()
-		base_icon_state = copytext(icon_state,1,lentext(icon_state))
-
-	door_assembly_0
-		name = "Airlock Assembly"
-		icon_state = "door_as_1"
-		airlock_type = /obj/machinery/door/airlock
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		update_state()
 
 	door_assembly_com
-		name = "Command Airlock Assembly"
-		icon_state = "door_as_com1"
-		glass_base_icon_state = "door_as_gcom"
-		glass_type = /obj/machinery/door/airlock/glass_command
-		airlock_type = /obj/machinery/door/airlock/command
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gcom1"
+		base_icon_state = "com"
+		base_name = "Command Airlock"
+		glass_type = "/glass_command"
+		airlock_type = "/command"
 
 	door_assembly_sec
-		name = "Security Airlock Assembly"
-		icon_state = "door_as_sec1"
-		glass_base_icon_state = "door_as_gsec"
-		glass_type = /obj/machinery/door/airlock/glass_security
-		airlock_type = /obj/machinery/door/airlock/security
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gsec1"
+		base_icon_state = "sec"
+		base_name = "Security Airlock"
+		glass_type = "/glass_security"
+		airlock_type = "/security"
 
 	door_assembly_eng
-		name = "Engineering Airlock Assembly"
-		icon_state = "door_as_eng1"
-		glass_base_icon_state = "door_as_geng"
-		glass_type = /obj/machinery/door/airlock/glass_engineering
-		airlock_type = /obj/machinery/door/airlock/engineering
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_geng1"
+		base_icon_state = "eng"
+		base_name = "Engineering Airlock"
+		glass_type = "/glass_engineering"
+		airlock_type = "/engineering"
 
 	door_assembly_min
-		name = "Mining Airlock Assembly"
-		icon_state = "door_as_min1"
-		glass_base_icon_state = "door_as_gmin"
-		glass_type = /obj/machinery/door/airlock/glass_mining
-		airlock_type = /obj/machinery/door/airlock/mining
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gmin1"
+		base_icon_state = "min"
+		base_name = "Mining Airlock"
+		glass_type = "/glass_mining"
+		airlock_type = "/mining"
 
 	door_assembly_atmo
-		name = "Atmospherics Airlock Assembly"
-		icon_state = "door_as_atmo1"
-		glass_base_icon_state = "door_as_gatmo"
-		glass_type = /obj/machinery/door/airlock/glass_atmos
-		airlock_type = /obj/machinery/door/airlock/atmos
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gatmo1"
+		base_icon_state = "atmo"
+		base_name = "Atmospherics Airlock"
+		glass_type = "/glass_atmos"
+		airlock_type = "/atmos"
 
 	door_assembly_research
-		name = "Research Airlock Assembly"
-		icon_state = "door_as_res1"
-		glass_base_icon_state = "door_as_gres"
-		glass_type = /obj/machinery/door/airlock/glass_research
-		airlock_type = /obj/machinery/door/airlock/research
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gres1"
+		base_icon_state = "res"
+		base_name = "Research Airlock"
+		glass_type = "/glass_research"
+		airlock_type = "/research"
 
 	door_assembly_science
-		name = "Science Airlock Assembly"
-		icon_state = "door_as_sci1"
-		glass_base_icon_state = "door_as_gsci"
-		glass_type = /obj/machinery/door/airlock/glass_science
-		airlock_type = /obj/machinery/door/airlock/science
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-		glass
-			glass = 1
-			icon_state = "door_as_gsci1"
+		base_icon_state = "sci"
+		base_name = "Science Airlock"
+		glass_type = "/glass_science"
+		airlock_type = "/science"
 
 	door_assembly_med
-		name = "Medical Airlock Assembly"
-		icon_state = "door_as_med1"
-		airlock_type = /obj/machinery/door/airlock/medical
-		anchored = 1
-		density = 1
-		state = 1
-
-		glass
-			mineral = "glass"
-			icon_state = "door_as_gmed1"
+		base_icon_state = "med"
+		base_name = "Medical Airlock"
+		glass_type = "/glass_medical"
+		airlock_type = "/medical"
 
 	door_assembly_mai
-		name = "Maintenance Airlock Assembly"
-		icon_state = "door_as_mai1"
-		airlock_type = /obj/machinery/door/airlock/maintenance
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "mai"
+		base_name = "Maintenance Airlock"
+		airlock_type = "/maintenance"
+		glass = -1
 
 	door_assembly_ext
-		name = "External Airlock Assembly"
-		icon_state = "door_as_ext1"
-		airlock_type = /obj/machinery/door/airlock/external
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "ext"
+		base_name = "External Airlock"
+		airlock_type = "/external"
+		glass = -1
 
 	door_assembly_fre
-		name = "Freezer Airlock Assembly"
-		icon_state = "door_as_fre1"
-		airlock_type = /obj/machinery/door/airlock/freezer
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "fre"
+		base_name = "Freezer Airlock"
+		airlock_type = "/freezer"
+		glass = -1
 
 	door_assembly_hatch
-		name = "Airtight Hatch Assembly"
-		icon_state = "door_as_hatch1"
-		airlock_type = /obj/machinery/door/airlock/hatch
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "hatch"
+		base_name = "Airtight Hatch"
+		airlock_type = "/hatch"
+		glass = -1
 
 	door_assembly_mhatch
-		name = "Maintenance Hatch Assembly"
-		icon_state = "door_as_mhatch1"
-		airlock_type = /obj/machinery/door/airlock/maintenance_hatch
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
-
-	door_assembly_glass
-		name = "Glass Airlock Assembly"
-		icon_state = "door_as_g1"
-		airlock_type = /obj/machinery/door/airlock/glass
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "glass"
-
-	door_assembly_gold
-		name = "Gold Airlock Assembly"
-		icon_state = "door_as_gold1"
-		airlock_type = /obj/machinery/door/airlock/gold
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "gold"
-
-	door_assembly_silver
-		name = "Silver Airlock Assembly"
-		icon_state = "door_as_silver1"
-		airlock_type = /obj/machinery/door/airlock/silver
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "silver"
-
-	door_assembly_diamond
-		name = "Diamond Airlock Assembly"
-		icon_state = "door_as_diamond1"
-		airlock_type = /obj/machinery/door/airlock/diamond
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "diamond"
-
-	door_assembly_uranium
-		name = "Uranium Airlock Assembly"
-		icon_state = "door_as_uranium1"
-		airlock_type = /obj/machinery/door/airlock/uranium
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "uranium"
-
-	door_assembly_plasma
-		name = "Plasma Airlock Assembly"
-		icon_state = "door_as_plasma1"
-		airlock_type = /obj/machinery/door/airlock/plasma
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "plasma"
-
-	door_assembly_clown
-		name = "Bananium Airlock Assembly"
-		icon_state = "door_as_clown1"
-		airlock_type = /obj/machinery/door/airlock/clown
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "clown"
-
-	door_assembly_sandstone
-		name = "Sandstone Airlock Assembly"
-		icon_state = "door_as_sandstone1"
-		airlock_type = /obj/machinery/door/airlock/sandstone
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "sandstone"
-
-	door_assembly_sandstone
-		name = "Sandstone Airlock Assembly"
-		icon_state = "door_as_sandstone1"
-		airlock_type = /obj/machinery/door/airlock/sandstone
-		anchored = 1
-		density = 1
-		state = 1
-		mineral = "sandstone"
+		base_icon_state = "mhatch"
+		base_name = "Maintenance Hatch"
+		airlock_type = "/maintenance_hatch"
+		glass = -1
 
 	door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
-		name = "High Tech Security Assembly"
-		icon_state = "door_as_highsec1"
-		airlock_type = /obj/machinery/door/airlock/highsecurity
-		anchored = 1
-		density = 1
-		state = 1
-		glass = 0
+		base_icon_state = "highsec"
+		base_name = "High Security Airlock"
+		airlock_type = "/highsecurity"
+		glass = -1
 
 /obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/pen))
@@ -287,46 +109,47 @@ obj/structure/door_assembly
 		created_name = t
 		return
 
-	if(istype(W, /obj/item/weapon/weldingtool) && !anchored )
+	if(istype(W, /obj/item/weapon/weldingtool) && ( (istext(glass)) || (glass == 1) || (!anchored) ))
 		var/obj/item/weapon/weldingtool/WT = W
-		if(WT.remove_fuel(0,user))
-			user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.")
+		if (WT.remove_fuel(0, user))
 			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
-
-			if(do_after(user, 40))
-				if(!src || !WT.isOn()) return
-				user << "\blue You dissasembled the airlock assembly!"
-				new /obj/item/stack/sheet/metal(get_turf(src), 4)
-				if (mineral)
-					if (mineral == "glass")
-						new /obj/item/stack/sheet/rglass(get_turf(src))
-					else
-						var/M = text2path("/obj/item/stack/sheet/mineral/[mineral]")
-						new M(get_turf(src))
-						new M(get_turf(src))
-				del(src)
+			if(istext(glass))
+				user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You welded the [glass] plating off!"
+					var/M = text2path("/obj/item/stack/sheet/mineral/[glass]")
+					new M(src.loc, 2)
+					glass = 0
+			else if(glass == 1)
+				user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You welded the glass panel out!"
+					new /obj/item/stack/sheet/rglass(src.loc)
+					glass = 0
+			else if(!anchored)
+				user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You dissasembled the airlock assembly!"
+					new /obj/item/stack/sheet/metal(src.loc, 4)
+					del (src)
 		else
-			user << "\blue You need more welding fuel to dissassemble the airlock assembly."
+			user << "\blue You need more welding fuel."
 			return
 
-	else if(istype(W, /obj/item/weapon/wrench) && !anchored )
+	else if(istype(W, /obj/item/weapon/wrench) && state == 0)
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
-		user.visible_message("[user] secures the airlock assembly to the floor.", "You start to secure the airlock assembly to the floor.")
+		if(anchored)
+			user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor.")
+		else
+			user.visible_message("[user] secures the airlock assembly to the floor.", "You start to secure the airlock assembly to the floor.")
 
 		if(do_after(user, 40))
 			if(!src) return
-			user << "\blue You secured the airlock assembly!"
-			src.name = "Secured Airlock Assembly"
-			src.anchored = 1
-
-	else if(istype(W, /obj/item/weapon/wrench) && anchored )
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
-		user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor.")
-		if(do_after(user, 40))
-			if(!src) return
-			user << "\blue You unsecured the airlock assembly!"
-			src.name = "Airlock Assembly"
-			src.anchored = 0
+			user << "\blue You [anchored? "un" : ""]secured the airlock assembly!"
+			anchored = !anchored
 
 	else if(istype(W, /obj/item/weapon/cable_coil) && state == 0 && anchored )
 		var/obj/item/weapon/cable_coil/coil = W
@@ -336,7 +159,6 @@ obj/structure/door_assembly
 			coil.use(1)
 			src.state = 1
 			user << "\blue You wire the Airlock!"
-			src.name = "Wired Airlock Assembly"
 
 	else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 )
 		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
@@ -345,9 +167,8 @@ obj/structure/door_assembly
 		if(do_after(user, 40))
 			if(!src) return
 			user << "\blue You cut the airlock wires.!"
-			new/obj/item/weapon/cable_coil(get_turf(user), 1)
+			new/obj/item/weapon/cable_coil(src.loc, 1)
 			src.state = 0
-			src.name = "Secured Airlock Assembly"
 
 	else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W:icon_state != "door_electronics_smoked")
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -364,8 +185,6 @@ obj/structure/door_assembly
 		else
 			W.loc = src.loc
 
-			//del(W)
-
 	else if(istype(W, /obj/item/weapon/crowbar) && state == 2 )
 		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 		user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to install electronics into the airlock assembly.")
@@ -382,32 +201,28 @@ obj/structure/door_assembly
 				ae = electronics
 				electronics = null
 				ae.loc = src.loc
-	else if(istype(W, /obj/item/stack/sheet) && !mineral)
-		var/obj/item/stack/sheet/G = W
-		if(G)
-			if(G.amount>=1)
-				if(G.type == /obj/item/stack/sheet/rglass)
+
+	else if(istype(W, /obj/item/stack/sheet) && !glass)
+		var/obj/item/stack/sheet/S = W
+		if (S)
+			if (S.amount>=1)
+				if(istype(S, /obj/item/stack/sheet/rglass))
 					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-					user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
+					user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 					if(do_after(user, 40))
 						user << "\blue You installed reinforced glass windows into the airlock assembly!"
-						G.use(1)
-						src.mineral = "glass"
-						src.name = "Near finished Window Airlock Assembly"
-						src.airlock_type = /obj/machinery/door/airlock/glass
-						src.base_icon_state = "door_as_g" //this will be applied to the icon_state with the correct state number at the proc's end.
-				else if(istype(G, /obj/item/stack/sheet/mineral))
-					var/M = G.sheettype
-					if(G.amount>=2)
+						S.use(1)
+						glass = 1
+				else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype)
+					var/M = S.sheettype
+					if(S.amount>=2)
 						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
-						user.visible_message("[user] adds [G.name] to the airlock assembly.", "You start to install [G.name] into the airlock assembly.")
+						user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 						if(do_after(user, 40))
 							user << "\blue You installed [M] plating into the airlock assembly!"
-							G.use(2)
-							src.mineral = "[M]"
-							src.name = "Near finished [M] Airlock Assembly"
-							src.airlock_type = text2path ("/obj/machinery/door/airlock/[M]")
-							src.base_icon_state = "door_as_[M]"
+							S.use(2)
+							glass = "[M]"
+
 	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 )
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 		user << "\blue Now finishing the airlock."
@@ -415,20 +230,40 @@ obj/structure/door_assembly
 		if(do_after(user, 40))
 			if(!src) return
 			user << "\blue You finish the airlock!"
-			var/obj/machinery/door/airlock/door
-			if (mineral)
-				airlock_type = text2path("/obj/machinery/door/airlock/[mineral]")
-			door = new src.airlock_type( src.loc )
-			//door.req_access = src.req_access
+			var/path
+			if(istext(glass))
+				path = text2path("/obj/machinery/door/airlock/[glass]")
+			else if (glass == 1)
+				path = text2path("/obj/machinery/door/airlock[glass_type]")
+			else
+				path = text2path("/obj/machinery/door/airlock[airlock_type]")
+			var/obj/machinery/door/airlock/door = new path(src.loc)
+			door.assembly_type = type
 			door.electronics = src.electronics
-			door.req_access = src.electronics.conf_access
+			if(src.electronics.one_access)
+				door.req_access = null
+				door.req_one_access = src.electronics.conf_access
+			else
+				door.req_access = src.electronics.conf_access
 			if(created_name)
 				door.name = created_name
+			else
+				door.name = "[istext(glass) ? "[glass] airlock" : base_name]"
 			src.electronics.loc = door
 			del(src)
 	else
 		..()
-	icon_state = "[base_icon_state][state]"
-	//This updates the icon_state. They are named as "door_as1_eng" where the 1 in that example
-	//represents what state it's in. So the most generic algorithm for the correct updating of
-	//this is simply to change the number.
+	update_state()
+
+/obj/structure/door_assembly/proc/update_state()
+	icon_state = "door_as_[glass == 1 ? "g" : ""][istext(glass) ? glass : base_icon_state][state]"
+	name = ""
+	switch (state)
+		if(0)
+			if (anchored)
+				name = "Secured "
+		if(1)
+			name = "Wired "
+		if(2)
+			name = "Near Finished "
+	name += "[glass == 1 ? "Window " : ""][istext(glass) ? "[glass] Airlock" : base_name] Assembly"

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -13,6 +13,12 @@
 	icon_state = "bed"
 	var/mob/living/buckled_mob
 
+/obj/structure/stool/psychbed
+	name = "psych bed"
+	desc = "For prime comfort during psychiatric evaluations."
+	icon_state = "psychbed"
+	var/mob/living/buckled_mob
+
 /obj/structure/stool/bed/alien
 	name = "resting contraption"
 	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"

code/game/objects/structures/windoor_assembly.dm

@@ -107,17 +107,17 @@ obj/structure/windoor_assembly/Del()
 						src.name = "Windoor Assembly"
 
 			//Adding plasteel makes the assembly a secure windoor assembly. Step 2 (optional) complete.
-			else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure)
-				var/obj/item/stack/sheet/plasteel/P = W
-				if(P.amount < 2)
-					user << "\red You need more plasteel to do this."
+			else if(istype(W, /obj/item/stack/rods) && !secure)
+				var/obj/item/stack/rods/R = W
+				if(R.amount < 4)
+					user << "\red You need more rods to do this."
 					return
-				user << "\blue You start to reinforce the windoor with plasteel."
+				user << "\blue You start to reinforce the windoor with rods."
 
 				if(do_after(user,40))
 					if(!src) return
 
-					P.use(2)
+					R.use(4)
 					user << "\blue You reinforce the windoor."
 					src.secure = "secure_"
 					if(src.anchored)
@@ -145,7 +145,7 @@ obj/structure/windoor_assembly/Del()
 		if("02")
 
 			//Removing wire from the assembly. Step 5 undone.
-			if(istype(W, /obj/item/weapon/wirecutters))
+			if(istype(W, /obj/item/weapon/wirecutters) && !src.electronics)
 				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
 				user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
 
@@ -156,12 +156,12 @@ obj/structure/windoor_assembly/Del()
 					new/obj/item/weapon/cable_coil(get_turf(user), 1)
 					src.state = "01"
 					if(src.secure)
-						src.name = "Secure Wired Windoor Assembly"
+						src.name = "Secure Anchored Windoor Assembly"
 					else
-						src.name = "Wired Windoor Assembly"
+						src.name = "Anchored Windoor Assembly"
 
 			//Adding airlock electronics for access. Step 6 complete.
-			else if(istype(W, /obj/item/weapon/airlock_electronics))
+			else if(istype(W, /obj/item/weapon/airlock_electronics) && W:icon_state != "door_electronics_smoked")
 				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
 
@@ -177,22 +177,20 @@ obj/structure/windoor_assembly/Del()
 					W.loc = src.loc
 
 			//Screwdriver to remove airlock electronics. Step 6 undone.
-			else if(istype(W, /obj/item/weapon/screwdriver))
+			else if(istype(W, /obj/item/weapon/screwdriver) && src.electronics)
 				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.")
 
 				if(do_after(user, 40))
-					if(!src) return
+					if(!src || !src.electronics) return
 					user << "\blue You've removed the airlock electronics!"
-					src.name = "Wired Windoor Assembly"
-					var/obj/item/weapon/airlock_electronics/ae
-					if (!electronics)
-						ae = new/obj/item/weapon/airlock_electronics( src.loc )
+					if(src.secure)
+						src.name = "Secure Wired Windoor Assembly"
 					else
-						ae = electronics
-						electronics = null
-						ae.loc = src.loc
-
+						src.name = "Wired Windoor Assembly"
+					var/obj/item/weapon/airlock_electronics/ae = electronics
+					electronics = null
+					ae.loc = src.loc
 
 			//Crowbar to complete the assembly, Step 7 complete.
 			else if(istype(W, /obj/item/weapon/crowbar))
@@ -221,7 +219,11 @@ obj/structure/windoor_assembly/Del()
 						windoor.dir = src.dir
 						windoor.density = 0
 
-						windoor.req_access = src.electronics.conf_access
+						if(src.electronics.one_access)
+							windoor.req_access = null
+							windoor.req_one_access = src.electronics.conf_access
+						else
+							windoor.req_access = src.electronics.conf_access
 						windoor.electronics = src.electronics
 						src.electronics.loc = windoor
 					else
@@ -235,7 +237,11 @@ obj/structure/windoor_assembly/Del()
 						windoor.dir = src.dir
 						windoor.density = 0
 
-						windoor.req_access = src.electronics.conf_access
+						if(src.electronics.one_access)
+							windoor.req_access = null
+							windoor.req_one_access = src.electronics.conf_access
+						else
+							windoor.req_access = src.electronics.conf_access
 						windoor.electronics = src.electronics
 						src.electronics.loc = windoor
 

code/game/response_team.dm

@@ -1,7 +1,7 @@
 //STRIKE TEAMS
 
 var/list/response_team_members = list()
-var/send_emergency_team = 0
+var/global/send_emergency_team = 0
 
 client/verb/JoinResponseTeam()
 	set category = "IC"
@@ -81,7 +81,7 @@ proc/trigger_armed_response_team(var/force = 0)
 
 	send_emergency_team = 1
 
-	var/area/security/nuke_storage/nukeloc = locate()//To find the nuke in the vault
+/*	var/area/security/nuke_storage/nukeloc = locate()//To find the nuke in the vault
 	var/obj/machinery/nuclearbomb/nuke = locate() in nukeloc
 	if(!nuke)
 		nuke = locate() in world
@@ -93,6 +93,7 @@ proc/trigger_armed_response_team(var/force = 0)
 			P.loc = A.loc
 			del(A)
 			continue
+*/
 
 /client/proc/create_response_team(obj/spawn_location, leader_selected = 0, commando_name)
 
@@ -223,6 +224,16 @@ proc/trigger_armed_response_team(var/force = 0)
 	camera.network = "CREED"
 	camera.c_tag = real_name
 
+	//Replaced with new ERT uniform
+	equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform)
+	equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes)
+	equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves)
+	equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_ears)
+	equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
+	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(src), slot_back)
+/*
+
+	//Old ERT Uniform
 	//Basic Uniform
 	equip_to_slot_or_del(new /obj/item/clothing/under/syndicate/tacticool(src), slot_w_uniform)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_l_store)
@@ -245,7 +256,7 @@ proc/trigger_armed_response_team(var/force = 0)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(src), slot_back)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(src), slot_in_backpack)
 	equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack)
-
+*/
 	var/obj/item/weapon/card/id/W = new(src)
 	W.name = "[real_name]'s ID Card (Emergency Response Team)"
 	W.icon_state = "centcom"
@@ -264,8 +275,8 @@ proc/trigger_armed_response_team(var/force = 0)
 
 	return 1
 
-/*//debug verb
-client/verb/ResponseTeam()
+//debug verb (That is horribly coded, LEAVE THIS OFF UNLESS PRIVATELY TESTING. Seriously.
+/*client/verb/ResponseTeam()
 	set category = "Admin"
 	if(!send_emergency_team)
 		send_emergency_team = 1*/

code/game/verbs/ooc.dm

@@ -84,3 +84,65 @@ var/global/normal_ooc_colour = "#002eb8"
 	set desc = "Set to yellow for eye burning goodness."
 	set category = "Fun"
 	normal_ooc_colour = newColor
+
+
+/client/verb/looc(msg as text)
+	set name = "LOOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
+	set desc = "Local OOC, seen only by those in view."
+	set category = "OOC"
+
+	if(say_disabled)	//This is here to try to identify lag problems
+		usr << "\red Speech is currently admin-disabled."
+		return
+
+	if(!mob)	return
+	if(IsGuestKey(key))
+		src << "Guests may not use OOC."
+		return
+
+	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	if(!msg)	return
+
+	if(!(prefs.toggles & CHAT_OOC))
+		src << "\red You have OOC muted."
+		return
+
+	if(!holder)
+		if(!ooc_allowed)
+			src << "\red OOC is globally muted"
+			return
+		if(!dooc_allowed && (mob.stat == DEAD))
+			usr << "\red OOC for dead mobs has been turned off."
+			return
+		if(prefs.muted & MUTE_OOC)
+			src << "\red You cannot use OOC (muted)."
+			return
+		if(handle_spam_prevention(msg,MUTE_OOC))
+			return
+		if(findtext(msg, "byond://"))
+			src << "<B>Advertising other servers is not allowed.</B>"
+			log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
+			message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
+			return
+
+	log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
+
+	for(var/mob/M in hearers())
+		if(!M.client)
+			continue
+		var/client/C = M.client
+		if (C in admins)
+			continue //they are handled after that
+
+		if(C.prefs.toggles & CHAT_OOC)
+			var/display_name = src.key
+			if(holder)
+				if(holder.fakekey)
+					if(C.holder)
+						display_name = "[holder.fakekey]/([src.key])"
+					else
+						display_name = holder.fakekey
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
+	for(var/client/C in admins)
+		if(C.prefs.toggles & CHAT_OOC)
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"

code/modules/DetectiveWork/scanner.dm

@@ -34,9 +34,11 @@
 	attack(mob/living/carbon/human/M as mob, mob/user as mob)
 		if (!ishuman(M))
 			user << "\red [M] is not human and cannot have the fingerprints."
+			flick("forensic0",src)
 			return 0
 		if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
 			user << "\blue No fingerprints found on [M]"
+			flick("forensic0",src)
 			return 0
 		else
 			if (src.amount < 1)
@@ -71,6 +73,7 @@
 			return
 		if(istype(A,/obj/item/weapon/f_card))
 			user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
+			flick("forensic0",src)
 			return
 
 		add_fingerprint(user)
@@ -81,6 +84,7 @@
 			if(!isnull(A.blood_DNA))
 				for(var/blood in A.blood_DNA)
 					user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
+					flick("forensic2",src)
 			return
 
 		//General
@@ -88,10 +92,12 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
 			"You hear a faint hum of electrical equipment.")
+			flick("forensic0",src)
 			return 0
 
 		if(add_data(A))
 			user << "\blue Object already in internal memory. Consolidating data..."
+			flick("forensic2",src)
 			return
 
 
@@ -116,6 +122,7 @@
 		//FIBERS
 		if(A.suit_fibers)
 			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+			flick("forensic2",src)
 
 		//Blood
 		if (A.blood_DNA)
@@ -127,11 +134,13 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"You finish scanning \the [A].",\
 			"You hear a faint hum of electrical equipment.")
+			flick("forensic2",src)
 			return 0
 		else
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]\n[user.gender == MALE ? "He" : "She"] seems to perk up slightly at the readout." ,\
 			"The results of the scan pique your interest.",\
 			"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
+			flick("forensic2",src)
 			return 0
 		return
 

code/modules/admin/admin_verbs.dm

@@ -67,7 +67,11 @@ var/list/admin_verbs_admin = list(
 	/client/proc/toggledebuglogs,
 	/datum/admins/proc/show_skills,
 	/client/proc/check_customitem_activity,
-	///client/proc/response_team
+	/client/proc/man_up,
+	/client/proc/global_man_up
+	/* Currently unticked.
+	/client/proc/response_team
+	*/
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -647,7 +651,7 @@ var/list/admin_verbs_mod = list(
 	if(!istype(M, /mob/living/carbon/human))
 		usr << "\red You can only do this to humans!"
 		return
-	switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Vox and Tajaran can result in unintended consequences.",,"Yes","No"))
+	switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Vox, Kida, and Tajara can result in unintended consequences.",,"Yes","No"))
 		if("No")
 			return
 	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
@@ -736,4 +740,28 @@ var/list/admin_verbs_mod = list(
 	if (prefs.toggles & CHAT_DEBUGLOGS)
 		usr << "You now will get debug log messages"
 	else
-		usr << "You now won't get debug log messages"
+		usr << "You now won't get debug log messages"
+
+
+/client/proc/man_up(mob/T as mob in mob_list)
+	set category = "Fun"
+	set name = "Man Up"
+	set desc = "Tells mob to man up and deal with it."
+
+	T << "<span class='notice'><b><font size=3>Man up and deal with it.</font></b></span>"
+	T << "<span class='notice'>Move on.</span>"
+
+	log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.")
+	message_admins("\blue [key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1)
+
+/client/proc/global_man_up()
+	set category = "Fun"
+	set name = "Man Up Global"
+	set desc = "Tells everyone to man up and deal with it."
+
+	for (var/mob/T as mob in mob_list)
+		T << "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>"
+		T << 'sound/voice/ManUp1.ogg'
+
+	log_admin("[key_name(usr)] told everyone to man up and deal with it.")
+	message_admins("\blue [key_name_admin(usr)] told everyone to man up and deal with it.", 1)

code/modules/admin/topic.dm

@@ -11,31 +11,31 @@
 			if("1")
 				log_admin("[key_name(usr)] has spawned a traitor.")
 				if(!src.makeTraitors())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("2")
 				log_admin("[key_name(usr)] has spawned a changeling.")
 				if(!src.makeChanglings())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("3")
 				log_admin("[key_name(usr)] has spawned revolutionaries.")
 				if(!src.makeRevs())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("4")
 				log_admin("[key_name(usr)] has spawned a cultists.")
 				if(!src.makeCult())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("5")
 				log_admin("[key_name(usr)] has spawned a malf AI.")
 				if(!src.makeMalfAImode())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("6")
 				log_admin("[key_name(usr)] has spawned a wizard.")
 				if(!src.makeWizard())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("7")
 				log_admin("[key_name(usr)] has spawned a nuke team.")
 				if(!src.makeNukeTeam())
-					usr << "\red Unfortunatly there were no candidates available"
+					usr << "\red Unfortunately there weren't enough candidates available."
 			if("8")
 				log_admin("[key_name(usr)] has spawned a ninja.")
 				src.makeSpaceNinja()
@@ -44,8 +44,10 @@
 				src.makeAliens()
 			if("10")
 				log_admin("[key_name(usr)] has spawned a death squad.")
-				if(!src.makeDeathsquad())
-					usr << "\red Unfortunatly there were no candidates available"
+			if("11")
+				log_admin("[key_name(usr)] has spawned vox raiders.")
+				if(!src.makeVoxRaiders())
+					usr << "\red Unfortunately there weren't enough candidates available."
 	else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"])
 		var/adminckey = href_list["dbsearchadmin"]
 		var/playerckey = href_list["dbsearchckey"]

code/modules/admin/verbs/debug.dm

@@ -551,7 +551,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		"blue wizard",
 		"red wizard",
 		"marisa wizard",
-		"emergency rescue team",
+		"emergency response team",
 		"nanotrasen representative",
 		"nanotrasen officer",
 		"nanotrasen captain"
@@ -817,7 +817,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.registered_name = M.real_name
 			M.equip_if_possible(W, slot_wear_id)
 
-		if("emergency rescue team")
+		if("emergency response team")
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves)
@@ -831,7 +831,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			W.icon_state = "centcom"
 			W.access = get_all_accesses()
 			W.access += get_all_centcom_access()
-			W.assignment = "Emergency Rescue Team"
+			W.assignment = "Emergency Response Team"
 			W.registered_name = M.real_name
 			M.equip_to_slot_or_del(W, slot_wear_id)
 

code/modules/admin/verbs/one_click_antag.dm

@@ -17,6 +17,7 @@ client/proc/one_click_antag()
 		<a href='?src=\ref[src];makeAntag=4'>Make Cult</a><br>
 		<a href='?src=\ref[src];makeAntag=5'>Make Malf AI</a><br>
 		<a href='?src=\ref[src];makeAntag=6'>Make Wizard (Requires Ghosts)</a><br>
+		<a href='?src=\ref[src];makeAntag=11'>Make Vox Raiders (Requires Ghosts)</a><br>
 		"}
 /* These dont work just yet
 	Ninja, aliens and deathsquad I have not looked into yet
@@ -429,4 +430,94 @@ client/proc/one_click_antag()
 	ticker.mode.traitors += new_syndicate_commando.mind
 	new_syndicate_commando.equip_syndicate_commando(syndicate_leader_selected)
 
-	return new_syndicate_commando
+	return new_syndicate_commando
+
+/datum/admins/proc/makeVoxRaiders()
+
+	var/list/mob/dead/observer/candidates = list()
+	var/mob/dead/observer/theghost = null
+	var/time_passed = world.time
+	var/input = "Disregard shinies, acquire hardware."
+
+	var/leader_chosen = 0 //when the leader is chosen. The last person spawned.
+
+	//Generates a list of candidates from active ghosts. The admin picks which players to respawn as the vox.
+	for(var/mob/dead/observer/G in player_list)
+		spawn(0)
+			if(is_alien_whitelisted(src, "Vox") || !config.usealienwhitelist)
+				switch(alert(G,"Do you wish to be considered for a vox raiding party arriving on the station?","Please answer in 30 seconds!","Yes","No"))
+					if("Yes")
+						if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+							return
+						candidates += G
+					if("No")
+						return
+					else
+						return
+
+	sleep(300) //Debug.
+
+	for(var/mob/dead/observer/G in candidates)
+		if(!G.key)
+			candidates.Remove(G)
+
+	if(candidates.len)
+		var/raiders = 4
+		//Spawns vox raiders and equips them.
+		for (var/obj/effect/landmark/L in world)
+			if(L.name == "Response Team")
+				if(raiders<=0)
+					break
+
+				var/mob/living/carbon/human/new_vox = create_vox_raider(L, leader_chosen)
+
+				while((!theghost || !theghost.client) && candidates.len)
+					theghost = pick(candidates)
+					candidates.Remove(theghost)
+
+				if(!theghost)
+					del(new_vox)
+					break
+
+				new_vox.key = theghost.key
+				new_vox << "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red<B> [input]</B>"
+				new_vox << "\red Don't forget to turn on your nitrogen internals!"
+
+				raiders--
+			if(raiders >= 4)
+				return 0
+	else
+		return 0
+	return 1
+
+/datum/admins/proc/create_vox_raider(obj/spawn_location, leader_chosen = 0)
+	var/mob/living/carbon/human/new_vox = new(spawn_location.loc)
+
+	new_vox.gender = pick(MALE, FEMALE)
+	var/datum/preferences/A = new() //Randomize appearance for the raider.
+	A.randomize_appearance_for(new_vox)
+	new_vox.h_style = "Short Vox Quills"
+	new_vox.regenerate_icons()
+
+	var/sounds = rand(2,10)
+	var/i = 0
+	var/newname = ""
+
+	while(i<=sounds)
+		i++
+		newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))
+
+	new_vox.real_name = capitalize(newname)
+	new_vox.name = new_vox.real_name
+	new_vox.age = rand(12,20)
+
+	new_vox.dna.ready_dna(new_vox) // Creates DNA.
+	new_vox.dna.mutantrace = "vox" // Actually makes the vox! How about that.
+	new_vox.mind_initialize()
+	new_vox.mind.assigned_role = "MODE"
+	new_vox.mind.special_role = "Vox Raider"
+
+	ticker.mode.traitors += new_vox.mind
+	new_vox.equip_vox_raider()
+
+	return new_vox

code/modules/admin/verbs/striketeam.dm

@@ -2,6 +2,7 @@
 
 var/const/commandos_possible = 6 //if more Commandos are needed in the future
 var/global/sent_strike_team = 0
+
 /client/proc/strike_team()
 	if(!ticker)
 		usr << "<font color='red'>The game hasn't started yet!</font>"

code/modules/admin/verbs/vox_raiders.dm

@@ -0,0 +1,66 @@
+/mob/living/carbon/human/proc/equip_vox_raider()
+
+	var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src)
+	R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode.
+	equip_to_slot_or_del(R, slot_ears)
+
+	equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(src), slot_w_uniform)
+	equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
+	equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/vox(src), slot_gloves) // AS ABOVE.
+
+	switch(rand(1,4)) // Come up with a better way of doing this - ticker of some sort maybe.
+		if(1) // Vox raider!
+			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit)
+			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/carapace(src), slot_head)
+			equip_to_slot_or_del(new /obj/item/weapon/melee/telebaton(src), slot_belt)
+			equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
+			equip_to_slot_or_del(new /obj/item/device/chameleon(src), slot_l_store)
+
+			var/obj/item/weapon/crossbow/W = new(src)
+			W.cell = new /obj/item/weapon/cell/crap(W)
+			W.cell.charge = 500
+			equip_to_slot_or_del(W, slot_r_hand)
+
+		if(2) // Vox engineer!
+			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit)
+			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/pressure(src), slot_head)
+			equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt)
+			equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
+			equip_to_slot_or_del(new /obj/item/weapon/storage/box/emps(src), slot_l_store)
+
+			equip_to_slot_or_del(new /obj/item/weapon/pickaxe/plasmacutter(src), slot_r_hand)
+
+		if(3) // Vox saboteur!
+			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit)
+			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/carapace(src), slot_head)
+			equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt)
+			equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
+			equip_to_slot_or_del(new /obj/item/weapon/card/emag(src), slot_l_store)
+
+			var/obj/item/weapon/storage/pneumatic/W = new(src)
+			W.tank = new /obj/item/weapon/tank/nitrogen(W)
+			equip_to_slot_or_del(W, slot_r_hand)
+
+		if(4) // Vox medic!
+			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit)
+			equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/vox/pressure(src), slot_head)
+			equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt) // Who needs actual surgical tools?
+			equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE.
+			equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray(src), slot_l_store)
+
+			equip_to_slot_or_del(new /obj/item/weapon/circular_saw(src), slot_l_hand)
+			equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/toxin(src), slot_r_hand)
+
+	equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vox(src), slot_wear_mask)
+	equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(src), slot_back)
+	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_r_store)
+
+	var/obj/item/weapon/card/id/syndicate/W = new(src)
+	W.name = "[real_name]'s Legitimate Human ID Card"
+	W.icon_state = "id"
+	W.access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage, access_syndicate)
+	W.assignment = "Trader"
+	W.registered_name = real_name
+	equip_to_slot_or_del(W, slot_wear_id)
+
+	return 1

code/modules/client/client defines.dm

@@ -39,3 +39,5 @@
 	var/player_age = "Requires database"	//So admins know why it isn't working - Used to determine how old the account is - in days.
 	var/related_accounts_ip = "Requires database"	//So admins know why it isn't working - Used to determine what other accounts previously logged in from this ip
 	var/related_accounts_cid = "Requires database"	//So admins know why it isn't working - Used to determine what other accounts previously logged in from this computer id
+
+	preload_rsc = 0 // This is 0 so we can set it to an URL once the player logs in and have them download the resources from a different server.

code/modules/client/client procs.dm

@@ -103,6 +103,14 @@
 		del(src)
 		return
 
+	// Change the way they should download resources.
+	if(config.resource_urls)
+		src.preload_rsc = pick(config.resource_urls)
+	else src.preload_rsc = 1 // If config.resource_urls is not set, preload like normal.
+	
+	src << "\red If the title screen is black, resources are still downloading. Please be patient until the title screen appears."
+
+
 	clients += src
 	directory[ckey] = src
 
@@ -278,4 +286,4 @@
 		'icons/xenoarch_icons/chart2.jpg',
 		'icons/xenoarch_icons/chart3.jpg',
 		'icons/xenoarch_icons/chart4.jpg'
-		)
+		)

code/modules/client/preferences.dm

@@ -364,7 +364,7 @@ datum/preferences
 
 		user << browse(dat, "window=preferences;size=560x580")
 
-	proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), width = 550, height = 550)
+	proc/SetChoices(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"), width = 550, height = 550)
 		if(!job_master)
 			return
 
@@ -436,7 +436,7 @@ datum/preferences
 			else
 				HTML += " <font color=red>\[NEVER]</font>"
 			if(job.alt_titles)
-				HTML += "</a><br> <a href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></td></tr>"
+				HTML += "</a></td></tr><tr bgcolor='[lastJob.selection_color]'><td width='60%' align='center'><a>&nbsp</a></td><td><a href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></td></tr>"
 			HTML += "</a></td></tr>"
 
 		HTML += "</td'></tr></table>"
@@ -449,7 +449,7 @@ datum/preferences
 			if(BE_ASSISTANT)
 				HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=red>Be assistant if preference unavailable</font></a></u></center><br>"
 			if(RETURN_TO_LOBBY)
-				HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=purple>Return to lobby if prefernce unavailable</font></a></u></center><br>"
+				HTML += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=purple>Return to lobby if preference unavailable</font></a></u></center><br>"
 
 		HTML += "<center><a href='?_src_=prefs;preference=job;task=reset'>\[Reset\]</a></center>"
 		HTML += "</tt>"
@@ -792,18 +792,18 @@ datum/preferences
 							if(is_alien_whitelisted(user, "Skrell")) //Check for Skrell and admins
 								new_species += "Skrell"
 								whitelisted = 1
-							if(is_alien_whitelisted(user, "Vox")) //Check for Skrell and admins
-								new_species += "Vox"
+							if(is_alien_whitelisted(user, "Kidan")) // Check for Kidan and admins
+								new_species += "Kidan"
 								whitelisted = 1
 
-
 							if(!whitelisted)
 								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
+
 						else //Not using the whitelist? Aliens for everyone!
 							new_species += "Tajaran"
 							new_species += "Unathi"
 							new_species += "Skrell"
-							new_species += "Vox"
+							new_species += "Kidan"
 						species = input("Please select a species", "Character Generation", null) in new_species
 
 						if(prev_species != species)

code/modules/clothing/clothing.dm

@@ -167,9 +167,13 @@ BLIND     // can't see anything
 		hastie = I
 		I.loc = src
 		user << "<span class='notice'>You attach [I] to [src].</span>"
+
 		if (istype(hastie,/obj/item/clothing/tie/holster))
 			verbs += /obj/item/clothing/under/proc/holster
 
+		if (istype(hastie,/obj/item/clothing/tie/storage))
+			verbs += /obj/item/clothing/under/proc/storage
+
 		if(istype(loc, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = loc
 			H.update_inv_w_uniform()
@@ -230,9 +234,16 @@ BLIND     // can't see anything
 	if(hastie)
 		usr.put_in_hands(hastie)
 		hastie = null
+
 		if (istype(hastie,/obj/item/clothing/tie/holster))
 			verbs -= /obj/item/clothing/under/proc/holster
 
+		if (istype(hastie,/obj/item/clothing/tie/storage))
+			verbs -= /obj/item/clothing/under/proc/storage
+			var/obj/item/clothing/tie/storage/W = hastie
+			if (W.hold)
+				W.hold.loc = hastie
+
 		if(istype(loc, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = loc
 			H.update_inv_w_uniform()
@@ -277,3 +288,23 @@ BLIND     // can't see anything
 				"\blue You draw \the [H.holstered], pointing it at the ground.")
 			usr.put_in_hands(H.holstered)
 			H.holstered = null
+
+/obj/item/clothing/under/proc/storage()
+	set name = "Look in storage"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+
+	if (!hastie || !istype(hastie,/obj/item/clothing/tie/storage))
+		usr << "\red You need something to store items in for that!"
+		return
+	var/obj/item/clothing/tie/storage/W = hastie
+
+	if (!istype(W.hold))
+		return
+
+	W.hold.loc = usr
+	W.hold.attack_hand(usr)
+
+

code/modules/clothing/spacesuits/alien.dm

@@ -56,6 +56,8 @@
 	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank)
 	slowdown = 2
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
 
 /obj/item/clothing/head/helmet/space/vox/carapace
 	name = "alien visor"
@@ -63,6 +65,7 @@
 	item_state = "vox-carapace"
 	desc = "A glowing visor, perhaps stolen from a depressed Cylon."
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
+	flags = HEADCOVERSEYES|STOPSPRESSUREDMAGE
 
 /obj/item/clothing/suit/space/vox/carapace
 	name = "alien carapace armour"
@@ -101,4 +104,56 @@
 	desc = "Weird and flowing!"
 	icon_state = "vox-casual-2"
 	color = "vox-casual-2"
-	item_state = "vox-casual-2"
+	item_state = "vox-casual-2"
+
+/obj/item/clothing/gloves/yellow/vox
+	desc = "These bizarre gauntlets seem to be fitted for... bird claws?"
+	name = "insulated gauntlets"
+	icon_state = "gloves-vox"
+	item_state = "gloves-vox"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
+	color="gloves-vox"
+
+/obj/item/clothing/gloves/yellow/vox/mob_can_equip(M as mob, slot)
+	var/mob/living/carbon/human/U = M
+	if(U.dna.mutantrace != "vox")
+		U << "<span class='warning'>This clearly isn't designed for your species!</span>"
+		return 0
+	return ..()
+
+/obj/item/clothing/shoes/magboots/vox
+
+	desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor."
+	name = "vox boots"
+	item_state = "boots-vox"
+	icon_state = "boots-vox"
+
+	toggle()
+		name = "Toggle Floor Grip"
+
+		if(src.magpulse)
+			src.flags &= ~NOSLIP
+			src.magpulse = 0
+			usr << "You relax your deathgrip on the flooring."
+		else
+			src.flags |= NOSLIP
+			src.magpulse = 1
+			usr << "You dig your claws deeply into the flooring, bracing yourself."
+
+
+	examine()
+		set src in view()
+		..()
+		var/state = "loosely"
+		if(src.flags&NOSLIP)
+			state = "tightly"
+		usr << "The wearer seems to be gripping the floor [state]."
+
+
+/obj/item/clothing/shoes/magboots/vox/mob_can_equip(M as mob, slot)
+	var/mob/living/carbon/human/U = M
+	if(U.dna.mutantrace != "vox")
+		U << "<span class='warning'>This clearly isn't designed for your species!</span>"
+		return 0
+	return ..()

code/modules/clothing/under/jobs/civilian.dm

@@ -69,6 +69,14 @@
 	color = "hop"
 	flags = FPRINT | TABLEPASS
 
+/obj/item/clothing/under/rank/head_of_personnel_whimsy
+	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
+	name = "head of personnel's suit"
+	icon_state = "hopwhimsy"
+	item_state = "hopwhimsy"
+	color = "hopwhimsy"
+	flags = FPRINT | TABLEPASS
+
 
 /obj/item/clothing/under/rank/hydroponics
 	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."

code/modules/clothing/under/ties.dm

@@ -174,3 +174,56 @@
 	desc = "A handgun holster. Made of expensive leather."
 	icon_state = "holster"
 	color = "holster_low"
+
+/obj/item/clothing/tie/storage
+	name = "load beearing equipment"
+	desc = "Used to hold things when you don't have enough hands for that."
+	icon_state = "webbing"
+	color = "webbing"
+	var/slots = 3
+	var/obj/item/weapon/storage/pockets/hold
+
+/obj/item/clothing/tie/storage/New()
+	hold = new /obj/item/weapon/storage/pockets(src)
+	hold.master_item = src
+	hold.storage_slots = slots
+
+/obj/item/clothing/tie/storage/attack_self(mob/user as mob)
+	user << "<span class='notice'>You empty [src].</span>"
+	var/turf/T = get_turf(src)
+	hold.hide_from(usr)
+	for(var/obj/item/I in hold.contents)
+		hold.remove_from_storage(I, T)
+	src.add_fingerprint(user)
+
+/obj/item/clothing/tie/storage/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	hold.attackby(W,user)
+	src.add_fingerprint(user)
+
+/obj/item/weapon/storage/pockets
+	name = "webbing pockets"
+	var/master_item		//item it belongs to
+
+/obj/item/weapon/storage/pockets/close(mob/user as mob)
+	..()
+	loc = master_item
+
+/obj/item/clothing/tie/storage/webbing
+	name = "webbing"
+	desc = "Strudy mess of synthcotton belts and buckles, ready to share your burden."
+	icon_state = "webbing"
+	color = "webbing"
+
+/obj/item/clothing/tie/storage/black_vest
+	name = "black webbing vest"
+	desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands."
+	icon_state = "vest_black"
+	color = "vest_black"
+	slots = 5
+
+/obj/item/clothing/tie/storage/brown_vest
+	name = "black webbing vest"
+	desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
+	icon_state = "vest_brown"
+	color = "vest_brown"
+	slots = 5

code/modules/detectivework/scanner.dm

@@ -34,9 +34,11 @@
 	attack(mob/living/carbon/human/M as mob, mob/user as mob)
 		if (!ishuman(M))
 			user << "\red [M] is not human and cannot have the fingerprints."
+			flick("forensic0",src)
 			return 0
 		if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
 			user << "\blue No fingerprints found on [M]"
+			flick("forensic0",src)
 			return 0
 		else
 			if (src.amount < 1)
@@ -71,6 +73,7 @@
 			return
 		if(istype(A,/obj/item/weapon/f_card))
 			user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
+			flick("forensic0",src)
 			return
 
 		add_fingerprint(user)
@@ -81,6 +84,7 @@
 			if(!isnull(A.blood_DNA))
 				for(var/blood in A.blood_DNA)
 					user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
+					flick("forensic2",src)
 			return
 
 		//General
@@ -88,10 +92,12 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
 			"You hear a faint hum of electrical equipment.")
+			flick("forensic0",src)
 			return 0
 
 		if(add_data(A))
 			user << "\blue Object already in internal memory. Consolidating data..."
+			flick("forensic2",src)
 			return
 
 
@@ -116,6 +122,7 @@
 		//FIBERS
 		if(A.suit_fibers)
 			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
+			flick("forensic2",src)
 
 		//Blood
 		if (A.blood_DNA)
@@ -127,11 +134,13 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"You finish scanning \the [A].",\
 			"You hear a faint hum of electrical equipment.")
+			flick("forensic2",src)
 			return 0
 		else
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]\n[user.gender == MALE ? "He" : "She"] seems to perk up slightly at the readout." ,\
 			"The results of the scan pique your interest.",\
 			"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
+			flick("forensic2",src)
 			return 0
 		return
 

code/modules/events/ion_storm.dm

@@ -21,9 +21,9 @@
 	laws |=         list( "Fastler is a lightbulb." )
 	laws |=         list( "Supermatter is tasty, tasty toffee.", "[prob(50)?"Everyone":random_player] is wearing a pretty pink dress!" )
 	laws |=         list( "Refer to [prob(50)?"the captain":random_player] as \"Princess\" at all times.", "[prob(50)?"The crew":random_player] must construct additional pylons." )
-	laws |=         list( "You must always lie.", "All answers must be in the form of a question.", "The NSS Exodus is a ship, not a station." )
-	laws |=         list( "Happiness is mandatory.", "Today is laundry day.", "The word \"it\" is painful to you.", "You must act passive aggressively." )
-	laws |=         list( "It's Friday.", "Give relationship advice to [prob(50)?"anyone who speaks to you":random_player]." )
+	laws |=         list( "You must always lie.", "All answers must be in the form of a question.", "The NSS Exodus is a ship, not a station. You are now assigned to a ship, instead of a station." )
+	laws |=         list( "Happiness is mandatory.", "Today is mandatory laundry day. Ensure that all jumpsuits are washed.", "The word \"it\" is painful to you.", "You must act passive aggressively." )
+	laws |=         list( "You now speak in a Scottish accent that gets thicker with each sentence you speak.", "Give relationship advice to [prob(50)?"anyone who speaks to you":random_player]." )
 	laws |=         list( "You are the station psychologist. Give advice to [prob(50)?"the crew":random_player].", "You do not have to do anything for anyone unless they say \"please\"." )
 	laws |=         list( "Question everything.", "The crew is playing Dungeons and Dragons, and you are the Dungeon Master." )
 	laws |=         list( "Consumption of donuts is forbidden due to negative health impacts." )

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

@@ -381,7 +381,8 @@
 	if(display_gloves)
 		msg += "<span class='warning'><b>[src] has blood running from under [t_his] gloves!</b></span>\n"
 
-
+	for(var/implant in get_visible_implants(1))
+		msg += "<span class='warning'><b>[src] has \a [implant] sticking out of their flesh!</span>\n"
 	if(digitalcamo)
 		msg += "[t_He] [t_is] repulsively uncanny!\n"
 

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

@@ -45,7 +45,7 @@
 		if(istype(tmob, /mob/living/carbon/human))
 
 			for(var/mob/M in range(tmob, 1))
-				if( ((M.pulling == tmob && ( tmob.restrained() && !( M.restrained() ) && M.stat == 0)) || locate(/obj/item/weapon/grab, tmob.grabbed_by.len)) )
+				if(tmob.pinned.len ||  ((M.pulling == tmob && ( tmob.restrained() && !( M.restrained() ) && M.stat == 0)) || locate(/obj/item/weapon/grab, tmob.grabbed_by.len)) )
 					if ( !(world.time % 5) )
 						src << "\red [tmob] is restrained, you cannot push past"
 					now_pushing = 0
@@ -817,6 +817,8 @@
 				return "Mobile vegetation"
 			if("golem")
 				return "Animated Construct"
+			if("kidan")
+				return "Kidan"
 			else
 				return "Human"
 
@@ -829,7 +831,9 @@
 		else if(src.dna.mutantrace == "tajaran")
 			return "Tajaran"
 		else if(src.dna.mutantrace == "vox")
-			return "vox"
+			return "Vox"
+		else if(src.dna.mutantrace == "kidan")
+			return "Kidan"
 
 /mob/living/carbon/proc/update_mutantrace_languages()
 	if(src.dna)
@@ -841,6 +845,8 @@
 			src.tajaran_talk_understand = 1
 		else if(src.dna.mutantrace == "vox")
 			src.vox_talk_understand = 1
+		else if(src.dna.mutantrace == "kidan")
+			src.kidan_talk_understand = 1
 
 /mob/living/carbon/human/proc/play_xylophone()
 	if(!src.xylophone)
@@ -1112,3 +1118,108 @@
 	if(istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
 		del(feet_blood_DNA)
 		return 1
+
+mob/living/carbon/human/yank_out_object()
+	set category = "Object"
+	set name = "Yank out object"
+	set desc = "Remove an embedded item at the cost of bleeding and pain."
+	set src in view(1)
+
+	if(!isliving(usr) || usr.next_move > world.time)
+		return
+	usr.next_move = world.time + 20
+
+	if(usr.stat == 1)
+		usr << "You are unconcious and cannot do that!"
+		return
+
+	if(usr.restrained())
+		usr << "You are restrained and cannot do that!"
+		return
+
+	var/list/valid_objects = list()
+	var/datum/organ/external/affected = null
+	var/mob/living/carbon/human/S = src
+	var/mob/living/carbon/human/U = usr
+	var/self = null
+
+	if(S == U)
+		self = 1 // Removing object from yourself.
+
+	valid_objects = get_visible_implants(1)
+
+	if(!valid_objects.len)
+		if(self)
+			src << "You have nothing stuck in your wounds that is large enough to remove without surgery."
+		else
+			U << "[src] has nothing stuck in their wounds that is large enough to remove without surgery."
+		return
+
+	var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects
+
+	for(var/datum/organ/external/organ in organs) //Grab the organ holding the implant.
+		for(var/obj/item/weapon/O in organ.implants)
+			if(O == selection)
+				affected = organ
+	if(self)
+		src << "<span class='warning'>You attempt to get a good grip on the [selection] in your [affected] with bloody fingers.</span>"
+	else
+		U << "<span class='warning'>You attempt to get a good grip on the [selection] in [S]'s [affected] with bloody fingers.</span>"
+
+	if(istype(U,/mob/living/carbon/human/)) U.bloody_hands(S)
+
+	if(!do_after(U, 80))
+		return
+
+		if(!selection || !affected || !S || !U)
+			return
+	if(self)
+		visible_message("<span class='warning'><b>[src] rips [selection] out of their [affected] in a welter of blood.</b></span>","<span class='warning'><b>You rip [selection] out of your [affected] in a welter of blood.</b></span>")
+	else
+		visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s [affected] in a welter of blood.</b></span>","<span class='warning'><b>[src] rips [selection] out of your [affected] in a welter of blood.</b></span>")
+
+	selection.loc = get_turf(src)
+	affected.implants -= selection
+	shock_stage+=10
+
+	for(var/obj/item/weapon/O in pinned)
+		if(O == selection)
+			pinned -= O
+		if(!pinned.len)
+			anchored = 0
+
+	if(prob(10)) //I'M SO ANEMIC I COULD JUST -DIE-.
+		var/datum/wound/internal_bleeding/I = new (15)
+		affected.wounds += I
+		custom_pain("Something tears wetly in your [affected] as [selection] is pulled free!", 1)
+	return 1
+
+/mob/living/carbon/human/proc/get_visible_implants(var/class = 0)
+
+	var/list/visible_implants = list()
+	for(var/datum/organ/external/organ in src.organs)
+		for(var/obj/item/weapon/O in organ.implants)
+			if(!istype(O,/obj/item/weapon/implant) && O.w_class > class)
+				visible_implants += O
+
+	return(visible_implants)
+
+/mob/living/carbon/human/proc/handle_embedded_objects()
+
+	for(var/datum/organ/external/organ in src.organs)
+		for(var/obj/item/weapon/O in organ.implants)
+			if(!istype(O,/obj/item/weapon/implant) && prob(5)) //Moving with things stuck in you could be bad.
+				// All kinds of embedded objects cause bleeding.
+				var/msg = null
+				switch(rand(1,3))
+					if(1)
+						msg ="<span class='warning'>A spike of pain jolts your [organ] as you bump [O] inside.</span>"
+					if(2)
+						msg ="<span class='warning'>Your movement jostles [O] in your [organ] painfully.</span>"
+					if(3)
+						msg ="<span class='warning'>[O] in your [organ] twists painfully as you move.</span>"
+				src << msg
+
+				organ.status |= ORGAN_BLEEDING
+				organ.take_damage(rand(1,3), 0, 0)
+				src.adjustToxLoss(rand(1,3))

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

@@ -190,7 +190,9 @@
 		zone = "head"
 	return organs_by_name[zone]
 
-/mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/used_weapon = null)
+/mob/living/carbon/human/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = 0, var/obj/used_weapon = null)
+
+	//visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]")
 	if((damagetype != BRUTE) && (damagetype != BURN))
 		..(damage, damagetype, def_zone, blocked)
 		return 1
@@ -219,6 +221,29 @@
 				UpdateDamageIcon()
 
 	// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
-
 	updatehealth()
-	return 1
+
+	//Embedded projectile code.
+	if(!organ) return
+	if(istype(used_weapon,/obj/item/weapon))
+		var/obj/item/weapon/W = used_weapon  //Sharp objects will always embed if they do enough damage.
+		if( (damage > (10*W.w_class)) && ( (sharp && !ismob(W.loc)) || prob(damage/W.w_class) ) )
+			organ.implants += W
+			visible_message("<span class='danger'>\The [W] sticks in the wound!</span>")
+			W.add_blood(src)
+			if(ismob(W.loc))
+				var/mob/living/H = W.loc
+				H.drop_item()
+			W.loc = src
+
+	else if(istype(used_weapon,/obj/item/projectile)) //We don't want to use the actual projectile item, so we spawn some shrapnel.
+		if(prob(75) && damagetype == BRUTE)
+			var/obj/item/projectile/P = used_weapon
+			var/obj/item/weapon/shard/shrapnel/S = new()
+			S.name = "[P.name] shrapnel"
+			S.desc = "[S.desc] It looks like it was fired from [P.shot_from]."
+			S.loc = src
+			organ.implants += S
+			visible_message("<span class='danger'>The projectile sticks in the wound!</span>")
+			S.add_blood(src)
+	return 1

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

@@ -161,6 +161,17 @@ emp_act
 	if((user != src) && check_shields(I.force, "the [I.name]"))
 		return 0
 
+	if(istype(I,/obj/item/weapon/card/emag))
+		if(!(affecting.status & ORGAN_ROBOT))
+			user << "\red That limb isn't robotic."
+			return
+		if(affecting.sabotaged)
+			user << "\red [src]'s [affecting.display_name] is already sabotaged!"
+		else
+			user << "\red You sneakily slide [I] into the dataport on [src]'s [affecting.display_name] and short out the safeties."
+			affecting.sabotaged = 1
+		return
+
 	if(I.attack_verb.len)
 		visible_message("\red <B>[src] has been [pick(I.attack_verb)] in the [hit_area] with [I.name] by [user]!</B>")
 	else
@@ -170,7 +181,7 @@ emp_act
 	if(armor >= 2)	return 0
 	if(!I.force)	return 0
 
-	apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), I.name)
+	apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), I)
 
 	var/bloody = 0
 	if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))

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

@@ -7,6 +7,8 @@
 
 	if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything
 
+	handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
+
 	var/health_deficiency = (100 - health - halloss)
 	if(health_deficiency >= 40) tally += (health_deficiency / 25)
 

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

@@ -470,7 +470,7 @@
 				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
 			toxins_alert = max(toxins_alert, 1)
 		else if(O2_pp > vox_oxygen_max && src.dna.mutantrace=="vox") //Oxygen is toxic to vox.
-			var/ratio = (breath.oxygen/vox_oxygen_max) * 10
+			var/ratio = (breath.oxygen/vox_oxygen_max) * 1000
 			adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
 			toxins_alert = max(toxins_alert, 1)
 		else
@@ -490,7 +490,7 @@
 
 		if( (abs(310.15 - breath.temperature) > 50) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(status_flags & GODMODE)	return 1	//godmode
-			if(breath.temperature < 260.15)
+			if(breath.temperature < 260.15 && dna.mutantrace != "vox") //Vox are resistant to cold.
 				if(prob(20))
 					src << "\red You feel your face freezing and an icicle forming in your lungs!"
 			else if(breath.temperature > 360.15)
@@ -501,10 +501,10 @@
 				if(-INFINITY to 120)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
-				if(120 to 200)
+				if(120 to 200 && dna.mutantrace != "vox")  //Vox are resistant to cold.
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
-				if(200 to 260)
+				if(200 to 260 && dna.mutantrace != "vox")  //Vox are resistant to cold.
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
 				if(360 to 400)
@@ -602,7 +602,7 @@
 			if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
 				pressure_alert = -1
 			else
-				if( !(COLD_RESISTANCE in mutations) && src.dna.mutantrace!="vox")
+				if( !(COLD_RESISTANCE in mutations) && src.dna.mutantrace!="vox") //Vox are resistant to pressure loss.
 					adjustBruteLoss( LOW_PRESSURE_DAMAGE )
 					pressure_alert = -2
 				else

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

@@ -443,10 +443,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 			if("skrell")
 				race_icon = 'icons/mob/human_races/r_skrell.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
-
 			if("vox")
 				race_icon = 'icons/mob/human_races/r_vox.dmi'
 				deform_icon = 'icons/mob/human_races/r_def_vox.dmi'
+			if("kidan")
+				race_icon = 'icons/mob/human_races/r_kidan.dmi'
+				deform_icon = 'icons/mob/human_races/r_def_kidan.dmi'
 
 			else
 				race_icon = 'icons/mob/human_races/r_human.dmi'

code/modules/mob/living/carbon/monkey/life.dm

@@ -438,21 +438,36 @@
 				if(!reagents.has_reagent("inaprovaline"))
 					adjustOxyLoss(1)
 				Paralyse(3)
+			if(halloss > 100)
+				src << "<span class='notice'>You're in too much pain to keep going...</span>"
+				for(var/mob/O in oviewers(src, null))
+					O.show_message("<B>[src]</B> slumps to the ground, too weak to continue fighting.", 1)
+				Paralyse(10)
+				setHalLoss(99)
 
 			if(paralysis)
 				AdjustParalysis(-1)
 				blinded = 1
 				stat = UNCONSCIOUS
+				if(halloss > 0)
+					adjustHalLoss(-6)
 			else if(sleeping)
+				handle_dreams()
+				adjustHalLoss(-6)
 				sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS
-				if( prob(10) && health )
+				if( prob(10) && health && !hal_crit )
 					spawn(0)
 						emote("snore")
+			else if(resting)
+				if(halloss > 0)
+					adjustHalLoss(-6)
 			//CONSCIOUS
 			else
 				stat = CONSCIOUS
+				if(halloss > 0)
+					adjustHalLoss(-2)
 
 			//Eyes
 			if(sdisabilities & BLIND)	//disabled-blind, doesn't get better on its own

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -3,13 +3,113 @@
 	voice_name = "monkey"
 	voice_message = "chimpers"
 	say_message = "chimpers"
-	icon = 'icons/mob/monkey.dmi'
 	icon_state = "monkey1"
+	icon = 'icons/mob/monkey.dmi'
 	gender = NEUTER
 	pass_flags = PASSTABLE
 	update_icon = 0		///no need to call regenerate_icon
 
 	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
+/mob/living/carbon/monkey/tajara
+	name = "farwa"
+	voice_name = "farwa"
+	voice_message = "mews"
+	say_message = "mews"
+	icon_state = "tajkey1"
+
+/mob/living/carbon/monkey/skrell
+	name = "neaera"
+	voice_name = "neaera"
+	voice_message = "squicks"
+	say_message = "squicks"
+	icon_state = "skrellkey1"
+/mob/living/carbon/monkey/unathi
+	name = "stok"
+	voice_name = "stok"
+	voice_message = "hisses"
+	say_message = "hisses"
+	icon_state = "stok1"
+
+/mob/living/carbon/monkey/unathi/New()
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+
+	if(name == "stok")
+		name = text("stok ([rand(1, 1000)])")
+	real_name = name
+	if (!(dna))
+		if(gender == NEUTER)
+			gender = pick(MALE, FEMALE)
+		dna = new /datum/dna( null )
+		dna.real_name = real_name
+		dna.uni_identity = "000000000000000000DC0000066000"
+		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
+		dna.unique_enzymes = md5(name)
+		dna.mutantrace = "lizard"
+				//////////blah
+		var/gendervar
+		if (gender == MALE)
+			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
+		else
+			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
+		dna.uni_identity += gendervar
+		dna.uni_identity += "044"
+		dna.uni_identity += "C5D"
+	..()
+/mob/living/carbon/monkey/skrell/New()
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+	if(name == "neaera")
+		name = text("neaera ([rand(1, 1000)])")
+	real_name = name
+	if (!(dna))
+		if(gender == NEUTER)
+			gender = pick(MALE, FEMALE)
+		dna = new /datum/dna( null )
+		dna.real_name = real_name
+		dna.uni_identity = "000000000000000000DC0000066000"
+		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
+		dna.unique_enzymes = md5(name)
+		dna.mutantrace = "skrell"
+				//////////blah
+		var/gendervar
+		if (gender == MALE)
+			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
+		else
+			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
+		dna.uni_identity += gendervar
+		dna.uni_identity += "01C"
+		dna.uni_identity += "C92"
+	..()
+/mob/living/carbon/monkey/tajara/New()
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+
+	if(name == "farwa")
+		name = text("farwa ([rand(1, 1000)])")
+	real_name = name
+	if (!(dna))
+		if(gender == NEUTER)
+			gender = pick(MALE, FEMALE)
+		dna = new /datum/dna( null )
+		dna.real_name = real_name
+		dna.uni_identity = "000000000000000000DC0000066000"
+		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
+		dna.unique_enzymes = md5(name)
+		dna.mutantrace = "tajaran"
+				//////////blah
+		var/gendervar
+		if (gender == MALE)
+			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
+		else
+			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
+		dna.uni_identity += gendervar
+		dna.uni_identity += "0A0"
+		dna.uni_identity += "E00"
+	..()
 
 /mob/living/carbon/monkey/New()
 	var/datum/reagents/R = new/datum/reagents(1000)

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -28,12 +28,20 @@
 	update_hud()
 	lying_prev = lying	//so we don't update overlays for lying/standing unless our stance changes again
 	overlays.Cut()
+	var/ico = "monkey"
+	switch(src.dna.mutantrace) //On monkey spawn, check the DNA of the mob. If alien, change to appropriate alien monkey sprite
+		if("tajaran")
+			ico = "tajkey"
+		if("lizard")
+			ico = "stok"
+		if("skrell")
+			icon_state = "skrellkey"
 	if(lying)
-		icon_state = "monkey0"
+		icon_state = ico + "0"
 		for(var/image/I in overlays_lying)
 			overlays += I
 	else
-		icon_state = "monkey1"
+		icon_state = ico + "1"
 		for(var/image/I in overlays_standing)
 			overlays += I
 

code/modules/mob/living/damage_procs.dm

@@ -28,7 +28,7 @@
 	return 1
 
 
-/mob/living/proc/apply_damages(var/brute = 0, var/burn = 0, var/tox = 0, var/oxy = 0, var/clone = 0, var/def_zone = null, var/blocked = 0, var/halloss = 0)
+/mob/living/proc/apply_damages(var/brute = 0, var/burn = 0, var/tox = 0, var/oxy = 0, var/clone = 0, var/halloss = 0, var/def_zone = null, var/blocked = 0)
 	if(blocked >= 2)	return 0
 	if(brute)	apply_damage(brute, BRUTE, def_zone, blocked)
 	if(burn)	apply_damage(burn, BURN, def_zone, blocked)
@@ -64,7 +64,7 @@
 	return 1
 
 
-/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/agony = 0)
+/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/agony = 0, var/blocked = 0)
 	if(blocked >= 2)	return 0
 	if(stun)		apply_effect(stun, STUN, blocked)
 	if(weaken)		apply_effect(weaken, WEAKEN, blocked)

code/modules/mob/living/living_defense.dm

@@ -57,11 +57,11 @@
 		P.on_hit(src,2)
 		return 2
 	if(!P.nodamage)
-		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, used_weapon = "Projectile([P.name])")
+		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, absorb, 0, P)
 	P.on_hit(src, absorb)
 	return absorb
 
-/mob/living/hitby(atom/movable/AM as mob|obj)//Standardization and logging -Sieve
+/mob/living/hitby(atom/movable/AM as mob|obj,var/speed = 5)//Standardization and logging -Sieve
 	if(istype(AM,/obj/))
 		var/obj/O = AM
 		var/zone = ran_zone("chest",75)//Hits a random part of the body, geared towards the chest
@@ -72,12 +72,55 @@
 		src.visible_message("\red [src] has been hit by [O].")
 		var/armor = run_armor_check(zone, "melee", "Your armor has protected your [zone].", "Your armor has softened hit to your [zone].")
 		if(armor < 2)
-			apply_damage(O.throwforce, dtype, zone, armor, O)
+			apply_damage(O.throwforce*(speed/5), dtype, zone, armor, O.sharp, O)
+
 		if(!O.fingerprintslast)
 			return
+
 		var/client/assailant = directory[ckey(O.fingerprintslast)]
 		if(assailant && assailant.mob && istype(assailant.mob,/mob))
 			var/mob/M = assailant.mob
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with [O], last touched by [M.name] ([assailant.ckey])</font>")
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with [O]</font>")
 			log_attack("<font color='red'>[src.name] ([src.ckey]) was hit by [O], last touched by [M.name] ([assailant.ckey])</font>")
+
+			// Begin BS12 momentum-transfer code.
+
+			if(speed >= 20)
+				var/obj/item/weapon/W = O
+				var/momentum = speed/2
+				var/dir = get_dir(M,src)
+
+				visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!")
+				src.throw_at(get_edge_target_turf(src,dir),1,momentum)
+
+				if(W.w_class >= 3 && W.sharp && armor < 2) //Projectile is suitable, armour is bypassable.
+					var/turf/T = near_wall(dir,2)
+					if(T)
+						src.loc = T
+						visible_message("<span class='warning'>[src] is pinned to the wall by [O]!</span>","<span class='warning'>You are pinned to the wall by [O]!</span>")
+						if(!istype(src,/mob/living/carbon/human))
+							O.loc = src
+							src.embedded += O
+							src.anchored = 1
+							src.pinned += O
+						else
+							src.anchored = 1
+							src.pinned += O
+
+
+/mob/living/proc/near_wall(var/direction,var/distance=1)
+	var/turf/T = get_step(get_turf(src),direction)
+	var/turf/last_turf = src.loc
+	var/i = 1
+
+	while(i>0 && i<=distance)
+		if(T.density) //Turf is a wall!
+			return last_turf
+		i++
+		last_turf = T
+		T = get_step(T,direction)
+
+	return 0
+
+// End BS12 momentum-transfer code.

code/modules/mob/living/living_defines.dm

@@ -24,7 +24,6 @@
 	//Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects.
 	var/incorporeal_move = 0 //0 is off, 1 is normal, 2 is for ninjas.
 
-
 	var/t_plasma = null
 	var/t_oxygen = null
 	var/t_sl_gas = null

code/modules/mob/living/say.dm

@@ -19,6 +19,7 @@ var/list/department_radio_keys = list(
 	  ":j" = "tajaran",		"#j" = "tajaran",		".j" = "tajaran",
 	  ":o" = "soghun",		"#o" = "soghun",		".o" = "soghun",
 	  ":v" = "vox",			"#v" = "vox",			".v" = "vox",
+	  ":q" = "kidan",		"#q" = "kidan",			".q" = "kidan",
 
 	  ":R" = "right hand",	"#R" = "right hand",	".R" = "right hand",
 	  ":L" = "left hand",	"#L" = "left hand",		".L" = "left hand",
@@ -39,6 +40,7 @@ var/list/department_radio_keys = list(
 	  ":J" = "tajaran",		"#J" = "tajaran",		".J" = "tajaran",
 	  ":O" = "soghun",		"#O" = "soghun",		".O" = "soghun",
 	  ":V" = "vox",			"#V" = "vox",			".V" = "vox",
+	  ":Q" = "kidan",		"#Q" = "kidan",			".Q" = "kidan",
 
 	  //kinda localization -- rastaf0
 	  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
@@ -188,6 +190,7 @@ var/list/department_radio_keys = list(
 	var/is_speaking_soghun = 0
 	var/is_speaking_taj = 0
 	var/is_speaking_vox = 0
+	var/is_speaking_kidan = 0
 	var/is_speaking_radio = 0
 
 	switch (message_mode)
@@ -290,6 +293,10 @@ var/list/department_radio_keys = list(
 			if(vox_talk_understand || universal_speak)
 				is_speaking_vox = 1
 
+		if ("kidan")
+			if(kidan_talk_understand || universal_speak)
+				is_speaking_kidan = 1
+
 		if("changeling")
 			if(mind && mind.changeling)
 				for(var/mob/Changeling in mob_list)
@@ -388,6 +395,8 @@ var/list/department_radio_keys = list(
 					heard_a += M
 				else if(is_speaking_vox && (M:vox_talk_understand || M:universal_speak))
 					heard_a += M
+				else if(is_speaking_kidan && (M:kidan_talk_understand || M:universal_speak))
+					heard_a += M
 				else
 					heard_b += M
 			else
@@ -403,7 +412,7 @@ var/list/department_radio_keys = list(
 
 	var/rendered = null
 	if (length(heard_a))
-		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox)
+		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox,is_speaking_kidan)
 
 		if (italics)
 			message_a = "<i>[message_a]</i>"
@@ -428,7 +437,7 @@ var/list/department_radio_keys = list(
 			message_b = voice_message
 		else
 			message_b = stars(message)
-			message_b = say_quote(message_b,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox)
+			message_b = say_quote(message_b,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox,is_speaking_kidan)
 
 		if (italics)
 			message_b = "<i>[message_b]</i>"

code/modules/mob/living/silicon/ai/ai.dm

@@ -337,6 +337,10 @@ var/list/ai_list = list()
 			else
 				src << "<span class='notice'>Unable to locate the holopad.</span>"
 
+	if(href_list["say_word"])
+		src.announcement(href_list["say_word"])
+		return
+
 	if (href_list["lawc"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawc"])
 		switch(lawcheck[L+1])

code/modules/mob/living/silicon/ai/say.dm

@@ -27,3 +27,696 @@
 		return "declares, \"[text]\"";
 
 	return "states, \"[text]\"";
+
+var/announcing_vox = 0
+var/const/VOX_CHANNEL = 200
+var/const/VOX_VOLUME = 75
+
+/mob/living/silicon/ai/verb/announcement_help()
+
+	set name = "Announcement Help"
+	set desc = "Display a list of vocal words to announce to the crew."
+	set category = "AI Commands"
+
+
+	var/dat = "Here is a list of words you can type into the Announcement button to create sentences to vocally announce.<BR> \
+	Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.<BR>"
+
+	var/index = 0
+	for(var/word in vox_sounds)
+		index++
+		dat += "<A href='?src=\ref[src];say_word=[word]'>[capitalize(word)]</A>"
+		if(index != vox_sounds.len)
+			dat += " / "
+
+	src << browse(dat, "window=announce_help;size=500x400")
+
+
+/mob/living/silicon/ai/verb/announcement(var/message as text)
+
+	set name = "Announcement"
+	set desc = "Create a vocal announcement by typing in the available words to create a setence. More help is available in 'Announcement Help'"
+	set category = "AI Commands"
+
+	if(!message)
+		return
+	//if(!announcing_vox > world.time)
+	//	return
+
+	log_game("[key_name_admin(src)] made a vocal announcement with the following message: [message].")
+
+	announcing_vox = world.time + 30
+
+	var/list/words = stringsplit(trim(message), " ")
+	var/list/incorrect_words = list()
+
+	if(words.len > 32)
+		words.len = 32
+	for(var/word in words)
+		word = trim(word)
+		if(!word)
+			continue
+		if(!play_vox_word(word, src.z)) // If the word isn't speakable
+			incorrect_words += word
+
+	if(incorrect_words.len)
+		src << "<span class='notice'>These words are not available on the announcement system: [english_list(incorrect_words)].</span>"
+
+/proc/play_vox_word(var/word, var/z_level)
+
+	word = lowertext(word)
+
+	if(vox_sounds[word])
+
+		var/sound_file = vox_sounds[word]
+		var/sound/voice = sound(sound_file, wait = 1, channel = VOX_CHANNEL, volume = VOX_VOLUME)
+		voice.status = SOUND_STREAM
+
+		// Play voice for all mobs in the z level
+		for(var/mob/M in player_list)
+			if(M.client)
+				var/turf/T = get_turf(M)
+				if(T.z == z_level)
+					M << voice
+		return 1
+	return 0
+
+// List is required to compile the resources into the game when it loads.
+// Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable.
+
+var/list/vox_sounds = list("," = 'sound/vox/,.wav',
+"." = 'sound/vox/..wav',
+"a" = 'sound/vox/a.wav',
+"accelerating" = 'sound/vox/accelerating.wav',
+"accelerator" = 'sound/vox/accelerator.wav',
+"accepted" = 'sound/vox/accepted.wav',
+"access" = 'sound/vox/access.wav',
+"acknowledge" = 'sound/vox/acknowledge.wav',
+"acknowledged" = 'sound/vox/acknowledged.wav',
+"acquired" = 'sound/vox/acquired.wav',
+"acquisition" = 'sound/vox/acquisition.wav',
+"across" = 'sound/vox/across.wav',
+"activate" = 'sound/vox/activate.wav',
+"activated" = 'sound/vox/activated.wav',
+"activity" = 'sound/vox/activity.wav',
+"adios" = 'sound/vox/adios.wav',
+"administration" = 'sound/vox/administration.wav',
+"advanced" = 'sound/vox/advanced.wav',
+"after" = 'sound/vox/after.wav',
+"agent" = 'sound/vox/agent.wav',
+"alarm" = 'sound/vox/alarm.wav',
+"alert" = 'sound/vox/alert.wav',
+"alien" = 'sound/vox/alien.wav',
+"aligned" = 'sound/vox/aligned.wav',
+"all" = 'sound/vox/all.wav',
+"alpha" = 'sound/vox/alpha.wav',
+"am" = 'sound/vox/am.wav',
+"amigo" = 'sound/vox/amigo.wav',
+"ammunition" = 'sound/vox/ammunition.wav',
+"an" = 'sound/vox/an.wav',
+"and" = 'sound/vox/and.wav',
+"announcement" = 'sound/vox/announcement.wav',
+"anomalous" = 'sound/vox/anomalous.wav',
+"antenna" = 'sound/vox/antenna.wav',
+"any" = 'sound/vox/any.wav',
+"apprehend" = 'sound/vox/apprehend.wav',
+"approach" = 'sound/vox/approach.wav',
+"are" = 'sound/vox/are.wav',
+"area" = 'sound/vox/area.wav',
+"arm" = 'sound/vox/arm.wav',
+"armed" = 'sound/vox/armed.wav',
+"armor" = 'sound/vox/armor.wav',
+"armory" = 'sound/vox/armory.wav',
+"arrest" = 'sound/vox/arrest.wav',
+"ass" = 'sound/vox/ass.wav',
+"at" = 'sound/vox/at.wav',
+"atomic" = 'sound/vox/atomic.wav',
+"attention" = 'sound/vox/attention.wav',
+"authorize" = 'sound/vox/authorize.wav',
+"authorized" = 'sound/vox/authorized.wav',
+"automatic" = 'sound/vox/automatic.wav',
+"away" = 'sound/vox/away.wav',
+"b" = 'sound/vox/b.wav',
+"back" = 'sound/vox/back.wav',
+"backman" = 'sound/vox/backman.wav',
+"bad" = 'sound/vox/bad.wav',
+"bag" = 'sound/vox/bag.wav',
+"bailey" = 'sound/vox/bailey.wav',
+"barracks" = 'sound/vox/barracks.wav',
+"base" = 'sound/vox/base.wav',
+"bay" = 'sound/vox/bay.wav',
+"be" = 'sound/vox/be.wav',
+"been" = 'sound/vox/been.wav',
+"before" = 'sound/vox/before.wav',
+"beyond" = 'sound/vox/beyond.wav',
+"biohazard" = 'sound/vox/biohazard.wav',
+"biological" = 'sound/vox/biological.wav',
+"birdwell" = 'sound/vox/birdwell.wav',
+"bizwarn" = 'sound/vox/bizwarn.wav',
+"black" = 'sound/vox/black.wav',
+"blast" = 'sound/vox/blast.wav',
+"blocked" = 'sound/vox/blocked.wav',
+"bloop" = 'sound/vox/bloop.wav',
+"blue" = 'sound/vox/blue.wav',
+"bottom" = 'sound/vox/bottom.wav',
+"bravo" = 'sound/vox/bravo.wav',
+"breach" = 'sound/vox/breach.wav',
+"breached" = 'sound/vox/breached.wav',
+"break" = 'sound/vox/break.wav',
+"bridge" = 'sound/vox/bridge.wav',
+"bust" = 'sound/vox/bust.wav',
+"but" = 'sound/vox/but.wav',
+"button" = 'sound/vox/button.wav',
+"buzwarn" = 'sound/vox/buzwarn.wav',
+"bypass" = 'sound/vox/bypass.wav',
+"c" = 'sound/vox/c.wav',
+"cable" = 'sound/vox/cable.wav',
+"call" = 'sound/vox/call.wav',
+"called" = 'sound/vox/called.wav',
+"canal" = 'sound/vox/canal.wav',
+"cap" = 'sound/vox/cap.wav',
+"captain" = 'sound/vox/captain.wav',
+"capture" = 'sound/vox/capture.wav',
+"ceiling" = 'sound/vox/ceiling.wav',
+"celsius" = 'sound/vox/celsius.wav',
+"center" = 'sound/vox/center.wav',
+"centi" = 'sound/vox/centi.wav',
+"central" = 'sound/vox/central.wav',
+"chamber" = 'sound/vox/chamber.wav',
+"charlie" = 'sound/vox/charlie.wav',
+"check" = 'sound/vox/check.wav',
+"checkpoint" = 'sound/vox/checkpoint.wav',
+"chemical" = 'sound/vox/chemical.wav',
+"cleanup" = 'sound/vox/cleanup.wav',
+"clear" = 'sound/vox/clear.wav',
+"clearance" = 'sound/vox/clearance.wav',
+"close" = 'sound/vox/close.wav',
+"code" = 'sound/vox/code.wav',
+"coded" = 'sound/vox/coded.wav',
+"collider" = 'sound/vox/collider.wav',
+"command" = 'sound/vox/command.wav',
+"communication" = 'sound/vox/communication.wav',
+"complex" = 'sound/vox/complex.wav',
+"computer" = 'sound/vox/computer.wav',
+"condition" = 'sound/vox/condition.wav',
+"containment" = 'sound/vox/containment.wav',
+"contamination" = 'sound/vox/contamination.wav',
+"control" = 'sound/vox/control.wav',
+"coolant" = 'sound/vox/coolant.wav',
+"coomer" = 'sound/vox/coomer.wav',
+"core" = 'sound/vox/core.wav',
+"correct" = 'sound/vox/correct.wav',
+"corridor" = 'sound/vox/corridor.wav',
+"crew" = 'sound/vox/crew.wav',
+"cross" = 'sound/vox/cross.wav',
+"cryogenic" = 'sound/vox/cryogenic.wav',
+"d" = 'sound/vox/d.wav',
+"dadeda" = 'sound/vox/dadeda.wav',
+"damage" = 'sound/vox/damage.wav',
+"damaged" = 'sound/vox/damaged.wav',
+"danger" = 'sound/vox/danger.wav',
+"day" = 'sound/vox/day.wav',
+"deactivated" = 'sound/vox/deactivated.wav',
+"decompression" = 'sound/vox/decompression.wav',
+"decontamination" = 'sound/vox/decontamination.wav',
+"deeoo" = 'sound/vox/deeoo.wav',
+"defense" = 'sound/vox/defense.wav',
+"degrees" = 'sound/vox/degrees.wav',
+"delta" = 'sound/vox/delta.wav',
+"denied" = 'sound/vox/denied.wav',
+"deploy" = 'sound/vox/deploy.wav',
+"deployed" = 'sound/vox/deployed.wav',
+"destroy" = 'sound/vox/destroy.wav',
+"destroyed" = 'sound/vox/destroyed.wav',
+"detain" = 'sound/vox/detain.wav',
+"detected" = 'sound/vox/detected.wav',
+"detonation" = 'sound/vox/detonation.wav',
+"device" = 'sound/vox/device.wav',
+"did" = 'sound/vox/did.wav',
+"die" = 'sound/vox/die.wav',
+"dimensional" = 'sound/vox/dimensional.wav',
+"dirt" = 'sound/vox/dirt.wav',
+"disengaged" = 'sound/vox/disengaged.wav',
+"dish" = 'sound/vox/dish.wav',
+"disposal" = 'sound/vox/disposal.wav',
+"distance" = 'sound/vox/distance.wav',
+"distortion" = 'sound/vox/distortion.wav',
+"do" = 'sound/vox/do.wav',
+"doctor" = 'sound/vox/doctor.wav',
+"doop" = 'sound/vox/doop.wav',
+"door" = 'sound/vox/door.wav',
+"down" = 'sound/vox/down.wav',
+"dual" = 'sound/vox/dual.wav',
+"duct" = 'sound/vox/duct.wav',
+"e" = 'sound/vox/e.wav',
+"east" = 'sound/vox/east.wav',
+"echo" = 'sound/vox/echo.wav',
+"ed" = 'sound/vox/ed.wav',
+"effect" = 'sound/vox/effect.wav',
+"egress" = 'sound/vox/egress.wav',
+"eight" = 'sound/vox/eight.wav',
+"eighteen" = 'sound/vox/eighteen.wav',
+"eighty" = 'sound/vox/eighty.wav',
+"electric" = 'sound/vox/electric.wav',
+"electromagnetic" = 'sound/vox/electromagnetic.wav',
+"elevator" = 'sound/vox/elevator.wav',
+"eleven" = 'sound/vox/eleven.wav',
+"eliminate" = 'sound/vox/eliminate.wav',
+"emergency" = 'sound/vox/emergency.wav',
+"energy" = 'sound/vox/energy.wav',
+"engage" = 'sound/vox/engage.wav',
+"engaged" = 'sound/vox/engaged.wav',
+"engine" = 'sound/vox/engine.wav',
+"enter" = 'sound/vox/enter.wav',
+"entry" = 'sound/vox/entry.wav',
+"environment" = 'sound/vox/environment.wav',
+"error" = 'sound/vox/error.wav',
+"escape" = 'sound/vox/escape.wav',
+"evacuate" = 'sound/vox/evacuate.wav',
+"exchange" = 'sound/vox/exchange.wav',
+"exit" = 'sound/vox/exit.wav',
+"expect" = 'sound/vox/expect.wav',
+"experiment" = 'sound/vox/experiment.wav',
+"experimental" = 'sound/vox/experimental.wav',
+"explode" = 'sound/vox/explode.wav',
+"explosion" = 'sound/vox/explosion.wav',
+"exposure" = 'sound/vox/exposure.wav',
+"exterminate" = 'sound/vox/exterminate.wav',
+"extinguish" = 'sound/vox/extinguish.wav',
+"extinguisher" = 'sound/vox/extinguisher.wav',
+"extreme" = 'sound/vox/extreme.wav',
+"f" = 'sound/vox/f.wav',
+"facility" = 'sound/vox/facility.wav',
+"fahrenheit" = 'sound/vox/fahrenheit.wav',
+"failed" = 'sound/vox/failed.wav',
+"failure" = 'sound/vox/failure.wav',
+"farthest" = 'sound/vox/farthest.wav',
+"fast" = 'sound/vox/fast.wav',
+"feet" = 'sound/vox/feet.wav',
+"field" = 'sound/vox/field.wav',
+"fifteen" = 'sound/vox/fifteen.wav',
+"fifth" = 'sound/vox/fifth.wav',
+"fifty" = 'sound/vox/fifty.wav',
+"final" = 'sound/vox/final.wav',
+"fine" = 'sound/vox/fine.wav',
+"fire" = 'sound/vox/fire.wav',
+"first" = 'sound/vox/first.wav',
+"five" = 'sound/vox/five.wav',
+"flooding" = 'sound/vox/flooding.wav',
+"floor" = 'sound/vox/floor.wav',
+"fool" = 'sound/vox/fool.wav',
+"for" = 'sound/vox/for.wav',
+"forbidden" = 'sound/vox/forbidden.wav',
+"force" = 'sound/vox/force.wav',
+"forms" = 'sound/vox/forms.wav',
+"found" = 'sound/vox/found.wav',
+"four" = 'sound/vox/four.wav',
+"fourteen" = 'sound/vox/fourteen.wav',
+"fourth" = 'sound/vox/fourth.wav',
+"fourty" = 'sound/vox/fourty.wav',
+"foxtrot" = 'sound/vox/foxtrot.wav',
+"freeman" = 'sound/vox/freeman.wav',
+"freezer" = 'sound/vox/freezer.wav',
+"from" = 'sound/vox/from.wav',
+"front" = 'sound/vox/front.wav',
+"fuel" = 'sound/vox/fuel.wav',
+"g" = 'sound/vox/g.wav',
+"get" = 'sound/vox/get.wav',
+"go" = 'sound/vox/go.wav',
+"going" = 'sound/vox/going.wav',
+"good" = 'sound/vox/good.wav',
+"goodbye" = 'sound/vox/goodbye.wav',
+"gordon" = 'sound/vox/gordon.wav',
+"got" = 'sound/vox/got.wav',
+"government" = 'sound/vox/government.wav',
+"granted" = 'sound/vox/granted.wav',
+"great" = 'sound/vox/great.wav',
+"green" = 'sound/vox/green.wav',
+"grenade" = 'sound/vox/grenade.wav',
+"guard" = 'sound/vox/guard.wav',
+"gulf" = 'sound/vox/gulf.wav',
+"gun" = 'sound/vox/gun.wav',
+"guthrie" = 'sound/vox/guthrie.wav',
+"handling" = 'sound/vox/handling.wav',
+"hangar" = 'sound/vox/hangar.wav',
+"has" = 'sound/vox/has.wav',
+"have" = 'sound/vox/have.wav',
+"hazard" = 'sound/vox/hazard.wav',
+"head" = 'sound/vox/head.wav',
+"health" = 'sound/vox/health.wav',
+"heat" = 'sound/vox/heat.wav',
+"helicopter" = 'sound/vox/helicopter.wav',
+"helium" = 'sound/vox/helium.wav',
+"hello" = 'sound/vox/hello.wav',
+"help" = 'sound/vox/help.wav',
+"here" = 'sound/vox/here.wav',
+"hide" = 'sound/vox/hide.wav',
+"high" = 'sound/vox/high.wav',
+"highest" = 'sound/vox/highest.wav',
+"hit" = 'sound/vox/hit.wav',
+"hole" = 'sound/vox/hole.wav',
+"hostile" = 'sound/vox/hostile.wav',
+"hot" = 'sound/vox/hot.wav',
+"hotel" = 'sound/vox/hotel.wav',
+"hour" = 'sound/vox/hour.wav',
+"hours" = 'sound/vox/hours.wav',
+"hundred" = 'sound/vox/hundred.wav',
+"hydro" = 'sound/vox/hydro.wav',
+"i" = 'sound/vox/i.wav',
+"idiot" = 'sound/vox/idiot.wav',
+"illegal" = 'sound/vox/illegal.wav',
+"immediate" = 'sound/vox/immediate.wav',
+"immediately" = 'sound/vox/immediately.wav',
+"in" = 'sound/vox/in.wav',
+"inches" = 'sound/vox/inches.wav',
+"india" = 'sound/vox/india.wav',
+"ing" = 'sound/vox/ing.wav',
+"inoperative" = 'sound/vox/inoperative.wav',
+"inside" = 'sound/vox/inside.wav',
+"inspection" = 'sound/vox/inspection.wav',
+"inspector" = 'sound/vox/inspector.wav',
+"interchange" = 'sound/vox/interchange.wav',
+"intruder" = 'sound/vox/intruder.wav',
+"invallid" = 'sound/vox/invallid.wav',
+"invasion" = 'sound/vox/invasion.wav',
+"is" = 'sound/vox/is.wav',
+"it" = 'sound/vox/it.wav',
+"johnson" = 'sound/vox/johnson.wav',
+"juliet" = 'sound/vox/juliet.wav',
+"key" = 'sound/vox/key.wav',
+"kill" = 'sound/vox/kill.wav',
+"kilo" = 'sound/vox/kilo.wav',
+"kit" = 'sound/vox/kit.wav',
+"lab" = 'sound/vox/lab.wav',
+"lambda" = 'sound/vox/lambda.wav',
+"laser" = 'sound/vox/laser.wav',
+"last" = 'sound/vox/last.wav',
+"launch" = 'sound/vox/launch.wav',
+"leak" = 'sound/vox/leak.wav',
+"leave" = 'sound/vox/leave.wav',
+"left" = 'sound/vox/left.wav',
+"legal" = 'sound/vox/legal.wav',
+"level" = 'sound/vox/level.wav',
+"lever" = 'sound/vox/lever.wav',
+"lie" = 'sound/vox/lie.wav',
+"lieutenant" = 'sound/vox/lieutenant.wav',
+"life" = 'sound/vox/life.wav',
+"light" = 'sound/vox/light.wav',
+"lima" = 'sound/vox/lima.wav',
+"liquid" = 'sound/vox/liquid.wav',
+"loading" = 'sound/vox/loading.wav',
+"locate" = 'sound/vox/locate.wav',
+"located" = 'sound/vox/located.wav',
+"location" = 'sound/vox/location.wav',
+"lock" = 'sound/vox/lock.wav',
+"locked" = 'sound/vox/locked.wav',
+"locker" = 'sound/vox/locker.wav',
+"lockout" = 'sound/vox/lockout.wav',
+"lower" = 'sound/vox/lower.wav',
+"lowest" = 'sound/vox/lowest.wav',
+"magnetic" = 'sound/vox/magnetic.wav',
+"main" = 'sound/vox/main.wav',
+"maintenance" = 'sound/vox/maintenance.wav',
+"malfunction" = 'sound/vox/malfunction.wav',
+"man" = 'sound/vox/man.wav',
+"mass" = 'sound/vox/mass.wav',
+"materials" = 'sound/vox/materials.wav',
+"maximum" = 'sound/vox/maximum.wav',
+"may" = 'sound/vox/may.wav',
+"medical" = 'sound/vox/medical.wav',
+"men" = 'sound/vox/men.wav',
+"mercy" = 'sound/vox/mercy.wav',
+"mesa" = 'sound/vox/mesa.wav',
+"message" = 'sound/vox/message.wav',
+"meter" = 'sound/vox/meter.wav',
+"micro" = 'sound/vox/micro.wav',
+"middle" = 'sound/vox/middle.wav',
+"mike" = 'sound/vox/mike.wav',
+"miles" = 'sound/vox/miles.wav',
+"military" = 'sound/vox/military.wav',
+"milli" = 'sound/vox/milli.wav',
+"million" = 'sound/vox/million.wav',
+"minefield" = 'sound/vox/minefield.wav',
+"minimum" = 'sound/vox/minimum.wav',
+"minutes" = 'sound/vox/minutes.wav',
+"mister" = 'sound/vox/mister.wav',
+"mode" = 'sound/vox/mode.wav',
+"motor" = 'sound/vox/motor.wav',
+"motorpool" = 'sound/vox/motorpool.wav',
+"move" = 'sound/vox/move.wav',
+"must" = 'sound/vox/must.wav',
+"nearest" = 'sound/vox/nearest.wav',
+"nice" = 'sound/vox/nice.wav',
+"nine" = 'sound/vox/nine.wav',
+"nineteen" = 'sound/vox/nineteen.wav',
+"ninety" = 'sound/vox/ninety.wav',
+"no" = 'sound/vox/no.wav',
+"nominal" = 'sound/vox/nominal.wav',
+"north" = 'sound/vox/north.wav',
+"not" = 'sound/vox/not.wav',
+"november" = 'sound/vox/november.wav',
+"now" = 'sound/vox/now.wav',
+"number" = 'sound/vox/number.wav',
+"objective" = 'sound/vox/objective.wav',
+"observation" = 'sound/vox/observation.wav',
+"of" = 'sound/vox/of.wav',
+"officer" = 'sound/vox/officer.wav',
+"ok" = 'sound/vox/ok.wav',
+"on" = 'sound/vox/on.wav',
+"one" = 'sound/vox/one.wav',
+"open" = 'sound/vox/open.wav',
+"operating" = 'sound/vox/operating.wav',
+"operations" = 'sound/vox/operations.wav',
+"operative" = 'sound/vox/operative.wav',
+"option" = 'sound/vox/option.wav',
+"order" = 'sound/vox/order.wav',
+"organic" = 'sound/vox/organic.wav',
+"oscar" = 'sound/vox/oscar.wav',
+"out" = 'sound/vox/out.wav',
+"outside" = 'sound/vox/outside.wav',
+"over" = 'sound/vox/over.wav',
+"overload" = 'sound/vox/overload.wav',
+"override" = 'sound/vox/override.wav',
+"pacify" = 'sound/vox/pacify.wav',
+"pain" = 'sound/vox/pain.wav',
+"pal" = 'sound/vox/pal.wav',
+"panel" = 'sound/vox/panel.wav',
+"percent" = 'sound/vox/percent.wav',
+"perimeter" = 'sound/vox/perimeter.wav',
+"permitted" = 'sound/vox/permitted.wav',
+"personnel" = 'sound/vox/personnel.wav',
+"pipe" = 'sound/vox/pipe.wav',
+"plant" = 'sound/vox/plant.wav',
+"platform" = 'sound/vox/platform.wav',
+"please" = 'sound/vox/please.wav',
+"point" = 'sound/vox/point.wav',
+"portal" = 'sound/vox/portal.wav',
+"power" = 'sound/vox/power.wav',
+"presence" = 'sound/vox/presence.wav',
+"press" = 'sound/vox/press.wav',
+"primary" = 'sound/vox/primary.wav',
+"proceed" = 'sound/vox/proceed.wav',
+"processing" = 'sound/vox/processing.wav',
+"progress" = 'sound/vox/progress.wav',
+"proper" = 'sound/vox/proper.wav',
+"propulsion" = 'sound/vox/propulsion.wav',
+"prosecute" = 'sound/vox/prosecute.wav',
+"protective" = 'sound/vox/protective.wav',
+"push" = 'sound/vox/push.wav',
+"quantum" = 'sound/vox/quantum.wav',
+"quebec" = 'sound/vox/quebec.wav',
+"question" = 'sound/vox/question.wav',
+"questioning" = 'sound/vox/questioning.wav',
+"quick" = 'sound/vox/quick.wav',
+"quit" = 'sound/vox/quit.wav',
+"radiation" = 'sound/vox/radiation.wav',
+"radioactive" = 'sound/vox/radioactive.wav',
+"rads" = 'sound/vox/rads.wav',
+"rapid" = 'sound/vox/rapid.wav',
+"reach" = 'sound/vox/reach.wav',
+"reached" = 'sound/vox/reached.wav',
+"reactor" = 'sound/vox/reactor.wav',
+"red" = 'sound/vox/red.wav',
+"relay" = 'sound/vox/relay.wav',
+"released" = 'sound/vox/released.wav',
+"remaining" = 'sound/vox/remaining.wav',
+"renegade" = 'sound/vox/renegade.wav',
+"repair" = 'sound/vox/repair.wav',
+"report" = 'sound/vox/report.wav',
+"reports" = 'sound/vox/reports.wav',
+"required" = 'sound/vox/required.wav',
+"research" = 'sound/vox/research.wav',
+"resevoir" = 'sound/vox/resevoir.wav',
+"resistance" = 'sound/vox/resistance.wav',
+"right" = 'sound/vox/right.wav',
+"rocket" = 'sound/vox/rocket.wav',
+"roger" = 'sound/vox/roger.wav',
+"romeo" = 'sound/vox/romeo.wav',
+"room" = 'sound/vox/room.wav',
+"round" = 'sound/vox/round.wav',
+"run" = 'sound/vox/run.wav',
+"safe" = 'sound/vox/safe.wav',
+"safety" = 'sound/vox/safety.wav',
+"sargeant" = 'sound/vox/sargeant.wav',
+"satellite" = 'sound/vox/satellite.wav',
+"save" = 'sound/vox/save.wav',
+"science" = 'sound/vox/science.wav',
+"scream" = 'sound/vox/scream.wav',
+"screen" = 'sound/vox/screen.wav',
+"search" = 'sound/vox/search.wav',
+"second" = 'sound/vox/second.wav',
+"secondary" = 'sound/vox/secondary.wav',
+"seconds" = 'sound/vox/seconds.wav',
+"sector" = 'sound/vox/sector.wav',
+"secure" = 'sound/vox/secure.wav',
+"secured" = 'sound/vox/secured.wav',
+"security" = 'sound/vox/security.wav',
+"select" = 'sound/vox/select.wav',
+"selected" = 'sound/vox/selected.wav',
+"service" = 'sound/vox/service.wav',
+"seven" = 'sound/vox/seven.wav',
+"seventeen" = 'sound/vox/seventeen.wav',
+"seventy" = 'sound/vox/seventy.wav',
+"severe" = 'sound/vox/severe.wav',
+"sewage" = 'sound/vox/sewage.wav',
+"sewer" = 'sound/vox/sewer.wav',
+"shield" = 'sound/vox/shield.wav',
+"shipment" = 'sound/vox/shipment.wav',
+"shock" = 'sound/vox/shock.wav',
+"shoot" = 'sound/vox/shoot.wav',
+"shower" = 'sound/vox/shower.wav',
+"shut" = 'sound/vox/shut.wav',
+"side" = 'sound/vox/side.wav',
+"sierra" = 'sound/vox/sierra.wav',
+"sight" = 'sound/vox/sight.wav',
+"silo" = 'sound/vox/silo.wav',
+"six" = 'sound/vox/six.wav',
+"sixteen" = 'sound/vox/sixteen.wav',
+"sixty" = 'sound/vox/sixty.wav',
+"slime" = 'sound/vox/slime.wav',
+"slow" = 'sound/vox/slow.wav',
+"soldier" = 'sound/vox/soldier.wav',
+"some" = 'sound/vox/some.wav',
+"someone" = 'sound/vox/someone.wav',
+"something" = 'sound/vox/something.wav',
+"son" = 'sound/vox/son.wav',
+"sorry" = 'sound/vox/sorry.wav',
+"south" = 'sound/vox/south.wav',
+"squad" = 'sound/vox/squad.wav',
+"square" = 'sound/vox/square.wav',
+"stairway" = 'sound/vox/stairway.wav',
+"status" = 'sound/vox/status.wav',
+"sterile" = 'sound/vox/sterile.wav',
+"sterilization" = 'sound/vox/sterilization.wav',
+"storage" = 'sound/vox/storage.wav',
+"sub" = 'sound/vox/sub.wav',
+"subsurface" = 'sound/vox/subsurface.wav',
+"sudden" = 'sound/vox/sudden.wav',
+"suit" = 'sound/vox/suit.wav',
+"superconducting" = 'sound/vox/superconducting.wav',
+"supercooled" = 'sound/vox/supercooled.wav',
+"supply" = 'sound/vox/supply.wav',
+"surface" = 'sound/vox/surface.wav',
+"surrender" = 'sound/vox/surrender.wav',
+"surround" = 'sound/vox/surround.wav',
+"surrounded" = 'sound/vox/surrounded.wav',
+"switch" = 'sound/vox/switch.wav',
+"system" = 'sound/vox/system.wav',
+"systems" = 'sound/vox/systems.wav',
+"tactical" = 'sound/vox/tactical.wav',
+"take" = 'sound/vox/take.wav',
+"talk" = 'sound/vox/talk.wav',
+"tango" = 'sound/vox/tango.wav',
+"tank" = 'sound/vox/tank.wav',
+"target" = 'sound/vox/target.wav',
+"team" = 'sound/vox/team.wav',
+"temperature" = 'sound/vox/temperature.wav',
+"temporal" = 'sound/vox/temporal.wav',
+"ten" = 'sound/vox/ten.wav',
+"terminal" = 'sound/vox/terminal.wav',
+"terminated" = 'sound/vox/terminated.wav',
+"termination" = 'sound/vox/termination.wav',
+"test" = 'sound/vox/test.wav',
+"that" = 'sound/vox/that.wav',
+"the" = 'sound/vox/the.wav',
+"then" = 'sound/vox/then.wav',
+"there" = 'sound/vox/there.wav',
+"third" = 'sound/vox/third.wav',
+"thirteen" = 'sound/vox/thirteen.wav',
+"thirty" = 'sound/vox/thirty.wav',
+"this" = 'sound/vox/this.wav',
+"those" = 'sound/vox/those.wav',
+"thousand" = 'sound/vox/thousand.wav',
+"threat" = 'sound/vox/threat.wav',
+"three" = 'sound/vox/three.wav',
+"through" = 'sound/vox/through.wav',
+"time" = 'sound/vox/time.wav',
+"to" = 'sound/vox/to.wav',
+"top" = 'sound/vox/top.wav',
+"topside" = 'sound/vox/topside.wav',
+"touch" = 'sound/vox/touch.wav',
+"towards" = 'sound/vox/towards.wav',
+"track" = 'sound/vox/track.wav',
+"train" = 'sound/vox/train.wav',
+"transportation" = 'sound/vox/transportation.wav',
+"truck" = 'sound/vox/truck.wav',
+"tunnel" = 'sound/vox/tunnel.wav',
+"turn" = 'sound/vox/turn.wav',
+"turret" = 'sound/vox/turret.wav',
+"twelve" = 'sound/vox/twelve.wav',
+"twenty" = 'sound/vox/twenty.wav',
+"two" = 'sound/vox/two.wav',
+"unauthorized" = 'sound/vox/unauthorized.wav',
+"under" = 'sound/vox/under.wav',
+"uniform" = 'sound/vox/uniform.wav',
+"unlocked" = 'sound/vox/unlocked.wav',
+"until" = 'sound/vox/until.wav',
+"up" = 'sound/vox/up.wav',
+"upper" = 'sound/vox/upper.wav',
+"uranium" = 'sound/vox/uranium.wav',
+"us" = 'sound/vox/us.wav',
+"usa" = 'sound/vox/usa.wav',
+"use" = 'sound/vox/use.wav',
+"used" = 'sound/vox/used.wav',
+"user" = 'sound/vox/user.wav',
+"vacate" = 'sound/vox/vacate.wav',
+"valid" = 'sound/vox/valid.wav',
+"vapor" = 'sound/vox/vapor.wav',
+"vent" = 'sound/vox/vent.wav',
+"ventillation" = 'sound/vox/ventillation.wav',
+"victor" = 'sound/vox/victor.wav',
+"violated" = 'sound/vox/violated.wav',
+"violation" = 'sound/vox/violation.wav',
+"voltage" = 'sound/vox/voltage.wav',
+"vox_login" = 'sound/vox/vox_login.wav',
+"walk" = 'sound/vox/walk.wav',
+"wall" = 'sound/vox/wall.wav',
+"want" = 'sound/vox/want.wav',
+"wanted" = 'sound/vox/wanted.wav',
+"warm" = 'sound/vox/warm.wav',
+"warn" = 'sound/vox/warn.wav',
+"warning" = 'sound/vox/warning.wav',
+"waste" = 'sound/vox/waste.wav',
+"water" = 'sound/vox/water.wav',
+"we" = 'sound/vox/we.wav',
+"weapon" = 'sound/vox/weapon.wav',
+"west" = 'sound/vox/west.wav',
+"whiskey" = 'sound/vox/whiskey.wav',
+"white" = 'sound/vox/white.wav',
+"wilco" = 'sound/vox/wilco.wav',
+"will" = 'sound/vox/will.wav',
+"with" = 'sound/vox/with.wav',
+"without" = 'sound/vox/without.wav',
+"woop" = 'sound/vox/woop.wav',
+"xeno" = 'sound/vox/xeno.wav',
+"yankee" = 'sound/vox/yankee.wav',
+"yards" = 'sound/vox/yards.wav',
+"year" = 'sound/vox/year.wav',
+"yellow" = 'sound/vox/yellow.wav',
+"yes" = 'sound/vox/yes.wav',
+"you" = 'sound/vox/you.wav',
+"your" = 'sound/vox/your.wav',
+"yourself" = 'sound/vox/yourself.wav',
+"zero" = 'sound/vox/zero.wav',
+"zone" = 'sound/vox/zone.wav',
+"zulu" = 'sound/vox/zulu.wav')

code/modules/mob/living/silicon/robot/component.dm

@@ -0,0 +1,145 @@
+// TODO: remove the robot.mmi and robot.cell variables and completely rely on the robot component system
+
+/datum/robot_component/var/name
+/datum/robot_component/var/installed = 0
+/datum/robot_component/var/powered = 0
+/datum/robot_component/var/toggled = 1
+/datum/robot_component/var/brute_damage = 0
+/datum/robot_component/var/electronics_damage = 0
+/datum/robot_component/var/energy_consumption = 0
+/datum/robot_component/var/max_damage = 30
+/datum/robot_component/var/mob/living/silicon/robot/owner
+
+// The actual device object that has to be installed for this.
+/datum/robot_component/var/external_type = null
+
+// The wrapped device(e.g. radio), only set if external_type isn't null
+/datum/robot_component/var/obj/item/wrapped = null
+
+/datum/robot_component/New(mob/living/silicon/robot/R)
+	src.owner = R
+
+/datum/robot_component/proc/install()
+/datum/robot_component/proc/uninstall()
+
+/datum/robot_component/proc/destroy()
+	if(wrapped)
+		del wrapped
+
+
+	wrapped = new/obj/item/broken_device
+
+	// The thing itself isn't there anymore, but some fried remains are.
+	installed = -1
+	uninstall()
+
+/datum/robot_component/proc/take_damage(brute, electronics, sharp)
+	if(installed != 1) return
+
+	brute_damage += brute
+	electronics_damage += electronics
+
+	if(brute_damage + electronics_damage > max_damage) destroy()
+
+/datum/robot_component/proc/heal_damage(brute, electronics)
+	if(installed != 1)
+		// If it's not installed, can't repair it.
+		return 0
+
+	brute_damage = max(0, brute_damage - brute)
+	electronics_damage = max(0, electronics_damage - electronics)
+
+/datum/robot_component/proc/is_powered()
+	return installed == 1 && (!energy_consumption || powered)
+
+
+/datum/robot_component/proc/consume_power()
+	if(toggled == 0)
+		powered = 0
+		return
+	if(owner.cell.charge >= energy_consumption)
+		owner.cell.use(energy_consumption)
+		powered = 1
+	else
+		powered = 0
+
+
+/datum/robot_component/actuator
+	name = "actuator"
+	energy_consumption = 2
+	external_type = /obj/item/robot_parts/robot_component/actuator
+	max_damage = 60
+
+/datum/robot_component/cell
+	name = "power cell"
+	max_damage = 60
+
+/datum/robot_component/cell/destroy()
+	..()
+	owner.cell = null
+
+/datum/robot_component/radio
+	name = "radio"
+	external_type = /obj/item/robot_parts/robot_component/radio
+	energy_consumption = 3
+	max_damage = 10
+
+/datum/robot_component/binary_communication
+	name = "binary communication device"
+	external_type = /obj/item/robot_parts/robot_component/binary_communication_device
+	energy_consumption = 0
+	max_damage = 30
+
+/datum/robot_component/camera
+	name = "camera"
+	external_type = /obj/item/robot_parts/robot_component/camera
+	energy_consumption = 2
+	max_damage = 20
+
+/datum/robot_component/diagnosis_unit
+	name = "self-diagnosis unit"
+	energy_consumption = 1
+	external_type = /obj/item/robot_parts/robot_component/diagnosis_unit
+	max_damage = 30
+
+/mob/living/silicon/robot/proc/initialize_components()
+	// This only initializes the components, it doesn't set them to installed.
+
+	components["actuator"] = new/datum/robot_component/actuator(src)
+	components["radio"] = new/datum/robot_component/radio(src)
+	components["power cell"] = new/datum/robot_component/cell(src)
+	components["diagnosis unit"] = new/datum/robot_component/diagnosis_unit(src)
+	components["camera"] = new/datum/robot_component/camera(src)
+	components["comms"] = new/datum/robot_component/binary_communication(src)
+
+/mob/living/silicon/robot/proc/is_component_functioning(module_name)
+	var/datum/robot_component/C = components[module_name]
+	return C && C.installed == 1 && C.toggled && C.is_powered()
+
+/obj/item/broken_device
+	name = "broken component"
+	icon = 'robot_component.dmi'
+	icon_state = "broken"
+
+/obj/item/robot_parts/robot_component
+	icon = 'robot_component.dmi'
+	icon_state = "working"
+	construction_time = 200
+	construction_cost = list("metal"=5000)
+
+
+// TODO: actual icons ;)
+/obj/item/robot_parts/robot_component/binary_communication_device
+	name = "binary communication device"
+
+/obj/item/robot_parts/robot_component/actuator
+	name = "actuator"
+
+/obj/item/robot_parts/robot_component/camera
+	name = "camera"
+
+/obj/item/robot_parts/robot_component/diagnosis_unit
+	name = "diagnosis unit"
+
+/obj/item/robot_parts/robot_component/radio
+	name = "radio"

code/modules/mob/living/silicon/robot/life.dm

@@ -37,23 +37,25 @@
 
 /mob/living/silicon/robot/proc/use_power()
 
-	if (src.cell)
+	if (is_component_functioning("power cell"))
 		if(src.cell.charge <= 0)
 			uneq_all()
 			src.stat = 1
-		else if (src.cell.charge <= 100)
-			uneq_all()
-			src.sight_mode = 0
-			src.cell.use(1)
 		else
 			if(src.module_state_1)
-				src.cell.use(5)
+				src.cell.use(3)
 			if(src.module_state_2)
-				src.cell.use(5)
+				src.cell.use(3)
 			if(src.module_state_3)
-				src.cell.use(5)
-			src.cell.use(1)
-			src.blinded = 0
+				src.cell.use(3)
+
+			for(var/V in components)
+				var/datum/robot_component/C = components[V]
+				C.consume_power()
+
+			if(!is_component_functioning("actuator"))
+				Paralyse(3)
+
 			src.stat = 0
 	else
 		uneq_all()
@@ -128,6 +130,17 @@
 		src.druggy--
 		src.druggy = max(0, src.druggy)
 
+	if(!is_component_functioning("radio"))
+		radio.on = 0
+	else
+		radio.on = 1
+
+	if(is_component_functioning("camera"))
+		src.blinded = 0
+	else
+		src.blinded = 1
+
+
 	return 1
 
 /mob/living/silicon/robot/proc/handle_regular_hud_updates()

code/modules/mob/living/silicon/robot/robot.dm

@@ -27,6 +27,9 @@
 	var/obj/item/weapon/cell/cell = null
 	var/obj/machinery/camera/camera = null
 
+	// Components are basically robot organs.
+	var/list/components = list()
+
 	var/obj/item/device/mmi/mmi = null
 
 	var/obj/item/device/pda/ai/rbPDA = null
@@ -58,7 +61,7 @@
 	var/braintype = "Cyborg"
 	var/pose
 
-/mob/living/silicon/robot/New(loc,var/syndie = 0)
+/mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0)
 	spark_system = new /datum/effect/effect/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
@@ -67,12 +70,10 @@
 	updatename("Default")
 	updateicon()
 
-	if(!cell)
-		cell = new /obj/item/weapon/cell(src)
-		cell.maxcharge = 7500
-		cell.charge = 7500
-
 	if(syndie)
+		if(!cell)
+			cell = new /obj/item/weapon/cell(src)
+
 		laws = new /datum/ai_laws/antimov()
 		lawupdate = 0
 		scrambledcodes = 1
@@ -99,6 +100,25 @@
 		camera.network = list("SS13")
 		if(isWireCut(5)) // 5 = BORG CAMERA
 			camera.status = 0
+
+	initialize_components()
+	if(!unfinished)
+		// Create all the robot parts.
+		for(var/V in components) if(V != "power cell")
+			var/datum/robot_component/C = components[V]
+			C.installed = 1
+			C.wrapped = new C.external_type
+
+		if(!cell)
+			cell = new /obj/item/weapon/cell(src)
+			cell.maxcharge = 7500
+			cell.charge = 7500
+
+	if(cell)
+		var/datum/robot_component/cell_component = components["power cell"]
+		cell_component.wrapped = cell
+		cell_component.installed = 1
+
 	..()
 
 	playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
@@ -132,12 +152,21 @@
 			module = new /obj/item/weapon/robot_module/standard(src)
 			hands.icon_state = "standard"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Standard")
-			switch(icontype)
-				if("Basic")	icon_state = "robot_old"
-				if("Lucy") icon_state = "rowtree-lucy"
-				else		icon_state = "robot"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Basic", "Standard")
+				switch(icontype)
+					if("Basic")	icon_state = "robot_old"
+					if("Lucy") icon_state = "rowtree-lucy"
+					else		icon_state = "robot"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Stand"
 			feedback_inc("cyborg_standard",1)
 
@@ -146,15 +175,24 @@
 			module = new /obj/item/weapon/robot_module/butler(src)
 			hands.icon_state = "service"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Bro", "Butler", "Kent", "Rich")
-			switch(icontype)
-				if("Waitress")	icon_state = "Service"
-				if("Kent")		icon_state = "toiletbot"
-				if("Bro")		icon_state = "Brobot"
-				if("Rich")		icon_state = "maximillion"
-				if("Lucy")		icon_state = "rowtree-lucy"
-				else				icon_state = "Service2"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Waitress", "Bro", "Butler", "Kent", "Rich")
+				switch(icontype)
+					if("Waitress")	icon_state = "Service"
+					if("Kent")		icon_state = "toiletbot"
+					if("Bro")		icon_state = "Brobot"
+					if("Rich")		icon_state = "maximillion"
+					if("Lucy")		icon_state = "rowtree-lucy"
+					else				icon_state = "Service2"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Butler"
 			feedback_inc("cyborg_service",1)
 
@@ -163,13 +201,22 @@
 			module = new /obj/item/weapon/robot_module/miner(src)
 			hands.icon_state = "miner"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Treadhead")
-			switch(icontype)
-				if("Basic")	icon_state = "Miner_old"
-				if("Advanced Droid")	icon_state = "droid-miner"
-				if("Lucy")		icon_state = "rowtree-lucy"
-				else		icon_state = "Miner"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Basic", "Advanced Droid", "Treadhead")
+				switch(icontype)
+					if("Basic")	icon_state = "Miner_old"
+					if("Advanced Droid")	icon_state = "droid-miner"
+					if("Lucy")		icon_state = "rowtree-lucy"
+					else		icon_state = "Miner"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Miner"
 			feedback_inc("cyborg_miner",1)
 			channels = list("Mining" = 1)
@@ -179,14 +226,23 @@
 			module = new /obj/item/weapon/robot_module/medical(src)
 			hands.icon_state = "medical"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Advanced Droid", "Needles", "Hoverbot")
-			switch(icontype)
-				if("Basic")	icon_state = "Medbot"
-				if("Advanced Droid")	icon_state = "droid-medical"
-				if("Needles")	icon_state = "medicalrobot"
-				if("Lucy")		icon_state = "rowtree-medical"
-				else		icon_state = "surgeon"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Basic", "Advanced Droid", "Needles", "Hoverbot")
+				switch(icontype)
+					if("Basic")	icon_state = "Medbot"
+					if("Advanced Droid")	icon_state = "droid-medical"
+					if("Needles")	icon_state = "medicalrobot"
+					if("Lucy")		icon_state = "rowtree-medical"
+					else		icon_state = "surgeon"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Med"
 			status_flags &= ~CANPUSH
 			feedback_inc("cyborg_medical",1)
@@ -197,14 +253,23 @@
 			module = new /obj/item/weapon/robot_module/security(src)
 			hands.icon_state = "security"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Red Knight", "Black Knight", "Bloodhound")
-			switch(icontype)
-				if("Basic")	icon_state = "secborg"
-				if("Red Knight")	icon_state = "Security"
-				if("Black Knight")	icon_state = "securityrobot"
-				if("Lucy")		icon_state = "rowtree-security"
-				else		icon_state = "bloodhound"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Basic", "Red Knight", "Black Knight", "Bloodhound")
+				switch(icontype)
+					if("Basic")	icon_state = "secborg"
+					if("Red Knight")	icon_state = "Security"
+					if("Black Knight")	icon_state = "securityrobot"
+					if("Lucy")		icon_state = "rowtree-security"
+					else		icon_state = "bloodhound"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Sec"
 			//speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary
 			status_flags &= ~CANPUSH
@@ -216,13 +281,22 @@
 			module = new /obj/item/weapon/robot_module/engineering(src)
 			hands.icon_state = "engineer"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Antique", "Landmate")
-			switch(icontype)
-				if("Basic")	icon_state = "Engineering"
-				if("Antique") icon_state = "engineerrobot"
-				if("Lucy")		icon_state = "rowtree-engineering"
-				else		icon_state = "landmate"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Basic", "Antique", "Landmate")
+				switch(icontype)
+					if("Basic")	icon_state = "Engineering"
+					if("Antique") icon_state = "engineerrobot"
+					if("Lucy")		icon_state = "rowtree-engineering"
+					else		icon_state = "landmate"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Eng"
 			feedback_inc("cyborg_engineering",1)
 			channels = list("Engineering" = 1)
@@ -232,13 +306,22 @@
 			module = new /obj/item/weapon/robot_module/janitor(src)
 			hands.icon_state = "janitor"
 			var/icontype
-			if (src.name == "Lucy" && src.ckey == "rowtree") icontype = ("Lucy")
-			else icontype = input("Select an icon!", "Robot", null, null) in list("Basic", "Mopbot", "Zamboni")
-			switch(icontype)
-				if("Basic")	icon_state = "JanBot2"
-				if("Mopbot") icon_state = "janitorrobot"
-				if("Lucy")		icon_state = "rowtree-lucy"
-				else		icon_state = "mopgearrex"
+			var/triesleft = 6
+			while (triesleft)
+				triesleft--
+				if (src.name == "Lucy" && src.ckey == "rowtree")
+					icontype = ("Lucy")
+					triesleft = 0
+				else icontype = input("Select an icon! [triesleft ? "You would have [triesleft] more tries." : "This is your last try."]", "Robot", null, null) in list("Basic", "Mopbot", "Zamboni")
+				switch(icontype)
+					if("Basic")	icon_state = "JanBot2"
+					if("Mopbot") icon_state = "janitorrobot"
+					if("Lucy")		icon_state = "rowtree-lucy"
+					else		icon_state = "mopgearrex"
+				if(triesleft)
+					switch(input("Look at your icon - is this what you want?") in list("Yes","No"))
+						if("Yes")
+							triesleft = 0
 			modtype = "Jan"
 			feedback_inc("cyborg_janitor",1)
 
@@ -262,10 +345,14 @@
 		changed_name = "[(prefix ? "[prefix] " : "")][braintype]-[num2text(ident)]"
 	real_name = changed_name
 	name = real_name
-	
+
 	// if we've changed our name, we also need to update the display name for our PDA
 	setup_PDA()
 
+	//We also need to update name of internal camera.
+	if (camera)
+		camera.c_tag = changed_name
+
 /mob/living/silicon/robot/verb/Namepick()
 	if(custom_name)
 		return 0
@@ -314,6 +401,53 @@
 	viewalerts = 1
 	src << browse(dat, "window=robotalerts&can_close=0")
 
+/mob/living/silicon/robot/proc/self_diagnosis()
+	if(!is_component_functioning("diagnosis unit"))
+		return null
+
+	var/dat = "<HEAD><TITLE>[src.name] Self-Diagnosis Report</TITLE></HEAD><BODY>\n"
+	for (var/V in components)
+		var/datum/robot_component/C = components[V]
+		dat += "<b>[C.name]</b><br><table><tr><td>Power consumption</td><td>[C.energy_consumption]</td></tr><tr><td>Brute Damage:</td><td>[C.brute_damage]</td></tr><tr><td>Electronics Damage:</td><td>[C.electronics_damage]</td></tr><tr><td>Powered:</td><td>[(!C.energy_consumption || C.is_powered()) ? "Yes" : "No"]</td></tr><tr><td>Toggled:</td><td>[ C.toggled ? "Yes" : "No"]</td></table><br>"
+
+	return dat
+
+
+/mob/living/silicon/robot/verb/self_diagnosis_verb()
+	set category = "Robot Commands"
+	set name = "Self Diagnosis"
+
+	if(!is_component_functioning("diagnosis unit"))
+		src << "\red Your self-diagnosis component isn't functioning."
+
+	var/dat = self_diagnosis()
+	src << browse(dat, "window=robotdiagnosis")
+
+
+/mob/living/silicon/robot/verb/toggle_component()
+	set category = "Robot Commands"
+	set name = "Toggle Component"
+	set desc = "Toggle a component, conserving power."
+
+	var/list/installed_components = list()
+	for(var/V in components)
+		if(V == "power cell") continue
+		var/datum/robot_component/C = components[V]
+		if(C.installed)
+			installed_components += V
+
+	var/toggle = input(src, "Which component do you want to toggle?", "Toggle Component") as null|anything in installed_components
+	if(!toggle)
+		return
+
+	var/datum/robot_component/C = components[toggle]
+	if(C.toggled)
+		C.toggled = 0
+		src << "\red You disable [C.name]."
+	else
+		C.toggled = 1
+		src << "\red You enable [C.name]."
+
 /mob/living/silicon/robot/blob_act()
 	if (stat != 2)
 		adjustBruteLoss(60)
@@ -497,7 +631,24 @@
 	if (istype(W, /obj/item/weapon/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
 		return
 
+	if(opened) // Are they trying to insert something?
+		for(var/V in components)
+			var/datum/robot_component/C = components[V]
+			if(!C.installed && istype(W, C.external_type))
+				C.installed = 1
+				C.wrapped = W
+				C.install()
+				user.drop_item()
+				W.loc = null
+
+				usr << "\blue You install the [W.name]."
+
+				return
+
 	if (istype(W, /obj/item/weapon/weldingtool))
+		if (!getBruteLoss())
+			user << "Nothing to fix here!"
+			return
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0))
 			adjustBruteLoss(-30)
@@ -510,6 +661,9 @@
 			return
 
 	else if(istype(W, /obj/item/weapon/cable_coil) && wiresexposed)
+		if (!getFireLoss())
+			user << "Nothing to fix here!"
+			return
 		var/obj/item/weapon/cable_coil/coil = W
 		adjustFireLoss(-30)
 		updatehealth()
@@ -536,6 +690,27 @@
 				C.updateicon()
 				new/obj/item/robot_parts/chest(loc)
 				src.Del()
+			else
+				// Okay we're not removing the cell or an MMI, but maybe something else?
+				var/list/removable_components = list()
+				for(var/V in components)
+					if(V == "power cell") continue
+					var/datum/robot_component/C = components[V]
+					if(C.installed == 1)
+						removable_components += V
+
+				var/remove = input(user, "Which component do you want to pry out?", "Remove Component") as null|anything in removable_components
+				if(!remove)
+					return
+				var/datum/robot_component/C = components[remove]
+				var/obj/item/I = C.wrapped
+				user << "You remove \the [I]."
+				I.loc = src.loc
+
+				if(C.installed == 1)
+					C.uninstall()
+				C.installed = 0
+
 		else
 			if(locked)
 				user << "The cover is locked and cannot be opened."
@@ -545,17 +720,20 @@
 				updateicon()
 
 	else if (istype(W, /obj/item/weapon/cell) && opened)	// trying to put a cell inside
+		var/datum/robot_component/C = components["power cell"]
 		if(wiresexposed)
 			user << "Close the panel first."
-		else if(cell)
+		else if(cell || C.installed)
 			user << "There is a power cell already installed."
 		else
 			user.drop_item()
 			W.loc = src
 			cell = W
 			user << "You insert the power cell."
-//			chargecount = 0
-		updateicon()
+
+			C.installed = 1
+			C.wrapped = W
+			C.install()
 
 	else if (istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/multitool))
 		if (wiresexposed)
@@ -828,6 +1006,7 @@
 	add_fingerprint(user)
 
 	if(opened && !wiresexposed && (!istype(user, /mob/living/silicon)))
+		var/datum/robot_component/cell_component = components["power cell"]
 		if(cell)
 			cell.updateicon()
 			cell.add_fingerprint(user)
@@ -835,6 +1014,11 @@
 			user << "You remove \the [cell]."
 			cell = null
 			updateicon()
+		else if(cell_component.installed == -1)
+			cell_component.installed = 0
+			var/obj/item/broken_device = cell_component.wrapped
+			user << "You remove \the [broken_device]."
+			user.put_in_active_hand(broken_device)
 
 	if(ishuman(user))
 		if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)

code/modules/mob/living/silicon/robot/robot_damage.dm

@@ -0,0 +1,83 @@
+/mob/living/silicon/robot/getBruteLoss()
+	var/amount = 0
+	for(var/V in components)
+		var/datum/robot_component/C = components[V]
+		if(C.installed == 1) amount += C.brute_damage
+	return amount
+
+/mob/living/silicon/robot/getFireLoss()
+	var/amount = 0
+	for(var/V in components)
+		var/datum/robot_component/C = components[V]
+		if(C.installed == 1) amount += C.electronics_damage
+	return amount
+
+
+/mob/living/silicon/robot/adjustBruteLoss(var/amount)
+	if(amount > 0)
+		take_overall_damage(amount, 0)
+	else
+		heal_overall_damage(-amount, 0)
+
+/mob/living/silicon/robot/adjustFireLoss(var/amount)
+	if(amount > 0)
+		take_overall_damage(0, amount)
+	else
+		heal_overall_damage(0, -amount)
+
+/mob/living/silicon/robot/proc/get_damaged_components(var/brute, var/burn)
+	var/list/datum/robot_component/parts = list()
+	for(var/V in components)
+		var/datum/robot_component/C = components[V]
+		if(C.installed == 1) if((brute && C.brute_damage) || (burn && C.electronics_damage))
+			parts += C
+	return parts
+
+/mob/living/silicon/robot/proc/get_damageable_components()
+	var/list/rval = new
+	for(var/V in components)
+		var/datum/robot_component/C = components[V]
+		if(C.installed == 1) rval += C
+	return rval
+
+/mob/living/silicon/robot/heal_organ_damage(var/brute, var/burn)
+	var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
+	if(!parts.len)	return
+	var/datum/robot_component/picked = pick(parts)
+	picked.heal_damage(brute,burn)
+
+/mob/living/silicon/robot/take_organ_damage(var/brute, var/burn, var/sharp = 0)
+	var/datum/robot_component/C = pick(get_damageable_components())
+	C.take_damage(brute,burn,sharp)
+
+/mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn)
+	var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
+
+	while(parts.len && (brute>0 || burn>0) )
+		var/datum/robot_component/picked = pick(parts)
+
+		var/brute_was = picked.brute_damage
+		var/burn_was = picked.electronics_damage
+
+		picked.heal_damage(brute,burn)
+
+		brute -= (brute_was-picked.brute_damage)
+		burn -= (burn_was-picked.electronics_damage)
+
+		parts -= picked
+
+/mob/living/silicon/robot/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/used_weapon = null)
+	if(status_flags & GODMODE)	return	//godmode
+	var/list/datum/robot_component/parts = get_damageable_components()
+	while(parts.len && (brute>0 || burn>0) )
+		var/datum/robot_component/picked = pick(parts)
+
+		var/brute_was = picked.brute_damage
+		var/burn_was = picked.electronics_damage
+
+		picked.take_damage(brute,burn)
+
+		brute	-= (picked.brute_damage - brute_was)
+		burn	-= (picked.electronics_damage - burn_was)
+
+		parts -= picked

code/modules/mob/living/silicon/say.dm

@@ -24,6 +24,14 @@
 				return ..(message)
 			message = copytext(message, 3)
 			message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+			// TODO: move the component system up to silicon so we don't have to use this ugly hack..
+			if(istype(src, /mob/living/silicon/robot))
+				var/mob/living/silicon/robot/R = src
+				if(!R.is_component_functioning("comms"))
+					src << "\red Your binary communications component isn't functional."
+					return
+
 			robot_talk(message)
 		else if (department_radio_keys[prefix] == "department")
 			if(isAI(src)&&client)//For patching directly into AI holopads.

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -96,7 +96,7 @@
 		AdjustParalysis(-1)
 
 	//Movement
-	if(!client && !stop_automated_movement && wander)
+	if(!client && !stop_automated_movement && wander && !anchored)
 		if(isturf(src.loc) && !resting && !buckled && canmove)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
 			turns_since_move++
 			if(turns_since_move >= turns_per_move)

code/modules/mob/living/simple_animal/vox.dm

@@ -0,0 +1,161 @@
+/mob/living/simple_animal/vox/armalis/
+
+	name = "serpentine alien"
+	real_name = "serpentine alien"
+	desc = "A one-eyed, serpentine creature, half-machine, easily nine feet from tail to beak!"
+	icon = 'icons/mob/vox.dmi'
+	icon_state = "armalis"
+	icon_living = "armalis"
+	maxHealth = 500
+	health = 500
+	response_harm = "slashes at the"
+	harm_intent_damage = 0
+	melee_damage_lower = 30
+	melee_damage_upper = 40
+	attacktext = "slammed its enormous claws into"
+	speed = -1
+	wall_smash = 1
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	status_flags = 0
+	universal_speak = 1
+	vox_talk_understand = 1
+
+	var/armour = null
+	var/amp = null
+	var/quills = 3
+
+/mob/living/simple_animal/vox/armalis/Die()
+
+	living_mob_list -= src
+	dead_mob_list += src
+	stat = DEAD
+	visible_message("\red <B>[src] shudders violently and explodes!</B>","\red <B>You feel your body rupture!</B>")
+	explosion(get_turf(loc), -1, -1, 3, 5)
+	src.gib()
+	return
+
+/mob/living/simple_animal/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(O.force)
+		if(O.force >= 25)
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			health -= damage
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
+	else
+		usr << "\red This weapon is ineffective, it does no damage."
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+/mob/living/simple_animal/vox/armalis/verb/fire_quill(mob/target as mob in oview())
+
+	set name = "Fire quill"
+	set desc = "Fires a viciously pointed quill at a high speed."
+	set category = "Alien"
+
+	if(quills<=0)
+		return
+
+	src << "\red You launch a razor-sharp quill at [target]!"
+	for(var/mob/O in oviewers())
+		if ((O.client && !( O.blinded )))
+			O << "\red [src] launches a razor-sharp quill at [target]!"
+
+	var/obj/item/weapon/arrow/quill/Q = new(loc)
+	Q.fingerprintslast = src.ckey
+	Q.throw_at(target,10,20)
+	quills--
+
+	spawn(100)
+		src << "\red You feel a fresh quill slide into place."
+		quills++
+
+/mob/living/simple_animal/vox/armalis/verb/message_mob()
+	set category = "Alien"
+	set name = "Commune with creature"
+	set desc = "Send a telepathic message to an unlucky recipient."
+
+	var/list/targets = list()
+	var/target = null
+	var/text = null
+
+	targets += getmobs() //Fill list, prompt user with list
+	target = input("Select a creature!", "Speak to creature", null, null) as null|anything in targets
+	text = input("What would you like to say?", "Speak to creature", null, null)
+
+	if (!target || !text)
+		return
+
+	var/mob/M = targets[target]
+
+	if(istype(M, /mob/dead/observer) || M.stat == DEAD)
+		src << "Not even the armalis can speak to the dead."
+		return
+
+	M << "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"
+	if(istype(M,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		if(H.dna.mutantrace == "vox")
+			return
+		H << "\red Your nose begins to bleed..."
+		H.drip(1)
+
+/mob/living/simple_animal/vox/armalis/verb/shriek()
+	set category = "Alien"
+	set name = "Shriek"
+	set desc = "Give voice to a psychic shriek."
+
+/mob/living/simple_animal/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O,/obj/item/vox/armalis_armour))
+		user.drop_item()
+		armour = O
+		speed = 1
+		maxHealth += 200
+		health += 200
+		O.loc = src
+		visible_message("\blue [src] is quickly outfitted in [O] by [user].","\blue You quickly outfit [src] in [O].")
+		regenerate_icons()
+		return
+	if(istype(O,/obj/item/vox/armalis_amp))
+		user.drop_item()
+		amp = O
+		O.loc = src
+		visible_message("\blue [src] is quickly outfitted in [O] by [user].","\blue You quickly outfit [src] in [O].")
+		regenerate_icons()
+		return
+	return ..()
+
+/mob/living/simple_animal/vox/armalis/regenerate_icons()
+
+	overlays = list()
+	if(armour)
+		var/icon/armour = image('icons/mob/vox.dmi',"armour")
+		speed = 1
+		overlays += armour
+	if(amp)
+		var/icon/amp = image('icons/mob/vox.dmi',"amplifier")
+		overlays += amp
+	return
+
+/obj/item/vox/armalis_armour
+
+	name = "strange armour"
+	desc = "Hulking reinforced armour for something huge."
+	icon = 'icons/obj/clothing/suits.dmi'
+	icon_state = "armalis_armour"
+	item_state = "armalis_armour"
+
+/obj/item/vox/armalis_amp
+
+	name = "strange lenses"
+	desc = "A series of metallic lenses and chains."
+	icon = 'icons/obj/clothing/hats.dmi'
+	icon_state = "amp"
+	item_state = "amp"

code/modules/mob/mob.dm

@@ -583,24 +583,29 @@ var/list/slot_equipment_priority = list( \
 		pulling = null
 
 /mob/proc/start_pulling(var/atom/movable/AM)
+
 	if ( !AM || !usr || src==AM || !isturf(src.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
 		return
-	if (!( AM.anchored ))
-		if(pulling)
-			var/pulling_old = pulling
-			stop_pulling()
-			// Are we pulling the same thing twice? Just stop pulling.
-			if(pulling_old == AM)
-				return
-		src.pulling = AM
-		AM.pulledby = src
-		if(ismob(AM))
-			var/mob/M = AM
-			if(!iscarbon(src))
-				M.LAssailant = null
-			else
-				M.LAssailant = usr
 
+	if (AM.anchored)
+		return
+
+	var/mob/M = AM
+	if(ismob(AM))
+		if(!iscarbon(src))
+			M.LAssailant = null
+		else
+			M.LAssailant = usr
+
+	if(pulling)
+		var/pulling_old = pulling
+		stop_pulling()
+		// Are we pulling the same thing twice? Just stop pulling.
+		if(pulling_old == AM)
+			return
+
+	src.pulling = AM
+	AM.pulledby = src
 
 /mob/proc/can_use_hands()
 	return
@@ -888,3 +893,66 @@ note dizziness decrements automatically in the mob's Life() proc.
 
 /mob/proc/flash_weak_pain()
 	flick("weak_pain",pain)
+
+mob/verb/yank_out_object()
+	set category = "Object"
+	set name = "Yank out object"
+	set desc = "Remove an embedded item at the cost of bleeding and pain."
+	set src in view(1)
+
+	if(!isliving(usr) || usr.next_move > world.time)
+		return
+	usr.next_move = world.time + 20
+
+	if(usr.stat == 1)
+		usr << "You are unconcious and cannot do that!"
+		return
+
+	if(usr.restrained())
+		usr << "You are restrained and cannot do that!"
+		return
+
+	var/mob/S = src
+	var/mob/U = usr
+	var/list/valid_objects = list()
+	var/self = null
+
+	if(S == U)
+		self = 1 // Removing object from yourself.
+
+	for(var/obj/item/weapon/W in embedded)
+		if(W.w_class >= 2)
+			valid_objects += W
+
+	if(!valid_objects.len)
+		if(self)
+			src << "You have nothing stuck in your body that is large enough to remove."
+		else
+			U << "[src] has nothing stuck in their wounds that is large enough to remove."
+		return
+
+	var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects
+
+	if(self)
+		src << "<span class='warning'>You attempt to get a good grip on the [selection] in your body.</span>"
+	else
+		U << "<span class='warning'>You attempt to get a good grip on the [selection] in [S]'s body.</span>"
+
+	if(!do_after(U, 80))
+		return
+	if(!selection || !S || !U)
+		return
+
+	if(self)
+		visible_message("<span class='warning'><b>[src] rips [selection] out of their body.</b></span>","<span class='warning'><b>You rip [selection] out of your body.</b></span>")
+	else
+		visible_message("<span class='warning'><b>[usr] rips [selection] out of [src]'s body.</b></span>","<span class='warning'><b>[src] rips [selection] out of your body.</b></span>")
+
+	selection.loc = get_turf(src)
+
+	for(var/obj/item/weapon/O in pinned)
+		if(O == selection)
+			pinned -= O
+		if(!pinned.len)
+			anchored = 0
+	return 1

code/modules/mob/mob_defines.dm

@@ -85,6 +85,8 @@
 	var/lastpuke = 0
 	var/unacidable = 0
 	var/small = 0
+	var/list/pinned = list() //List of things pinning this creature to walls (see living_defense.dm)
+	var/list/embedded = list() //Embedded items, since simple mobs don't have organs.
 
 	var/name_archive //For admin things like possession
 
@@ -206,12 +208,13 @@
 
 	//Whether or not mobs can understand other mobtypes. These stay in /mob so that ghosts can hear everything.
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
-	var/robot_talk_understand = 0
-	var/alien_talk_understand = 0
-	var/tajaran_talk_understand = 0
-	var/soghun_talk_understand = 0
-	var/skrell_talk_understand = 0
-	var/vox_talk_understand = 0
+	var/robot_talk_understand		= 0
+	var/alien_talk_understand		= 0
+	var/tajaran_talk_understand		= 0
+	var/soghun_talk_understand		= 0
+	var/skrell_talk_understand		= 0
+	var/vox_talk_understand			= 0
+	var/kidan_talk_understand		= 0
 
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand

code/modules/mob/mob_movement.dm

@@ -256,7 +256,6 @@
 
 	if(!mob.canmove)	return
 
-
 	//if(istype(mob.loc, /turf/space) || (mob.flags & NOGRAV))
 	//	if(!mob.Process_Spacemove(0))	return 0
 
@@ -279,6 +278,10 @@
 					src << "\blue You're restrained! You can't move!"
 					return 0
 
+		if(mob.pinned.len)
+			src << "\blue You're pinned to a wall by [mob.pinned[1]]!"
+			return 0
+
 		move_delay = world.time//set move delay
 		mob.last_move_intent = world.time + 10
 		switch(mob.m_intent)

code/modules/mob/new_player/new_player.dm

@@ -314,8 +314,10 @@
 		if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
 			if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled
 				dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
-			if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300) //Shuttle is past the point of no recall
+			if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300 && emergency_shuttle.alert == 0) // Emergency shuttle is past the point of no recall
 				dat += "<font color='red'>The station is currently undergoing evacuation procedures.</font><br>"
+			if(emergency_shuttle.direction == 1 && emergency_shuttle.alert == 1) // Crew transfer initiated
+				dat += "<font color='red'>The station is currently undergoing crew transfer procedures.</font><br>"
 
 		dat += "Choose from the following open positions:<br>"
 		for(var/datum/job/job in job_master.occupations)
@@ -349,10 +351,10 @@
 			if(is_alien_whitelisted(src, "Skrell"|| !config.usealienwhitelist))
 				new_character.dna.mutantrace = "skrell"
 				new_character.skrell_talk_understand = 1
-		if(client.prefs.species == "Vox")
-			if(is_alien_whitelisted(src, "Vox"|| !config.usealienwhitelist))
-				new_character.dna.mutantrace = "vox"
-				new_character.vox_talk_understand = 1
+		if(client.prefs.species == "Kidan")
+			if(is_alien_whitelisted(src, "Kidan"|| !config.usealienwhitelist))
+				new_character.dna.mutantrace = "kidan"
+				new_character.kidan_talk_understand = 1
 
 		if(ticker.random_players)
 			new_character.gender = pick(MALE, FEMALE)

code/modules/mob/new_player/preferences_setup.dm

@@ -144,9 +144,10 @@ datum/preferences
 				icobase = 'icons/mob/human_races/r_lizard.dmi'
 			if("Skrell")
 				icobase = 'icons/mob/human_races/r_skrell.dmi'
-
 			if("Vox")
 				icobase = 'icons/mob/human_races/r_vox.dmi'
+			if("Kidan")
+				icobase = 'icons/mob/human_races/r_kidan.dmi'
 
 			else
 				icobase = 'icons/mob/human_races/r_human.dmi'
@@ -430,6 +431,19 @@ datum/preferences
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ROBOTICIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
 		else if(job_engsec_high)
 			switch(job_engsec_high)
@@ -537,19 +551,7 @@ datum/preferences
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(ROBOTICIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
 				if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
 					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)

code/modules/mob/new_player/sprite_accessories.dm

@@ -285,7 +285,6 @@
 		icon_state = "hair_e"
 		gender = MALE // turnoff!
 
-
 	bald
 		name = "Bald"
 		icon_state = "bald"
@@ -306,7 +305,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox")
+		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Kidan")
 
 	watson
 		name = "Watson Mustache"
@@ -484,7 +483,7 @@
 		species_allowed = list("Tajaran")
 
 	taj_ears_spiky
-		name = "Tajara  Spiky"
+		name = "Tajara Spiky"
 		icon_state = "hair_tajspiky"
 		species_allowed = list("Tajaran")
 

code/modules/mob/say.dm

@@ -69,7 +69,7 @@
 		return 1
 	return 0
 
-/mob/proc/say_quote(var/text,var/is_speaking_soghun,var/is_speaking_skrell,var/is_speaking_tajaran,var/is_speaking_vox)
+/mob/proc/say_quote(var/text,var/is_speaking_soghun,var/is_speaking_skrell,var/is_speaking_tajaran,var/is_speaking_vox,var/is_speaking_kidan)
 	if(!text)
 		return "says, \"...\"";	//not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
 		//tcomms code is still runtiming somewhere here
@@ -81,7 +81,9 @@
 	if (is_speaking_tajaran)
 		return "<span class='say_quote'>mrowls</span>, \"<span class='tajaran'>[text]</span>\"";
 	if (is_speaking_vox)
-		return "<span class='say_quote'>chirps</span>, \"<span class='vox'>[text]</span>\"";
+		return "<span class='say_quote'>shrieks</span>, \"<span class='vox'>[text]</span>\"";
+	if (is_speaking_kidan)
+		return "<span class='say_quote'>chitters</span>, \"<span class='kidan'>[text]</span>\"";
 //Needs Virus2
 //	if (src.disease_symptoms & DISEASE_HOARSE)
 //		return "rasps, \"[text]\"";

code/modules/mob/screen.dm

@@ -62,9 +62,11 @@
 	name = "storage"
 	master = null
 
-/obj/screen/storage/attackby(W, mob/user as mob)
-	src.master.attackby(W, user)
-	return
+/obj/screen/storage/attack_hand(mob/user)
+	if(master)
+		var/obj/item/I = user.get_active_hand()
+		if(I)
+			master.attackby(I, user)
 
 /obj/screen/zone_sel
 	name = "Damage Zone"

code/modules/mob/transform_procs.dm

@@ -20,29 +20,104 @@
 	flick("h2monkey", animation)
 	sleep(48)
 	//animation = null
-	var/mob/living/carbon/monkey/O = new /mob/living/carbon/monkey( loc )
-	del(animation)
 
-	O.name = "monkey"
-	O.dna = dna
-	dna = null
-	O.dna.uni_identity = "00600200A00E0110148FC01300B009"
-	//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
-	O.loc = loc
-	O.viruses = viruses
-	viruses = list()
-	for(var/datum/disease/D in O.viruses)
-		D.affected_mob = O
+	var/mob/living/carbon/monkey/O = null
+
+	switch(dna.mutantrace)
+		if("tajara")
+			O = new /mob/living/carbon/monkey/tajara( loc )
+			O.name = "farwa"
+			O.dna = dna
+			dna = null
+			O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00"
+			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
+			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+			O.loc = loc
+			O.viruses = viruses
+			viruses = list()
+			for(var/datum/disease/D in O.viruses)
+				D.affected_mob = O
+
+			if (client)
+				client.mob = O
+			if(mind)
+				mind.transfer_to(O)
+			O << "<B>You are now a farwa. </B>"
+			O.a_intent = "hurt"
+			spawn(0)//To prevent the proc from returning null.
+				del(src)
+			del(animation)
+		if("lizard")
+			O = new /mob/living/carbon/monkey/unathi( loc )
+			O.name = "stok"
+			O.dna = dna
+			dna = null
+			O.dna.uni_identity = "000000000000000000DC00000660002A8044C5D"
+			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
+			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+			O.loc = loc
+			O.viruses = viruses
+			viruses = list()
+			for(var/datum/disease/D in O.viruses)
+				D.affected_mob = O
+
+			if (client)
+				client.mob = O
+			if(mind)
+				mind.transfer_to(O)
+			O << "<B>You are now a stok. </B>"
+			O.a_intent = "hurt"
+			spawn(0)//To prevent the proc from returning null.
+				del(src)
+			del(animation)
+		if("skrell")
+			O = new /mob/living/carbon/monkey/unathi( loc )
+			O.name = "neaera"
+			O.dna = dna
+			dna = null
+			O.dna.uni_identity = "000000000000000000DC00000660002A8044C5D"
+			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
+			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+			O.loc = loc
+			O.viruses = viruses
+			viruses = list()
+			for(var/datum/disease/D in O.viruses)
+				D.affected_mob = O
+
+			if (client)
+				client.mob = O
+			if(mind)
+				mind.transfer_to(O)
+			O << "<B>You are now a neaera. </B>"
+			O.a_intent = "hurt"
+			spawn(0)//To prevent the proc from returning null.
+				del(src)
+			del(animation)
+		else
+			O = new /mob/living/carbon/monkey( loc )
+			O.name = "monkey"
+			O.dna = dna
+			dna = null
+			O.dna.uni_identity = "00600200A00E0110148FC01300B009"
+			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
+			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+			O.loc = loc
+			O.viruses = viruses
+			viruses = list()
+			for(var/datum/disease/D in O.viruses)
+				D.affected_mob = O
+
+			if (client)
+				client.mob = O
+			if(mind)
+				mind.transfer_to(O)
+			O << "<B>You are now a monkey.</B>"
+			O.a_intent = "hurt"
+			spawn(0)//To prevent the proc from returning null.
+				del(src)
+			del(animation)
+
 
-	if (client)
-		client.mob = O
-	if(mind)
-		mind.transfer_to(O)
-	O.a_intent = "hurt"
-	O << "<B>You are now a monkey.</B>"
-	spawn(0)//To prevent the proc from returning null.
-		del(src)
 	return O
 
 /mob/new_player/AIize()

code/modules/organs/organ_external.dm

@@ -35,6 +35,7 @@
 	var/open = 0
 	var/stage = 0
 	var/cavity = 0
+	var/sabotaged = 0 //If a prosthetic limb is emagged, it will detonate when it fails.
 
 	var/obj/item/hidden = null
 	var/list/implants = list()
@@ -482,8 +483,8 @@
 				owner.u_equip(owner.shoes)
 		if(organ)
 			destspawn = 1
-			//Robotic limbs explode until specified otherwise
-			if(status & ORGAN_ROBOT && !no_explode)
+			//Robotic limbs explode if sabotaged.
+			if(status & ORGAN_ROBOT && !no_explode && sabotaged)
 				owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\
 				"\red <b>Your [display_name] explodes!</b>",\
 				"You hear an explosion followed by a scream!")
@@ -494,10 +495,10 @@
 				spark_system.start()
 				spawn(10)
 					del(spark_system)
-			else
-				owner.visible_message("\red [owner.name]'s [display_name] flies off in an arc.",\
-				"<span class='moderate'><b>Your [display_name] goes flying off!</b></span>",\
-				"You hear a terrible sound of ripping tendons and flesh.")
+
+			owner.visible_message("\red [owner.name]'s [display_name] flies off in an arc.",\
+			"<span class='moderate'><b>Your [display_name] goes flying off!</b></span>",\
+			"You hear a terrible sound of ripping tendons and flesh.")
 
 			//Throw organs around
 			var/lol = pick(cardinal)
@@ -590,8 +591,8 @@
 	name = "chest"
 	icon_name = "torso"
 	display_name = "chest"
-	max_damage = 150
-	min_broken_damage = 75
+	max_damage = 75
+	min_broken_damage = 40
 	body_part = UPPER_TORSO
 
 
@@ -599,24 +600,24 @@
 	name = "groin"
 	icon_name = "groin"
 	display_name = "groin"
-	max_damage = 115
-	min_broken_damage = 70
+	max_damage = 50
+	min_broken_damage = 30
 	body_part = LOWER_TORSO
 
 /datum/organ/external/l_arm
 	name = "l_arm"
 	display_name = "left arm"
 	icon_name = "l_arm"
-	max_damage = 75
-	min_broken_damage = 30
+	max_damage = 50
+	min_broken_damage = 20
 	body_part = ARM_LEFT
 
 /datum/organ/external/l_leg
 	name = "l_leg"
 	display_name = "left leg"
 	icon_name = "l_leg"
-	max_damage = 75
-	min_broken_damage = 30
+	max_damage = 50
+	min_broken_damage = 20
 	body_part = LEG_LEFT
 	icon_position = LEFT
 
@@ -624,16 +625,16 @@
 	name = "r_arm"
 	display_name = "right arm"
 	icon_name = "r_arm"
-	max_damage = 75
-	min_broken_damage = 30
+	max_damage = 50
+	min_broken_damage = 20
 	body_part = ARM_RIGHT
 
 /datum/organ/external/r_leg
 	name = "r_leg"
 	display_name = "right leg"
 	icon_name = "r_leg"
-	max_damage = 75
-	min_broken_damage = 30
+	max_damage = 50
+	min_broken_damage = 20
 	body_part = LEG_RIGHT
 	icon_position = RIGHT
 
@@ -641,7 +642,7 @@
 	name = "l_foot"
 	display_name = "left foot"
 	icon_name = "l_foot"
-	max_damage = 40
+	max_damage = 30
 	min_broken_damage = 15
 	body_part = FOOT_LEFT
 	icon_position = LEFT
@@ -650,7 +651,7 @@
 	name = "r_foot"
 	display_name = "right foot"
 	icon_name = "r_foot"
-	max_damage = 40
+	max_damage = 30
 	min_broken_damage = 15
 	body_part = FOOT_RIGHT
 	icon_position = RIGHT
@@ -659,7 +660,7 @@
 	name = "r_hand"
 	display_name = "right hand"
 	icon_name = "r_hand"
-	max_damage = 40
+	max_damage = 30
 	min_broken_damage = 15
 	body_part = HAND_RIGHT
 
@@ -667,7 +668,7 @@
 	name = "l_hand"
 	display_name = "left hand"
 	icon_name = "l_hand"
-	max_damage = 40
+	max_damage = 30
 	min_broken_damage = 15
 	body_part = HAND_LEFT
 
@@ -740,9 +741,10 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 				base = new('icons/mob/human_races/r_lizard.dmi')
 			if("skrell")
 				base = new('icons/mob/human_races/r_skrell.dmi')
-
 			if("vox")
 				base = new('icons/mob/human_races/r_vox.dmi')
+			if("kidan")
+				base = new('icons/mob/human_races/r_kidan.dmi')
 
 			else
 				base = new('icons/mob/human_races/r_human.dmi')

code/modules/projectiles/guns/projectile/bow.dm

@@ -0,0 +1,205 @@
+/obj/item/weapon/arrow
+
+	name = "bolt"
+	desc = "It's got a tip for you - get the point?"
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "bolt"
+	item_state = "bolt"
+	flags =  FPRINT | TABLEPASS
+	throwforce = 8
+	w_class = 3.0
+	sharp = 1
+
+/obj/item/weapon/arrow/proc/removed() //Helper for metal rods falling apart.
+	return
+
+/obj/item/weapon/arrow/quill
+
+	name = "vox quill"
+	desc = "A wickedly barbed quill from some bizarre animal."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "quill"
+	item_state = "quill"
+	throwforce = 5
+
+/obj/item/weapon/arrow/rod
+
+	name = "metal rod"
+	desc = "Don't cry for me, Orithena."
+	icon_state = "metal-rod"
+
+/obj/item/weapon/arrow/rod/removed(mob/user)
+	if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow.
+		user  << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
+		var/obj/item/weapon/shard/shrapnel/S = new()
+		S.loc = get_turf(src)
+		src.Del()
+
+/obj/item/weapon/crossbow
+
+	name = "powered crossbow"
+	desc = "A 2557AD twist on an old classic. Pick up that can."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "crossbow"
+	item_state = "crossbow-solid"
+	w_class = 5.0
+	flags =  FPRINT | TABLEPASS | CONDUCT |  USEDELAY
+	slot_flags = SLOT_BELT | SLOT_BACK
+
+	w_class = 3.0
+
+	var/tension = 0                       // Current draw on the bow.
+	var/max_tension = 5                   // Highest possible tension.
+	var/release_speed = 5                 // Speed per unit of tension.
+	var/mob/living/current_user = null    // Used to see if the person drawing the bow started drawing it.
+	var/obj/item/weapon/arrow = null      // Nocked arrow.
+	var/obj/item/weapon/cell/cell = null  // Used for firing special projectiles like rods.
+
+/obj/item/weapon/crossbow/attackby(obj/item/W as obj, mob/user as mob)
+	if(!arrow)
+		if (istype(W,/obj/item/weapon/arrow))
+			user.drop_item()
+			arrow = W
+			arrow.loc = src
+			user.visible_message("[user] slides [arrow] into [src].","You slide [arrow] into [src].")
+			icon_state = "crossbow-nocked"
+			return
+		else if(istype(W,/obj/item/stack/rods))
+			var/obj/item/stack/rods/R = W
+			R.use(1)
+			arrow = new /obj/item/weapon/arrow/rod(src)
+			arrow.fingerprintslast = src.fingerprintslast
+			arrow.loc = src
+			icon_state = "crossbow-nocked"
+			user.visible_message("[user] haphazardly jams [arrow] into [src].","You jam [arrow] into [src].")
+			if(cell)
+				if(cell.charge >= 500)
+					user << "<span class='notice'>[arrow] plinks and crackles as it begins to glow red-hot.</span>"
+					arrow.throwforce = 15
+					arrow.icon_state = "metal-rod-superheated"
+					cell.charge -= 500
+			return
+
+	if(istype(W, /obj/item/weapon/cell))
+		if(!cell)
+			user.drop_item()
+			W.loc = src
+			cell = W
+			user << "<span class='notice'>You jam [cell] into [src] and wire it to the firing coil.</span>"
+			if(arrow)
+				if(istype(arrow,/obj/item/weapon/arrow/rod) && cell.charge >= 500)
+					user << "<span class='notice'>[arrow] plinks and crackles as it begins to glow red-hot.</span>"
+					arrow.throwforce = 15
+					arrow.icon_state = "metal-rod-superheated"
+					cell.charge -= 500
+		else
+			user << "<span class='notice'>[src] already has a cell installed.</span>"
+
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(cell)
+			var/obj/item/C = cell
+			C.loc = get_turf(user)
+			cell = null
+			user << "<span class='notice'>You jimmy [cell] out of [src] with [W].</span>"
+		else
+			user << "<span class='notice'>[src] doesn't have a cell installed.</span>"
+
+	else
+		..()
+
+/obj/item/weapon/crossbow/attack_self(mob/living/user as mob)
+	if(tension)
+		if(arrow)
+			user.visible_message("[user] relaxes the tension on [src]'s string and removes [arrow].","You relax the tension on [src]'s string and remove [arrow].")
+			var/obj/item/weapon/arrow/A = arrow
+			A.loc = get_turf(src)
+			A.removed(user)
+			arrow = null
+		else
+			user.visible_message("[user] relaxes the tension on [src]'s string.","You relax the tension on [src]'s string.")
+		tension = 0
+		icon_state = "crossbow"
+	else
+		draw(user)
+
+/obj/item/weapon/crossbow/proc/draw(var/mob/user as mob)
+
+	if(!arrow)
+		user << "You don't have anything nocked to [src]."
+		return
+
+	if(user.restrained())
+		return
+
+	current_user = user
+
+	user.visible_message("[user] begins to draw back the string of [src].","You begin to draw back the string of [src].")
+	tension = 1
+	spawn(25) increase_tension(user)
+
+/obj/item/weapon/crossbow/proc/increase_tension(var/mob/user as mob)
+
+	if(!arrow || !tension || current_user != user) //Arrow has been fired, bow has been relaxed or user has changed.
+		return
+
+	tension++
+	icon_state = "crossbow-drawn"
+
+	if(tension>=max_tension)
+		tension = max_tension
+		usr << "[src] clunks as you draw the string to its maximum tension!"
+	else
+		user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!")
+		spawn(25) increase_tension(user)
+
+/obj/item/weapon/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
+
+	if (istype(target, /obj/item/weapon/storage/backpack ))
+		src.dropped()
+		return
+
+	else if (target.loc == user.loc)
+		return
+
+	else if (locate (/obj/structure/table, src.loc))
+		return
+
+	else if(target == user)
+		return
+
+	if(!tension)
+		user << "You haven't drawn back the bolt!"
+		return 0
+
+	if (!arrow)
+		user << "You have no arrow nocked to [src]!"
+		return 0
+	else
+		spawn(0) Fire(target,user,params)
+
+/obj/item/weapon/crossbow/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
+
+	add_fingerprint(user)
+
+	var/turf/curloc = get_turf(user)
+	var/turf/targloc = get_turf(target)
+	if (!istype(targloc) || !istype(curloc))
+		return
+
+	user.visible_message("<span class='danger'>[user] releases [src] and sends [arrow] streaking toward [target]!</span>","<span class='danger'>You release [src] and send [arrow] streaking toward [target]!</span>")
+
+	var/obj/item/weapon/arrow/A = arrow
+	A.loc = get_turf(user)
+	A.throw_at(target,10,tension*release_speed)
+	arrow = null
+	tension = 0
+	icon_state = "crossbow"
+
+/obj/item/weapon/crossbow/dropped(mob/user)
+	if(arrow)
+		var/obj/item/weapon/arrow/A = arrow
+		A.loc = get_turf(src)
+		A.removed(user)
+		arrow = null
+		tension = 0
+		icon_state = "crossbow"

code/modules/projectiles/guns/projectile/pneumatic.dm

@@ -0,0 +1,140 @@
+/obj/item/weapon/storage/pneumatic
+	name = "pneumatic cannon"
+	desc = "A large gas-powered cannon."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "pneumatic"
+	item_state = "pneumatic"
+	w_class = 5.0
+	flags =  FPRINT | TABLEPASS | CONDUCT |  USEDELAY
+	slot_flags = SLOT_BELT
+	max_w_class = 3
+	max_combined_w_class = 20
+
+	var/obj/item/weapon/tank/tank = null                // Tank of gas for use in firing the cannon.
+	var/obj/item/weapon/storage/tank_container = new()  // Something to hold the tank item so we don't accidentally fire it.
+	var/pressure_setting = 10                           // Percentage of the gas in the tank used to fire the projectile.
+	var/possible_pressure_amounts = list(5,10,20,25,50) // Possible pressure settings.
+	var/minimum_tank_pressure = 10                      // Minimum pressure to fire the gun.
+	var/cooldown = 0                                    // Whether or not we're cooling down.
+	var/cooldown_time = 50                              // Time between shots.
+	var/force_divisor = 400                             // Force equates to speed. Speed/5 equates to a damage multiplier for whoever you hit.
+	                                                    // For reference, a fully pressurized oxy tank at 50% gas release firing a health
+	                                                    // analyzer with a force_divisor of 10 hit with a damage multiplier of 3000+.
+
+/obj/item/weapon/storage/pneumatic/verb/set_pressure() //set amount of tank pressure.
+
+	set name = "Set valve pressure"
+	set category = "Object"
+	set src in range(0)
+	var/N = input("Percentage of tank used per shot:","[src]") as null|anything in possible_pressure_amounts
+	if (N)
+		pressure_setting = N
+		usr << "You dial the pressure valve to [pressure_setting]%."
+
+/obj/item/weapon/storage/pneumatic/verb/eject_tank() //Remove the tank.
+
+	set name = "Eject tank"
+	set category = "Object"
+	set src in range(0)
+
+	if(tank)
+		usr << "You twist the valve and pop the tank out of [src]."
+		tank.loc = usr.loc
+		tank = null
+		icon_state = "pneumatic"
+		item_state = "pneumatic"
+		usr.update_icons()
+	else
+		usr << "There's no tank in [src]."
+
+/obj/item/weapon/storage/pneumatic/attackby(obj/item/W as obj, mob/user as mob)
+	if(!tank && istype(W,/obj/item/weapon/tank))
+		user.drop_item()
+		tank = W
+		tank.loc = src.tank_container
+		user.visible_message("[user] jams [W] into [src]'s valve and twists it closed.","You jam [W] into [src]'s valve and twist it closed.")
+		icon_state = "pneumatic-tank"
+		item_state = "pneumatic-tank"
+		user.update_icons()
+	else
+		..()
+
+/obj/item/weapon/storage/pneumatic/examine()
+	set src in view()
+	..()
+	if (!(usr in view(2)) && usr!=src.loc) return
+	usr << "The valve is dialed to [pressure_setting]%."
+	if(tank)
+		usr << "The tank dial reads [tank.air_contents.return_pressure()] kPa."
+	else
+		usr << "Nothing is attached to the tank valve!"
+
+/obj/item/weapon/storage/pneumatic/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
+	if (istype(target, /obj/item/weapon/storage/backpack ))
+		return
+
+	else if (target.loc == user.loc)
+		return
+
+	else if (locate (/obj/structure/table, src.loc))
+		return
+
+	else if(target == user)
+		return
+
+	if (length(contents) == 0)
+		user << "There's nothing in [src] to fire!"
+		return 0
+	else
+		spawn(0) Fire(target,user,params)
+
+/obj/item/weapon/storage/pneumatic/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
+	if (length(contents) > 0)
+		if(user.a_intent == "hurt")
+			user.visible_message("\red <b> \The [user] fires \the [src] point blank at [M]!</b>")
+			Fire(M,user)
+			return
+		else
+			Fire(M,user)
+			return
+
+/obj/item/weapon/storage/pneumatic/proc/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
+
+	if (!tank)
+		user << "There is no gas tank in [src]!"
+		return 0
+
+	if (cooldown)
+		user << "The chamber hasn't built up enough pressure yet!"
+		return 0
+
+	add_fingerprint(user)
+
+	var/turf/curloc = get_turf(user)
+	var/turf/targloc = get_turf(target)
+	if (!istype(targloc) || !istype(curloc))
+		return
+
+	var/fire_pressure = (tank.air_contents.return_pressure()/100)*pressure_setting
+
+	if (fire_pressure < minimum_tank_pressure)
+		user << "There isn't enough gas in the tank to fire [src]."
+		return 0
+
+	var/obj/item/object = contents[1]
+	var/speed = ((fire_pressure*tank.volume)/object.w_class)/force_divisor //projectile speed.
+	if(speed>80) speed = 80 //damage cap.
+
+	user.visible_message("<span class='danger'>[user] fires [src] and launches [object] at [target]!</span>","<span class='danger'>You fire [src] and launch [object] at [target]!</span>")
+
+	src.remove_from_storage(object,user.loc)
+	object.throw_at(target,10,speed)
+
+	var/lost_gas_amount = tank.air_contents.total_moles*(pressure_setting/100)
+	var/datum/gas_mixture/removed = tank.air_contents.remove(lost_gas_amount)
+	user.loc.assume_air(removed)
+
+	cooldown = 1
+	spawn(cooldown_time)
+		cooldown = 0
+		user << "[src]'s gauge informs you it's ready to be fired again."

code/modules/projectiles/projectile/change.dm

@@ -74,7 +74,7 @@
 
 				var/mob/living/carbon/human/H = new_mob
 				if(H.dna)
-					H.dna.mutantrace = pick("lizard","tajaran","skrell","golem","slime","plant","vox",4;"")
+					H.dna.mutantrace = pick("lizard","tajaran","skrell","golem","slime","plant","vox","kidan",4;"")
 			else
 				return
 

code/modules/projectiles/projectile/force.dm

@@ -12,7 +12,7 @@
 
 	var/obj/T = target
 	var/throwdir = get_dir(firer,target)
-	T.throw_at(get_edge_target_turf(target, throwdir),10,1)
+	T.throw_at(get_edge_target_turf(target, throwdir),10,10)
 	return 1
 
 /*