Merge remote-tracking branch 'refs/remotes/origin/master' into dev-ace

.github/CONTRIBUTING.md

@@ -12,6 +12,7 @@ These are just guidelines, not rules, use your best judgment and feel free to pr
 
 [How Can I Contribute?](#how-can-i-contribute)
   * [Your First Code Contribution](#your-first-code-contribution)
+  * [VOREStation Coding Standards](#vorestation-coding-standards)
   * [Pull Requests](#pull-requests)
   * [Git Commit Messages](#git-commit-messages)
 
@@ -29,21 +30,45 @@ By participating, you are expected to uphold this code.
 
 ### Your First Code Contribution
 
-Unsure where to begin contributing to VOREStation? You can start by looking through these `beginner` and `help-wanted` issues:
+Unsure where to begin contributing to VOREStation? You can start by looking through the issues tab.
 
-* [Beginner issues][beginner] - issues which should only require a few lines of code, and a test or two.
-* [Help wanted issues][help-wanted] - issues which should be a bit more involved than `beginner` issues.
+### VOREStation Coding Standards
+
+Any code submissions that do not meet our coding standards are likely to be rejected, or at the very least, have a maintainer request changes on your PR. Save time and follow these standards from the start.
+
+* If it is something like a bugfix that Polaris would want (the codebase we use), code it in their code and make the PR to them. We regularly update from them. They would want any general gameplay bugfixes, and things that are obviously intended to work one way, but do not. They do not have any of our fluff species (vulp, akula, fenn, etc) so do not make PRs related to that, or any vore content to them.
+* Never edit stock Polaris .DMI files. If you are confused about which .DMI files we have added and which were there originally, refer to their repository and and see if they exist (https://github.com/PolarisSS13/Polaris). All PRs with edits to stock .DMI files will be rejected.
+* When changing any code in any stock Polaris .DM file, you must mark your changes:
+    * For single-line changes: //VOREStation Edit - "Explanation" (Edit can also be Add for new lines or Removal if you are commenting the line out)
+    * For multi-line additions: //VOREStation Edit - "Explanation" and then at the bottom of your changes, //VOREStation Edit End
+    * For multi-like removals: Use a block comment (/\* xxx \*/) to comment out the existing code block (do not modify whitespace more than necessary) and at the start, it should contain /\* VOREStation Removal - "Reason"
+* Change whitespace as little as possible. Do not randomly add/remove whitespace.
+* Any new files should have "_vr" at the end. For example, "life_vr.dm". Just make them in the same location as the file they are related to.
+
+The `attempt_vr()` proc has been added for your convienence. It allows a many-line change to become a single-line change in the existing Polaris files, preserving mergeability and allowing better code separation while preventing your new code from causing runtimes that stop the original code from running. If you are wanting to inject new procedures into an existing proc, called `update_atoms()` for example, you would create `update_atoms_vr()` in a nearby `_vr.dm` file, and then call to it from a single line in the original `update_atoms()` with `attempt_vr()`.
+
+The syntax for `attempt_vr()` is: `attempt_vr(atom,"proc_name",list(arg1,arg2))`, where:
+* `atom` should be replaced with what your extended proc is defined on (if you are in something like /obj/machine/scanner/proc/update_things() and you are calling your newly defined /obj/machine/scanner/proc/update_things_vr() you can just put `src` here)
+* `proc_name` is a STRING that should be the name of your proc, such as "update_atoms_vr"
+* `list(arg1,arg2)` should contain any args you wish to pass to the proc
+
+As an example of something you can do with `attempt_vr()` in a single line, the grab and vore code is done with this in a single line. When a grab is clicked on someone, there is a line similar to:
+`if(attempt_vr(src,"handle_grabs_vr",list(src,attacker))) return`
+
+Then in our `handle_grabs_vr()` proc, if we want to avoid performing the stock game actions and have handled the vore stuff ourselves, we return true, and the original proc returns since attempt_vr returns true.
 
 ### Pull Requests
 
-* Your submission must pass Travis CI checking. If you think there is a bug in Travis, open an issue.
-* It can be a WIP PR, and if so, please mark it with [WIP] in the title so it can be labeled appropriately.
-* If your pull request has many no-conflict merge commits, it cannot be merged. Squash and make a new PR.
+* Your submission must pass Travis CI checking. The checks are important, prevent many common mistakes, and even experienced coders get caught by it sometimes. If you think there is a bug in Travis, open an issue. (One known Travis issue is comments in the middle of multi-line lists, just don't do it)
+* Your PR should not have an excessive number of commits unless it is a large project or includes many separate remote commits (such as a pull from Polaris). If you need to keep tweaking your PR to pass Travis or to satisfy a maintainer's requests and are making many commits, you should squash them in the end and update your PR accordingly so these commits don't clog up the history.
+* You can create a WIP PR, and if so, please mark it with [WIP] in the title so it can be labeled appropriately. These can't sit forever, though.
+* If your pull request has many no-conflict merge commits ('merge from master' into your PR branch), it cannot be merged. Squash and make a new PR/forcepush to your PR branch.
 
 ### Git Commit Messages
 
-* Limit the first line to 72 characters or less.
+* Limit the first line to 72 characters or less, otherwise it truncates the title with '...', wrapping the rest into the description.
 * Reference issues and pull requests liberally.
+* Use the GitHub magic words "Fixed/Fixes/Fix, Resolved/Resolves/Resolve, Closed/Closes/Close", as in, "Closes #1928", as this will automatically close that issue when the PR is merged if it is a fix for that issue.
 
 ## Licensing
 VOREStation is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.

.travis.yml

@@ -31,6 +31,7 @@ script:
   - (! grep 'step_[xy]' maps/**/*.dmm)
   - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
   - (! grep -En "<\s*span\s+class\s*=\s*('[^'>]+|[^'>]+')\s*>" **/*.dm)
+  - (! grep 'maps\\.*test.*' *.dme)
   - awk -f tools/indentation.awk **/*.dm
   - md5sum -c - <<< "88490b460c26947f5ec1ab1bb9fa9f17 *html/changelogs/example.yml"
   - (num=`grep -E '\\\\(red|blue|green|black|b|i[^mc])' **/*.dm | wc -l`; echo "$num escapes (expecting ${MACRO_COUNT} or less)"; [ $num -le ${MACRO_COUNT} ])

code/ZAS/Airflow.dm

@@ -228,13 +228,16 @@ mob/living/carbon/human/airflow_hit(atom/A)
 	var/b_loss = airflow_speed * vsc.airflow_damage
 
 	var/blocked = run_armor_check(BP_HEAD,"melee")
-	apply_damage(b_loss/3, BRUTE, BP_HEAD, blocked, 0, "Airflow")
+	var/soaked = get_armor_soak(BP_HEAD,"melee")
+	apply_damage(b_loss/3, BRUTE, BP_HEAD, blocked, soaked, 0, "Airflow")
 
 	blocked = run_armor_check(BP_TORSO,"melee")
-	apply_damage(b_loss/3, BRUTE, BP_TORSO, blocked, 0, "Airflow")
+	soaked = get_armor_soak(BP_TORSO,"melee")
+	apply_damage(b_loss/3, BRUTE, BP_TORSO, blocked, soaked, 0, "Airflow")
 
 	blocked = run_armor_check(BP_GROIN,"melee")
-	apply_damage(b_loss/3, BRUTE, BP_GROIN, blocked, 0, "Airflow")
+	soaked = get_armor_soak(BP_GROIN,"melee")
+	apply_damage(b_loss/3, BRUTE, BP_GROIN, blocked, soaked, 0, "Airflow")
 
 	if(airflow_speed > 10)
 		Paralyse(round(airflow_speed * vsc.airflow_stun))

code/ZAS/ConnectionGroup.dm

@@ -180,7 +180,8 @@ Class Procs:
 	air_master.mark_zone_update(B)
 
 /connection_edge/zone/recheck()
-	if(!A.air.compare(B.air))
+	// Edges with only one side being vacuum need processing no matter how close.
+	if(!A.air.compare(B.air, vacuum_exception = 1))
 		air_master.mark_edge_active(src)
 
 //Helper proc to get connections for a zone.
@@ -235,7 +236,10 @@ Class Procs:
 	air_master.mark_zone_update(A)
 
 /connection_edge/unsimulated/recheck()
-	if(!A.air.compare(air))
+	// Edges with only one side being vacuum need processing no matter how close.
+	// Note: This handles the glaring flaw of a room holding pressure while exposed to space, but
+	// does not specially handle the less common case of a simulated room exposed to an unsimulated pressurized turf.
+	if(!A.air.compare(air, vacuum_exception = 1))
 		air_master.mark_edge_active(src)
 
 proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)

code/ZAS/Phoron.dm

@@ -95,14 +95,14 @@ obj/var/phoronproof = 0
 		return
 
 	//Burn skin if exposed.
-	if(vsc.plc.SKIN_BURNS)
+	if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron"))
 		if(!pl_head_protected() || !pl_suit_protected())
 			burn_skin(0.75)
 			if(prob(20)) src << "<span class='danger'>Your skin burns!</span>"
 			updatehealth()
 
 	//Burn eyes if exposed.
-	if(vsc.plc.EYE_BURNS)
+	if(vsc.plc.EYE_BURNS && (species.breath_type != "phoron"))
 		if(!head)
 			if(!wear_mask)
 				burn_eyes()
@@ -118,22 +118,12 @@ obj/var/phoronproof = 0
 						burn_eyes()
 
 	//Genetic Corruption
-	if(vsc.plc.GENETIC_CORRUPTION)
+	if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != "phoron"))
 		if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
 			randmutb(src)
 			src << "<span class='danger'>High levels of toxins cause you to spontaneously mutate!</span>"
 			domutcheck(src,null)
 
-/mob/living/carbon/human/vox/pl_effects()
-	//Handles all the bad things phoron can do to Vox.
-
-	//Contamination
-	if(vsc.plc.CLOTH_CONTAMINATION) contaminate()
-
-	//Anything else requires them to not be dead.
-	if(stat >= 2)
-		return
-
 /mob/living/carbon/human/proc/burn_eyes()
 	var/obj/item/organ/internal/eyes/E = internal_organs_by_name[O_EYES]
 	if(E)

code/__defines/belly_modes_vr.dm

@@ -18,3 +18,10 @@
 
 // Stance for hostile mobs to be in while devouring someone.
 #define HOSTILE_STANCE_EATING	99
+
+// Defines for weight system
+#define MIN_MOB_WEIGHT			70
+#define MAX_MOB_WEIGHT			500
+#define MIN_NUTRITION_TO_GAIN	450	// Above this amount you will gain weight
+#define MAX_NUTRITION_TO_LOSE	50	// Below this amount you will lose weight
+// #define WEIGHT_PER_NUTRITION	0.0285 // Tuned so 1050 (nutrition for average mob) = 30 lbs

code/__defines/misc_vr.dm

@@ -4,6 +4,12 @@
 #define     BACKUP_HUD 11 // HUD for showing whether or not they have a backup implant.
 #define   STATUS_R_HUD 12 // HUD for showing the same STATUS_HUD info on the right side, but not for 'boring' statuses (transparent icons)
 #define  HEALTH_VR_HUD 13 // HUD with blank 100% bar so it's hidden most of the time.
+#define     VANTAG_HUD 14 // HUD for showing being-an-antag-target prefs
 
 #undef TOTAL_HUDS //Undo theirs.
-#define     TOTAL_HUDS 13 // Total number of HUDs.
+#define     TOTAL_HUDS 14 // Total number of HUDs.
+
+#define VANTAG_NONE    "hudblank"
+#define VANTAG_VORE    "vantag_vore"
+#define VANTAG_KIDNAP  "vantag_kidnap"
+#define VANTAG_KILL    "vantag_kill"

code/__defines/mobs.dm

@@ -26,11 +26,13 @@
 #define BORGXRAY  0x4
 #define BORGMATERIAL  8
 
-#define STANCE_IDLE      1
-#define STANCE_ALERT     2
-#define STANCE_ATTACK    3
-#define STANCE_ATTACKING 4
-#define STANCE_TIRED     5
+#define STANCE_IDLE      1	// Looking for targets if hostile.  Does idle wandering.
+#define STANCE_ALERT     2	// Bears
+#define STANCE_ATTACK    3	// Attempting to get into attack position
+#define STANCE_ATTACKING 4	// Doing attacks
+#define STANCE_TIRED     5	// Bears
+#define STANCE_FOLLOW    6	// Following somone
+#define STANCE_BUSY      7	// Do nothing on life ticks (Other code is running)
 
 #define LEFT  1
 #define RIGHT 2
@@ -139,7 +141,7 @@
 #define INCAPACITATION_STUNNED 8
 #define INCAPACITATION_FORCELYING 16 //needs a better name - represents being knocked down BUT still conscious.
 #define INCAPACITATION_KNOCKOUT 32
-
+#define INCAPACITATION_NONE 0
 
 #define INCAPACITATION_DEFAULT (INCAPACITATION_RESTRAINED|INCAPACITATION_BUCKLED_FULLY)
 #define INCAPACITATION_KNOCKDOWN (INCAPACITATION_KNOCKOUT|INCAPACITATION_FORCELYING)

code/__defines/species_languages.dm

@@ -52,4 +52,4 @@
 #define INNATE       64  // All mobs can be assumed to speak and understand this language. (audible emotes)
 #define NO_TALK_MSG  128 // Do not show the "\The [speaker] talks into \the [radio]" message
 #define NO_STUTTER   256 // No stuttering, slurring, or other speech problems
-#define ALT_TRANSMIT 512 // Language is not based on vision or sound (Todo: add this into the say code and use it for the rootspeak languages)
+#define ALT_TRANSMIT 512 // Language is not based on vision or sound (Todo: add this into the say code and use it for the rootspeak languages)

code/__defines/turfs.dm

@@ -7,4 +7,7 @@
 #define TURF_HAS_EDGES          64
 #define TURF_HAS_CORNERS        128
 #define TURF_IS_FRAGILE         256
-#define TURF_ACID_IMMUNE        512
+#define TURF_ACID_IMMUNE        512
+
+#define isCardinal(x)			(x == NORTH || x == SOUTH || x == EAST || x == WEST)
+#define isDiagonal(x)			(x == NORTHEAST || x == SOUTHEAST || x == NORTHWEST || x == SOUTHWEST)

code/_helpers/global_lists.dm

@@ -51,12 +51,13 @@ var/global/list/facial_hair_styles_list = list()	//stores /datum/sprite_accessor
 var/global/list/facial_hair_styles_male_list = list()
 var/global/list/facial_hair_styles_female_list = list()
 var/global/list/skin_styles_female_list = list()		//unused
+var/global/list/body_marking_styles_list = list()		//stores /datum/sprite_accessory/marking indexed by name
 	//Underwear
 var/datum/category_collection/underwear/global_underwear = new()
 
 	//Backpacks
 var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag")
-var/global/list/pdachoicelist = list("Default", "Slim", "Old")
+var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged")
 var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
 
 // Visual nets
@@ -141,6 +142,12 @@ var/global/list/string_slot_flags = list(
 				facial_hair_styles_male_list += H.name
 				facial_hair_styles_female_list += H.name
 
+	//Body markings - Initialise all /datum/sprite_accessory/marking into an list indexed by marking name
+	paths = typesof(/datum/sprite_accessory/marking) - /datum/sprite_accessory/marking
+	for(var/path in paths)
+		var/datum/sprite_accessory/marking/M = new path()
+		body_marking_styles_list[M.name] = M
+
 	//Surgery Steps - Initialize all /datum/surgery_step into a list
 	paths = typesof(/datum/surgery_step)-/datum/surgery_step
 	for(var/T in paths)

code/_helpers/global_lists_vr.dm

@@ -13,6 +13,13 @@ var/global/list/player_sizes_list = list(
 		"Small" 	= RESIZE_SMALL,
 		"Tiny" 		= RESIZE_TINY)
 
+//stores vantag settings indexed by name
+var/global/list/vantag_choices_list = list(
+		VANTAG_NONE		=	"No Involvement",
+		VANTAG_VORE		=	"Be Prey",
+		VANTAG_KIDNAP	=	"Be Kidnapped",
+		VANTAG_KILL		=	"Be Killed")
+
 //Important items that are preserved when people are digested, etc.
 //On Polaris, different from Cryo list as MMIs need to be removed for FBPs to be logged out.
 var/global/list/important_items = list(

code/_helpers/icons.dm

@@ -793,6 +793,26 @@ proc // Creates a single icon from a given /atom or /image.  Only the first argu
 			alpha_mask.Blend(image_overlay,ICON_OR)//OR so they are lumped together in a nice overlay.
 		return alpha_mask//And now return the mask.
 
+//getFlatIcon but generates an icon that can face ALL four directions. The only four.
+/proc/getCompoundIcon(atom/A)
+	var/icon/north = getFlatIcon(A,defdir=NORTH,always_use_defdir=1)
+	var/icon/south = getFlatIcon(A,defdir=SOUTH,always_use_defdir=1)
+	var/icon/east = getFlatIcon(A,defdir=EAST,always_use_defdir=1)
+	var/icon/west = getFlatIcon(A,defdir=WEST,always_use_defdir=1)
+
+	//Starts with a blank icon because of byond bugs.
+	var/icon/full = icon('icons/effects/effects.dmi', "icon_state"="nothing")
+
+	full.Insert(north,dir=NORTH)
+	full.Insert(south,dir=SOUTH)
+	full.Insert(east,dir=EAST)
+	full.Insert(west,dir=WEST)
+	qdel(north)
+	qdel(south)
+	qdel(east)
+	qdel(west)
+	return full
+
 /mob/proc/AddCamoOverlay(atom/A)//A is the atom which we are using as the overlay.
 	var/icon/opacity_icon = new(A.icon, A.icon_state)//Don't really care for overlays/underlays.
 	//Now we need to culculate overlays+underlays and add them together to form an image for a mask.

code/_helpers/mobs.dm

@@ -63,12 +63,12 @@ proc/random_facial_hair_style(gender, species = "Human")
 
 		return f_style
 
-proc/sanitize_name(name, species = "Human")
+proc/sanitize_name(name, species = "Human", robot = 0)
 	var/datum/species/current_species
 	if(species)
 		current_species = all_species[species]
 
-	return current_species ? current_species.sanitize_name(name) : sanitizeName(name)
+	return current_species ? current_species.sanitize_name(name, robot) : sanitizeName(name, MAX_NAME_LEN, robot)
 
 proc/random_name(gender, species = "Human")
 

code/_helpers/text.dm

@@ -85,7 +85,7 @@
 			// 0  .. 9
 			if(48 to 57)			//Numbers
 				if(!last_char_group)		continue	//suppress at start of string
-				if(!allow_numbers)			continue
+				if(!allow_numbers)			continue	// If allow_numbers is 0, then don't do this.
 				output += ascii2text(ascii_char)
 				number_of_alphanumeric++
 				last_char_group = 3

code/_helpers/unsorted.dm

@@ -753,9 +753,6 @@ proc/GaussRandRound(var/sigma,var/roundto)
 		C.x_pos = (T.x - trg_min_x)
 		C.y_pos = (T.y - trg_min_y)
 
-	var/list/fromupdate = new/list()
-	var/list/toupdate = new/list()
-
 	moving:
 		for (var/turf/T in refined_src)
 			var/datum/coords/C_src = refined_src[T]
@@ -763,19 +760,40 @@ proc/GaussRandRound(var/sigma,var/roundto)
 				var/datum/coords/C_trg = refined_trg[B]
 				if(C_src.x_pos == C_trg.x_pos && C_src.y_pos == C_trg.y_pos)
 
-					var/old_dir1 = T.dir
-					var/old_icon_state1 = T.icon_state
-					var/old_icon1 = T.icon
-					var/old_overlays = T.overlays.Copy()
-					var/old_underlays = T.underlays.Copy()
+					//You can stay, though.
+					if(istype(T,/turf/space))
+						refined_src -= T
+						refined_trg -= B
+						continue moving
 
-					var/turf/X = B.ChangeTurf(T.type)
-					X.set_dir(old_dir1)
-					X.icon_state = old_icon_state1
-					X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
-					X.overlays = old_overlays
-					X.underlays = old_underlays
+					var/turf/X //New Destination Turf
 
+					//Are we doing shuttlework? Just to save another type check later.
+					var/shuttlework = 0
+
+					//Shuttle turfs handle their own fancy moving.
+					if(istype(T,/turf/simulated/shuttle))
+						shuttlework = 1
+						var/turf/simulated/shuttle/SS = T
+						if(!SS.landed_holder) SS.landed_holder = new(turf = SS)
+						X = SS.landed_holder.land_on(B)
+
+					//Generic non-shuttle turf move.
+					else
+						var/old_dir1 = T.dir
+						var/old_icon_state1 = T.icon_state
+						var/old_icon1 = T.icon
+						var/old_overlays = T.overlays.Copy()
+						var/old_underlays = T.underlays.Copy()
+
+						X = B.ChangeTurf(T.type)
+						X.set_dir(old_dir1)
+						X.icon_state = old_icon_state1
+						X.icon = old_icon1
+						X.overlays = old_overlays
+						X.underlays = old_underlays
+
+					//Move the air from source to dest
 					var/turf/simulated/ST = T
 					if(istype(ST) && ST.zone)
 						var/turf/simulated/SX = X
@@ -784,55 +802,22 @@ proc/GaussRandRound(var/sigma,var/roundto)
 						SX.air.copy_from(ST.zone.air)
 						ST.zone.remove(ST)
 
-					/* Quick visual fix for some weird shuttle corner artefacts when on transit space tiles */
-					if(direction && findtext(X.icon_state, "swall_s"))
-
-						// Spawn a new shuttle corner object
-						var/obj/corner = new()
-						corner.loc = X
-						corner.density = 1
-						corner.anchored = 1
-						corner.icon = X.icon
-						corner.icon_state = replacetext(X.icon_state, "_s", "_f")
-						corner.tag = "delete me"
-						corner.name = "wall"
-
-						// Find a new turf to take on the property of
-						var/turf/nextturf = get_step(corner, direction)
-						if(!nextturf || !istype(nextturf, /turf/space))
-							nextturf = get_step(corner, turn(direction, 180))
-
-
-						// Take on the icon of a neighboring scrolling space icon
-						X.icon = nextturf.icon
-						X.icon_state = nextturf.icon_state
-
-
+					//Move the objects. Not forceMove because the object isn't "moving" really, it's supposed to be on the "same" turf.
 					for(var/obj/O in T)
-
-						// Reset the shuttle corners
-						if(O.tag == "delete me")
-							X.icon = 'icons/turf/shuttle.dmi'
-							X.icon_state = replacetext(O.icon_state, "_f", "_s") // revert the turf to the old icon_state
-							X.name = "wall"
-							qdel(O) // prevents multiple shuttle corners from stacking
-							continue
-						if(!istype(O,/obj)) continue
 						O.loc = X
+
+					//Move the mobs unless it's an AI eye or other eye type.
 					for(var/mob/M in T)
-						if(!istype(M,/mob) || istype(M, /mob/observer/eye)) continue // If we need to check for more mobs, I'll add a variable
+						if(istype(M, /mob/observer/eye)) continue // If we need to check for more mobs, I'll add a variable
 						M.loc = X
 
-//					var/area/AR = X.loc
+					if(shuttlework)
+						var/turf/simulated/shuttle/SS = T
+						SS.landed_holder.leave_turf()
 
-//					if(AR.lighting_use_dynamic)							//TODO: rewrite this code so it's not messed by lighting ~Carn
-//						X.opacity = !X.opacity
-//						X.SetOpacity(!X.opacity)
+					else if(turftoleave)
+						T.ChangeTurf(turftoleave)
 
-					toupdate += X
-
-					if(turftoleave)
-						fromupdate += T.ChangeTurf(turftoleave)
 					else
 						T.ChangeTurf(get_base_turf_by_area(T))
 
@@ -840,7 +825,6 @@ proc/GaussRandRound(var/sigma,var/roundto)
 					refined_trg -= B
 					continue moving
 
-
 proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 	if(!original)
 		return null

code/_onclick/click.dm

@@ -341,6 +341,7 @@
 		var/mob/living/carbon/C = usr
 		C.swap_hand()
 	else
-		var/turf/T = screen_loc2turf("screen-loc", get_turf(usr))
-		T.Click(location, control, params)
+		var/turf/T = screen_loc2turf(screen_loc, get_turf(usr))
+		if(T)
+			T.Click(location, control, params)
 	. = 1

code/controllers/Processes/mob.dm

@@ -14,7 +14,7 @@
 /datum/controller/process/mob/doWork()
 	for(last_object in mob_list)
 		var/mob/M = last_object
-		if(isnull(M.gcDestroyed))
+		if(M && isnull(M.gcDestroyed))
 			try
 				M.Life()
 			catch(var/exception/e)

code/controllers/Processes/obj.dm

@@ -11,7 +11,7 @@
 /datum/controller/process/obj/doWork()
 	for(last_object in processing_objects)
 		var/datum/O = last_object
-		if(isnull(O.gcDestroyed))
+		if(O && isnull(O.gcDestroyed))
 			try
 				O:process()
 			catch(var/exception/e)

code/controllers/communications.dm

@@ -108,6 +108,7 @@ var/const/ERT_FREQ	= 1345
 var/const/AI_FREQ	= 1343
 var/const/DTH_FREQ	= 1341
 var/const/SYND_FREQ = 1213
+var/const/RAID_FREQ	= 1277
 var/const/ENT_FREQ	= 1461 //entertainment frequency. This is not a diona exclusive frequency.
 
 // department channels
@@ -133,6 +134,7 @@ var/list/radiochannels = list(
 	"Response Team" = ERT_FREQ,
 	"Special Ops" 	= DTH_FREQ,
 	"Mercenary" 	= SYND_FREQ,
+	"Raider"		= RAID_FREQ,
 	"Supply" 		= SUP_FREQ,
 	"Service" 		= SRV_FREQ,
 	"AI Private"	= AI_FREQ,
@@ -145,7 +147,7 @@ var/list/radiochannels = list(
 var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ)
 
 // Antag channels, i.e. Syndicate
-var/list/ANTAG_FREQS = list(SYND_FREQ)
+var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ)
 
 //Department channels, arranged lexically
 var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ)

code/controllers/emergency_shuttle_controller.dm

@@ -84,6 +84,8 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 		if(istype(A, /area/hallway))
 			A.readyalert()
 
+	atc.reroute_traffic(yes = 1)
+
 //calls the shuttle for a routine crew transfer
 /datum/emergency_shuttle_controller/proc/call_transfer()
 	if(!can_call()) return
@@ -98,7 +100,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	shuttle.move_time = SHUTTLE_TRANSIT_DURATION
 
 	priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_called_message, "%dock_name%", "[using_map.dock_name]"),  "%ETA%", "[estimated_time] minute\s"))
-	atc.shift_ending() //VOREStation Add
+	atc.shift_ending()
 
 //recalls the shuttle
 /datum/emergency_shuttle_controller/proc/recall()

code/datums/autolathe/devices_vr.dm

@@ -0,0 +1,3 @@
+/datum/category_item/autolathe/devices/sleevecard
+	name = "sleevecard"
+	path =/obj/item/device/sleevecard

code/datums/autolathe/engineering.dm

@@ -74,6 +74,10 @@
 	name = "request console electronics"
 	path =/obj/item/weapon/circuitboard/request
 
+/datum/category_item/autolathe/engineering/pipelayer
+	name = "pipe layer electronics"
+	path =/obj/item/weapon/circuitboard/pipelayer
+
 /datum/category_item/autolathe/engineering/motor
 	name = "motor"
 	path =/obj/item/weapon/stock_parts/motor

code/datums/autolathe/tools.dm

@@ -14,6 +14,11 @@
 	name = "welding tool"
 	path =/obj/item/weapon/weldingtool
 
+/datum/category_item/autolathe/tools/electric_welder
+	name = "electric welding tool"
+	path =/obj/item/weapon/weldingtool/electric/unloaded
+	hidden = 1
+
 /datum/category_item/autolathe/tools/screwdriver
 	name = "screwdriver"
 	path =/obj/item/weapon/screwdriver

code/datums/supplypacks/atmospherics.dm

@@ -11,7 +11,7 @@
 	name = "Inflatable barriers"
 	contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3)
 	cost = 20
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/engineering
 	containername = "Inflatable Barrier Crate"
 
 /datum/supply_packs/atmos/canister_empty

code/datums/supplypacks/costumes.dm

@@ -78,7 +78,7 @@
 			/obj/item/clothing/under/scratch,
 			/obj/item/clothing/under/wedding/bride_white,
 			/obj/item/clothing/suit/chef,
-			/obj/item/clothing/suit/apron/overalls,
+			/obj/item/clothing/suit/storage/apron/overalls,
 			/obj/item/clothing/under/redcoat,
 			/obj/item/clothing/under/kilt
 			)

code/datums/supplypacks/engineering.dm

@@ -18,7 +18,7 @@
 	name = "Superconducting Magnetic Coil"
 	contains = list(/obj/item/weapon/smes_coil)
 	cost = 75
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/engineering
 	containername = "Superconducting Magnetic Coil crate"
 
 /datum/supply_packs/eng/electrical
@@ -30,9 +30,18 @@
 			/obj/item/weapon/cell/high = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/engineering/electrical
 	containername = "Electrical maintenance crate"
 
+/datum/supply_packs/eng/e_welders
+	name = "Electric welder crate"
+	contains = list(
+			/obj/item/weapon/weldingtool/electric = 3
+			)
+	cost = 15
+	containertype = /obj/structure/closet/crate/engineering/electrical
+	containername = "Electric welder crate"
+
 /datum/supply_packs/eng/mechanical
 	name = "Mechanical maintenance crate"
 	contains = list(
@@ -42,7 +51,7 @@
 			/obj/item/clothing/head/hardhat
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/engineering
 	containername = "Mechanical maintenance crate"
 
 /datum/supply_packs/eng/fueltank
@@ -61,34 +70,35 @@
 			/obj/item/weapon/paper/solar
 			)
 	cost = 20
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/engineering
 	containername = "Solar pack crate"
 
 /datum/supply_packs/eng/engine
 	name = "Emitter crate"
 	contains = list(/obj/machinery/power/emitter = 2)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Emitter crate"
 	access = access_ce
 
 /datum/supply_packs/eng/engine/field_gen
 	name = "Field Generator crate"
 	contains = list(/obj/machinery/field_generator = 2)
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Field Generator crate"
 	access = access_ce
 
 /datum/supply_packs/eng/engine/sing_gen
 	name = "Singularity Generator crate"
 	contains = list(/obj/machinery/the_singularitygen)
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Singularity Generator crate"
 	access = access_ce
 
 /datum/supply_packs/eng/engine/collector
 	name = "Collector crate"
 	contains = list(/obj/machinery/power/rad_collector = 3)
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Collector crate"
 
 /datum/supply_packs/eng/engine/PA
@@ -103,7 +113,7 @@
 			/obj/structure/particle_accelerator/power_box,
 			/obj/structure/particle_accelerator/end_cap
 			)
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "Particle Accelerator crate"
 	access = access_ce
 
