Replaces all var/const with #define

2026-08-26 05:27:01 +01:00 · 2020-01-28 21:25:20 +00:00
parent 076ef673cd
commit c64bc93649
269 changed files with 1481 additions and 1474 deletions
@@ -1,10 +1,10 @@
 //TODO: Make these simple_animals

-var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
-var/const/MAX_IMPREGNATION_TIME = 150
+#define MIN_IMPREGNATION_TIME 100 //time it takes to impregnate someone
+#define MAX_IMPREGNATION_TIME 150

-var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle
-var/const/MAX_ACTIVE_TIME = 400
+#define MIN_ACTIVE_TIME 200 //time between being dropped and going idle
+#define MAX_ACTIVE_TIME 400

 /obj/item/clothing/mask/facehugger
 	name = "alien"
@@ -13,7 +13,7 @@
 	var/askDelay = 10 * 60 * 1
 	//var/mob/living/carbon/brain/brainmob = null
 	var/list/ghost_volunteers[0]
-	req_access = list(access_robotics)
+	req_access = list(ACCESS_ROBOTICS)
 	mecha = null//This does not appear to be used outside of reference in mecha.dm.
 	var/silenced = FALSE //if TRUE, they can't talk.
 	var/next_ping_at = 0
@@ -14,7 +14,7 @@
 			return TRUE
 	..()

-/mob/living/carbon/water_act(volume, temperature, source, method = TOUCH)
+/mob/living/carbon/water_act(volume, temperature, source, method = REAGENT_TOUCH)
 	. = ..()
 	if(volume > 10) // Anything over 10 volume will make the mob wetter.
 		wetlevel = min(wetlevel + 1,5)
@@ -1549,7 +1549,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X

 	//Check for weapons
 	if(judgebot.weaponscheck)
-		if(!idcard || !(access_weapons in idcard.access))
+		if(!idcard || !(ACCESS_WEAPONS in idcard.access))
 			if(judgebot.check_for_weapons(l_hand))
 				threatcount += 4
 			if(judgebot.check_for_weapons(r_hand))
@@ -651,7 +651,7 @@ emp_act
 			return FALSE
 	return ..()

-/mob/living/carbon/human/water_act(volume, temperature, source, method = TOUCH)
+/mob/living/carbon/human/water_act(volume, temperature, source, method = REAGENT_TOUCH)
 	. = ..()
 	dna.species.water_act(src, volume, temperature, source, method)

@@ -950,7 +950,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u

 	H.sync_lighting_plane_alpha()

-/datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source, method = TOUCH)
+/datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source, method = REAGENT_TOUCH)
 	if(abs(temperature - M.bodytemperature) > 10) // If our water and mob temperature varies by more than 10K, cool or/ heat them appropriately.
 		M.bodytemperature = (temperature + M.bodytemperature) * 0.5 // Approximation for gradual heating or cooling.

@@ -36,10 +36,10 @@
 	genemutcheck(H, REMOTETALKBLOCK, null, MUTCHK_FORCED)
 	H.dna.default_blocks.Add(REMOTETALKBLOCK)

-/datum/species/grey/water_act(mob/living/carbon/human/H, volume, temperature, source, method = TOUCH)
+/datum/species/grey/water_act(mob/living/carbon/human/H, volume, temperature, source, method = REAGENT_TOUCH)
 	. = ..()

-	if(method == TOUCH)
+	if(method == REAGENT_TOUCH)
 		if(H.wear_mask)
 			to_chat(H, "<span class='danger'>Your [H.wear_mask] protects you from the acid!</span>")
 			return
@@ -46,7 +46,7 @@
 /datum/superheroes/proc/assign_id(var/mob/living/carbon/human/H)
 	var/obj/item/card/id/syndicate/W = new(H)
 	W.registered_name = H.real_name
-	W.access = list(access_maint_tunnels)
+	W.access = list(ACCESS_MAINT_TUNNELS)
 	if(class == "Superhero")
 		W.assignment = "Superhero"
 		W.rank = "Superhero"
