various compile fixes

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

code/game/jobs/job/security.dm

@@ -92,11 +92,12 @@
 	spawn_positions = 1
 	supervisors = "the head of security"
 	selection_color = "#ffeeee"
+	alt_titles = list("Forensic Technician")
 
 	access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 	minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 
-	minimal_player_age = 7	alt_titles = list("Forensic Technician")
+	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_sec(H), slot_ears)

code/game/machinery/vending.dm

@@ -737,7 +737,7 @@
 	icon_state = "robotics"
 	icon_deny = "robotics-deny"
 	req_access_txt = "29"
-	products = list(/obj/item/clothing/suit/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/weapon/cable_coil = 4,/obj/item/device/flash = 4,
+	products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/weapon/cable_coil = 4,/obj/item/device/flash = 4,
 					/obj/item/weapon/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3,
 					/obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
 					/obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5)

code/modules/admin/verbs/mapping.dm

@@ -240,39 +240,45 @@ var/global/prevent_airgroup_regroup = 0
 	set category = "Mapping"
 	set name = "Break All Airgroups"
 
-	prevent_airgroup_regroup = 1
+	/*prevent_airgroup_regroup = 1
 	for(var/datum/air_group/AG in air_master.air_groups)
 		AG.suspend_group_processing()
-	message_admins("[src.ckey] used 'Break All Airgroups'")
+	message_admins("[src.ckey] used 'Break All Airgroups'")*/
 
 /client/proc/regroup_all_air_groups()
 	set category = "Mapping"
 	set name = "Regroup All Airgroups Attempt"
 
-	prevent_airgroup_regroup = 0
+	usr << "\red Proc disabled."
+
+	/*prevent_airgroup_regroup = 0
 	for(var/datum/air_group/AG in air_master.air_groups)
 		AG.check_regroup()
-	message_admins("[src.ckey] used 'Regroup All Airgroups Attempt'")
+	message_admins("[src.ckey] used 'Regroup All Airgroups Attempt'")*/
 
 /client/proc/kill_pipe_processing()
 	set category = "Mapping"
 	set name = "Kill pipe processing"
 
-	pipe_processing_killed = !pipe_processing_killed
+	usr << "\red Proc disabled."
+
+	/*pipe_processing_killed = !pipe_processing_killed
 	if(pipe_processing_killed)
 		message_admins("[src.ckey] used 'kill pipe processing', stopping all pipe processing.")
 	else
-		message_admins("[src.ckey] used 'kill pipe processing', restoring all pipe processing.")
+		message_admins("[src.ckey] used 'kill pipe processing', restoring all pipe processing.")*/
 
 /client/proc/kill_air_processing()
 	set category = "Mapping"
 	set name = "Kill air processing"
 
-	air_processing_killed = !air_processing_killed
+	usr << "\red Proc disabled."
+
+	/*air_processing_killed = !air_processing_killed
 	if(air_processing_killed)
 		message_admins("[src.ckey] used 'kill air processing', stopping all air processing.")
 	else
-		message_admins("[src.ckey] used 'kill air processing', restoring all air processing.")
+		message_admins("[src.ckey] used 'kill air processing', restoring all air processing.")*/
 
 //This proc is intended to detect lag problems relating to communication procs
 var/global/say_disabled = 0
@@ -280,11 +286,13 @@ var/global/say_disabled = 0
 	set category = "Mapping"
 	set name = "Disable all communication verbs"
 
-	say_disabled = !say_disabled
+	usr << "\red Proc disabled."
+
+	/*say_disabled = !say_disabled
 	if(say_disabled)
 		message_admins("[src.ckey] used 'Disable all communication verbs', killing all communication methods.")
 	else
-		message_admins("[src.ckey] used 'Disable all communication verbs', restoring all communication methods.")
+		message_admins("[src.ckey] used 'Disable all communication verbs', restoring all communication methods.")*/
 
 //This proc is intended to detect lag problems relating to movement
 var/global/movement_disabled = 0
@@ -293,9 +301,11 @@ var/global/movement_disabled_exception //This is the client that calls the proc,
 	set category = "Mapping"
 	set name = "Disable all movement"
 