@@ -111,7 +121,7 @@
 	contains = list(/obj/item/weapon/circuitboard/shield_gen)
 	name = "Bubble shield generator circuitry"
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "bubble shield generator circuitry crate"
 	access = access_ce
 
@@ -119,7 +129,7 @@
 	contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
 	name = "Hull shield generator circuitry"
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "hull shield generator circuitry crate"
 	access = access_ce
 
@@ -127,7 +137,7 @@
 	contains = list(/obj/item/weapon/circuitboard/shield_cap)
 	name = "Bubble shield capacitor circuitry"
 	cost = 30
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	containername = "shield capacitor circuitry crate"
 	access = access_ce
 
@@ -169,7 +179,7 @@
 	name = "P.A.C.M.A.N. portable generator parts"
 	cost = 25
 	containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	access = access_tech_storage
 	contains = list(
 			/obj/item/weapon/stock_parts/micro_laser,
@@ -182,7 +192,7 @@
 	name = "Super P.A.C.M.A.N. portable generator parts"
 	cost = 35
 	containername = "Super P.A.C.M.A.N. portable generator construction kit"
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/engineering
 	access = access_tech_storage
 	contains = list(
 			/obj/item/weapon/stock_parts/micro_laser,

code/datums/supplypacks/hydroponics.dm

@@ -51,7 +51,7 @@
 			/obj/item/weapon/material/minihoe,
 			/obj/item/device/analyzer/plant_analyzer,
 			/obj/item/clothing/gloves/botanic_leather,
-			/obj/item/clothing/suit/apron,
+			/obj/item/clothing/suit/storage/apron,
 			/obj/item/weapon/material/minihoe,
 			/obj/item/weapon/storage/box/botanydisk
 			)
@@ -141,9 +141,10 @@
 	access = access_hydroponics
 
 /datum/supply_packs/hydro/tray
-	name = "Empty hydroponics tray"
-	cost = 20
+	name = "Empty hydroponics trays"
+	cost = 50
 	containertype = /obj/structure/closet/crate/hydroponics
 	containername = "Hydroponics tray crate"
-	contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0})
-	access = access_hydroponics
+	contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0} = 3)
+	access = access_hydroponics
+

code/datums/supplypacks/medical.dm

@@ -66,6 +66,27 @@
 	containername = "Surgery crate"
 	access = access_medical
 