@@ -234,7 +234,7 @@
 		target.equip_to_slot_or_del(new /obj/item/radio/headset(target), slot_l_ear)
 		var/obj/item/card/id/syndicate/W = new(target)
 		W.icon_state = "lifetimeid"
-		W.access = list(access_maint_tunnels)
+		W.access = list(ACCESS_MAINT_TUNNELS)
 		W.assignment = "Greyshirt"
 		W.rank = "Greyshirt"
 		W.flags |= NODROP
@@ -223,7 +223,7 @@
 /mob/living/can_be_pulled(user, grab_state, force)
 	return ..() && !(buckled && buckled.buckle_prevents_pull)

-/mob/living/water_act(volume, temperature, source, method = TOUCH)
+/mob/living/water_act(volume, temperature, source, method = REAGENT_TOUCH)
 	. = ..()
 	adjust_fire_stacks(-(volume * 0.2))

@@ -2,7 +2,7 @@
 //
 // The datum containing all the chunks.

-var/const/CHUNK_SIZE = 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc..
+#define CHUNK_SIZE 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc..

 var/datum/cameranet/cameranet = new()

@@ -66,8 +66,8 @@
 */

 var/announcing_vox = 0 // Stores the time of the last announcement
-var/const/VOX_DELAY = 100
-var/const/VOX_PATH = "sound/vox_fem/"
+#define VOX_DELAY 100
+#define VOX_PATH "sound/vox_fem/"

 /mob/living/silicon/ai/verb/announcement_help()
 	set name = "Announcement Help"
@@ -4,7 +4,7 @@

 /mob/living/silicon/proc/laws_sanity_check()
 	if(!src.laws)
-		laws = new base_law_type
+		laws = new BASE_LAW_TYPE

 /mob/living/silicon/proc/has_zeroth_law()
 	return laws.zeroth_law != null
@@ -13,7 +13,7 @@
 	braintype = "Robot"
 	lawupdate = 0
 	density = 0
-	req_one_access = list(access_engine, access_robotics)
+	req_one_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
 	ventcrawler = 2
 	magpulse = 1
 	mob_size = MOB_SIZE_SMALL
@@ -46,7 +46,7 @@

 	// Disable the microphone wire on Drones
 	if(radio)
-		radio.wires.CutWireIndex(WIRE_TRANSMIT)
+		radio.wires.CutWireIndex(RADIO_WIRE_TRANSMIT)

 	if(camera && "Robots" in camera.network)
 		camera.network.Add("Engineering")
@@ -3,7 +3,7 @@
 	desc = "Used to monitor the station's drone population and the assembler that services them."
 	icon_screen = "power"
 	icon_keyboard = "power_key"
-	req_access = list(access_engine_equip)
+	req_access = list(ACCESS_ENGINE_EQUIP)
 	circuit = /obj/item/circuitboard/drone_control

 	//Used when pinging drones.