-	movement_disabled = !movement_disabled
+	usr << "\red Proc disabled."
+
+	/*movement_disabled = !movement_disabled
 	if(movement_disabled)
 		message_admins("[src.ckey] used 'Disable all movement', killing all movement.")
 		movement_disabled_exception = usr.ckey
 	else
-		message_admins("[src.ckey] used 'Disable all movement', restoring all movement.")
+		message_admins("[src.ckey] used 'Disable all movement', restoring all movement.")*/

code/modules/clothing/under/ties.dm

@@ -154,4 +154,23 @@
 	name = "medical guard armband"
 	desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and green."
 	icon_state = "medgreen"
-	color = "medgreen"
+	color = "medgreen"
+
+/obj/item/clothing/tie/holster
+	name = "shoulder holster"
+	desc = "A handgun holster."
+	icon_state = "holster"
+	color = "holster"
+	var/obj/item/weapon/gun/holstered = null
+
+/obj/item/clothing/tie/holster/armpit
+	name = "shoulder holster"
+	desc = "A worn-out handgun holster. Perfect for concealed carry"
+	icon_state = "holster"
+	color = "holster"
+
+/obj/item/clothing/tie/holster/waist
+	name = "shoulder holster"
+	desc = "A handgun holster. Made of expensive leather."
+	icon_state = "holster"
+	color = "holster_low"

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

@@ -366,93 +366,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 			if((COLD_RESISTANCE in mutations) || (prob(1)))
 				heal_organ_damage(0,1)
 
-		if(mHallucination in mutations)
-			hallucination = 100
-			halloss = 0
-
-		if(mSmallsize in mutations)
-			if(!(pass_flags & PASSTABLE))
-				pass_flags |= PASSTABLE
-		else
-			if(pass_flags & PASSTABLE)
-				pass_flags &= ~PASSTABLE
-
-		// Make nanoregen heal youu, -3 all damage types
-		if((NANOREGEN in augmentations) || (mRegen in mutations))
-			var/healed = 0
-			var/hptoreg = 0
-			if(NANOREGEN in augmentations)
-				hptoreg += 3
-			if(mRegen in mutations)
-				hptoreg += 2
-			if(stat==UNCONSCIOUS) hptoreg/=2
-			if(stat==DEAD) hptoreg=0
-
-			for(var/i=0, i<hptoreg, i++)
-				var/list/damages = new/list()
-				if(getToxLoss())
-					damages+="tox"
-				if(getOxyLoss())
-					damages+="oxy"
-				if(getCloneLoss())
-					damages+="clone"
-				if(getBruteLoss())
-					damages+="brute"
-				if(getFireLoss())
-					damages+="burn"
-				if(halloss != 0)
-					damages+="hal"
-
-				if(damages.len)
-					switch(pick(damages))
-						if("tox")
-							adjustToxLoss(-1)
-							healed = 1
-						if("oxy")
-							adjustOxyLoss(-1)
-							healed = 1
-						if("clone")
-							adjustCloneLoss(-1)
-							healed = 1
-						if("brute")
-							heal_organ_damage(1,0)
-							healed = 1
-						if("burn")
-							heal_organ_damage(0,1)
-							healed = 1
-						if("hal")
-							if(halloss > 0)
-								halloss -= 1
-							if(halloss < 0)
-								halloss = 0
-							healed = 1
-				else
-					break
-
-			if(healed)
-				if(prob(5))
-					src << "\blue You feel your wounds mending..."
-		if(!(/mob/living/carbon/human/proc/morph in src.verbs))
-			if(mMorph in mutations)
-				src.verbs += /mob/living/carbon/human/proc/morph
-		else
-			if(!(mMorph in mutations))
-				src.verbs -= /mob/living/carbon/human/proc/morph
-
-		if(!(/mob/living/carbon/human/proc/remoteobserve in src.verbs))
-			if(mRemote in mutations)
-				src.verbs += /mob/living/carbon/human/proc/remoteobserve
-		else
-			if(!(mRemote in mutations))
-				src.verbs -= /mob/living/carbon/human/proc/remoteobserve
-
-		if(!(/mob/living/carbon/human/proc/remotesay in src.verbs))
-			if(mRemotetalk in mutations)
-				src.verbs += /mob/living/carbon/human/proc/remotesay
-		else
-			if(!(mRemotetalk in mutations))
-				src.verbs -= /mob/living/carbon/human/proc/remotesay
-
 		if ((HULK in mutations) && health <= 25)
 			mutations.Remove(HULK)
 			update_mutations()		//update our mutation overlays