+/datum/supply_packs/med/deathalarm
+	name = "Death Alarm crate"
+	contains = list(
+			/obj/item/weapon/storage/box/cdeathalarm_kit,
+			/obj/item/weapon/storage/box/cdeathalarm_kit
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Death Alarm crate"
+	access = access_medical
+
+/datum/supply_packs/med/clotting
+	name = "Clotting Medicine crate"
+	contains = list(
+			/obj/item/weapon/storage/firstaid/clotting
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Clotting Medicine crate"
+	access = access_medical
+
 /datum/supply_packs/med/sterile
 	name = "Sterile equipment crate"
 	contains = list(

code/datums/supplypacks/munitions.dm

@@ -74,6 +74,14 @@
 	containername = "Energy marksman crate"
 	access = access_armory
 
+/datum/supply_packs/munitions/burstlaser
+	name = "Burst laser crate"
+	contains = list(/obj/item/weapon/gun/energy/gun/burst = 2)
+	cost = 50
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Burst laser crate"
+	access = access_armory
+
 /datum/supply_packs/munitions/ionweapons
 	name = "Electromagnetic weapons crate"
 	contains = list(
@@ -85,6 +93,17 @@
 	containername = "electromagnetic weapons crate"
 	access = access_armory
 
+/datum/supply_packs/munitions/ionpistols
+	name = "Electromagnetic pistols crate"
+	contains = list(
+			/obj/item/weapon/gun/energy/ionrifle/pistol = 2,
+			/obj/item/weapon/storage/box/emps
+			)
+	cost = 30
+	containertype = /obj/structure/closet/crate/secure
+	containername = "electromagnetic weapons crate"
+	access = access_armory
+
 /datum/supply_packs/randomised/munitions/automatic
 	name = "Automatic weapon crate"
 	num_contained = 2

code/datums/supplypacks/recreation_vr.dm

@@ -0,0 +1,8 @@
+/datum/supply_packs/recreation/rover
+	name = "NT Humvee"
+	contains = list(
+			/obj/vehicle/train/rover/engine
+			)
+	containertype = /obj/structure/largecrate
+	containername = "NT Humvee Crate"
+	cost = 100

code/datums/supplypacks/robotics.dm

@@ -20,7 +20,7 @@
 			/obj/item/weapon/cell/high = 2
 			)
 	cost = 10
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robotics assembly"
 	access = access_robotics
 
@@ -39,7 +39,7 @@
 	name = "All robolimb blueprints"
 	contains = list(
 	/obj/item/weapon/disk/limb/bishop,
-	/obj/item/weapon/disk/limb/hesphiastos,
+	/obj/item/weapon/disk/limb/hephaestus,
 	/obj/item/weapon/disk/limb/morpheus,
 	/obj/item/weapon/disk/limb/veymed,
 	/obj/item/weapon/disk/limb/wardtakahashi,
@@ -56,7 +56,7 @@
 	name = "Morpheus robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/morpheus)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robolimb blueprints (Morpheus)"
 	access = access_robotics
 
@@ -64,15 +64,23 @@
 	name = "Xion robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/xion)
 	cost = 20
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robolimb blueprints (Xion)"
 	access = access_robotics
 
+/datum/supply_packs/robotics/robolimbs/hephaestus
+	name = "Hephaestus robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/hephaestus)
+	cost = 35
+	containertype = /obj/structure/closet/crate/secure/science
+	containername = "Robolimb blueprints (Hephaestus)"
+	access = access_robotics
+
 /datum/supply_packs/robotics/robolimbs/wardtakahashi
 	name = "Ward-Takahashi robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/wardtakahashi)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robolimb blueprints (Ward-Takahashi)"
 	access = access_robotics
 
@@ -80,7 +88,7 @@
 	name = "Zeng Hu robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/zenghu)
 	cost = 35
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robolimb blueprints (Zeng Hu)"
 	access = access_robotics
 
@@ -88,7 +96,7 @@
 	name = "Bishop robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/bishop)
 	cost = 70
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robolimb blueprints (Bishop)"
 	access = access_robotics
 
@@ -96,7 +104,7 @@
 	name = "Vey-Med robolimb blueprints"
 	contains = list(/obj/item/weapon/disk/limb/veymed)
 	cost = 70
-	containertype = /obj/structure/closet/crate/secure/gear
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "Robolimb blueprints (Vey-Med)"
 	access = access_robotics
 
@@ -108,7 +116,7 @@
 			/obj/item/weapon/circuitboard/mecha/ripley/peripherals
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "APLU \"Ripley\" Circuit Crate"
 	access = access_robotics
 
@@ -119,7 +127,7 @@
 			/obj/item/weapon/circuitboard/mecha/odysseus/main
 			)
 	cost = 25
-	containertype = /obj/structure/closet/crate/secure
+	containertype = /obj/structure/closet/crate/secure/science
 	containername = "\"Odysseus\" Circuit Crate"
 	access = access_robotics
 
@@ -133,7 +141,7 @@
 			)
 	name = "Random APLU modkit"
 	cost = 200
-	containertype = /obj/structure/closet/crate
+	containertype = /obj/structure/closet/crate/science
 	containername = "heavy crate"
 
 /datum/supply_packs/randomised/robotics/exosuit_mod/durand
@@ -150,4 +158,14 @@
 			/obj/item/device/kit/paint/gygax/darkgygax,
 			/obj/item/device/kit/paint/gygax/recitence
 			)
-	name = "Random Gygax exosuit modkit"
+	name = "Random Gygax exosuit modkit"
+
+/datum/supply_packs/robotics/jumper_cables
+	name = "Jumper kit crate"
+	contains = list(
+			/obj/item/device/defib_kit/jumper_kit = 4
+			)
+	cost = 30
+	containertype = /obj/structure/closet/crate/secure/science
+	containername = "Jumper kit crate"
+	access = access_robotics

code/datums/supplypacks/science.dm

@@ -40,6 +40,7 @@
 	name = "Exotic seeds crate"
 	contains = list(
 			/obj/item/seeds/replicapod = 2,
+			/obj/item/seeds/ambrosiavulgarisseed = 2,
 			/obj/item/seeds/libertymycelium,
 			/obj/item/seeds/reishimycelium,
 			/obj/item/seeds/random = 6,
@@ -49,4 +50,3 @@
 	containertype = /obj/structure/closet/crate/hydroponics
 	containername = "Exotic Seeds crate"
 	access = access_hydroponics
-

code/datums/supplypacks/science_vr.dm

@@ -14,15 +14,29 @@
 	name = "Advanced Robolimb Blueprints"
 	contains = list(
 			/obj/item/weapon/disk/limb/bishop,
-			/obj/item/weapon/disk/limb/hesphiastos,
+			/obj/item/weapon/disk/limb/hephaestus,
 			/obj/item/weapon/disk/limb/morpheus,
 			/obj/item/weapon/disk/limb/veymed,
 			/obj/item/weapon/disk/limb/wardtakahashi,
 			/obj/item/weapon/disk/limb/xion,
 			/obj/item/weapon/disk/limb/zenghu,
-			/obj/item/weapon/disk/limb/talon
+			/obj/item/weapon/disk/limb/talon,
+			/obj/item/weapon/disk/limb/dsi_tajaran,
+			/obj/item/weapon/disk/limb/dsi_lizard,
+			/obj/item/weapon/disk/limb/dsi_sergal,
+			/obj/item/weapon/disk/limb/dsi_nevrean,
+			/obj/item/weapon/disk/limb/dsi_vulpkanin
 			)
 	cost = 40
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Advanced Robolimb Blueprint Crate"
-	access = access_robotics
+	access = access_robotics
+
+/datum/supply_packs/sci/dune_buggy
+	name = "Exploration Dune Buggy"
+	contains = list(
+			/obj/vehicle/train/rover/engine/dunebuggy
+			)
+	cost = 100
+	containertype = /obj/structure/largecrate
+	containername = "Exploration Dune Buggy Crate"

code/datums/uplink/announcements.dm

@@ -11,13 +11,9 @@
 		log_and_message_admins("has triggered a falsified [src]", user)
 
 /datum/uplink_item/abstract/announcements/fake_centcom
-	item_cost = DEFAULT_TELECRYSTAL_AMOUNT / 3
-
-/datum/uplink_item/abstract/announcements/fake_centcom/New()
-	..()
-	spawn(2)
-		name = "[command_name()] Update Announcement"
-		desc = "Causes a falsified [command_name()] Update. Triggers immediately after supplying additional data."
+	name = "Command Update Announcement"
+	desc = "Causes a falsified Command Update. Triggers immediately after supplying additional data."
+	item_cost = 40
 
 /datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user)
 	var/title = sanitize(input("Enter your announcement title.", "Announcement Title") as null|text)

code/datums/uplink/medical.dm

@@ -19,6 +19,16 @@
 	item_cost = 5
 	path = /obj/item/weapon/storage/box/ambrosia
 
+/datum/uplink_item/item/medical/clotting
+	name = "Clotting Medicine injector"
+	item_cost = 10
+	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/clotting
+
+/datum/uplink_item/item/medical/bonemeds
+	name = "Bone Repair injector"
+	item_cost = 10
+	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed
+
 /datum/uplink_item/item/medical/ambrosiadeusseeds
 	name = "Box of 7x ambrosia deus seed packets"
 	item_cost = 10

code/datums/wires/jukebox.dm

@@ -1,7 +1,7 @@
 /datum/wires/jukebox
 	random = 1
 	holder_type = /obj/machinery/media/jukebox
-	wire_count = 7
+	wire_count = 11
 
 var/const/WIRE_POWER = 1
 var/const/WIRE_HACK = 2
@@ -10,6 +10,10 @@ var/const/WIRE_SPEEDDOWN = 8
 var/const/WIRE_REVERSE = 16
 var/const/WIRE_NOTHING1 = 32
 var/const/WIRE_NOTHING2 = 64
+var/const/WIRE_START = 128
+var/const/WIRE_STOP = 256
+var/const/WIRE_PREV = 512
+var/const/WIRE_NEXT = 1024
 
 /datum/wires/jukebox/CanUse(var/mob/living/L)
 	var/obj/machinery/media/jukebox/A = holder
@@ -40,6 +44,14 @@ var/const/WIRE_NOTHING2 = 64
 			holder.visible_message("<span class='notice'>\icon[holder] The speakers squeaks.</span>")
 		if(WIRE_SPEEDDOWN)
 			holder.visible_message("<span class='notice'>\icon[holder] The speakers rumble.</span>")
+		if(WIRE_START)
+			A.StartPlaying()
+		if(WIRE_STOP)
+			A.StopPlaying()
+		if(WIRE_PREV)
+			A.PrevTrack()
+		if(WIRE_NEXT)
+			A.NextTrack()
 		else
 			A.shock(usr, 10) // The nothing wires give a chance to shock just for fun
 

code/defines/obj.dm

@@ -11,8 +11,7 @@
 		switch(alert("Travel back to ss13?",,"Yes","No"))
 			if("Yes")
 				if(user.z != src.z)	return
-				user.loc.loc.Exited(user)
-				user.loc = pick(latejoin)
+				user.forceMove(pick(latejoin))
 			if("No")
 				return
 

code/defines/obj/weapon.dm

@@ -290,19 +290,21 @@
 /obj/item/weapon/module
 	icon = 'icons/obj/module.dmi'
 	icon_state = "std_module"
+	item_state = "std_mod"
 	w_class = ITEMSIZE_SMALL
-	item_state = "electronic"
 	flags = CONDUCT
 	var/mtype = 1						// 1=electronic 2=hardware
 
 /obj/item/weapon/module/card_reader
 	name = "card reader module"
 	icon_state = "card_mod"
+	item_state = "std_mod"
 	desc = "An electronic module for reading data and ID cards."
 
 /obj/item/weapon/module/power_control
 	name = "power control module"
 	icon_state = "power_mod"
+	item_state = "std_mod"
 	desc = "Heavy-duty switching circuits for power control."
 	matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 
@@ -321,11 +323,13 @@
 /obj/item/weapon/module/cell_power
 	name = "power cell regulator module"
 	icon_state = "power_mod"
+	item_state = "std_mod"
 	desc = "A converter and regulator allowing the use of power cells."
 
 /obj/item/weapon/module/cell_power
 	name = "power cell charger module"
 	icon_state = "power_mod"
+	item_state = "std_mod"
 	desc = "Charging circuits for power cells."
 
 

code/defines/procs/hud.dm

@@ -71,7 +71,12 @@ mob/proc/handle_regular_hud_updates() //Used in the life.dm of mobs that can use
 			client.images -= hud
 	med_hud_users -= src
 	sec_hud_users -= src
-
+	//VOREStation Add - HUD lists
+	eng_hud_users -= src
+	sci_hud_users -= src
+	gen_hud_users -= src
+	if(vantag_hud) process_vantag_hud(src) //VOREStation Add - So any mob can have the vantag hud, observer or not.
+	//VOREStation Add End
 mob/proc/in_view(var/turf/T)
 	return view(T)
 

code/defines/procs/hud_vr.dm

@@ -1,8 +1,34 @@
+var/global/list/gen_hud_users            = list() // List of all entities using a generic AR shades.
+var/global/list/eng_hud_users            = list() // List of all entities using a engineer HUD.
+var/global/list/sci_hud_users            = list() // List of all entities using a science HUD.
+
+var/global/list/vantag_hud_users		 = list() // List of all mobs with the VANTAG hud on.
+
+/proc/broadcast_engineering_hud_message(var/message, var/broadcast_source)
+	broadcast_hud_message(message, broadcast_source, eng_hud_users, /obj/item/clothing/glasses/omnihud/eng)
+
+/proc/broadcast_science_hud_message(var/message, var/broadcast_source)
+	broadcast_hud_message(message, broadcast_source, sci_hud_users, /obj/item/clothing/glasses/omnihud/rnd)
+
 proc/process_omni_hud(var/mob/M, var/mode, var/mob/Alt)
 	if(!can_process_hud(M))
 		return
 
-	var/datum/arranged_hud_process/P = arrange_hud_process(M, Alt, med_hud_users)
+	var/datum/arranged_hud_process/P
+	switch(mode)
+		if("med")
+			P = arrange_hud_process(M, Alt, med_hud_users)
+		if("sec")
+			P = arrange_hud_process(M, Alt, sec_hud_users)
+		if("eng")
+			P = arrange_hud_process(M, Alt, eng_hud_users)
+		if("sci")
+			P = arrange_hud_process(M, Alt, sci_hud_users)
+		if("best")
+			P = arrange_hud_process(M, Alt, sec_hud_users)
+		else
+			P = arrange_hud_process(M, Alt, gen_hud_users)
+
 	for(var/mob/living/carbon/human/guy in P.Mob.in_view(P.Turf))
 		if(P.Mob.see_invisible < guy.invisibility)
 			continue
@@ -19,3 +45,16 @@ proc/process_omni_hud(var/mob/M, var/mode, var/mob/Alt)
 			P.Client.images += guy.hud_list[WANTED_HUD]
 			P.Client.images += guy.hud_list[STATUS_R_HUD]
 			P.Client.images += guy.hud_list[BACKUP_HUD]
+
+
+proc/process_vantag_hud(var/mob/M)
+	if(!M.vantag_hud || !can_process_hud(M))
+		return
+
+	var/datum/arranged_hud_process/P = arrange_hud_process(M, null, vantag_hud_users)
+
+	for(var/mob/living/carbon/human/guy in P.Mob.in_view(P.Turf))
+		if(P.Mob.see_invisible < guy.invisibility)
+			continue
+
+		P.Client.images += guy.hud_list[VANTAG_HUD]

code/game/antagonist/antagonist.dm

@@ -107,6 +107,7 @@
 			candidates -= player
 			log_debug("[key_name(player)] is not eligible to become a [role_text]: Only ghosts may join as this role! They have been removed from the draft.")
 		else if(config.use_age_restriction_for_antags && player.current.client.player_age < minimum_player_age)
+			candidates -= player
 			log_debug("[key_name(player)] is not eligible to become a [role_text]: Is only [player.current.client.player_age] day\s old, has to be [minimum_player_age] day\s!")
 		else if(istype(player.current, /mob/living/voice))
 			candidates -= player

code/game/antagonist/antagonist_create.dm

@@ -43,12 +43,15 @@
 /datum/antagonist/proc/create_radio(var/freq, var/mob/living/carbon/human/player)
 	var/obj/item/device/radio/R
 
-	if(freq == SYND_FREQ)
-		R = new/obj/item/device/radio/headset/syndicate(player)
-	else
-		R = new/obj/item/device/radio/headset(player)
+	switch(freq)
+		if(SYND_FREQ)
+			R = new/obj/item/device/radio/headset/syndicate(player)
+		if(RAID_FREQ)
+			R = new/obj/item/device/radio/headset/raider(player)
+		else
+			R = new/obj/item/device/radio/headset(player)
+			R.set_frequency(freq)
 
-	R.set_frequency(freq)
 	player.equip_to_slot_or_del(R, slot_l_ear)
 	return R
 

code/game/antagonist/outsider/raider.dm

@@ -232,7 +232,7 @@ var/datum/antagonist/raider/raiders
 	W.handle_item_insertion(id)
 	player.equip_to_slot_or_del(W, slot_wear_id)
 	spawn_money(rand(50,150)*10,W)
-	create_radio(SYND_FREQ, player)
+	create_radio(RAID_FREQ, player)
 
 	return 1
 

code/game/atoms_movable.dm

@@ -125,8 +125,17 @@
 				if(A:lying) continue
 				src.throw_impact(A,speed)
 			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,speed)
+				if(!A.density || A.throwpass)
+					continue
+				// Special handling of windows, which are dense but block only from some directions
+				if(istype(A, /obj/structure/window))
+					var/obj/structure/window/W = A
+					if (!W.is_full_window() && !(turn(src.last_move, 180) & A.dir))
+						continue
+				// Same thing for (closed) windoors, which have the same problem
+				else if(istype(A, /obj/machinery/door/window) && !(turn(src.last_move, 180) & A.dir))
+					continue
+				src.throw_impact(A,speed)
 
 /atom/movable/proc/throw_at(atom/target, range, speed, thrower)
 	if(!target || !src)	return 0

code/game/dna/dna2.dm

@@ -94,6 +94,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
 
 	// New stuff
 	var/species = "Human"
+	var/list/body_markings = list()
 
 // Make a copy of this strand.
 // USE THIS WHEN COPYING STUFF OR YOU'LL GET CORRUPTION!
@@ -103,6 +104,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
 	new_dna.b_type=b_type
 	new_dna.real_name=real_name
 	new_dna.species=species
+	new_dna.body_markings=body_markings.Copy()
 	for(var/b=1;b<=DNA_SE_LENGTH;b++)
 		new_dna.SE[b]=SE[b]
 		if(b<=DNA_UI_LENGTH)
@@ -196,6 +198,11 @@ var/global/list/datum/dna/gene/dna_genes[0]
 	SetUIValueRange(DNA_UI_HAIR_STYLE,  hair,  hair_styles_list.len,       1)
 	SetUIValueRange(DNA_UI_BEARD_STYLE, beard, facial_hair_styles_list.len,1)
 
+	body_markings.Cut()
+	for(var/obj/item/organ/external/E in character.organs)
+		if(E.markings.len)
+			body_markings[E.organ_tag] = E.markings.Copy()
+
 	UpdateUI()
 
 // Set a DNA UI block's raw value.

code/game/dna/dna2_helpers.dm

@@ -156,6 +156,13 @@
 			else
 				H.gender = MALE
 
+		//Body markings
+		for(var/tag in dna.body_markings)
+			var/obj/item/organ/external/E = H.organs_by_name[tag]
+			if(E)
+				var/list/marklist = dna.body_markings[tag]
+				E.markings = marklist.Copy()
+
 		//Hair
 		var/hair = dna.GetUIValueRange(DNA_UI_HAIR_STYLE,hair_styles_list.len)
 		if((0 < hair) && (hair <= hair_styles_list.len))

code/game/gamemodes/changeling/powers/shriek.dm

@@ -95,11 +95,15 @@
 
 	changeling.chem_charges -= 20
 
-	var/range_heavy = 2
-	var/range_light = 5
+	var/range_heavy = 1
+	var/range_med = 2
+	var/range_light = 4
+	var/range_long = 6
 	if(src.mind.changeling.recursive_enhancement)
 		range_heavy = range_heavy * 2
+		range_med = range_med * 2
 		range_light = range_light * 2
+		range_long = range_long * 2
 		src << "<span class='notice'>We are extra loud.</span>"
 		src.mind.changeling.recursive_enhancement = 0
 

code/game/gamemodes/cult/cult_structures.dm

@@ -109,7 +109,7 @@
 	light_color="#ff0000"
 	spawnable=list(
 		/mob/living/simple_animal/hostile/scarybat,
-		/mob/living/simple_animal/hostile/vore/creature,
+		/mob/living/simple_animal/hostile/creature/vore,
 		/mob/living/simple_animal/hostile/faithless
 	)   // Vorestation Edit
 
@@ -118,9 +118,9 @@
 	light_color="#ff0000"
 	spawnable=list(
 		/mob/living/simple_animal/hostile/scarybat/cult,
-		/mob/living/simple_animal/hostile/vore/creature/cult,
+		/mob/living/simple_animal/hostile/creature/cult,
 		/mob/living/simple_animal/hostile/faithless/cult
-	)  // Vorestation Edit
+	)
 
 /obj/effect/gateway/active/cult/cultify()
 	return

code/game/gamemodes/cult/runes.dm

@@ -231,7 +231,7 @@ var/list/sacrificed = list()
 			if(T)
 				T.hotspot_expose(700,125)
 			var/rune = src // detaching the proc - in theory
-			empulse(U, (range_red - 2), range_red)
+			empulse(U, (range_red - 3), (range_red - 2), (range_red - 1), range_red)
 			qdel(rune)
 			return
 

code/game/gamemodes/events.dm

@@ -210,7 +210,7 @@ var/hadevent    = 0
 /proc/carp_migration() // -- Darem
 	for(var/obj/effect/landmark/C in landmarks_list)
 		if(C.name == "carpspawn")
-			new /mob/living/simple_animal/hostile/vore/carp(C.loc) // Vorestation edit
+			new /mob/living/simple_animal/hostile/carp(C.loc)
 	//sleep(100)
 	spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes.
 		command_announcement.Announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", new_sound = 'sound/AI/commandreport.ogg')
@@ -350,6 +350,11 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 					M << "<br>"
 					M.add_ion_law("THE STATION IS [who2pref] [who2]")
 