@@ -65,7 +65,7 @@ var/list/robot_verbs_default = list(

 	var/wiresexposed = 0
 	var/locked = 1
-	var/list/req_one_access = list(access_robotics)
+	var/list/req_one_access = list(ACCESS_ROBOTICS)
 	var/list/req_access
 	var/ident = 0
 	//var/list/laws = list()
@@ -1301,7 +1301,7 @@ var/list/robot_verbs_default = list(
 	designation = "SpecOps"
 	lawupdate = 0
 	scrambledcodes = 1
-	req_one_access = list(access_cent_specops)
+	req_one_access = list(ACCESS_CENT_SPECOPS)
 	ionpulse = 1
 	magpulse = 1
 	pdahide = 1
@@ -1350,7 +1350,7 @@ var/list/robot_verbs_default = list(
 	designation = "ERT"
 	lawupdate = 0
 	scrambledcodes = 1
-	req_one_access = list(access_cent_specops)
+	req_one_access = list(ACCESS_CENT_SPECOPS)
 	ionpulse = 1

 	force_modules = list("Engineering", "Medical", "Security")
@@ -7,7 +7,7 @@
 	faction = list("syndicate")
 	designation = "Syndicate Assault"
 	modtype = "Syndicate"
-	req_access = list(access_syndicate)
+	req_access = list(ACCESS_SYNDICATE)
 	ionpulse = 1
 	lawchannel = "State"
 	var/playstyle_string = "<span class='userdanger'>You are a Syndicate assault cyborg!</span><br>\
@@ -143,7 +143,7 @@
 	icon_dead = icon_state
 	access_card = new /obj/item/card/id(src)
 //This access is so bots can be immediately set to patrol and leave Robotics, instead of having to be let out first.
-	access_card.access += access_robotics
+	access_card.access += ACCESS_ROBOTICS
 	set_custom_texts()
 	Radio = new/obj/item/radio/headset/bot(src)

@@ -187,7 +187,7 @@
 	..()

 /obj/machinery/bot_core/cleanbot
-	req_one_access = list(access_janitor, access_robotics)
+	req_one_access = list(ACCESS_JANITOR, ACCESS_ROBOTICS)


 /mob/living/simple_animal/bot/cleanbot/get_controls(mob/user)
@@ -342,7 +342,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm
 	icon = 'icons/obj/aibots.dmi'
 	icon_state = "firstaid_arm"
 	w_class = WEIGHT_CLASS_NORMAL
-	req_one_access = list(access_medical, access_robotics)
+	req_one_access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS)
 	var/build_step = 0
 	var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
 	var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
@@ -599,7 +599,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm
 	icon = 'icons/obj/aibots.dmi'
 	icon_state = "honkbot_arm"
 	w_class = WEIGHT_CLASS_NORMAL
-	req_one_access = list(access_clown, access_robotics, access_mime)
+	req_one_access = list(ACCESS_CLOWN, ACCESS_ROBOTICS, ACCESS_MIME)
 	var/build_step = 0
 	var/created_name = "Honkbot" //To preserve the name if it's a unique medbot I guess

@@ -59,7 +59,7 @@
 		check_records = 0//Don't actively target people set to arrest
 		arrest_type = 1//Don't even try to cuff
 		declare_arrests = 0 // Don't spam sec
-		bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
+		bot_core.req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE, ACCESS_ROBOTICS)

 		if(created_name == initial(name) || !created_name)
 			if(lasercolor == "b")
@@ -415,7 +415,7 @@
 	..()

 /obj/machinery/bot_core/floorbot
-	req_one_access = list(access_construction, access_robotics)
+	req_one_access = list(ACCESS_CONSTRUCTION, ACCESS_ROBOTICS)

 /mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/A)
 	if(isturf(A))
@@ -35,7 +35,7 @@
 	locked = 0

 /obj/machinery/bot_core/toy
-	req_access = list(access_maint_tunnels, access_theatre, access_robotics)
+	req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE, ACCESS_ROBOTICS)

 /mob/living/simple_animal/bot/secbot/griefsky/proc/spam_flag_false() //used for addtimer to not spam comms
 	spam_flag = 0
@@ -31,7 +31,7 @@
 	var/arrest_type = FALSE

 /obj/machinery/bot_core/honkbot
-	req_one_access = list(access_clown, access_robotics, access_mime)
+	req_one_access = list(ACCESS_CLOWN, ACCESS_ROBOTICS, ACCESS_MIME)

 /mob/living/simple_animal/bot/honkbot/Initialize()
 	. = ..()