@@ -605,8 +518,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 
 	proc/handle_breath(datum/gas_mixture/breath)
-		if((status_flags & GODMODE) || REBREATHER in augmentations)
+		if(status_flags & GODMODE)
 			return
+
 		if(!breath || (breath.total_moles() == 0) || suiciding)
 			if(reagents.has_reagent("inaprovaline"))
 				return

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

@@ -18,12 +18,12 @@
 			if (copytext(message, 1, 2) != "*")
 				return
 
-	if(dna)
-		/*if(dna.mutantrace == "lizard")
+	/*if(dna)
+		if(dna.mutantrace == "lizard")
 			if(copytext(message, 1, 2) != "*")
-				message = replacetext(message, "s", stutter("ss"))*/
+				message = replacetext(message, "s", stutter("ss"))
 
-		/*if(dna.mutantrace == "slime" && prob(5))
+		if(dna.mutantrace == "slime" && prob(5))
 			if(copytext(message, 1, 2) != "*")
 				if(copytext(message, 1, 2) == ";")
 					message = ";"
@@ -33,17 +33,8 @@
 				var/imax = rand(5,20)
 				for(var/i = 0,i<imax,i++)
 					message += "E"*/
-			if(copytext(message, 1, 2) != "*")
-				if(copytext(message, 1, 2) == ";")
-					message = ";"
-				else
-					message = ""
-				message += "SKR"
-				var/imax = rand(5,20)
-				for(var/i = 0,i<imax,i++)
-					message += "E"
 
-	if(stat != DEAD)
+	if(stat != DEAD)jump
 		for(var/datum/disease/pierrot_throat/D in viruses)
 			var/list/temp_message = text2list(message, " ") //List each word in the message
 			var/list/pick_list = list()

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

@@ -28,7 +28,8 @@
 			robot_talk(message)
 		else if ((copytext(message, 1, 3) == ":h") || (copytext(message, 1, 3) == ":H") || \
 				(copytext(message, 1, 3) == "#h") || (copytext(message, 1, 3) == "#H") || \
-				(copytext(message, 1, 3) == ".h") || (copytext(message, 1, 3) == ".H"))			if(isAI(src)&&client)//For patching directly into AI holopads.
+				(copytext(message, 1, 3) == ".h") || (copytext(message, 1, 3) == ".H"))
+			if(isAI(src)&&client)//For patching directly into AI holopads.
 				var/mob/living/silicon/ai/U = src
 				message = copytext(message, 3)
 				message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))

code/modules/projectiles/projectile.dm

@@ -75,15 +75,14 @@
 				return 0// nope.avi
 
 			var/distance = get_dist(original,loc)
-			def_zone = ran_zone(def_zone, 100-(5*distance)) //Lower accurancy/longer range tradeoff.
-			if(silenced)
-				M << "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!"
-			else
-				var/distance = get_dist(original,loc)
-				//Lower accurancy/longer range tradeoff. Distance matters a lot here, so at
-				// close distance, actually RAISE the chance to hit.
-				def_zone = get_zone_with_miss_chance(def_zone, M, -30 + 8*distance)
+			//Lower accurancy/longer range tradeoff. Distance matters a lot here, so at
+			// close distance, actually RAISE the chance to hit.
+			def_zone = get_zone_with_miss_chance(def_zone, M, -30 + 8*distance)
 
+			if(silenced)
+				if(def_zone)
+					M << "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!"
+			else
 				if(!def_zone)
 					visible_message("\The [src] misses [M] narrowly.")
 					del(src)