+	if(botEmagChance)
+		for(var/mob/living/bot/bot in machines)
+			if(prob(botEmagChance))
+				bot.emag_act(1)
+
 	/*
 
 	var/apcnum = 0

code/game/gamemodes/meteor/meteors.dm

@@ -254,7 +254,7 @@
 	..()
 	// Best case scenario: Comparable to a low-yield EMP grenade.
 	// Worst case scenario: Comparable to a standard yield EMP grenade.
-	empulse(src, rand(2, 4), rand(4, 10))
+	empulse(src, rand(1, 3), rand(2, 4), rand(3, 7), rand(5, 10))
 
 //Station buster Tunguska
 /obj/effect/meteor/tunguska

code/game/gamemodes/technomancer/instability.dm

@@ -126,7 +126,7 @@
 						safe_blink(src, range = 6)
 						src << "<span class='warning'>You're teleported against your will!</span>"
 					if(4)
-						emp_act(2)
+						emp_act(3)
 
 			if(51 to 100) //Severe
 				rng = rand(0,3)

code/game/gamemodes/technomancer/spells/control.dm

@@ -35,17 +35,15 @@
 		/mob/living/simple_animal/adultslime,
 		/mob/living/simple_animal/tindalos,
 		/mob/living/simple_animal/yithian,
-		/mob/living/simple_animal/hostile/vore/bear,
-		/mob/living/simple_animal/hostile/vore/carp,
 		/mob/living/simple_animal/hostile/scarybat,
 		/mob/living/simple_animal/hostile/viscerator,
-		/mob/living/simple_animal/hostile/retaliate/malf_drone,
+		/mob/living/simple_animal/hostile/malf_drone,
 		/mob/living/simple_animal/hostile/giant_spider,
 		/mob/living/simple_animal/hostile/hivebot,
 		/mob/living/simple_animal/hostile/diyaab, //Doubt these will get used but might as well,
 		/mob/living/simple_animal/hostile/samak,
 		/mob/living/simple_animal/hostile/shantak
-		) // Vorestation edits to add vore versions.
+		)
 
 //This unfortunately is gonna be rather messy due to the various mobtypes involved.
 /obj/item/weapon/spell/control/proc/select(var/mob/living/L)

code/game/gamemodes/technomancer/spells/spawner/pulsar.dm

@@ -23,7 +23,7 @@
 		..()
 
 /obj/item/weapon/spell/spawner/pulsar/on_throw_cast(atom/hit_atom, mob/user)
-	empulse(hit_atom, 1, 1, log=1)
+	empulse(hit_atom, 1, 1, 1, 1, log=1)
 
 /obj/effect/temporary_effect/pulsar
 	name = "pulsar"
@@ -44,7 +44,7 @@
 /obj/effect/temporary_effect/pulsar/proc/pulse_loop()
 	while(pulses_remaining)
 		sleep(2 SECONDS)
-		empulse(src, heavy_range = 1, light_range = 2, log = 1)
+		empulse(src, 1, 1, 2, 2, log = 1)
 		pulses_remaining--
 	qdel(src)
 

code/game/gamemodes/technomancer/spells/summon/summon_creature.dm

@@ -22,7 +22,7 @@
 		"Chick"			=	/mob/living/simple_animal/chick,
 		"Crab"			=	/mob/living/simple_animal/crab,
 		"Parrot"		=	/mob/living/simple_animal/parrot,
-		"Goat"			=	/mob/living/simple_animal/hostile/retaliate/goat,
+		"Goat"			=	/mob/living/simple_animal/retaliate/goat,
 		"Cat"			=	/mob/living/simple_animal/cat,
 		"Kitten"		=	/mob/living/simple_animal/cat/kitten,
 		"Corgi"			=	/mob/living/simple_animal/corgi,
@@ -31,8 +31,8 @@
 		"SPIDER"		=	/mob/living/simple_animal/hostile/giant_spider,
 		"SPIDER HUNTER"	=	/mob/living/simple_animal/hostile/giant_spider/hunter,
 		"SPIDER NURSE"	=	/mob/living/simple_animal/hostile/giant_spider/nurse,
-		"CARP"			=	/mob/living/simple_animal/hostile/vore/carp,
-		"BEAR"			=	/mob/living/simple_animal/hostile/vore/bear
+		"CARP"			=	/mob/living/simple_animal/hostile/carp,
+		"BEAR"			=	/mob/living/simple_animal/hostile/bear
 		) // Vorestation edits to add vore versions.
 	cooldown = 30
 	instability_cost = 10

code/game/jobs/job/captain.dm

@@ -23,41 +23,41 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	ideal_character_age = 70 // Old geezer captains ftw
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/cap(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/com(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/captain(H), slot_w_uniform)
-		if(H.age>49)
-			// Since we can have something other than the default uniform at this
-			// point, check if we can actually attach the medal
-			var/obj/item/clothing/uniform = H.w_uniform
-			var/obj/item/clothing/accessory/medal/gold/captain/medal = new()
+/datum/job/captain/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/cap(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/com(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/captain(H), slot_w_uniform)
+	if(H.age>49)
+		// Since we can have something other than the default uniform at this
+		// point, check if we can actually attach the medal
+		var/obj/item/clothing/uniform = H.w_uniform
+		var/obj/item/clothing/accessory/medal/gold/captain/medal = new()
 
-			if(uniform && uniform.can_attach_accessory(medal))
-				uniform.attach_accessory(null, medal)
-			else
-				qdel(medal)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_l_hand)
+		if(uniform && uniform.can_attach_accessory(medal))
+			uniform.attach_accessory(null, medal)
 		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
+			qdel(medal)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_l_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
 
 
-		H.implant_loyalty()
+	H.implant_loyalty()
 
-		return 1
+	return 1
 
-	get_access()
-		return get_all_station_access()
+/datum/job/captain/get_access()
+	return get_all_station_access()
 
 
 
@@ -95,22 +95,24 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 			            access_hop, access_RC_announce, access_keycard_auth, access_gateway)
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_l_hand)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
-		H.implant_loyalty()
-		return 1
+/datum/job/hop/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_l_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
+	H.implant_loyalty()
+	return 1
+
+
 
 /datum/job/secretary
 	title = "Command Secretary"
@@ -131,7 +133,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	access = list(access_heads)
 	minimal_access = list(access_heads)
 
-/datum/job/secretary/equip(var/mob/living/carbon/human/H)
+/datum/job/secretary/equip(var/mob/living/carbon/human/H, var/alt_title)
 	if(!H)	return 0
 	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(H), slot_l_ear)
 	switch(H.backbag)

code/game/jobs/job/civilian.dm

@@ -15,18 +15,18 @@
 	alt_titles = list("Barista")
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/bar(H), slot_belt)
-		return 1
+/datum/job/bartender/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/bar(H), slot_belt)
+	return 1
 
 
 
@@ -46,15 +46,15 @@
 	alt_titles = list("Cook")
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/chef(H), slot_belt)
-		return 1
+/datum/job/chef/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/chef(H), slot_belt)
+	return 1
 
 
 
@@ -74,21 +74,21 @@
 	alt_titles = list("Hydroponicist")
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(H), slot_wear_suit)
-		H.equip_to_slot_or_del(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/hydroponics(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/hyd(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/hyd(H), slot_back)
-		return 1
+/datum/job/hydro/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/hydroponics(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/hyd(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/hyd(H), slot_back)
+	return 1
 
 
 
@@ -112,16 +112,16 @@
 	ideal_character_age = 40
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
-		H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
-		return 1
+/datum/job/qm/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt)
+//	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
+	H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
+	return 1
 
 
 
@@ -139,14 +139,14 @@
 	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
 	minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		return 1
+/datum/job/cargo_tech/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt)
+//	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	return 1
 
 
 
@@ -166,27 +166,27 @@
 	minimal_access = list(access_mining, access_mining_station, access_mailsorting)
 	alt_titles = list("Drill Technician","Prospector")
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_l_hand)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_l_store)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack)
-		return 1
+/datum/job/mining/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+//	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_l_hand)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_l_store)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack)
+	return 1
 
-	equip_survival(var/mob/living/carbon/human/H)
+/datum/job/mining/equip_survival(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.species.equip_survival_gear(H,1)
 		return 1
@@ -207,13 +207,13 @@
 	alt_titles = list("Custodian", "Sanitation Technician")
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt)
-		return 1
+/datum/job/janitor/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt)
+	return 1
 
 
 
@@ -234,13 +234,13 @@
 	alt_titles = list("Journalist", "Professor", "Historian", "Writer")
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/librarian(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_l_hand)
-		return 1
+/datum/job/librarian/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/librarian(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_l_hand)
+	return 1
 
 
 
@@ -261,22 +261,22 @@
 	minimal_access = list(access_lawyer, access_sec_doors, access_heads)
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/ia(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/internalaffairs(H), slot_wear_suit)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(H), slot_glasses)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/lawyer(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
+/datum/job/lawyer/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/ia(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/internalaffairs(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(H), slot_glasses)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/lawyer(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
 
-		H.implant_loyalty()
+	H.implant_loyalty()
 
 
-		return 1
+	return 1

code/game/jobs/job/civilian_chaplain.dm

@@ -15,146 +15,146 @@
 	alt_titles = list("Counselor")
 
 
-	equip(var/mob/living/carbon/human/H, var/alt_title, var/ask_questions = TRUE)
-		if(!H)	return 0
+/datum/job/chaplain/equip(var/mob/living/carbon/human/H, var/alt_title, var/ask_questions = TRUE)
+	if(!H)	return 0
 
-		var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT
-		H.equip_to_slot_or_del(B, slot_l_hand)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		if(!ask_questions)
-			return 1
-
-
-		spawn(0)
-			var/religion_name = "Christianity"
-			var/new_religion = sanitize(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name), MAX_NAME_LEN)
-
-			if (!new_religion)
-				new_religion = religion_name
-
-			switch(lowertext(new_religion))
-				if("christianity")
-					B.name = pick("The Holy Bible","The Dead Sea Scrolls")
-				if("satanism")
-					B.name = "The Unholy Bible"
-				if("cthulu")
-					B.name = "The Necronomicon"
-				if("islam")
-					B.name = "Quran"
-				if("scientology")
-					B.name = pick("The Biography of L. Ron Hubbard","Dianetics")
-				if("chaos")
-					B.name = "The Book of Lorgar"
-				if("imperium")
-					B.name = "Uplifting Primer"
-				if("toolboxia")
-					B.name = "Toolbox Manifesto"
-				if("homosexuality")
-					B.name = "Guys Gone Wild"
-				//if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks")
-				//	B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition")
-				//	H.setBrainLoss(100) // starts off retarded as fuck
-				if("science")
-					B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition")
-				else
-					B.name = "The Holy Book of [new_religion]"
-			feedback_set_details("religion_name","[new_religion]")
-
-		spawn(1)
-			var/deity_name = "Space Jesus"
-			var/new_deity = sanitize(input(H, "Would you like to change your deity? Default is Space Jesus.", "Name change", deity_name), MAX_NAME_LEN)
-
-			if ((length(new_deity) == 0) || (new_deity == "Space Jesus") )
-				new_deity = deity_name
-			B.deity_name = new_deity
-
-			var/accepted = 0
-			var/outoftime = 0
-			spawn(200) // 20 seconds to choose
-				outoftime = 1
-			var/new_book_style = "Bible"
-
-			while(!accepted)
-				if(!B) break // prevents possible runtime errors
-				new_book_style = input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")
-				switch(new_book_style)
-					if("Koran")
-						B.icon_state = "koran"
-						B.item_state = "koran"
-						for(var/area/chapel/main/A in world)
-							for(var/turf/T in A.contents)
-								if(T.icon_state == "carpetsymbol")
-									T.set_dir(4)
-					if("Scrapbook")
-						B.icon_state = "scrapbook"
-						B.item_state = "scrapbook"
-					if("Creeper")
-						B.icon_state = "creeper"
-						B.item_state = "syringe_kit"
-					if("White Bible")
-						B.icon_state = "white"
-						B.item_state = "syringe_kit"
-					if("Holy Light")
-						B.icon_state = "holylight"
-						B.item_state = "syringe_kit"
-					if("Athiest")
-						B.icon_state = "athiest"
-						B.item_state = "syringe_kit"
-						for(var/area/chapel/main/A in world)
-							for(var/turf/T in A.contents)
-								if(T.icon_state == "carpetsymbol")
-									T.set_dir(10)
-					if("Tome")
-						B.icon_state = "tome"
-						B.item_state = "syringe_kit"
-					if("The King in Yellow")
-						B.icon_state = "kingyellow"
-						B.item_state = "kingyellow"
-					if("Ithaqua")
-						B.icon_state = "ithaqua"
-						B.item_state = "ithaqua"
-					if("Scientology")
-						B.icon_state = "scientology"
-						B.item_state = "scientology"
-						for(var/area/chapel/main/A in world)
-							for(var/turf/T in A.contents)
-								if(T.icon_state == "carpetsymbol")
-									T.set_dir(8)
-					if("the bible melts")
-						B.icon_state = "melted"
-						B.item_state = "melted"
-					if("Necronomicon")
-						B.icon_state = "necronomicon"
-						B.item_state = "necronomicon"
-					else
-						// if christian bible, revert to default
-						B.icon_state = "bible"
-						B.item_state = "bible"
-						for(var/area/chapel/main/A in world)
-							for(var/turf/T in A.contents)
-								if(T.icon_state == "carpetsymbol")
-									T.set_dir(2)
-
-				H.update_inv_l_hand() // so that it updates the bible's item_state in his hand
-
-				switch(input(H,"Look at your bible - is this what you want?") in list("Yes","No"))
-					if("Yes")
-						accepted = 1
-					if("No")
-						if(outoftime)
-							H << "Welp, out of time, buddy. You're stuck. Next time choose faster."
-							accepted = 1
-
-			if(ticker)
-				ticker.Bible_icon_state = B.icon_state
-				ticker.Bible_item_state = B.item_state
-				ticker.Bible_name = B.name
-				ticker.Bible_deity_name = B.deity_name
-			feedback_set_details("religion_deity","[new_deity]")
-			feedback_set_details("religion_book","[new_book_style]")
+	var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT
+	H.equip_to_slot_or_del(B, slot_l_hand)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	if(!ask_questions)
 		return 1
 
+
+	spawn(0)
+		var/religion_name = "Christianity"
+		var/new_religion = sanitize(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name), MAX_NAME_LEN)
+
+		if (!new_religion)
+			new_religion = religion_name
+
+		switch(lowertext(new_religion))
+			if("christianity")
+				B.name = pick("The Holy Bible","The Dead Sea Scrolls")
+			if("satanism")
+				B.name = "The Unholy Bible"
+			if("cthulu")
+				B.name = "The Necronomicon"
+			if("islam")
+				B.name = "Quran"
+			if("scientology")
+				B.name = pick("The Biography of L. Ron Hubbard","Dianetics")
+			if("chaos")
+				B.name = "The Book of Lorgar"
+			if("imperium")
+				B.name = "Uplifting Primer"
+			if("toolboxia")
+				B.name = "Toolbox Manifesto"
+			if("homosexuality")
+				B.name = "Guys Gone Wild"
+			//if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks")
+			//	B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition")
+			//	H.setBrainLoss(100) // starts off retarded as fuck
+			if("science")
+				B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition")
+			else
+				B.name = "The Holy Book of [new_religion]"
+		feedback_set_details("religion_name","[new_religion]")
+
+	spawn(1)
+		var/deity_name = "Space Jesus"
+		var/new_deity = sanitize(input(H, "Would you like to change your deity? Default is Space Jesus.", "Name change", deity_name), MAX_NAME_LEN)
+
+		if ((length(new_deity) == 0) || (new_deity == "Space Jesus") )
+			new_deity = deity_name
+		B.deity_name = new_deity
+
+		var/accepted = 0
+		var/outoftime = 0
+		spawn(200) // 20 seconds to choose
+			outoftime = 1
+		var/new_book_style = "Bible"
+
+		while(!accepted)
+			if(!B) break // prevents possible runtime errors
+			new_book_style = input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")
+			switch(new_book_style)
+				if("Koran")
+					B.icon_state = "koran"
+					B.item_state = "koran"
+					for(var/area/chapel/main/A in world)
+						for(var/turf/T in A.contents)
+							if(T.icon_state == "carpetsymbol")
+								T.set_dir(4)
+				if("Scrapbook")
+					B.icon_state = "scrapbook"
+					B.item_state = "scrapbook"
+				if("Creeper")
+					B.icon_state = "creeper"
+					B.item_state = "syringe_kit"
+				if("White Bible")
+					B.icon_state = "white"
+					B.item_state = "syringe_kit"
+				if("Holy Light")
+					B.icon_state = "holylight"
+					B.item_state = "syringe_kit"
+				if("Athiest")
+					B.icon_state = "athiest"
+					B.item_state = "syringe_kit"
+					for(var/area/chapel/main/A in world)
+						for(var/turf/T in A.contents)
+							if(T.icon_state == "carpetsymbol")
+								T.set_dir(10)
+				if("Tome")
+					B.icon_state = "tome"
+					B.item_state = "syringe_kit"
+				if("The King in Yellow")
+					B.icon_state = "kingyellow"
+					B.item_state = "kingyellow"
+				if("Ithaqua")
+					B.icon_state = "ithaqua"
+					B.item_state = "ithaqua"
+				if("Scientology")
+					B.icon_state = "scientology"
+					B.item_state = "scientology"
+					for(var/area/chapel/main/A in world)
+						for(var/turf/T in A.contents)
+							if(T.icon_state == "carpetsymbol")
+								T.set_dir(8)
+				if("the bible melts")
+					B.icon_state = "melted"
+					B.item_state = "melted"
+				if("Necronomicon")
+					B.icon_state = "necronomicon"
+					B.item_state = "necronomicon"
+				else
+					// if christian bible, revert to default
+					B.icon_state = "bible"
+					B.item_state = "bible"
+					for(var/area/chapel/main/A in world)
+						for(var/turf/T in A.contents)
+							if(T.icon_state == "carpetsymbol")
+								T.set_dir(2)
+
+			H.update_inv_l_hand() // so that it updates the bible's item_state in his hand
+
+			switch(input(H,"Look at your bible - is this what you want?") in list("Yes","No"))
+				if("Yes")
+					accepted = 1
+				if("No")
+					if(outoftime)
+						H << "Welp, out of time, buddy. You're stuck. Next time choose faster."
+						accepted = 1
+
+		if(ticker)
+			ticker.Bible_icon_state = B.icon_state
+			ticker.Bible_item_state = B.item_state
+			ticker.Bible_name = B.name
+			ticker.Bible_deity_name = B.deity_name
+		feedback_set_details("religion_deity","[new_deity]")
+		feedback_set_details("religion_book","[new_book_style]")
+	return 1
+
 /datum/job/chaplain/equip_preview(var/mob/living/carbon/human/H, var/alt_title)
 	return equip(H, alt_title, FALSE)

code/game/jobs/job/engineering.dm

@@ -28,26 +28,26 @@
 	minimal_player_age = 7
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/ce(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/ce(H), slot_l_store)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/workboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		return 1
+/datum/job/chief_engineer/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/ce(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/heads/ce(H), slot_l_store)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/workboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	return 1
 
-	equip_survival(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.species.equip_survival_gear(H,1)
-		return 1
+/datum/job/chief_engineer/equip_survival(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.species.equip_survival_gear(H,1)
+	return 1
 
 
 /datum/job/engineer
@@ -67,26 +67,26 @@
 	alt_titles = list("Maintenance Technician","Engine Technician","Electrician")
 
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/workboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/device/t_scanner(H), slot_r_store)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/engineering(H), slot_l_store)
-		return 1
+/datum/job/engineer/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/eng(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/workboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/device/t_scanner(H), slot_r_store)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/engineering(H), slot_l_store)
+	return 1
 
-	equip_survival(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.species.equip_survival_gear(H,1)
-		return 1
+/datum/job/engineer/equip_survival(var/mob/living/carbon/human/H)
+	if(!H)	return 0
+	H.species.equip_survival_gear(H,1)
+	return 1
 
 
 /datum/job/atmos
@@ -106,21 +106,21 @@
 
 	minimal_player_age = 3
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/workboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/atmos(H), slot_l_store)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt)
-		return 1
+/datum/job/atmos/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/engi(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/workboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/atmos(H), slot_l_store)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt)
+	return 1
 
-	equip_survival(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.species.equip_survival_gear(H,1)
-		return 1
+/datum/job/atmos/equip_survival(var/mob/living/carbon/human/H)
+	if(!H)	return 0
+	H.species.equip_survival_gear(H,1)
+	return 1

code/game/jobs/job/medical.dm

@@ -23,21 +23,21 @@
 	minimal_player_age = 10
 	ideal_character_age = 50
 
-	equip(var/mob/living/carbon/human/H, var/alt_title)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/med(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/cmo(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(H), slot_wear_suit)
-		H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), slot_s_store)
-		return 1
+/datum/job/cmo/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/med(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/heads/cmo(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), slot_s_store)
+	return 1
 
 /datum/job/doctor
 	title = "Medical Doctor"
@@ -55,50 +55,50 @@
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva)
 	alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
 
-	equip(var/mob/living/carbon/human/H, var/alt_title)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+/datum/job/doctor/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/med(H), slot_back)
+	if(has_alt_title(H, alt_title,"Emergency Physician"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
+	else if(has_alt_title(H, alt_title,"Surgeon"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head)
+	else if(has_alt_title(H, alt_title,"Virologist"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
 		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
+			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/virology(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/vir(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/med(H), slot_back)
-		if(has_alt_title(H, alt_title,"Emergency Physician"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
-		else if(has_alt_title(H, alt_title,"Surgeon"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
-			H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head)
-		else if(has_alt_title(H, alt_title,"Virologist"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit)
-			H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
-			switch(H.backbag)
-				if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/virology(H), slot_back)
-				if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/vir(H), slot_back)
-				if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-				if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/viro(H), slot_back)
-		else if(has_alt_title(H, alt_title,"Medical Doctor"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
-		else if(has_alt_title(H, alt_title,"Nurse"))
-			if(H.gender == FEMALE)
-				if(prob(50))
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
-				else
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
-				H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
+			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/viro(H), slot_back)
+	else if(has_alt_title(H, alt_title,"Medical Doctor"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+	else if(has_alt_title(H, alt_title,"Nurse"))
+		if(H.gender == FEMALE)
+			if(prob(50))
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
 			else
-				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
+				H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
+			H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
 		else
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), slot_s_store)
-		return 1
+			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
+	else
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(H), slot_s_store)
+	return 1
 
 
 
@@ -121,19 +121,19 @@
 
 	minimal_player_age = 3
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(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/chemist(H), slot_belt)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/chemistry(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/chem(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/chem(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(H), slot_wear_suit)
-		return 1
+/datum/job/chemist/equip(var/mob/living/carbon/human/H)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(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/chemist(H), slot_belt)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/chemistry(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/chem(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/chem(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(H), slot_wear_suit)
+	return 1
 
 
 /* I'm commenting out Geneticist so you can't actually see it in the job menu, given that you can't play as one - Jon.
@@ -151,19 +151,19 @@
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research)
 	minimal_access = list(access_medical, access_morgue, access_genetics, access_research)
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_medsci(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(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/geneticist(H), slot_belt)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/genetics(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/gen(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(H), slot_wear_suit)
-		H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
-		return 1
+/datum/job/geneticist/equip(var/mob/living/carbon/human/H)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_medsci(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(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/geneticist(H), slot_belt)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/genetics(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/gen(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
+	return 1
 */
 
 /datum/job/psychiatrist