@@ -530,7 +530,7 @@
 				if(inject_beaker)
 					if(use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
 						var/fraction = min(injection_amount/reagent_glass.reagents.total_volume, 1)
-						reagent_glass.reagents.reaction(patient, INGEST, fraction)
+						reagent_glass.reagents.reaction(patient, REAGENT_INGEST, fraction)
 						reagent_glass.reagents.trans_to(patient, injection_amount) //Inject from beaker instead.
 				else
 					patient.reagents.add_reagent(reagent_id,injection_amount)
@@ -615,7 +615,7 @@
 		declare_cooldown = 0

 /obj/machinery/bot_core/medbot
-	req_one_access = list(access_medical, access_robotics)
+	req_one_access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS)

 /obj/machinery/bot_core/medbot/syndicate
-	req_one_access = list(access_syndicate)
+	req_one_access = list(ACCESS_SYNDICATE)
@@ -871,4 +871,4 @@
 #undef DELIGHT

 /obj/machinery/bot_core/mulebot
-	req_access = list(access_cargo)
+	req_access = list(ACCESS_CARGO)
@@ -456,4 +456,4 @@ Auto Patrol: []"},
 	..()

 /obj/machinery/bot_core/secbot
-	req_access = list(access_security)
+	req_access = list(ACCESS_SECURITY)
@@ -33,7 +33,7 @@

 /mob/living/simple_animal/bot/ed209/syndicate/setup_access()
 	if(access_card)
-		access_card.access = list(access_syndicate, access_syndicate_leader)
+		access_card.access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER)
 		prev_access = access_card.access

 /mob/living/simple_animal/bot/ed209/syndicate/update_icon()
@@ -5,7 +5,7 @@
 	hair_style = "bald"
 	facial_hair_style = "shaved"
 	id_job = "Operative"
-	id_access_list = list(access_syndicate)
+	id_access_list = list(ACCESS_SYNDICATE)
 	outfit = /datum/outfit/syndicatesoldiercorpse

 /datum/outfit/syndicatesoldiercorpse
@@ -27,7 +27,7 @@
 	hair_style = "bald"
 	facial_hair_style = "shaved"
 	id_job = "Operative"
-	id_access_list = list(access_syndicate)
+	id_access_list = list(ACCESS_SYNDICATE)
 	outfit = /datum/outfit/syndicatecommandocorpse

 /datum/outfit/syndicatecommandocorpse
@@ -209,7 +209,7 @@
 				mind.transfer_to(C)
 			qdel(src)

-var/const/MAX_CHICKENS = 50
+#define MAX_CHICKENS 50
 var/global/chicken_count = 0

 /mob/living/simple_animal/chicken
@@ -117,7 +117,7 @@
 			var/obj/item/pda/pda = O
 			id_card = pda.id

-		if(access_robotics in id_card.access)
+		if(ACCESS_ROBOTICS in id_card.access)
 			to_chat(user, "<span class='notice'>You swipe your access card and pop the brain out of [src].</span>")
 			eject_brain()
 			return 1
@@ -159,7 +159,7 @@
 			var/mob/living/L = target
 			if(L.reagents)
 				if(beegent)
-					beegent.reaction_mob(L, INGEST)
+					beegent.reaction_mob(L, REAGENT_INGEST)
 					L.reagents.add_reagent(beegent.id, rand(1, 5))
 				else
 					L.reagents.add_reagent("spidertoxin", 5)
@@ -238,7 +238,7 @@
 	. = ..()
 	if(. && beegent && isliving(target))
 		var/mob/living/L = target
-		beegent.reaction_mob(L, TOUCH)
+		beegent.reaction_mob(L, REAGENT_TOUCH)
 		L.reagents.add_reagent(beegent.id, rand(1, 5))

 //PEASENT BEES
@@ -141,7 +141,7 @@
 	volume = min(volume, reagents.total_volume)

 	var/fraction = min(volume/reagents.total_volume, 1)
-	reagents.reaction(C, INGEST, fraction)
+	reagents.reaction(C, REAGENT_INGEST, fraction)
 	reagents.trans_to(C, volume)

 /mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/proc/link_host(mob/living/carbon/C)
@@ -422,7 +422,7 @@
 		visible_message("<span class='warning'>The mutated core shudders, and collapses into a puddle, unable to maintain its form.</span>")
 	qdel(src)
 */