@@ -182,23 +182,23 @@
 	minimal_access = list(access_medical, access_medical_equip, access_psychiatrist)
 	alt_titles = list("Psychologist")
 
-	equip(var/mob/living/carbon/human/H, var/alt_title)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
-		if(has_alt_title(H, alt_title,"Psychiatrist"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych(H), slot_w_uniform)
-		else if(has_alt_title(H, alt_title,"Psychologist"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych/turtleneck(H), slot_w_uniform)
-		else
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+/datum/job/psychiatrist/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
+	if(has_alt_title(H, alt_title,"Psychiatrist"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych(H), slot_w_uniform)
+	else if(has_alt_title(H, alt_title,"Psychologist"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/psych/turtleneck(H), slot_w_uniform)
+	else
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
 
 
 /datum/job/Paramedic
@@ -217,29 +217,29 @@
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks)
 	alt_titles = list("Emergency Medical Technician")
 
-	equip(var/mob/living/carbon/human/H, var/alt_title)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/med(H), slot_back)
-		if(has_alt_title(H, alt_title,"Emergency Medical Technician"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
-		else if(has_alt_title(H, alt_title,"Paramedic"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/black(H), slot_w_uniform)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
-		else
-			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/medical/emt(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_l_store)
-		return 1
+/datum/job/Paramedic/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/med(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/med(H), slot_back)
+	if(has_alt_title(H, alt_title,"Emergency Medical Technician"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
+	else if(has_alt_title(H, alt_title,"Paramedic"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/black(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/fr_jacket(H), slot_wear_suit)
+	else
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/medical/emt(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_l_store)
+	return 1
 
-	equip_survival(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.species.equip_survival_gear(H,1)
-		return 1
+/datum/job/Paramedic/equip_survival(var/mob/living/carbon/human/H)
+	if(!H)	return 0
+	H.species.equip_survival_gear(H,1)
+	return 1

code/game/jobs/job/science.dm

@@ -26,20 +26,20 @@
 	minimal_player_age = 14
 	ideal_character_age = 50
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/rd(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/tox(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
-		return 1
+/datum/job/rd/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/rd(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/tox(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+	return 1
 
 
 
@@ -61,19 +61,19 @@
 
 	minimal_player_age = 14
 
-	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_l_ear)
-		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/science(H), slot_belt)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/tox(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/science(H), slot_wear_suit)
-		return 1
+/datum/job/scientist/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
+	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/science(H), slot_belt)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/tox(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/science(H), slot_wear_suit)
+	return 1
 
 /datum/job/xenobiologist
 	title = "Xenobiologist"
@@ -93,19 +93,19 @@
 
 	minimal_player_age = 14
 
-	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_l_ear)
-		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/science(H), slot_belt)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/tox(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/science(H), slot_wear_suit)
-		return 1
+/datum/job/xenobiologist/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H) return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
+	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/science(H), slot_belt)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/toxins(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/tox(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/tox(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/science(H), slot_wear_suit)
+	return 1
 
 /datum/job/roboticist
 	title = "Roboticist"
@@ -125,14 +125,14 @@
 
 	minimal_player_age = 7
 
-	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_l_ear)
-		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_r_store)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
-		return 1
+/datum/job/roboticist/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
+	if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+	if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_r_store)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit)
+	return 1

code/game/jobs/job/security.dm

@@ -20,30 +20,30 @@
 			            access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 			            access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
 			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
-	alt_titles = list("Commander")
+	alt_titles = list("Commander", "Chief of Security")
 	minimum_character_age = 25
 	minimal_player_age = 14
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/sec(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_store)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
-		H.implant_loyalty()
-		return 1
+/datum/job/hos/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/sec(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_l_ear)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+//	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
+	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_store)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+	H.implant_loyalty()
+	return 1
 
 
 
@@ -63,26 +63,26 @@
 	minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_external_airlocks)
 	minimal_player_age = 5
 
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/sec(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
-		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
-		return 1
+/datum/job/warden/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/sec(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
+//	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
+	H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+	return 1
 
 
 
@@ -102,31 +102,32 @@
 	minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
 	economic_modifier = 5
 	minimal_player_age = 3
-	equip(var/mob/living/carbon/human/H, var/alt_title)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		H.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(H), slot_l_store)
-		if(H.backbag == 1)//Why cant some of these things spawn in his office?
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
-		if(has_alt_title(H, alt_title,"Forensic Technician"))
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/crimekit, slot_r_hand)
-		else
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_trench(H), slot_wear_suit)
-			H.equip_to_slot_or_del(new /obj/item/clothing/head/det(H), slot_head)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/crimekit(H), slot_r_hand)
-		return 1
+
+/datum/job/detective/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/norm(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	H.equip_to_slot_or_del(new /obj/item/weapon/flame/lighter/zippo(H), slot_l_store)
+	if(H.backbag == 1)//Why cant some of these things spawn in his office?
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
+	if(has_alt_title(H, alt_title,"Forensic Technician"))
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/crimekit, slot_r_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_trench(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/det(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase/crimekit(H), slot_r_hand)
+	return 1
 
 
 
@@ -146,22 +147,23 @@
 	access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks)
 	minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks)
 	minimal_player_age = 3
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
-		switch(H.backbag)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-			if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/sec(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store)
-		H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
-		return 1
+
+/datum/job/officer/equip(var/mob/living/carbon/human/H, var/alt_title)
+	if(!H)	return 0
+	H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
+	switch(H.backbag)
+		if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
+		if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/sec(H), slot_back)
+		if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		if(5) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/messenger/sec(H), slot_back)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+	H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store)
+	H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
+	if(H.backbag == 1)
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand)
+	else
+		H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
+	return 1

code/game/jobs/job_controller.dm

@@ -416,13 +416,13 @@ var/global/datum/controller/occupations/job_master
 			if(!S)
 				S = locate("start*[rank]") // use old stype
 			if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf))
-				H.loc = S.loc
+				H.forceMove(S.loc)
 			else
 				LateSpawn(H, rank)
 
 			// Moving wheelchair if they have one
 			if(H.buckled && istype(H.buckled, /obj/structure/bed/chair/wheelchair))
-				H.buckled.loc = H.loc
+				H.buckled.forceMove(H.loc)
 				H.buckled.set_dir(H.dir)
 
 		// If they're head, give them the account info for their department
@@ -627,12 +627,12 @@ var/global/datum/controller/occupations/job_master
 
 	if(spawnpos && istype(spawnpos))
 		if(spawnpos.check_job_spawning(rank))
-			H.loc = pick(spawnpos.turfs)
+			H.forceMove(pick(spawnpos.turfs))
 			. = spawnpos.msg
 		else
 			H << "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead."
-			H.loc = pick(latejoin)
+			H.forceMove(pick(latejoin))
 			. = "has arrived on the station"
 	else
-		H.loc = pick(latejoin)
+		H.forceMove(pick(latejoin))
 		. = "has arrived on the station"

code/game/machinery/atmoalter/canister.dm

@@ -348,7 +348,7 @@ update_flag
 				"\[N2O\]" = "redws", \
 				"\[N2\]" = "red", \
 				"\[O2\]" = "blue", \
-				"\[Phoron\]" = "purple", \
+				"\[Phoron\]" = "orangeps", \
 				"\[CO2\]" = "black", \
 				"\[Air\]" = "grey", \
 				"\[CAUTION\]" = "yellow", \

code/game/machinery/cloning.dm

@@ -117,7 +117,7 @@
 
 	clonemind.transfer_to(H)
 	H.ckey = R.ckey
-	H << "<span class='notice'><b>Consciousness slowly creeps over you as your body regenerates.</b><br><i>So this is what cloning feels like?</i></span>"
+	to_chat(H, "<span class='warning'><b>Consciousness slowly creeps over you as your body regenerates.</b><br><b><font size='3'>Your recent memories are fuzzy, and it's hard to remember anything from today...</font></b></span><br><span class='notice'><i>So this is what cloning feels like?</i></span>")
 
 	// -- Mode/mind specific stuff goes here
 	callHook("clone", list(H))

code/game/machinery/computer/arcade.dm

@@ -66,7 +66,11 @@
 		if(1)
 			num_of_prizes = rand(1,4)
 		if(2)
+			num_of_prizes = rand(1,3)
+		if(3)
 			num_of_prizes = rand(0,2)
+		if(4)
+			num_of_prizes = rand(0,1)
 	for(num_of_prizes; num_of_prizes > 0; num_of_prizes--)
 		empprize = pickweight(prizes)
 		new empprize(src.loc)

code/game/machinery/computer/cloning.dm

@@ -305,7 +305,7 @@
 	if(subject.isSynthetic())
 		scantemp = "Error: Majority of subject is non-organic."
 		return
-	if (subject.suiciding == 1)
+	if (subject.suiciding)
 		scantemp = "Error: Subject's brain is not responding to scanning stimuli."
 		return
 	if ((!subject.ckey) || (!subject.client))

code/game/machinery/computer/communications.dm

@@ -34,13 +34,15 @@
 	var/status_display_freq = "1435"
 	var/stat_msg1
 	var/stat_msg2
-	var/datum/lore/atc_controller/ATC //VOREStation Add
+
+	var/datum/lore/atc_controller/ATC
 	var/datum/announcement/priority/crew_announcement = new
 
 /obj/machinery/computer/communications/New()
 	..()
+	ATC = atc
 	crew_announcement.newscast = 1
-	ATC = atc //VOREStation Add
+
 /obj/machinery/computer/communications/process()
 	if(..())
 		if(state != STATE_STATUSDISPLAY)
@@ -130,10 +132,8 @@
 		if("messagelist")
 			src.currmsg = 0
 			src.state = STATE_MESSAGELIST
-		//VOREStation Add for ATC stuff
 		if("toggleatc")
 			src.ATC.squelched = !src.ATC.squelched
-		//VOREStation Add End
 		if("viewmessage")
 			src.state = STATE_VIEWMESSAGE
 			if (!src.currmsg)
@@ -315,7 +315,7 @@
 			else
 				dat += "<BR>\[ <A HREF='?src=\ref[src];operation=login'>Log In</A> \]"
 			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=messagelist'>Message List</A> \]"
-			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=toggleatc'>[ATC.squelched ? "Enable" : "Disable"] ATC Relay</A> \]" //VOREStation Add
+			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=toggleatc'>[ATC.squelched ? "Enable" : "Disable"] ATC Relay</A> \]"
 		if(STATE_CALLSHUTTLE)
 			dat += "Are you sure you want to call the shuttle? \[ <A HREF='?src=\ref[src];operation=callshuttle2'>OK</A> | <A HREF='?src=\ref[src];operation=main'>Cancel</A> \]"
 		if(STATE_CANCELSHUTTLE)
@@ -379,7 +379,7 @@
 				dat += "<BR>\[ <A HREF='?src=\ref[src];operation=ai-callshuttle'>Call Emergency Shuttle</A> \]"
 			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=ai-messagelist'>Message List</A> \]"
 			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=ai-status'>Set Status Display</A> \]"
-			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=toggleatc'>[ATC.squelched ? "Enable" : "Disable"] ATC Relay</A> \]" //VOREStation Add
+			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=toggleatc'>[ATC.squelched ? "Enable" : "Disable"] ATC Relay</A> \]"
 		if(STATE_CALLSHUTTLE)
 			dat += "Are you sure you want to call the shuttle? \[ <A HREF='?src=\ref[src];operation=ai-callshuttle2'>OK</A> | <A HREF='?src=\ref[src];operation=ai-main'>Cancel</A> \]"
 		if(STATE_MESSAGELIST)

code/game/machinery/cryopod.dm

@@ -389,6 +389,10 @@
 	for(var/mob/M in to_despawn)
 		despawn_occupant(M)
 
+	// VOREStation
+	hook_vr("despawn", list(to_despawn, src))
+	// VOREStation
+
 	//Drop all items into the pod.
 	for(var/obj/item/W in to_despawn)
 		to_despawn.drop_from_inventory(W)

code/game/machinery/cryopod_vr.dm

@@ -1,5 +1,13 @@
 //Overrides!
 
+/obj/machinery/cryopod
+	// The corresponding spawn point type that user despawning here will return at next round.
+	// Note: We use a type instead of name so that its validity is checked at compile time.
+	var/spawnpoint_type = /datum/spawnpoint/cryo
+
+/obj/machinery/cryopod/robot
+	spawnpoint_type = /datum/spawnpoint/cyborg
+
 /obj/machinery/cryopod/robot/door/gateway
 	name = "public teleporter"
 	desc = "The short-range teleporter you might've came in from. You could leave easily using this."
@@ -9,6 +17,7 @@
 	occupied_icon_state = "tele1"
 	on_store_message = "has departed via short-range teleport."
 	on_enter_occupant_message = "The teleporter activates, and you step into the swirling portal."
+	spawnpoint_type = /datum/spawnpoint/gateway
 
 /obj/machinery/computer/cryopod/gateway
 	name = "teleport oversight console"
@@ -17,7 +26,8 @@
 /obj/machinery/cryopod/robot/door/dorms
 	desc = "A small elevator that goes down to the residential district."
 	on_enter_occupant_message = "The elevator door closes slowly, ready to bring you down to the residential district."
+	spawnpoint_type = /datum/spawnpoint/elevator
 
 /obj/machinery/computer/cryopod/dorms
 	name = "residential oversight console"
-	desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the residential district."
+	desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the residential district."

code/game/machinery/doors/airlock.dm

@@ -37,7 +37,16 @@
 /obj/machinery/door/airlock/attack_generic(var/mob/user, var/damage)
 	if(stat & (BROKEN|NOPOWER))
 		if(damage >= 10)
-			if(src.density)
+			if(src.locked || src.welded)
+				visible_message("<span class='danger'>\The [user] begins breaking into \the [src] internals!</span>")
+				if(do_after(user,10 SECONDS,src))
+					src.locked = 0
+					src.welded = 0
+					update_icon()
+					open(1)
+					if(prob(25))
+						src.shock(user, 100)
+			else if(src.density)
 				visible_message("<span class='danger'>\The [user] forces \the [src] open!</span>")
 				open(1)
 			else
@@ -329,6 +338,18 @@
 	secured_wires = 1
 	assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity
 
+/obj/machinery/door/airlock/voidcraft
+	name = "voidcraft hatch"
+	desc = "It's an extra resilient airlock intended for spacefaring vessels."
+	icon = 'icons/obj/doors/shuttledoors.dmi'
+	explosion_resistance = 20
+	assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft
+
+// Airlock opens from top-bottom instead of left-right.
+/obj/machinery/door/airlock/voidcraft/vertical
+	icon = 'icons/obj/doors/shuttledoors_vertical.dmi'
+	assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft/vertical
+
 /*
 About the new airlock wires panel:
 *	An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.

code/game/machinery/doors/unpowered.dm

@@ -13,12 +13,12 @@
 	if(src.locked)	return
 	..()
 	return
-	
+
 /obj/machinery/door/unpowered/emag_act()
 	return -1
 
 /obj/machinery/door/unpowered/shuttle
-	icon = 'icons/turf/shuttle.dmi'
+	icon = 'icons/turf/shuttle_white.dmi'
 	name = "door"
 	icon_state = "door1"
 	opacity = 1

code/game/machinery/jukebox.dm

@@ -1,10 +1,12 @@
-datum/track
-	var/title
-	var/sound
+//
+// Media Player Jukebox
+// Rewritten by Leshana from existing Polaris code, merging in D2K5 and N3X15 work
+//
 
-datum/track/New(var/title_name, var/audio)
-	title = title_name
-	sound = audio
+#define JUKEMODE_NEXT        1 // Advance to next song in the track list
+#define JUKEMODE_RANDOM      2 // Not shuffle, randomly picks next each time.
+#define JUKEMODE_REPEAT_SONG 3 // Play the same song over and over
+#define JUKEMODE_PLAY_ONCE   4 // Play, then stop.
 
 /obj/machinery/media/jukebox/
 	name = "space jukebox"
@@ -19,33 +21,17 @@ datum/track/New(var/title_name, var/audio)
 	active_power_usage = 100
 	circuit = /obj/item/weapon/circuitboard/jukebox
 
-	var/playing = 0
-
 	// Vars for hacking
 	var/datum/wires/jukebox/wires = null
 	var/hacked = 0 // Whether to show the hidden songs or not
-	var/freq = 0
+	var/freq = 0 // Currently no effect, will return in phase II of mediamanager.
 
-	var/datum/track/current_track
-	var/list/datum/track/tracks = list(
-		new/datum/track("Beyond", 'sound/ambience/ambispace.ogg'),
-		new/datum/track("Clouds of Fire", 'sound/music/clouds.s3m'),
-		new/datum/track("D`Bert", 'sound/music/title2.ogg'),
-		new/datum/track("D`Fort", 'sound/ambience/song_game.ogg'),
-		new/datum/track("Floating", 'sound/music/main.ogg'),
-		new/datum/track("Endless Space", 'sound/music/space.ogg'),
-		new/datum/track("Part A", 'sound/misc/TestLoop1.ogg'),
-		new/datum/track("Scratch", 'sound/music/title1.ogg'),
-		new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'),
-	)
-
-	// Only visible if hacked
-	var/list/datum/track/secret_tracks = list(
-		new/datum/track("Clown", 'sound/music/clown.ogg'),
-		new/datum/track("Space Asshole", 'sound/music/space_asshole.ogg'),
-		new/datum/track("Thunderdome", 'sound/music/THUNDERDOME.ogg'),
-		new/datum/track("Russkiy rep Diskoteka", 'sound/music/russianrapdisco.ogg')
-	)
+	var/loop_mode = JUKEMODE_PLAY_ONCE			// Behavior when finished playing a song
+	var/max_queue_len = 3						// How many songs are we allowed to queue up?
+	var/datum/track/current_track				// Currently playing song
+	var/list/datum/track/queue = list()			// Queued songs
+	var/list/datum/track/tracks = list()		// Available tracks
+	var/list/datum/track/secret_tracks = list() // Only visible if hacked
 
 /obj/machinery/media/jukebox/New()
 	..()
@@ -54,11 +40,70 @@ datum/track/New(var/title_name, var/audio)
 	update_icon()
 
 /obj/machinery/media/jukebox/Destroy()
-	StopPlaying()
 	qdel(wires)
 	wires = null
 	..()
 
+// On initialization, copy our tracks from the global list
+/obj/machinery/media/jukebox/initialize()
+	..()
+	if(all_jukebox_tracks.len < 1)
+		stat |= BROKEN // No tracks configured this round!
+		return
+	// Ootherwise load from the global list!
+	for(var/datum/track/T in all_jukebox_tracks)
+		if(T.secret)
+			secret_tracks |= T
+		else
+			tracks |= T
+	return
+
+/obj/machinery/media/jukebox/process()
+	if(!playing)
+		return
+	if(inoperable())
+		disconnect_media_source()
+		playing = 0
+		return
+	// If the current track isn't finished playing, let it keep going
+	if(current_track && world.time < media_start_time + current_track.duration)
+		return
+	// Otherwise time to pick a new one!
+	if(queue.len > 0)
+		current_track = queue[1]
+		queue.Cut(1, 2)  // Remove the item we just took off the list
+	else
+		// Oh... nothing in queue? Well then pick next according to our rules
+		switch(loop_mode)
+			if(JUKEMODE_NEXT)
+				var/curTrackIndex = max(1, tracks.Find(current_track))
+				var/newTrackIndex = (curTrackIndex % tracks.len) + 1  // Loop back around if past end
+				current_track = tracks[newTrackIndex]
+			if(JUKEMODE_RANDOM)
+				var/previous_track = current_track
+				do
+					current_track = pick(tracks)
+				while(current_track == previous_track && tracks.len > 1)
+			if(JUKEMODE_REPEAT_SONG)
+				current_track = current_track
+			if(JUKEMODE_PLAY_ONCE)
+				current_track = null
+				playing = 0
+				update_icon()
+	updateDialog()
+	start_stop_song()
+
+// Tells the media manager to start or stop playing based on current settings.
+/obj/machinery/media/jukebox/proc/start_stop_song()
+	if(current_track && playing)
+		media_url = current_track.url
+		media_start_time = world.time
+		visible_message("<span class='notice'>\The [src] begins to play [current_track.display()].</span>")
+	else
+		media_url = ""
+		media_start_time = 0
+	update_music()
+
 /obj/machinery/media/jukebox/proc/set_hacked(var/newhacked)
 	if (hacked == newhacked) return
 	hacked = newhacked
@@ -80,13 +125,16 @@ datum/track/New(var/title_name, var/audio)
 	if(istype(W, /obj/item/device/multitool))
 		return wires.Interact(user)
 	if(istype(W, /obj/item/weapon/wrench))
-		if(playing)
-			StopPlaying()
 		user.visible_message("<span class='warning'>[user] has [anchored ? "un" : ""]secured \the [src].</span>", "<span class='notice'>You [anchored ? "un" : ""]secure \the [src].</span>")
 		anchored = !anchored
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		power_change()
 		update_icon()
+		if(!anchored)
+			playing = 0
+			disconnect_media_source()
+		else
+			update_media_source()
 		return
 	return ..()
 
@@ -125,16 +173,23 @@ datum/track/New(var/title_name, var/audio)
 		usr << "<span class='warning'>You must secure \the [src] first.</span>"
 		return
 
-	if(stat & (NOPOWER|BROKEN))
+	if(inoperable())
 		usr << "\The [src] doesn't appear to function."
 		return
 
 	if(href_list["change_track"])
-		for(var/datum/track/T in tracks)
-			if(T.title == href_list["title"])
-				current_track = T
-				StartPlaying()
-				break
+		var/datum/track/T = locate(href_list["change_track"]) in tracks
+		if(istype(T))
+			current_track = T
+			StartPlaying()
+	else if(href_list["loopmode"])
+		var/newval = text2num(href_list["loopmode"])
+		loop_mode = sanitize_inlist(newval, list(JUKEMODE_NEXT, JUKEMODE_RANDOM, JUKEMODE_REPEAT_SONG, JUKEMODE_PLAY_ONCE), loop_mode)
+	else if(href_list["volume"])
+		var/newval = input("Choose Jukebox volume (0-100%)", "Jukebox volume", round(volume * 100.0))			
+		newval = sanitize_integer(text2num(newval), min = 0, max = 100, default = volume * 100.0)
+		volume = newval / 100.0
+		update_music() // To broadcast volume change without restarting song
 	else if(href_list["stop"])
 		StopPlaying()
 	else if(href_list["play"])
@@ -162,36 +217,39 @@ datum/track/New(var/title_name, var/audio)
 	return 1
 
 /obj/machinery/media/jukebox/interact(mob/user)
-	if(stat & (NOPOWER|BROKEN))
+	if(inoperable())
 		usr << "\The [src] doesn't appear to function."
 		return
-
 	ui_interact(user)
 
 /obj/machinery/media/jukebox/ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1)
 	var/title = "RetroBox - Space Style"
 	var/data[0]
 
-	if(!(stat & (NOPOWER|BROKEN)))
-		data["current_track"] = current_track != null ? current_track.title : ""
+	if(operable())
 		data["playing"] = playing
+		data["hacked"] = hacked
+		data["max_queue_len"] = max_queue_len
+		data["media_start_time"] = media_start_time
+		data["loop_mode"] = loop_mode
+		data["volume"] = volume
+		if(current_track)
+			data["current_track_ref"] = "\ref[current_track]"  // Convenient shortcut
+			data["current_track"] = current_track.toNanoList()
+		data["percent"] = playing ? min(100, round(world.time - media_start_time) / current_track.duration) : 0;
 
 		var/list/nano_tracks = new
 		for(var/datum/track/T in tracks)
-			nano_tracks[++nano_tracks.len] = list("track" = T.title)
-
+			nano_tracks[++nano_tracks.len] = T.toNanoList()
 		data["tracks"] = nano_tracks
 
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
-		// the ui does not exist, so we'll create a new() one
-        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
 		ui = new(user, src, ui_key, "jukebox.tmpl", title, 450, 600)
-		// when the ui is first opened this is the data it will use
 		ui.set_initial_data(data)
-		// open the new ui window
 		ui.open()
+		ui.set_auto_update(playing)
 
 /obj/machinery/media/jukebox/attack_ai(mob/user as mob)
 	return src.attack_hand(user)
@@ -212,24 +270,6 @@ datum/track/New(var/title_name, var/audio)
 	new /obj/effect/decal/cleanable/blood/oil(src.loc)
 	qdel(src)
 
-/obj/machinery/media/jukebox/attackby(obj/item/W as obj, mob/user as mob)
-	src.add_fingerprint(user)
-
-	if(default_deconstruction_screwdriver(user, W))
-		return
-	if(default_deconstruction_crowbar(user, W))
-		return
-	if(istype(W, /obj/item/weapon/wrench))
-		if(playing)
-			StopPlaying()
-		user.visible_message("<span class='warning'>[user] has [anchored ? "un" : ""]secured \the [src].</span>", "<span class='notice'>You [anchored ? "un" : ""]secure \the [src].</span>")
-		anchored = !anchored
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-		power_change()
-		update_icon()
-		return
-	return ..()
-
 /obj/machinery/media/jukebox/emag_act(var/remaining_charges, var/mob/user)
 	if(!emagged)
 		emagged = 1
@@ -239,34 +279,36 @@ datum/track/New(var/title_name, var/audio)
 		return 1
 
 /obj/machinery/media/jukebox/proc/StopPlaying()
-	var/area/main_area = get_area(src)
-	// Always kill the current sound
-	for(var/mob/living/M in mobs_in_area(main_area))
-		M << sound(null, channel = 1)
-
-		main_area.forced_ambience = null
 	playing = 0
 	update_use_power(1)
 	update_icon()
-
+	start_stop_song()
 
 /obj/machinery/media/jukebox/proc/StartPlaying()
-	StopPlaying()
 	if(!current_track)
 		return
-
-	var/area/main_area = get_area(src)
-	if(freq)
-		var/sound/new_song = sound(current_track.sound, channel = 1, repeat = 1, volume = 25)
-		new_song.frequency = freq
-		main_area.forced_ambience = list(new_song)
-	else
-		main_area.forced_ambience = list(current_track.sound)
-
-	for(var/mob/living/M in mobs_in_area(main_area))
-		if(M.mind)
-			main_area.play_ambience(M)
-
 	playing = 1
 	update_use_power(2)
-	update_icon()
+	update_icon()
+	start_stop_song()
+	updateDialog()
+
+// Advance to the next track - Don't start playing it unless we were already playing
+/obj/machinery/media/jukebox/proc/NextTrack()
+	if(!tracks.len) return
+	var/curTrackIndex = max(1, tracks.Find(current_track))
+	var/newTrackIndex = (curTrackIndex % tracks.len) + 1  // Loop back around if past end
+	current_track = tracks[newTrackIndex]
+	if(playing)
+		start_stop_song()
+	updateDialog()
+
+// Advance to the next track - Don't start playing it unless we were already playing
+/obj/machinery/media/jukebox/proc/PrevTrack()
+	if(!tracks.len) return
+	var/curTrackIndex = max(1, tracks.Find(current_track))
+	var/newTrackIndex = curTrackIndex == 1 ? tracks.len : curTrackIndex - 1
+	current_track = tracks[newTrackIndex]
+	if(playing)
+		start_stop_song()
+	updateDialog()

code/game/machinery/jukebox_vr.dm

@@ -1,33 +0,0 @@
-// The improved, hackable jukebox for vorestation!
-
-/obj/machinery/media/jukebox/vore
-	circuit = /obj/item/weapon/circuitboard/jukebox/vore
-	secret_tracks = list(
-		new/datum/track("Bandit Radio", 'sound/music/jukebox/bandit_radio.ogg'),
-		new/datum/track("Ghost Fight (Toby Fox)", 'sound/music/jukebox/TobyFoxGhostFight.mid'),
-		new/datum/track("Space Asshole", 'sound/music/space_asshole.ogg'),
-		new/datum/track("THUNDERDOME", 'sound/music/THUNDERDOME.ogg'),
-	)
-	tracks = list(
-		new/datum/track("A Song About Hares", 'sound/music/jukebox/SongAboutHares.ogg'),
-		new/datum/track("Below The Asteroids", 'sound/music/jukebox/BelowTheAsteroids.ogg'),
-		new/datum/track("Beyond", 'sound/ambience/ambispace.ogg'),
-		new/datum/track("Clouds of Fire", 'sound/music/clouds.s3m'),
-		new/datum/track("D`Bert", 'sound/music/title2.ogg'),
-		new/datum/track("D`Fort", 'sound/ambience/song_game.ogg'),
-		new/datum/track("Duck Tales - Moon", 'sound/music/jukebox/DuckTalesMoon.mid'),
-		new/datum/track("Endless Space", 'sound/music/space.ogg'),
-		new/datum/track("Floating", 'sound/music/main.ogg'),
-		new/datum/track("Fly Me To The Moon", 'sound/music/jukebox/Fly_Me_To_The_Moon.ogg'),
-		new/datum/track("Mad About Me", 'sound/music/jukebox/Cantina.ogg'),
-		new/datum/track("Minor Turbulence", 'sound/music/jukebox/MinorTurbulenceFull.ogg'),
-		new/datum/track("Ode to Greed", 'sound/music/jukebox/OdeToGreed.ogg'),
-		new/datum/track("Part A", 'sound/misc/TestLoop1.ogg'),
-		new/datum/track("Ransacked", 'sound/music/jukebox/Ransacked.ogg'),
-		new/datum/track("Russkiy rep Diskoteka", 'sound/music/jukebox/russianrapdisco.ogg'),
-		new/datum/track("Scratch", 'sound/music/title1.ogg'),
-		new/datum/track("Space Oddity", 'sound/music/space_oddity.ogg'),
-		new/datum/track("Thunderdome", 'sound/music/THUNDERDOME.ogg'),
-		new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'),
-		new/datum/track("Welcome To Jurassic Park", 'sound/music/jukebox/WelcomeToJurassicPark.mid')
-	)

code/game/machinery/navbeacon.dm

@@ -1,52 +1,45 @@
 // Navigation beacon for AI robots
 // Functions as a transponder: looks for incoming signal matching
 
-var/global/list/navbeacons			// no I don't like putting this in, but it will do for now
+var/global/list/navbeacons = list()	// no I don't like putting this in, but it will do for now
 
 /obj/machinery/navbeacon
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "navbeacon0-f"
 	name = "navigation beacon"
-	desc = "A radio beacon used for bot navigation."
+	desc = "A beacon used for bot navigation."
 	level = 1		// underfloor
 	layer = 2.5
 	anchored = 1
 	var/open = 0		// true if cover is open
 	var/locked = 1		// true if controls are locked
-	var/freq = 1445		// radio frequency
+	var/freq = null		// DEPRECATED we don't use radios anymore!
 	var/location = ""	// location response text
-	var/list/codes		// assoc. list of transponder codes
-	var/codes_txt = ""	// codes as set on map: "tag1;tag2" or "tag1=value;tag2=value"
+	var/codes_txt		// DEPRECATED codes as set on map: "tag1;tag2" or "tag1=value;tag2=value"
+	var/list/codes = list()	// assoc. list of transponder codes
 	req_access = list(access_engine)
 
 /obj/machinery/navbeacon/New()
 	..()
-
-	set_codes()
+	set_codes_from_txt(codes_txt)
+	if(freq)
+		warning("[src] at [x],[y],[z] has deprecated var freq=[freq].  Replace it with proper type.")
 
 	var/turf/T = loc
 	hide(!T.is_plating())
-
-	// add beacon to MULE bot beacon list
-	if(freq == 1400)
-		if(!navbeacons)
-			navbeacons = new()
-		navbeacons += src
-
-
-	spawn(5)	// must wait for map loading to finish
-		if(radio_controller)
-			radio_controller.add_object(src, freq, RADIO_NAVBEACONS)
+	navbeacons += src
 
 // set the transponder codes assoc list from codes_txt
-/obj/machinery/navbeacon/proc/set_codes()
+// DEPRECATED - This is kept only for compatibilty with old map files! Do not use this!
+// Instead, you should replace the map instance with one of the appropriate navbeacon subtypes.
+// See the bottom of this file for a list of subtypes, make your own examples if your map needs more
+/obj/machinery/navbeacon/proc/set_codes_from_txt()
 	if(!codes_txt)
 		return
+	warning("[src] at [x],[y],[z] in [get_area(src)] is using the deprecated 'codes_txt' mapping method.  Replace it with proper type.")
 
-	codes = new()
-
+	codes = list()
 	var/list/entries = splittext(codes_txt, ";")	// entries are separated by semicolons
-
 	for(var/e in entries)
 		var/index = findtext(e, "=")		// format is "key=value"
 		if(index)
@@ -56,6 +49,8 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do
 		else
 			codes[e] = "1"
 
+/obj/machinery/navbeacon/hides_under_flooring()
+	return 1
 
 // called when turf state changes
 // hide the object if turf is intact
@@ -73,38 +68,6 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do
 	else
 		icon_state = "[state]"
 
-
-// look for a signal of the form "findbeacon=X"
-// where X is any
-// or the location
-// or one of the set transponder keys
-// if found, return a signal
-/obj/machinery/navbeacon/receive_signal(datum/signal/signal)
-
-	var/request = signal.data["findbeacon"]
-	if(request && ((request in codes) || request == "any" || request == location))
-		spawn(1)
-			post_signal()
-
-// return a signal giving location and transponder codes
-
-/obj/machinery/navbeacon/proc/post_signal()
-
-	var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
-	if(!frequency) return
-
-	var/datum/signal/signal = new()
-	signal.source = src
-	signal.transmission_method = 1
-	signal.data["beacon"] = location
-
-	for(var/key in codes)
-		signal.data[key] = codes[key]
-
-	frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
-
-
 /obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user)
 	var/turf/T = loc
 	if(!T.is_plating())
@@ -117,7 +80,7 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do
 
 		updateicon()
 
-	else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda))
+	else if(I.GetID())
 		if(open)
 			if(allowed(user))
 				locked = !locked
@@ -153,8 +116,7 @@ var/global/list/navbeacons			// no I don't like putting this in, but it will do
 
 	if(locked && !ai)
 		t = {"<TT><B>Navigation Beacon</B><HR><BR>
-<i>(swipe card to unlock controls)</i><BR>
-Frequency: [format_frequency(freq)]<BR><HR>
+<i>(swipe card to unlock controls)</i><BR><HR>
 Location: [location ? location : "(none)"]</A><BR>
 Transponder Codes:<UL>"}
 
@@ -165,14 +127,7 @@ Transponder Codes:<UL>"}
 	else
 
 		t = {"<TT><B>Navigation Beacon</B><HR><BR>
-<i>(swipe card to lock controls)</i><BR>
-Frequency:
-<A href='byond://?src=\ref[src];freq=-10'>-</A>
-<A href='byond://?src=\ref[src];freq=-2'>-</A>
-[format_frequency(freq)]
-<A href='byond://?src=\ref[src];freq=2'>+</A>
-<A href='byond://?src=\ref[src];freq=10'>+</A><BR>
-<HR>
+<i>(swipe card to lock controls)</i><BR><HR>
 Location: <A href='byond://?src=\ref[src];locedit=1'>[location ? location : "(none)"]</A><BR>
 Transponder Codes:<UL>"}
 
@@ -195,11 +150,7 @@ Transponder Codes:<UL>"}
 		if(open && !locked)
 			usr.set_machine(src)
 
-			if(href_list["freq"])
-				freq = sanitize_frequency(freq + text2num(href_list["freq"]))
-				updateDialog()
-
-			else if(href_list["locedit"])
+			if(href_list["locedit"])
 				var/newloc = sanitize(input("Enter New Location", "Navigation Beacon", location) as text|null)
 				if(newloc)
 					location = newloc
@@ -248,6 +199,41 @@ Transponder Codes:<UL>"}
 
 /obj/machinery/navbeacon/Destroy()
 	navbeacons.Remove(src)
-	if(radio_controller)
-		radio_controller.remove_object(src, freq)
+	..()
+
+
+//
+// Nav Beacon Mapping
+// These subtypes are what you should actually put into maps! they will make your life much easier.
+//
+// Developer Note: navbeacons do not HAVE to use these subtypes.  They are purely for mapping convenience.
+// You can feel free to construct them in-game as just /obj/machinery/navbeacon and they will work just
+// fine, and you can define your own specific types for every instance on map if you want (BayStation does)
+// This design is a compromise that means you can do mapping without every single one being its own type
+// but with it still being easy to map ~ Leshana
+//
+
+// Mulebot delivery destinations
+
+/obj/machinery/navbeacon/delivery/north
+	codes = list("delivery" = 1, "dir" = NORTH)
+
+/obj/machinery/navbeacon/delivery/south
+	codes = list("delivery" = 1, "dir" = SOUTH)
+
+/obj/machinery/navbeacon/delivery/east
+	codes = list("delivery" = 1, "dir" = EAST)
+
+/obj/machinery/navbeacon/delivery/west
+	codes = list("delivery" = 1, "dir" = WEST)
+
+
+// For part of the patrol route
+// You MUST set "location"
+// You MUST set "next_patrol"
+/obj/machinery/navbeacon/patrol
+	var/next_patrol
+
+/obj/machinery/navbeacon/patrol/New()
+	codes = list("patrol" = 1, "next_patrol" = next_patrol)
 	..()

code/game/machinery/pipe/pipelayer.dm

@@ -1,57 +1,104 @@
 /obj/machinery/pipelayer
-
 	name = "automatic pipe layer"
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "pipe_d"
 	density = 1
-	var/turf/old_turf
-	var/old_dir
-	var/on = 0
-	var/a_dis = 0
-	var/P_type = 0
-	var/P_type_t = ""
-	var/max_metal = 50
-	var/metal = 10
-	var/obj/item/weapon/wrench/W
+	circuit = /obj/item/weapon/circuitboard/pipelayer
+	var/turf/old_turf		// Last turf we were on.
+	var/old_dir				// Last direction we were facing.
+	var/on = 0				// Pipelaying online?
+	var/a_dis = 0			// Auto-dismantling - If enabled it will remove floor tiles
+	var/P_type = 0			// Currently selected pipe type
+	var/P_type_t = ""		// Name of currently selected pipe type
+	var/max_metal = 50		// Max capacity for internal metal storage
+	var/metal = 0			// Current amount in internal metal storage
+	var/pipe_cost = 0.25	// Cost in steel for each pipe.
+	var/obj/item/weapon/wrench/W // Internal wrench used for wrenching down the pipes
 	var/list/Pipes = list("regular pipes"=0,"scrubbers pipes"=31,"supply pipes"=29,"heat exchange pipes"=2)
 
 /obj/machinery/pipelayer/New()
 	W = new(src)
 	..()
+	default_apply_parts()
+	update_icon()
 
+/obj/machinery/pipelayer/Destroy()
+	qdel(W)
+	W = null
+	..()
+
+/obj/machinery/pipelayer/RefreshParts()
+	var/mb_rating = 0
+	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+		mb_rating += M.rating
+	max_metal = mb_rating * initial(max_metal)
+
+/obj/machinery/pipelayer/dismantle()
+	eject_metal()
+	..()
+
+// Whenever we move, if enabled try and lay pipe
 /obj/machinery/pipelayer/Move(new_turf,M_Dir)
 	..()
 
 	if(on && a_dis)
 		dismantleFloor(old_turf)
-	layPipe(old_turf,M_Dir,old_dir)
+	layPipe(old_turf, M_Dir, old_dir)
 
 	old_turf = new_turf
-	old_dir = turn(M_Dir,180)
+	old_dir = turn(M_Dir, 180)
 
 /obj/machinery/pipelayer/attack_hand(mob/user as mob)
-	if(!metal&&!on)
+	if(..())
+		return
+	if(panel_open)
+		if(metal < 1)
+			user << "\The [src] is empty."
+			return
+		var/answer = alert(user, "Do you want to eject all the metal in \the [src]?", , "Yes","No")
+		if(answer == "Yes")
+			var/amount_ejected = eject_metal()
+			user.visible_message("<span class='notice'>[user] removes [amount_ejected] sheet\s of [DEFAULT_WALL_MATERIAL] from the \the [src].</span>",
+				"<span class='notice'>You remove [amount_ejected] sheet\s of [DEFAULT_WALL_MATERIAL] from \the [src].</span>")
+		return
+	if(!metal && !on)
 		user << "<span class='warning'>\The [src] doesn't work without metal.</span>"
 		return
-	on=!on
+	on = !on
+	old_turf = get_turf(src)
+	old_dir = dir
 	user.visible_message("<span class='notice'>[user] has [!on?"de":""]activated \the [src].</span>", "<span class='notice'>You [!on?"de":""]activate \the [src].</span>")
 	return
 
 /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob)
-
-	if (istype(W, /obj/item/weapon/wrench))
+	if(default_deconstruction_screwdriver(user, W))
+		return
+	if(default_deconstruction_crowbar(user, W))
+		return
+	if(default_part_replacement(user, W))
+		return
+	if (!panel_open && iswrench(W))
 		P_type_t = input("Choose pipe type", "Pipe type") as null|anything in Pipes
 		P_type = Pipes[P_type_t]
 		user.visible_message("<span class='notice'>[user] has set \the [src] to manufacture [P_type_t].</span>", "<span class='notice'>You set \the [src] to manufacture [P_type_t].</span>")
 		return
-
-	if(istype(W, /obj/item/weapon/crowbar))
-		a_dis=!a_dis
+	if(!panel_open && iscrowbar(W))
+		a_dis = !a_dis
 		user.visible_message("<span class='notice'>[user] has [!a_dis?"de":""]activated auto-dismantling.</span>", "<span class='notice'>You [!a_dis?"de":""]activate auto-dismantling.</span>")
 		return
-
+	if(istype(W, /obj/item/pipe))
+		// NOTE - We must check for matter, otherwise the (free) pipe dispenser can be used to get infinite steel.
+		if(!W.matter || W.matter[DEFAULT_WALL_MATERIAL] < pipe_cost * SHEET_MATERIAL_AMOUNT)
+			user << "<span class='warning'>\The [W] doesn't contain enough [DEFAULT_WALL_MATERIAL] to recycle.</span>"
+		else if(metal + pipe_cost > max_metal)
+			user << "<span class='notice'>\The [src] is full.</span>"
+		else
+			user.drop_from_inventory(W)
+			metal += pipe_cost
+			usr << "<span class='notice'>You recycle \the [W].</span>"
+			qdel(W)
+		return
 	if(istype(W, /obj/item/stack/material) && W.get_material_name() == DEFAULT_WALL_MATERIAL)
-
 		var/result = load_metal(W)
 		if(isnull(result))
 			user << "<span class='warning'>Unable to load [W] - no metal found.</span>"
@@ -59,23 +106,8 @@
 			user << "<span class='notice'>\The [src] is full.</span>"
 		else
 			user.visible_message("<span class='notice'>[user] has loaded metal into \the [src].</span>", "<span class='notice'>You load metal into \the [src]</span>")
-
 		return
 
-	if(istype(W, /obj/item/weapon/screwdriver))
-		if(metal)
-			var/m = round(input(usr,"Please specify the amount of metal to remove","Remove metal",min(round(metal),50)) as num, 1)
-			m = min(m, 50)
-			m = min(m, round(metal))
-			m = round(m)
-			if(m)
-				use_metal(m)
-				var/obj/item/stack/material/steel/MM = new (get_turf(src))
-				MM.amount = m
-				user.visible_message("<span class='notice'>[user] removes [m] sheet\s of metal from the \the [src].</span>", "<span class='notice'>You remove [m] sheet\s of metal from \the [src]</span>")
-		else
-			user << "\The [src] is empty."
-		return
 	..()
 
 /obj/machinery/pipelayer/examine(mob/user)
@@ -83,7 +115,7 @@
 	user << "\The [src] has [metal] sheet\s, is set to produce [P_type_t], and auto-dismantling is [!a_dis?"de":""]activated."
 
 /obj/machinery/pipelayer/proc/reset()
-	on=0
+	on = 0
 	return
 
 /obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/MM)
@@ -100,12 +132,22 @@
 	return
 
 /obj/machinery/pipelayer/proc/use_metal(amount)
-	if(!metal || metal<amount)
+	if(!metal || metal < amount)
 		visible_message("\The [src] deactivates as its metal source depletes.")
 		return
-	metal-=amount
+	metal -= amount
 	return 1
 
+/obj/machinery/pipelayer/proc/eject_metal()
+	var/amount_ejected = 0
+	while (metal >= 1)
+		var/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL)
+		var/obj/item/stack/material/S = new M.stack_type(get_turf(src))
+		S.amount = min(metal, S.max_amount)
+		metal -= S.amount
+		amount_ejected += S.amount
+	return amount_ejected
+
 /obj/machinery/pipelayer/proc/dismantleFloor(var/turf/new_turf)
 	if(istype(new_turf, /turf/simulated/floor))
 		var/turf/simulated/floor/T = new_turf
@@ -114,11 +156,11 @@
 	return new_turf.is_plating()
 
 /obj/machinery/pipelayer/proc/layPipe(var/turf/w_turf,var/M_Dir,var/old_dir)
-	if(!on || !(M_Dir in list(1, 2, 4, 8)) || M_Dir==old_dir)
+	if(!on || !(M_Dir in list(NORTH, SOUTH, EAST, WEST)) || M_Dir==old_dir)
 		return reset()
-	if(!use_metal(0.25))
+	if(!use_metal(pipe_cost))
 		return reset()
-	var/fdirn = turn(M_Dir,180)
+	var/fdirn = turn(M_Dir, 180)
 	var/p_type
 	var/p_dir
 
@@ -130,6 +172,8 @@
 		p_dir=M_Dir
 
 	var/obj/item/pipe/P = new (w_turf, pipe_type=p_type, dir=p_dir)
+	// We used metal to make these, so should be reclaimable!
+	P.matter = list(DEFAULT_WALL_MATERIAL = pipe_cost * SHEET_MATERIAL_AMOUNT)
 	P.attackby(W , src)
 
 	return 1

code/game/machinery/portable_turret.dm

@@ -441,7 +441,7 @@ var/list/turret_icons
 			else
 				take_damage(initial(health) * 8) //should instakill most turrets
 		if(3)
-			take_damage(initial(health) * 8 / 3)
+			take_damage(initial(health) * 8 / 3) //Level 4 is too weak to bother turrets
 
 /obj/machinery/porta_turret/proc/die()	//called when the turret dies, ie, health <= 0
 	health = 0

code/game/machinery/recharger.dm

@@ -8,7 +8,7 @@ obj/machinery/recharger
 	idle_power_usage = 4
 	active_power_usage = 40000	//40 kW
 	var/obj/item/charging = null
-	var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly)
+	var/list/allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/laptop, /obj/item/weapon/cell, /obj/item/device/flashlight, /obj/item/device/electronic_assembly, /obj/item/weapon/weldingtool/electric)
 	var/icon_state_charged = "recharger2"
 	var/icon_state_charging = "recharger1"
 	var/icon_state_idle = "recharger0" //also when unpowered
@@ -33,19 +33,19 @@ obj/machinery/recharger
 
 	if(allowed)
 		if(charging)
-			user << "<span class='warning'>\A [charging] is already charging here.</span>"
+			to_chat(user, "<span class='warning'>\A [charging] is already charging here.</span>")
 			return
 		// Checks to make sure he's not in space doing it, and that the area got proper power.
 		if(!powered())
-			user << "<span class='warning'>The [name] blinks red as you try to insert the item!</span>"
+			to_chat(user, "<span class='warning'>The [name] blinks red as you try to insert the item!</span>")
 			return
 		if(istype(G, /obj/item/weapon/gun/energy))
 			var/obj/item/weapon/gun/energy/E = G
 			if(!E.power_supply)
-				user << "<span class='notice'>Your gun has no power cell.</span>"
+				to_chat(user, "<span class='notice'>Your gun has no power cell.</span>")
 				return
 			if(E.self_recharge)
-				user << "<span class='notice'>Your gun has no recharge port.</span>"
+				to_chat(user, "<span class='notice'>Your gun has no recharge port.</span>")
 				return
 		if(istype(G, /obj/item/weapon/gun/energy/staff))
 			return
@@ -65,16 +65,22 @@ obj/machinery/recharger
 			if(!assembly.battery)
 				to_chat(user, "<span class='warning'>The assembly doesn't have a power cell.</span>")
 				return
+		if(istype(G, /obj/item/weapon/weldingtool/electric))
+			var/obj/item/weapon/weldingtool/electric/welder = G
+			if(!welder.power_supply)
+				to_chat(user, "<span class='notice'>Your welder has no power cell.</span>")
+				return
+
 		user.drop_item()
 		G.loc = src
 		charging = G
 		update_icon()
 	else if(portable && istype(G, /obj/item/weapon/wrench))
 		if(charging)
-			user << "<span class='warning'>Remove [charging] first!</span>"
+			to_chat(user, "<span class='warning'>Remove [charging] first!</span>")
 			return
 		anchored = !anchored
-		user << "You [anchored ? "attached" : "detached"] the recharger."
+		to_chat(user, "You [anchored ? "attached" : "detached"] the recharger.")
 		playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
 	else if(default_deconstruction_screwdriver(user, G))
 		return
@@ -208,8 +214,8 @@ obj/machinery/recharger
 	name = "wall recharger"
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "wrecharger0"
-	active_power_usage = 25000	//25 kW , It's more specialized than the standalone recharger (guns and batons only) so make it more powerful
-	allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/weapon/cell/device)
+	active_power_usage = 25000	//25 kW , It's more specialized than the standalone recharger (guns, batons, and flashlights only) so make it more powerful
+	allowed_devices = list(/obj/item/weapon/gun/energy, /obj/item/weapon/melee/baton, /obj/item/device/flashlight, /obj/item/weapon/cell/device)
 	icon_state_charged = "wrecharger2"
 	icon_state_charging = "wrecharger1"
 	icon_state_idle = "wrecharger0"

code/game/machinery/telecomms/broadcaster.dm

@@ -374,6 +374,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_deathsquad += blackbox_msg
 				if(SYND_FREQ)
 					blackbox.msg_syndicate += blackbox_msg
+				if(RAID_FREQ)
+					blackbox.msg_raider += blackbox_msg
 				if(SUP_FREQ)
 					blackbox.msg_cargo += blackbox_msg
 				if(SRV_FREQ)
@@ -554,6 +556,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_deathsquad += blackbox_msg
 				if(SYND_FREQ)
 					blackbox.msg_syndicate += blackbox_msg
+				if(RAID_FREQ)
+					blackbox.msg_raider += blackbox_msg
 				if(SUP_FREQ)
 					blackbox.msg_cargo += blackbox_msg
 				if(SRV_FREQ)

code/game/machinery/telecomms/presets.dm

@@ -40,15 +40,15 @@
 	id = "Hub"
 	network = "tcommsat"
 	autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical",
-	"supply", "service", "common", "command", "engineering", "security", "unused",
-	"receiverA", "broadcasterA")
+	"supply", "service", "common", "command", "engineering", "security", "unused", "hb_relay",
+	"receiverA", "broadcasterA") //VOREStation Edit - Added "hb_relay"
 
 /obj/machinery/telecomms/hub/preset_cent
 	id = "CentCom Hub"
 	network = "tcommsat"
 	produces_heat = 0
-	autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
-	 "centcomm", "receiverCent", "broadcasterCent")
+	autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "hb_relay",
+	 "centcomm", "receiverCent", "broadcasterCent") //VOREStation Edit - Added "hb_relay"
 
 //Receivers
 

code/game/machinery/telecomms/presets_vr.dm

@@ -0,0 +1,5 @@
+/obj/machinery/telecomms/relay/preset/houseboat
+	id = "Nearby Ship Relay"
+	hide = 1
+	produces_heat = 0
+	autolinkers = list("hb_relay")

code/game/machinery/teleporter.dm

@@ -63,7 +63,7 @@
 				for(var/obj/machinery/teleport/hub/H in range(1))
 					var/amount = rand(2,5)
 					for(var/i=0;i<amount;i++)
-						new /mob/living/simple_animal/hostile/vore/carp(get_turf(H)) // Vorestation edit
+						new /mob/living/simple_animal/hostile/carp(get_turf(H))
 				//
 			else
 				for(var/mob/O in hearers(src, null))

code/game/mecha/mecha_control_console.dm

@@ -105,7 +105,7 @@
 	proc/shock()
 		var/obj/mecha/M = in_mecha()
 		if(M)
-			M.emp_act(2)
+			M.emp_act(4)
 		qdel(src)
 
 	proc/get_mecha_log()

code/game/objects/effects/effect_system.dm

@@ -333,7 +333,7 @@ steam.start() -- spawns the effect
 			spawn(0)
 				var/turf/T = get_turf(src.holder)
 				if(T != src.oldposition)
-					if(istype(T, /turf/simulated))
+					if(isturf(T))
 						var/obj/effect/effect/ion_trails/I = PoolOrNew(/obj/effect/effect/ion_trails, src.oldposition)
 						src.oldposition = T
 						I.set_dir(src.holder.dir)

code/game/objects/effects/landmarks.dm

@@ -194,7 +194,7 @@
 	new /obj/item/clothing/under/waiter(src.loc)
 	var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
 	new CHOICE(src.loc)
-	new /obj/item/clothing/suit/apron(src.loc)
+	new /obj/item/clothing/suit/storage/apron(src.loc)
 	delete_me = 1
 
 /obj/effect/landmark/costume/pirate/New()

code/game/objects/effects/zone_divider.dm

@@ -0,0 +1,20 @@
+// This artificially splits a ZAS zone, useful if you wish to prevent massive super-zones which can cause lag.
+/obj/effect/zone_divider
+	name = "zone divider"
+	icon = 'icons/mob/screen1.dmi'
+	icon_state = "x3"
+	invisibility = 101 		//nope, can't see this
+	anchored = 1
+	density = 0
+	opacity = 0
+
+/obj/effect/zone_divider/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+ 	// Special case to prevent us from being part of a zone during the first air master tick.
+ 	// We must merge ourselves into a zone on next tick.  This will cause a bit of lag on
+ 	// startup, but it can't really be helped you know?
+	if(air_master && air_master.current_cycle == 0)
+		spawn(1)
+			air_master.mark_for_update(get_turf(src))
+		return 0
+	return !air_group // Anything except zones can pass
+

code/game/objects/empulse.dm

@@ -4,17 +4,17 @@
 
 // #define EMPDEBUG 10
 
-proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
+proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_range, log=0)
 	if(!epicenter) return
 
 	if(!istype(epicenter, /turf))
 		epicenter = get_turf(epicenter.loc)
 
 	if(log)
-		message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
-		log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+		message_admins("EMP with size ([first_range], [second_range], [third_range], [fourth_range]) in area [epicenter.loc.name] ")
+		log_game("EMP with size ([first_range], [second_range], [third_range], [fourth_range]) in area [epicenter.loc.name] ")
 
-	if(heavy_range > 1)
+	if(first_range > 1)
 		var/obj/effect/overlay/pulse = PoolOrNew(/obj/effect/overlay, epicenter)
 		pulse.icon = 'icons/effects/effects.dmi'
 		pulse.icon_state = "emppulse"
@@ -23,28 +23,50 @@ proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
 		spawn(20)
 			qdel(pulse)
 
-	if(heavy_range > light_range)
-		light_range = heavy_range
+	if(first_range > second_range)
+		second_range = first_range
+	if(second_range > third_range)
+		third_range = second_range
+	if(third_range > fourth_range)
+		fourth_range = third_range
 
-	for(var/mob/M in range(heavy_range, epicenter))
+	for(var/mob/M in range(first_range, epicenter))
 		M << 'sound/effects/EMPulse.ogg'
 
-	for(var/atom/T in range(light_range, epicenter))
+	for(var/atom/T in range(fourth_range, epicenter))
 		#ifdef EMPDEBUG
 		var/time = world.timeofday
 		#endif
 		var/distance = get_dist(epicenter, T)
 		if(distance < 0)
 			distance = 0
-		if(distance < heavy_range)
+		//Worst effects, really hurts
+		if(distance < first_range)
 			T.emp_act(1)
-		else if(distance == heavy_range)
+		else if(distance == first_range)
 			if(prob(50))
 				T.emp_act(1)
 			else
 				T.emp_act(2)
-		else if(distance <= light_range)
+		//Slightly less painful
+		else if(distance <= second_range)
 			T.emp_act(2)
+		else if(distance == second_range)
+			if(prob(50))
+				T.emp_act(2)
+			else
+				T.emp_act(3)
+		//Even less slightly less painful
+		else if(distance <= third_range)
+			T.emp_act(3)
+		else if(distance == third_range)
+			if(prob(50))
+				T.emp_act(2)
+			else
+				T.emp_act(3)
+		//This should be more or less harmless
+		else if(distance <= fourth_range)
+			T.emp_act(4)
 		#ifdef EMPDEBUG
 		if((world.timeofday - time) >= EMPDEBUG)
 			log_and_message_admins("EMPDEBUG: [T.name] - [T.type] - took [world.timeofday - time]ds to process emp_act()!")

code/game/objects/items.dm

@@ -44,6 +44,7 @@
 	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
 	var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
 	var/list/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/list/armorsoak = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
 	var/zoomdevicename = null //name used for message when binoculars/scope is used

code/game/objects/items/bodybag.dm

@@ -113,6 +113,7 @@
 	a hostile enviroment."
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
+	item_state = "bodybag_cryo_folded"
 	origin_tech = list(TECH_BIO = 4)
 
 /obj/item/bodybag/cryobag/attack_self(mob/user)

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

@@ -419,6 +419,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(1) icon = 'icons/obj/pda.dmi'
 		if(2) icon = 'icons/obj/pda_slim.dmi'
 		if(3) icon = 'icons/obj/pda_old.dmi'
+		if(4) icon = 'icons/obj/pda_rugged.dmi'
 		else
 			icon = 'icons/obj/pda_old.dmi'
 			log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.")
@@ -998,7 +999,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			M.apply_damage( rand(30,60) , BURN)
 		message += "You feel a searing heat! Your [P] is burning!"
 	if(i>=20 && i<=25) //EMP
-		empulse(P.loc, 3, 6, 1)
+		empulse(P.loc, 1, 2, 4, 6, 1)
 		message += "Your [P] emits a wave of electromagnetic energy!"
 	if(i>=25 && i<=40) //Smoke
 		var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem

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

@@ -2,7 +2,7 @@
 	name = "inteliCard"
 	icon = 'icons/obj/pda.dmi'
 	icon_state = "aicard" // aicard-full
-	item_state = "electronic"
+	item_state = "aicard"
 	w_class = ITEMSIZE_SMALL
 	slot_flags = SLOT_BELT
 	show_messages = 0

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

@@ -213,6 +213,17 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	update_icon()
 	ui_interact(user)
 
+// Proc: MouseDrop()
+//Same thing PDAs do
+/obj/item/device/communicator/MouseDrop(obj/over_object as obj)
+	var/mob/M = usr
+	if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+		return
+	if(!istype(over_object, /obj/screen))
+		return attack_self(M)
+	return
+
+
 // Proc: attack_ghost()
 // Parameters: 1 (user - the ghost clicking on the device)
 // Description: Recreates the known_devices list, so that the ghost looking at the device can see themselves, then calls ..() so that NanoUI appears.
@@ -998,12 +1009,21 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 
 	if(video_source) //Already in a video
 		user << "<span class='danger'>You are already connected to a video call!</span>"
+		return
 
 	if(user.blinded) //User is blinded
 		user << "<span class='danger'>You cannot see well enough to do that!</span>"
+		return
 
 	if(!(src in comm.communicating) || !comm.camera) //You called someone with a broken communicator or one that's fake or yourself or something
 		user << "<span class='danger'>\icon[src]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.</span>"
+		return
+
+	var/turf/t1 = get_turf(src)
+	var/turf/t2 = get_turf(comm)
+	if(!is_on_same_plane_or_station(t1.z, t2.z) || !video_source.can_use())
+		user << "<span class='danger'>Request to establish video timed out!</span>"
+		return
 
 	user << "<span class='notice'>\icon[src] Attempting to start video over existing call.</span>"
 	sleep(30)
@@ -1023,7 +1043,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	user.reset_view(video_source)
 	user << "<span class='notice'>Now viewing video session. To leave camera view: OOC -> Cancel Camera View</span>"
 	spawn(0)
-		while(user.machine == video_source && Adjacent(user))
+		while(user.machine == video_source && (Adjacent(user) || loc == user))
 			var/turf/T = get_turf(video_source)
 			if(!T || !is_on_same_plane_or_station(T.z, user.z) || !video_source.can_use())
 				user << "<span class='warning'>The screen bursts into static, then goes black.</span>"
@@ -1086,6 +1106,21 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 
 	src.attack_self(usr)
 
+// Verb: activate()
+// Parameters: None
+// Description: Lets synths use their communicators without hands.
+/obj/item/device/communicator/integrated/verb/see_video()
+	set category = "AI IM"
+	set name = "View Comm. Video"
+	set desc = "Utilizes your built-in communicator."
+	set src in usr
+
+	if(usr.stat == 2)
+		usr << "You can't do that because you are dead!"
+		return
+
+	src.watch_video(usr)
+
 // A camera preset for spawning in the communicator
 /obj/machinery/camera/communicator
 	network = list(NETWORK_COMMUNICATORS)

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

@@ -8,6 +8,8 @@
 
 	var/state	 								//0 off, 1 open, 2 working, 3 dead
 	var/uses = 2								//Calculates initial uses based on starting cell size
+	var/use_on_synthetic = 0					//If 1, this is only useful on FBPs, if 0, this is only useful on fleshies
+	var/pad_name = "defib pads"				//Just the name given for some cosmetic things
 	var/chance = 75								//Percent chance of working
 	var/charge_cost								//Set in New() based on uses
 	var/obj/item/weapon/cell/cell				//The size is mostly irrelevant, see 'uses'
@@ -32,13 +34,31 @@
 	if(istype(onto) && Adjacent(usr) && !usr.restrained() && !usr.stat)
 		var/mob/living/carbon/human/user = usr
 		//<--Feel free to code clothing checks right here
-		user.visible_message("<span class='warning'>[user] begins applying defib pads to [onto].</span>",
-		"<span class='warning'>You begin applying defib pads to [onto].</span>")
+		if(can_defib(onto))
+			user.visible_message("<span class='warning'>[user] begins applying [pad_name] to [onto].</span>",
+			"<span class='warning'>You begin applying [pad_name] to [onto].</span>")
 		if(do_after(user, 100, onto))
 			patient = onto
 			statechange(1,patient)
-			user.visible_message("<span class='warning'>[user] applies defib pads to [onto].</span>",
-			"<span class='warning'>You finish applying defib pads to [onto].</span>")
+			user.visible_message("<span class='warning'>[user] applies [pad_name] to [onto].</span>",
+			"<span class='warning'>You finish applying [pad_name] to [onto].</span>")
+
+
+//can_defib() check is where all of the qualifying conditions should go
+//Could probably toss in checks here for damage, organs, etc, but for now I'll leave it as just this
+/obj/item/device/defib_kit/proc/can_defib(var/mob/living/carbon/human/target)
+	var/mob/living/carbon/human/user = usr
+	if(use_on_synthetic && !target.isSynthetic())
+		to_chat(user, "[src] isn't designed for organics!")
+		return 0
+	else if(!use_on_synthetic && target.isSynthetic())
+		to_chat(user, "[src] isn't designed for synthetics!")
+		return 0
+	else if(!target.isSynthetic() && ((world.time - target.timeofdeath) > (10 MINUTES)))//Can only revive organics within a few minutes
+		to_chat(user, "There is no spark of life in [target.name], they've been dead too long to revive this way.")
+		return 0
+	return 1
+
 
 /obj/item/device/defib_kit/attackby(var/obj/item/A as obj, mob/living/user as mob)
 	..()
@@ -94,7 +114,7 @@
 
 	//Patient moved too far
 	if(patient && !(get_dist(src,patient) <= 1)) //You separated the kit and pads too far
-		audible_message("<span class='warning'>There's a clatter as the defib pads are yanked off of [patient].</span>")
+		audible_message("<span class='warning'>There is a clatter as the [pad_name] are yanked off of [patient].</span>")
 		statechange(0)
 		patient = null
 		return
@@ -111,7 +131,7 @@
 			patient.visible_message("<span class='warning'>[patient] convulses!</span>")
 			playsound(src.loc, 'sound/effects/sparks2.ogg', 75, 1)
 			//Actual rezzing code
-			if(prob(chance) && ((world.time - patient.timeofdeath) < (10 MINUTES))) //Can only revive within a few minutes
+			if(prob(chance))
 				if(!patient.client && patient.mind) //Don't force the dead person to come back if they don't want to.
 					for(var/mob/observer/dead/ghost in player_list)
 						if(ghost.mind == patient.mind)
@@ -155,3 +175,10 @@
 			break
 
 	return
+
+/obj/item/device/defib_kit/jumper_kit
+	name = "jumper cable kit"
+	desc = "This Morpheus-branded FBP defib kit is a semi-automated model. Apply cables, step back, wait."
+	icon_state = "jumper_kit"
+	use_on_synthetic = 1
+	pad_name = "jumper cables"

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

@@ -181,6 +181,38 @@
 	else
 		return ..()
 
+/obj/item/device/flashlight/MouseDrop(obj/over_object as obj)
+	if(!canremove)
+		return
+
+	if (ishuman(usr) || issmall(usr)) //so monkeys can take off their backpacks -- Urist
+
+		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why?
+			return
+
+		if (!( istype(over_object, /obj/screen) ))
+			return ..()
+
+		//makes sure that the thing is equipped, so that we can't drag it into our hand from miles away.
+		//there's got to be a better way of doing this.
+		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+			return
+
+		if (( usr.restrained() ) || ( usr.stat ))
+			return
+
+		if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src))
+			return
+
+		switch(over_object.name)
+			if("r_hand")
+				usr.u_equip(src)
+				usr.put_in_r_hand(src)
+			if("l_hand")
+				usr.u_equip(src)
+				usr.put_in_l_hand(src)
+		src.add_fingerprint(usr)
+
 /obj/item/device/flashlight/attackby(obj/item/weapon/W, mob/user as mob)
 	if(power_use)
 		if(istype(W, /obj/item/weapon/cell))
@@ -210,6 +242,26 @@
 	w_class = ITEMSIZE_TINY
 	power_use = 0
 
+/obj/item/device/flashlight/color	//Default color is blue, just roll with it.
+	name = "blue flashlight"
+	desc = "A hand-held emergency light. This one is blue."
+	icon_state = "flashlight_blue"
+
+/obj/item/device/flashlight/color/red
+	name = "red flashlight"
+	desc = "A hand-held emergency light. This one is red."
+	icon_state = "flashlight_red"
+
+/obj/item/device/flashlight/color/orange
+	name = "orange flashlight"
+	desc = "A hand-held emergency light. This one is orange."
+	icon_state = "flashlight_orange"
+
+/obj/item/device/flashlight/color/yellow
+	name = "yellow flashlight"
+	desc = "A hand-held emergency light. This one is yellow."
+	icon_state = "flashlight_yellow"
+
 /obj/item/device/flashlight/maglight
 	name = "maglight"
 	desc = "A very, very heavy duty flashlight."

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

@@ -45,8 +45,6 @@
 
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "lightreplacer0"
-	item_state = "electronic"
-
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2)

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

@@ -2,7 +2,6 @@
 	name = "megaphone"
 	desc = "A device used to project your voice. Loudly."
 	icon_state = "megaphone"
-	item_state = "radio"
 	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 

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

@@ -4,7 +4,6 @@
 	name = "power sink"
 	desc = "A nulling power sink which drains energy from electrical systems."
 	icon_state = "powersink0"
-	item_state = "electronic"
 	w_class = ITEMSIZE_LARGE
 	flags = CONDUCT
 	throwforce = 5

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -19,6 +19,12 @@
 	origin_tech = list(TECH_ILLEGAL = 3)
 	syndie = 1//Signifies that it de-crypts Syndicate transmissions
 
+/obj/item/device/encryptionkey/raider
+	icon_state = "cypherkey"
+	channels = list("Raider" = 1)
+	origin_tech = list(TECH_ILLEGAL = 2)
+	syndie = 1
+
 /obj/item/device/encryptionkey/binary
 	icon_state = "cypherkey"
 	translate_binary = 1

code/game/objects/items/devices/radio/headset.dm

@@ -75,6 +75,15 @@
 	syndie = 1
 	ks1type = /obj/item/device/encryptionkey/syndicate
 
+/obj/item/device/radio/headset/raider
+	origin_tech = list(TECH_ILLEGAL = 2)
+	syndie = 1
+	ks1type = /obj/item/device/encryptionkey/raider
+
+/obj/item/device/radio/headset/raider/initialize()
+	..()
+	set_frequency(RAID_FREQ)
+
 /obj/item/device/radio/headset/binary
 	origin_tech = list(TECH_ILLEGAL = 3)
 	ks1type = /obj/item/device/encryptionkey/binary
@@ -289,6 +298,7 @@
 	desc = "The headset of the boss's boss."
 	icon_state = "com_headset"
 	item_state = "headset"
+	centComm = 1
 //	freerange = 1
 	ks2type = /obj/item/device/encryptionkey/ert