-/mob/living/simple_animal/slime/water_act(volume, temperature, source, method = TOUCH)
+/mob/living/simple_animal/slime/water_act(volume, temperature, source, method = REAGENT_TOUCH)
 	. = ..()
 	var/water_damage = rand(10, 15) * volume
 	adjustBruteLoss(water_damage)
@@ -406,7 +406,7 @@
 	var/uniform_dmi='icons/mob/uniform.dmi'
 	if(disabilities&DISABILITY_FLAG_FAT)
 		uniform_dmi='icons/mob/uniform_fat.dmi'
-	if(job_support_low & CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
+	if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
 		clothes_s = new /icon(uniform_dmi, "grey_s")
 		clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 		if(backbag == 2)
@@ -416,7 +416,7 @@

 	else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
 		switch(job_support_high)
-			if(HOP)
+			if(JOB_HOP)
 				clothes_s = new /icon(uniform_dmi, "hop_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				if(prob(1))
@@ -428,7 +428,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(BARTENDER)
+			if(JOB_BARTENDER)
 				clothes_s = new /icon(uniform_dmi, "ba_suit_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				if(prob(1))
@@ -440,7 +440,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(BOTANIST)
+			if(JOB_BOTANIST)
 				clothes_s = new /icon(uniform_dmi, "hydroponics_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
@@ -454,7 +454,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CHEF)
+			if(JOB_CHEF)
 				clothes_s = new /icon(uniform_dmi, "chef_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY)
@@ -467,7 +467,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(JANITOR)
+			if(JOB_JANITOR)
 				clothes_s = new /icon(uniform_dmi, "janitor_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				if(prob(1))
@@ -479,7 +479,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(LIBRARIAN)
+			if(JOB_LIBRARIAN)
 				clothes_s = new /icon(uniform_dmi, "red_suit_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				if(prob(1))
@@ -491,7 +491,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(QUARTERMASTER)
+			if(JOB_QUARTERMASTER)
 				clothes_s = new /icon(uniform_dmi, "qm_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -504,7 +504,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CARGOTECH)
+			if(JOB_CARGOTECH)
 				clothes_s = new /icon(uniform_dmi, "cargotech_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -517,7 +517,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(MINER)
+			if(JOB_MINER)
 				clothes_s = new /icon(uniform_dmi, "miner_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -530,7 +530,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(LAWYER)
+			if(JOB_LAWYER)
 				clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
@@ -543,7 +543,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CHAPLAIN)
+			if(JOB_CHAPLAIN)
 				clothes_s = new /icon(uniform_dmi, "chapblack_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				if(prob(1))
@@ -555,12 +555,12 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CLOWN)
+			if(JOB_CLOWN)
 				clothes_s = new /icon(uniform_dmi, "clown_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
 				clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
-			if(MIME)
+			if(JOB_MIME)
 				clothes_s = new /icon(uniform_dmi, "mime_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
@@ -577,7 +577,7 @@

 	else if(job_medsci_high)
 		switch(job_medsci_high)
-			if(RD)
+			if(JOB_RD)
 				clothes_s = new /icon(uniform_dmi, "director_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
@@ -590,7 +590,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(SCIENTIST)
+			if(JOB_SCIENTIST)
 				clothes_s = new /icon(uniform_dmi, "toxinswhite_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
@@ -603,7 +603,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CHEMIST)
+			if(JOB_CHEMIST)
 				clothes_s = new /icon(uniform_dmi, "chemistrywhite_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				if(prob(1))
@@ -617,7 +617,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CMO)
+			if(JOB_CMO)
 				clothes_s = new /icon(uniform_dmi, "cmo_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				if(prob(1))
@@ -631,7 +631,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(DOCTOR)
+			if(JOB_DOCTOR)
 				clothes_s = new /icon(uniform_dmi, "medical_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				if(prob(1))
@@ -645,7 +645,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CORONER)
+			if(JOB_CORONER)
 				clothes_s = new /icon(uniform_dmi, "medical_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				if(prob(1))
@@ -659,7 +659,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(GENETICIST)
+			if(JOB_GENETICIST)
 				clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				if(prob(1))
@@ -673,7 +673,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(VIROLOGIST)
+			if(JOB_VIROLOGIST)
 				clothes_s = new /icon(uniform_dmi, "virologywhite_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
@@ -687,7 +687,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(PSYCHIATRIST)
+			if(JOB_PSYCHIATRIST)
 				clothes_s = new /icon(uniform_dmi, "psych_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
@@ -698,7 +698,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(PARAMEDIC)
+			if(JOB_PARAMEDIC)
 				clothes_s = new /icon(uniform_dmi, "paramedic_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY)
@@ -708,7 +708,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
 					if(3)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
-			if(ROBOTICIST)
+			if(JOB_ROBOTICIST)
 				clothes_s = new /icon(uniform_dmi, "robotics_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -725,7 +725,7 @@

 	else if(job_engsec_high)
 		switch(job_engsec_high)
-			if(CAPTAIN)
+			if(JOB_CAPTAIN)
 				clothes_s = new /icon(uniform_dmi, "captain_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				if(prob(1))
@@ -739,7 +739,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(HOS)
+			if(JOB_HOS)
 				clothes_s = new /icon(uniform_dmi, "hosred_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -752,7 +752,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(WARDEN)
+			if(JOB_WARDEN)
 				clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
 				if(prob(1))
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
@@ -766,7 +766,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(DETECTIVE)
+			if(JOB_DETECTIVE)
 				clothes_s = new /icon(uniform_dmi, "detective_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -781,7 +781,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(OFFICER)
+			if(JOB_OFFICER)
 				clothes_s = new /icon(uniform_dmi, "secred_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 				if(prob(1))
@@ -793,7 +793,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CHIEF)
+			if(JOB_CHIEF)
 				clothes_s = new /icon(uniform_dmi, "chief_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -808,7 +808,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(ENGINEER)
+			if(JOB_ENGINEER)
 				clothes_s = new /icon(uniform_dmi, "engine_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
@@ -822,7 +822,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(ATMOSTECH)
+			if(JOB_ATMOSTECH)
 				clothes_s = new /icon(uniform_dmi, "atmos_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
@@ -837,7 +837,7 @@
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)

-			if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
+			if(JOB_AI)//Gives AI and borgs assistant-wear, so they can still customize their character
 				clothes_s = new /icon(uniform_dmi, "grey_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
@@ -846,7 +846,7 @@
 					clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
 				else if(backbag == 3 || backbag == 4)
 					clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(CYBORG)
+			if(JOB_CYBORG)
 				clothes_s = new /icon(uniform_dmi, "grey_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
@@ -857,7 +857,7 @@
 					clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 	else if(job_karma_high)
 		switch(job_karma_high)
-			if(MECHANIC)
+			if(JOB_MECHANIC)
 				clothes_s = new /icon(uniform_dmi, "mechanic_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
@@ -869,7 +869,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(PILOT)
+			if(JOB_PILOT)
 				clothes_s = new /icon(uniform_dmi, "secred_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
@@ -880,7 +880,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(BRIGDOC)
+			if(JOB_BRIGDOC)
 				clothes_s = new /icon(uniform_dmi, "medical_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
@@ -891,7 +891,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(NANO)
+			if(JOB_NANO)
 				clothes_s = new /icon(uniform_dmi, "officer_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
 				switch(backbag)
@@ -901,7 +901,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(BLUESHIELD)
+			if(JOB_BLUESHIELD)
 				clothes_s = new /icon(uniform_dmi, "officer_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
@@ -913,7 +913,7 @@
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 					if(4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-			if(JUDGE)
+			if(JOB_JUDGE)
 				clothes_s = new /icon(uniform_dmi, "really_black_suit_s")
 				clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
 				clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY)