Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329

code/datums/action.dm

@@ -245,6 +245,14 @@
 /datum/action/item_action/toggle_helmet_light
 	name = "Toggle Helmet Light"
 
+/datum/action/item_action/toggle_welding_screen
+	name = "Toggle Welding Screen"
+
+/datum/action/item_action/toggle_welding_screen/Trigger()
+	var/obj/item/clothing/head/hardhat/weldhat/H = target
+	if(istype(H))
+		H.toggle_welding_screen(owner)
+
 /datum/action/item_action/toggle_headphones
 	name = "Toggle Headphones"
 	desc = "UNTZ UNTZ UNTZ"

code/datums/armor.dm

@@ -1,70 +1,70 @@
 #define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]"
 
 /proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0)
-  . = locate(ARMORID)
-  if (!.)
-    . = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic)
+	. = locate(ARMORID)
+	if (!.)
+		. = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic)
 
 /datum/armor
-  datum_flags = DF_USE_TAG
-  var/melee
-  var/bullet
-  var/laser
-  var/energy
-  var/bomb
-  var/bio
-  var/rad
-  var/fire
-  var/acid
-  var/magic
+	datum_flags = DF_USE_TAG
+	var/melee
+	var/bullet
+	var/laser
+	var/energy
+	var/bomb
+	var/bio
+	var/rad
+	var/fire
+	var/acid
+	var/magic
 
 /datum/armor/New(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0)
-  src.melee = melee
-  src.bullet = bullet
-  src.laser = laser
-  src.energy = energy
-  src.bomb = bomb
-  src.bio = bio
-  src.rad = rad
-  src.fire = fire
-  src.acid = acid
-  src.magic = magic
-  tag = ARMORID
+	src.melee = melee
+	src.bullet = bullet
+	src.laser = laser
+	src.energy = energy
+	src.bomb = bomb
+	src.bio = bio
+	src.rad = rad
+	src.fire = fire
+	src.acid = acid
+	src.magic = magic
+	tag = ARMORID
 
 /datum/armor/proc/modifyRating(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0)
-  return getArmor(src.melee+melee, src.bullet+bullet, src.laser+laser, src.energy+energy, src.bomb+bomb, src.bio+bio, src.rad+rad, src.fire+fire, src.acid+acid, src.magic+magic)
+	return getArmor(src.melee+melee, src.bullet+bullet, src.laser+laser, src.energy+energy, src.bomb+bomb, src.bio+bio, src.rad+rad, src.fire+fire, src.acid+acid, src.magic+magic)
 
 /datum/armor/proc/modifyAllRatings(modifier = 0)
-  return getArmor(melee+modifier, bullet+modifier, laser+modifier, energy+modifier, bomb+modifier, bio+modifier, rad+modifier, fire+modifier, acid+modifier, magic+modifier)
+	return getArmor(melee+modifier, bullet+modifier, laser+modifier, energy+modifier, bomb+modifier, bio+modifier, rad+modifier, fire+modifier, acid+modifier, magic+modifier)
 
 /datum/armor/proc/setRating(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic)
-  return getArmor((isnull(melee) ? src.melee : melee),\
-                  (isnull(bullet) ? src.bullet : bullet),\
-                  (isnull(laser) ? src.laser : laser),\
-                  (isnull(energy) ? src.energy : energy),\
-                  (isnull(bomb) ? src.bomb : bomb),\
-                  (isnull(bio) ? src.bio : bio),\
-                  (isnull(rad) ? src.rad : rad),\
-                  (isnull(fire) ? src.fire : fire),\
-                  (isnull(acid) ? src.acid : acid),\
-				  (isnull(magic) ? src.magic : magic))
+	return getArmor((isnull(melee) ? src.melee : melee),\
+					(isnull(bullet) ? src.bullet : bullet),\
+					(isnull(laser) ? src.laser : laser),\
+					(isnull(energy) ? src.energy : energy),\
+					(isnull(bomb) ? src.bomb : bomb),\
+					(isnull(bio) ? src.bio : bio),\
+					(isnull(rad) ? src.rad : rad),\
+					(isnull(fire) ? src.fire : fire),\
+					(isnull(acid) ? src.acid : acid),\
+					(isnull(magic) ? src.magic : magic))
 
 /datum/armor/proc/getRating(rating)
-  return vars[rating]
+	return vars[rating]
 
 /datum/armor/proc/getList()
-  return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic)
+	return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic)
 
 /datum/armor/proc/attachArmor(datum/armor/AA)
-  return getArmor(melee+AA.melee, bullet+AA.bullet, laser+AA.laser, energy+AA.energy, bomb+AA.bomb, bio+AA.bio, rad+AA.rad, fire+AA.fire, acid+AA.acid, magic+AA.magic)
+	return getArmor(melee+AA.melee, bullet+AA.bullet, laser+AA.laser, energy+AA.energy, bomb+AA.bomb, bio+AA.bio, rad+AA.rad, fire+AA.fire, acid+AA.acid, magic+AA.magic)
 
 /datum/armor/proc/detachArmor(datum/armor/AA)
-  return getArmor(melee-AA.melee, bullet-AA.bullet, laser-AA.laser, energy-AA.energy, bomb-AA.bomb, bio-AA.bio, rad-AA.rad, fire-AA.fire, acid-AA.acid, magic-AA.magic)
+	return getArmor(melee-AA.melee, bullet-AA.bullet, laser-AA.laser, energy-AA.energy, bomb-AA.bomb, bio-AA.bio, rad-AA.rad, fire-AA.fire, acid-AA.acid, magic-AA.magic)
 
 /datum/armor/vv_edit_var(var_name, var_value)
-  if (var_name == NAMEOF(src, tag))
-    return FALSE
-  . = ..()
-  tag = ARMORID // update tag in case armor values were edited
+	if (var_name == NAMEOF(src, tag))
+		return FALSE
+	. = ..()
+	tag = ARMORID // update tag in case armor values were edited
 
 #undef ARMORID

code/datums/browser.dm

@@ -194,7 +194,7 @@
 	.=..()
 	opentime = 0
 
-/datum/browser/modal/open()
+/datum/browser/modal/open(use_onclose = 1)
 	set waitfor = 0
 	opentime = world.time
 

code/datums/components/jousting.dm

@@ -45,7 +45,7 @@
 		var/knockdown_chance = (target_buckled? mounted_knockdown_chance_per_tile : unmounted_knockdown_chance_per_tile) * current
 		var/knockdown_time = (target_buckled? mounted_knockdown_time : unmounted_knockdown_time)
 		var/damage = (target_buckled? mounted_damage_boost_per_tile : unmounted_damage_boost_per_tile) * current
-		var/sharp = I.is_sharp()
+		var/sharp = I.get_sharpness()
 		var/msg
 		if(damage)
 			msg += "[user] [sharp? "impales" : "slams into"] [target] [sharp? "on" : "with"] their [parent]"

code/datums/components/mood.dm

@@ -8,7 +8,7 @@
 	var/mood_level = 5 //To track what stage of moodies they're on
 	var/sanity_level = 5 //To track what stage of sanity they're on
 	var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets
-	var/datum/mood_event/list/mood_events = list()
+	var/list/datum/mood_event/mood_events = list()
 	var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
 	var/obj/screen/mood/screen_obj
 
@@ -125,6 +125,9 @@
 			screen_obj.icon_state = "mood[mood_level]"
 
 /datum/component/mood/process() //Called on SSmood process
+	if(QDELETED(parent)) // workaround to an obnoxious sneaky periodical runtime.
+		qdel(src)
+		return
 	var/mob/living/owner = parent
 
 	switch(mood_level)
@@ -249,7 +252,7 @@
 	RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click)
 
 /datum/component/mood/proc/unmodify_hud(datum/source)
-	if(!screen_obj)
+	if(!screen_obj || !parent)
 		return
 	var/mob/living/owner = parent
 	var/datum/hud/hud = owner.hud_used

code/datums/components/riding.dm

@@ -310,10 +310,10 @@
 		if(!user.put_in_hands(inhand, TRUE))
 			qdel(inhand) // it isn't going to be added to offhands anyway
 			break
-		LAZYADD(equipped, src)
+		LAZYADD(equipped, inhand)
 	var/amount_equipped = LAZYLEN(equipped)
 	if(amount_equipped)
-		LAZYADD(offhands[L], amount_equipped)
+		LAZYADD(offhands[L], equipped)
 	if(amount_equipped >= amount_required)
 		return TRUE
 	unequip_buckle_inhands(L)

code/datums/components/storage/concrete/special.dm

@@ -1,5 +1,5 @@
-/datum/component/storage/concrete/secret_satchel/can_be_inserted(I,msg,user)
+/datum/component/storage/concrete/secret_satchel/can_be_inserted(obj/item/I, stop_messages = FALSE, mob/M)
 	if(SSpersistence.spawned_objects[I])
-		to_chat(user, "<span class='warning'>[I] is unstable after its journey through space and time, it wouldn't survive another trip.</span>")
+		to_chat(M, "<span class='warning'>[I] is unstable after its journey through space and time, it wouldn't survive another trip.</span>")
 		return FALSE
 	return ..()

code/datums/components/thermite.dm

@@ -15,7 +15,7 @@
 		/turf/closed/indestructible,
 		/turf/open/indestructible)
 		)
-	
+
 	var/static/list/resistlist = typecacheof(
 		/turf/closed/wall/r_wall
 		)
@@ -77,5 +77,5 @@
 		thermite_melt()
 
 /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params)
-	if(thing.is_hot())
+	if(thing.get_temperature())
 		thermite_melt(user)

code/datums/components/waddling.dm

@@ -1,15 +1,15 @@
 /datum/component/waddling
-    dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
 
 /datum/component/waddling/Initialize()
-    if(!isliving(parent))
-        return COMPONENT_INCOMPATIBLE
-    RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle)
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle)
 
 /datum/component/waddling/proc/Waddle()
-    var/mob/living/L = parent
-    if(L.incapacitated() || L.lying)
-        return
-    animate(L, pixel_z = 4, time = 0)
-    animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2)
-    animate(pixel_z = 0, transform = matrix(), time = 0)
+	var/mob/living/L = parent
+	if(L.incapacitated() || L.lying)
+		return
+	animate(L, pixel_z = 4, time = 0)
+	animate(pixel_z = 0, transform = turn(matrix(), pick(-12, 0, 12)), time=2)
+	animate(pixel_z = 0, transform = matrix(), time = 0)

code/datums/components/wet_floor.dm

@@ -88,6 +88,9 @@
 		if(TURF_WET_PERMAFROST)
 			intensity = 120
 			lube_flags = SLIDE_ICE | GALOSHES_DONT_HELP
+		if(TURF_WET_SUPERLUBE)
+			intensity = 120
+			lube_flags = SLIDE | GALOSHES_DONT_HELP | SLIP_WHEN_CRAWLING
 		else
 			qdel(parent.GetComponent(/datum/component/slippery))
 			return
@@ -159,7 +162,7 @@
 	//NB it's possible we get deleted after this, due to inherit
 
 /datum/component/wet_floor/proc/add_wet(type, duration_minimum = 0, duration_add = 0, duration_maximum = MAXIMUM_WET_TIME, _permanent = FALSE)
-	var/static/list/allowed_types = list(TURF_WET_WATER, TURF_WET_LUBE, TURF_WET_ICE, TURF_WET_PERMAFROST)
+	var/static/list/allowed_types = list(TURF_WET_WATER, TURF_WET_LUBE, TURF_WET_ICE, TURF_WET_PERMAFROST, TURF_WET_SUPERLUBE)
 	if(duration_minimum <= 0 || !type)
 		return FALSE
 	if(type in allowed_types)

code/datums/dash_weapon.dm

@@ -34,11 +34,10 @@
 	var/turf/T = get_turf(target)
 	if(target in view(user.client.view, user))
 		var/obj/spot1 = new phaseout(get_turf(user), user.dir)
-		user.forceMove(T)
-		playsound(T, dash_sound, 25, 1)
-		var/obj/spot2 = new phasein(get_turf(user), user.dir)
-		spot1.Beam(spot2,beam_effect,time=20)
-		current_charges--
+		if(do_teleport(user, T, null, TRUE, null, null, dash_sound, dash_sound, TRUE, TELEPORT_CHANNEL_FREE, TRUE))
+			var/obj/spot2 = new phasein(get_turf(user), user.dir)
+			spot1.Beam(spot2,beam_effect,time=20)
+			current_charges--
 		holder.update_action_buttons_icon()
 		addtimer(CALLBACK(src, .proc/charge), charge_rate)
 

code/datums/datum.dm

@@ -4,7 +4,7 @@
 	var/list/datum_components //for /datum/components
 	var/list/status_traits
 	var/list/comp_lookup //it used to be for looking up components which had registered a signal but now anything can register
-	var/list/signal_procs
+	var/list/list/datum/callback/signal_procs
 	var/signal_enabled = FALSE
 	var/datum_flags = NONE
 	var/datum/weakref/weak_reference

code/datums/datumvars.dm

@@ -875,14 +875,14 @@
 					return
 				// text2num conveniently returns a null on invalid values
 				O.armor = O.armor.setRating(melee = text2num(result["values"]["melee"]),\
-			                  bullet = text2num(result["values"]["bullet"]),\
-			                  laser = text2num(result["values"]["laser"]),\
-			                  energy = text2num(result["values"]["energy"]),\
-			                  bomb = text2num(result["values"]["bomb"]),\
-			                  bio = text2num(result["values"]["bio"]),\
-			                  rad = text2num(result["values"]["rad"]),\
-			                  fire = text2num(result["values"]["fire"]),\
-			                  acid = text2num(result["values"]["acid"]))
+											bullet = text2num(result["values"]["bullet"]),\
+											laser = text2num(result["values"]["laser"]),\
+											energy = text2num(result["values"]["energy"]),\
+											bomb = text2num(result["values"]["bomb"]),\
+											bio = text2num(result["values"]["bio"]),\
+											rad = text2num(result["values"]["rad"]),\
+											fire = text2num(result["values"]["fire"]),\
+											acid = text2num(result["values"]["acid"]))
 				log_admin("[key_name(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid]")
 				message_admins("<span class='notice'>[key_name_admin(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid]</span>")
 			else

code/datums/embedding_behavior.dm

@@ -1,53 +1,53 @@
 #define EMBEDID "embed-[embed_chance]-[embedded_fall_chance]-[embedded_pain_chance]-[embedded_pain_multiplier]-[embedded_fall_pain_multiplier]-[embedded_impact_pain_multiplier]-[embedded_unsafe_removal_pain_multiplier]-[embedded_unsafe_removal_time]"
 
 /proc/getEmbeddingBehavior(embed_chance = EMBED_CHANCE,
-                  embedded_fall_chance = EMBEDDED_ITEM_FALLOUT,
-                  embedded_pain_chance = EMBEDDED_PAIN_CHANCE,
-                  embedded_pain_multiplier = EMBEDDED_PAIN_MULTIPLIER,
-                  embedded_fall_pain_multiplier = EMBEDDED_FALL_PAIN_MULTIPLIER,
-                  embedded_impact_pain_multiplier = EMBEDDED_IMPACT_PAIN_MULTIPLIER,
-                  embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER,
-                  embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME)
-  . = locate(EMBEDID)
-  if (!.)
-    . = new /datum/embedding_behavior(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time)
+							embedded_fall_chance = EMBEDDED_ITEM_FALLOUT,
+							embedded_pain_chance = EMBEDDED_PAIN_CHANCE,
+							embedded_pain_multiplier = EMBEDDED_PAIN_MULTIPLIER,
+							embedded_fall_pain_multiplier = EMBEDDED_FALL_PAIN_MULTIPLIER,
+							embedded_impact_pain_multiplier = EMBEDDED_IMPACT_PAIN_MULTIPLIER,
+							embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER,
+							embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME)
+	. = locate(EMBEDID)
+	if (!.)
+		. = new /datum/embedding_behavior(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time)
 
 /datum/embedding_behavior
-  var/embed_chance
-  var/embedded_fall_chance
-  var/embedded_pain_chance
-  var/embedded_pain_multiplier //The coefficient of multiplication for the damage this item does while embedded (this*w_class)
-  var/embedded_fall_pain_multiplier //The coefficient of multiplication for the damage this item does when falling out of a limb (this*w_class)
-  var/embedded_impact_pain_multiplier //The coefficient of multiplication for the damage this item does when first embedded (this*w_class)
-  var/embedded_unsafe_removal_pain_multiplier //The coefficient of multiplication for the damage removing this without surgery causes (this*w_class)
-  var/embedded_unsafe_removal_time //A time in ticks, multiplied by the w_class.
+	var/embed_chance
+	var/embedded_fall_chance
+	var/embedded_pain_chance
+	var/embedded_pain_multiplier //The coefficient of multiplication for the damage this item does while embedded (this*w_class)
+	var/embedded_fall_pain_multiplier //The coefficient of multiplication for the damage this item does when falling out of a limb (this*w_class)
+	var/embedded_impact_pain_multiplier //The coefficient of multiplication for the damage this item does when first embedded (this*w_class)
+	var/embedded_unsafe_removal_pain_multiplier //The coefficient of multiplication for the damage removing this without surgery causes (this*w_class)
+	var/embedded_unsafe_removal_time //A time in ticks, multiplied by the w_class.
 
 /datum/embedding_behavior/New(embed_chance = EMBED_CHANCE,
-                  embedded_fall_chance = EMBEDDED_ITEM_FALLOUT,
-                  embedded_pain_chance = EMBEDDED_PAIN_CHANCE,
-                  embedded_pain_multiplier = EMBEDDED_PAIN_MULTIPLIER,
-                  embedded_fall_pain_multiplier = EMBEDDED_FALL_PAIN_MULTIPLIER,
-                  embedded_impact_pain_multiplier = EMBEDDED_IMPACT_PAIN_MULTIPLIER,
-                  embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER,
-                  embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME)
-  src.embed_chance = embed_chance
-  src.embedded_fall_chance = embedded_fall_chance
-  src.embedded_pain_chance = embedded_pain_chance
-  src.embedded_pain_multiplier = embedded_pain_multiplier
-  src.embedded_fall_pain_multiplier = embedded_fall_pain_multiplier
-  src.embedded_impact_pain_multiplier = embedded_impact_pain_multiplier
-  src.embedded_unsafe_removal_pain_multiplier = embedded_unsafe_removal_pain_multiplier
-  src.embedded_unsafe_removal_time = embedded_unsafe_removal_time
-  tag = EMBEDID
+								embedded_fall_chance = EMBEDDED_ITEM_FALLOUT,
+								embedded_pain_chance = EMBEDDED_PAIN_CHANCE,
+								embedded_pain_multiplier = EMBEDDED_PAIN_MULTIPLIER,
+								embedded_fall_pain_multiplier = EMBEDDED_FALL_PAIN_MULTIPLIER,
+								embedded_impact_pain_multiplier = EMBEDDED_IMPACT_PAIN_MULTIPLIER,
+								embedded_unsafe_removal_pain_multiplier = EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER,
+								embedded_unsafe_removal_time = EMBEDDED_UNSAFE_REMOVAL_TIME)
+	src.embed_chance = embed_chance
+	src.embedded_fall_chance = embedded_fall_chance
+	src.embedded_pain_chance = embedded_pain_chance
+	src.embedded_pain_multiplier = embedded_pain_multiplier
+	src.embedded_fall_pain_multiplier = embedded_fall_pain_multiplier
+	src.embedded_impact_pain_multiplier = embedded_impact_pain_multiplier
+	src.embedded_unsafe_removal_pain_multiplier = embedded_unsafe_removal_pain_multiplier
+	src.embedded_unsafe_removal_time = embedded_unsafe_removal_time
+	tag = EMBEDID
 
 /datum/embedding_behavior/proc/setRating(embed_chance, embedded_fall_chance, embedded_pain_chance, embedded_pain_multiplier, embedded_fall_pain_multiplier, embedded_impact_pain_multiplier, embedded_unsafe_removal_pain_multiplier, embedded_unsafe_removal_time)
-  return getEmbeddingBehavior((isnull(embed_chance) ? src.embed_chance : embed_chance),\
-                  (isnull(embedded_fall_chance) ? src.embedded_fall_chance : embedded_fall_chance),\
-                  (isnull(embedded_pain_chance) ? src.embedded_pain_chance : embedded_pain_chance),\
-                  (isnull(embedded_pain_multiplier) ? src.embedded_pain_multiplier : embedded_pain_multiplier),\
-                  (isnull(embedded_fall_pain_multiplier) ? src.embedded_fall_pain_multiplier : embedded_fall_pain_multiplier),\
-                  (isnull(embedded_impact_pain_multiplier) ? src.embedded_impact_pain_multiplier : embedded_impact_pain_multiplier),\
-                  (isnull(embedded_unsafe_removal_pain_multiplier) ? src.embedded_unsafe_removal_pain_multiplier : embedded_unsafe_removal_pain_multiplier),\
-                  (isnull(embedded_unsafe_removal_time) ? src.embedded_unsafe_removal_time : embedded_unsafe_removal_time))
+	return getEmbeddingBehavior((isnull(embed_chance) ? src.embed_chance : embed_chance),\
+								(isnull(embedded_fall_chance) ? src.embedded_fall_chance : embedded_fall_chance),\
+								(isnull(embedded_pain_chance) ? src.embedded_pain_chance : embedded_pain_chance),\
+								(isnull(embedded_pain_multiplier) ? src.embedded_pain_multiplier : embedded_pain_multiplier),\
+								(isnull(embedded_fall_pain_multiplier) ? src.embedded_fall_pain_multiplier : embedded_fall_pain_multiplier),\
+								(isnull(embedded_impact_pain_multiplier) ? src.embedded_impact_pain_multiplier : embedded_impact_pain_multiplier),\
+								(isnull(embedded_unsafe_removal_pain_multiplier) ? src.embedded_unsafe_removal_pain_multiplier : embedded_unsafe_removal_pain_multiplier),\
+								(isnull(embedded_unsafe_removal_time) ? src.embedded_unsafe_removal_time : embedded_unsafe_removal_time))
 
 #undef EMBEDID

code/datums/helper_datums/teleport.dm

@@ -79,6 +79,7 @@
 		tele_play_specials(teleatom, destturf, effectout, asoundout)
 		if(ismegafauna(teleatom))
 			message_admins("[teleatom] [ADMIN_FLW(teleatom)] has teleported from [ADMIN_VERBOSEJMP(curturf)] to [ADMIN_VERBOSEJMP(destturf)].")
+		SEND_SIGNAL(teleatom, COMSIG_MOVABLE_TELEPORTED, channel, curturf, destturf)
 
 	if(ismob(teleatom))
 		var/mob/M = teleatom

code/datums/martial/wrestling.dm

@@ -192,7 +192,7 @@
 		if (T && isturf(T))
 			if (!D.stat)
 				D.emote("scream")
-			D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human/.Knockdown, 20))
+			D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/Knockdown, 20))
 	log_combat(A, D, "has thrown with wrestling")
 	return 0
 

code/datums/mind.dm

@@ -41,8 +41,6 @@
 	var/special_role
 	var/list/restricted_roles = list()
 
-	var/list/datum/objective/objectives = list()
-
 	var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
 
 	var/linglink
@@ -360,13 +358,15 @@
 	output += memory
 
 
+	var/list/all_objectives = list()
 	for(var/datum/antagonist/A in antag_datums)
 		output += A.antag_memory
+		all_objectives |= A.objectives
 
-	if(objectives.len)
+	if(all_objectives.len)
 		output += "<B>Objectives:</B>"
 		var/obj_count = 1
-		for(var/datum/objective/objective in objectives)
+		for(var/datum/objective/objective in all_objectives)
 			output += "<br><B>Objective #[obj_count++]</B>: [objective.explanation_text]"
 			var/list/datum/mind/other_owners = objective.get_owners() - src
 			if(other_owners.len)
@@ -377,7 +377,7 @@
 
 	if(window)
 		recipient << browse(output,"window=memory")
-	else if(objectives.len || memory)
+	else if(all_objectives.len || memory)
 		to_chat(recipient, "<i>[output]</i>")
 
 /datum/mind/Topic(href, href_list)
@@ -408,34 +408,24 @@
 		memory = new_memo
 
 	else if (href_list["obj_edit"] || href_list["obj_add"])
-		var/datum/objective/objective
-		var/objective_pos
+		var/objective_pos //Edited objectives need to keep same order in antag objective list
 		var/def_value
-
 		var/datum/antagonist/target_antag
+		var/datum/objective/old_objective //The old objective we're replacing/editing
+		var/datum/objective/new_objective //New objective we're be adding
 
-		if (href_list["obj_edit"])
-			objective = locate(href_list["obj_edit"])
-			if (!objective)
+		if(href_list["obj_edit"])
+			for(var/datum/antagonist/A in antag_datums)
+				old_objective = locate(href_list["obj_edit"]) in A.objectives
+				if(old_objective)
+					target_antag = A
+					objective_pos = A.objectives.Find(old_objective)
+					break
+			if(!old_objective)
+				to_chat(usr,"Invalid objective.")
 				return
 
-			for(var/datum/antagonist/A in antag_datums)
-				if(objective in A.objectives)
-					target_antag = A
-					objective_pos = A.objectives.Find(objective)
-					break
-
-			if(!target_antag) //Shouldn't happen anymore
-				stack_trace("objective without antagonist found")
-				objective_pos = objectives.Find(objective)
-
-			//Text strings are easy to manipulate. Revised for simplicity.
-			var/temp_obj_type = "[objective.type]"//Convert path into a text string.
-			def_value = copytext(temp_obj_type, 19)//Convert last part of path into an objective keyword.
-			if(!def_value)//If it's a custom objective, it will be an empty string.
-				def_value = "custom"
 		else
-			//We're adding this objective
 			if(href_list["target_antag"])
 				var/datum/antagonist/X = locate(href_list["target_antag"]) in antag_datums
 				if(X)
@@ -447,7 +437,7 @@
 					if(1)
 						target_antag = antag_datums[1]
 					else
-						var/datum/antagonist/target = input("Which antagonist gets the objective:", "Antagonist", def_value) as null|anything in antag_datums + "(new custom antag)"
+						var/datum/antagonist/target = input("Which antagonist gets the objective:", "Antagonist", "(new custom antag)") as null|anything in antag_datums + "(new custom antag)"
 						if (QDELETED(target))
 							return
 						else if(target == "(new custom antag)")
@@ -455,149 +445,88 @@
 						else
 							target_antag = target
 
-		var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "custom")
-		if (!new_obj_type)
+		var/static/list/choices
+		if(!choices)
+			choices = list()
+
+			var/list/allowed_types = list(
+				/datum/objective/assassinate,
+				/datum/objective/maroon,
+				/datum/objective/debrain,
+				/datum/objective/protect,
+				/datum/objective/destroy,
+				/datum/objective/hijack,
+				/datum/objective/escape,
+				/datum/objective/survive,
+				/datum/objective/martyr,
+				/datum/objective/steal,
+				/datum/objective/download,
+				/datum/objective/nuclear,
+				/datum/objective/capture,
+				/datum/objective/absorb,
+				/datum/objective/custom
+			)
+
+			for(var/T in allowed_types)
+				var/datum/objective/X = T
+				choices[initial(X.name)] = T
+
+		if(old_objective)
+			if(old_objective.name in choices)
+				def_value = old_objective.name
+
+		var/selected_type = input("Select objective type:", "Objective type", def_value) as null|anything in choices
+		selected_type = choices[selected_type]
+		if (!selected_type)
 			return
 
-		var/datum/objective/new_objective = null
+		if(!old_objective)
+			//Add new one
+			new_objective = new selected_type
+			new_objective.owner = src
+			new_objective.admin_edit(usr)
+			target_antag.objectives += new_objective
 
-		switch (new_obj_type)
-			if ("assassinate","protect","debrain","maroon")
-				var/list/possible_targets = list("Free objective")
-				for(var/datum/mind/possible_target in SSticker.minds)
-					if ((possible_target != src) && ishuman(possible_target.current))
-						possible_targets += possible_target.current
-
-				var/mob/def_target = null
-				var/list/objective_list = typecacheof(list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain, /datum/objective/maroon))
-				if (is_type_in_typecache(objective, objective_list) && objective.target)
-					def_target = objective.target.current
-
-				var/mob/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
-				if (!new_target)
-					return
-
-				var/objective_path = text2path("/datum/objective/[new_obj_type]")
-				if (new_target == "Free objective")
-					new_objective = new objective_path
-					new_objective.owner = src
-					new_objective.target = null
-					new_objective.explanation_text = "Free objective"
-				else
-					new_objective = new objective_path
-					new_objective.owner = src
-					new_objective.target = new_target.mind
-					//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
-					new_objective.update_explanation_text()
-
-			if ("destroy")
-				var/list/possible_targets = active_ais(1)
-				if(possible_targets.len)
-					var/mob/new_target = input("Select target:", "Objective target") as null|anything in possible_targets
-					new_objective = new /datum/objective/destroy
-					new_objective.target = new_target.mind
-					new_objective.owner = src
-					new_objective.update_explanation_text()
-				else
-					to_chat(usr, "No active AIs with minds")
-
-			if ("prevent")
-				new_objective = new /datum/objective/block
-				new_objective.owner = src
-
-			if ("hijack")
-				new_objective = new /datum/objective/hijack
-				new_objective.owner = src
-
-			if ("escape")
-				new_objective = new /datum/objective/escape
-				new_objective.owner = src
-
-			if ("survive")
-				new_objective = new /datum/objective/survive
-				new_objective.owner = src
-
-			if("martyr")
-				new_objective = new /datum/objective/martyr
-				new_objective.owner = src
-
-			if ("nuclear")
-				new_objective = new /datum/objective/nuclear
-				new_objective.owner = src
-
-			if ("steal")
-				if (!istype(objective, /datum/objective/steal))
-					new_objective = new /datum/objective/steal
-					new_objective.owner = src
-				else
-					new_objective = objective
-				var/datum/objective/steal/steal = new_objective
-				if (!steal.select_target())
-					return
-
-			if("download","capture","absorb")
-				var/def_num
-				if(objective&&objective.type==text2path("/datum/objective/[new_obj_type]"))
-					def_num = objective.target_amount
-
-				var/target_number = input("Input target number:", "Objective", def_num) as num | null
-				if (isnull(target_number))//Ordinarily, you wouldn't need isnull. In this case, the value may already exist.
-					return
-
-				switch(new_obj_type)
-					if("download")
-						new_objective = new /datum/objective/download
-						new_objective.explanation_text = "Download [target_number] research node\s."
-					if("capture")
-						new_objective = new /datum/objective/capture
-						new_objective.explanation_text = "Capture [target_number] lifeforms with an energy net. Live, rare specimens are worth more."
-					if("absorb")
-						new_objective = new /datum/objective/absorb
-						new_objective.explanation_text = "Absorb [target_number] compatible genomes."
-				new_objective.owner = src
-				new_objective.target_amount = target_number
-
-			if ("custom")
-				var/expl = stripped_input(usr, "Custom objective:", "Objective", objective ? objective.explanation_text : "")
-				if (!expl)
-					return
-				new_objective = new /datum/objective
-				new_objective.owner = src
-				new_objective.explanation_text = expl
-
-		if (!new_objective)
-			return
-
-		if (objective)
-			if(target_antag)
-				target_antag.objectives -= objective
-			objectives -= objective
-			target_antag.objectives.Insert(objective_pos, new_objective)
-			message_admins("[key_name_admin(usr)] edited [current]'s objective to [new_objective.explanation_text]")
-			log_admin("[key_name(usr)] edited [current]'s objective to [new_objective.explanation_text]")
-		else
-			if(target_antag)
-				target_antag.objectives += new_objective
-			objectives += new_objective
 			message_admins("[key_name_admin(usr)] added a new objective for [current]: [new_objective.explanation_text]")
 			log_admin("[key_name(usr)] added a new objective for [current]: [new_objective.explanation_text]")
+		else
+			if(old_objective.type == selected_type)
+				//Edit the old
+				old_objective.admin_edit(usr)
+				new_objective = old_objective
+			else
+				//Replace the old
+				new_objective = new selected_type
+				new_objective.owner = src
+				new_objective.admin_edit(usr)
+				target_antag.objectives -= old_objective
+				target_antag.objectives.Insert(objective_pos, new_objective)
+			message_admins("[key_name_admin(usr)] edited [current]'s objective to [new_objective.explanation_text]")
+			log_admin("[key_name(usr)] edited [current]'s objective to [new_objective.explanation_text]")
 
 	else if (href_list["obj_delete"])
-		var/datum/objective/objective = locate(href_list["obj_delete"])
-		if(!istype(objective))
-			return
+		var/datum/objective/objective
 
 		for(var/datum/antagonist/A in antag_datums)
-			if(objective in A.objectives)
-				A.objectives -= objective
+			objective = locate(href_list["obj_delete"]) in A.objectives
+			if(istype(objective))
 				break
-		objectives -= objective
+		if(!objective)
+			to_chat(usr,"Invalid objective.")
+			return
+		//qdel(objective) Needs cleaning objective destroys
 		message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]")
 		log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")
 
 	else if(href_list["obj_completed"])
-		var/datum/objective/objective = locate(href_list["obj_completed"])
-		if(!istype(objective))
+		var/datum/objective/objective
+		for(var/datum/antagonist/A in antag_datums)
+			objective = locate(href_list["obj_completed"]) in A.objectives
+			if(istype(objective))
+				objective = objective
+				break
+		if(!objective)
+			to_chat(usr,"Invalid objective.")
 			return
 		objective.completed = !objective.completed
 		log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]")
@@ -652,10 +581,16 @@
 		usr = current
 	traitor_panel()
 
+/datum/mind/proc/get_all_objectives()
+	var/list/all_objectives = list()
+	for(var/datum/antagonist/A in antag_datums)
+		all_objectives |= A.objectives
+	return all_objectives
+
 /datum/mind/proc/announce_objectives()
 	var/obj_count = 1
 	to_chat(current, "<span class='notice'>Your current objectives:</span>")
-	for(var/objective in objectives)
+	for(var/objective in get_all_objectives())
 		var/datum/objective/O = objective
 		to_chat(current, "<B>Objective #[obj_count]</B>: [O.explanation_text]")
 		obj_count++

code/datums/mood_events/generic_negative_events.dm

@@ -5,8 +5,8 @@
 	mood_change = -1
 
 /datum/mood_event/broken_vow //Used for when mimes break their vow of silence
-  description = "<span class='boldwarning'>I have brought shame upon my name, and betrayed my fellow mimes by breaking our sacred vow...</span>\n"
-  mood_change = -8
+	description = "<span class='boldwarning'>I have brought shame upon my name, and betrayed my fellow mimes by breaking our sacred vow...</span>\n"
+	mood_change = -8
 
 /datum/mood_event/on_fire
 	description = "<span class='boldwarning'>I'M ON FIRE!!!</span>\n"
@@ -55,14 +55,14 @@
 	timeout = 2 MINUTES
 
 /datum/mood_event/shameful_suicide //suicide_acts that return SHAME, like sord
-  description = "<span class='boldwarning'>I can't even end it all!</span>\n"
-  mood_change = -10
-  timeout = 1 MINUTES
+	description = "<span class='boldwarning'>I can't even end it all!</span>\n"
+	mood_change = -10
+	timeout = 1 MINUTES
 
 /datum/mood_event/dismembered
-  description = "<span class='boldwarning'>AHH! I WAS USING THAT LIMB!</span>\n"
-  mood_change = -8
-  timeout = 2400
+	description = "<span class='boldwarning'>AHH! I WAS USING THAT LIMB!</span>\n"
+	mood_change = -8
+	timeout = 2400
 
 /datum/mood_event/noshoes
 	description = "<span class='warning'>I am a disgrace to comedy everywhere!</span>\n"
@@ -92,20 +92,20 @@
 			mood_change = 2
 
 /datum/mood_event/brain_damage
-  mood_change = -3
+	mood_change = -3
 
 /datum/mood_event/brain_damage/add_effects()
-  var/damage_message = pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")
-  description = "<span class='warning'>Hurr durr... [damage_message]</span>\n"
+	var/damage_message = pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")
+	description = "<span class='warning'>Hurr durr... [damage_message]</span>\n"
 
 /datum/mood_event/hulk //Entire duration of having the hulk mutation
-  description = "<span class='warning'>HULK SMASH!</span>\n"
-  mood_change = -4
+	description = "<span class='warning'>HULK SMASH!</span>\n"
+	mood_change = -4
 
 /datum/mood_event/epilepsy //Only when the mutation causes a seizure
-  description = "<span class='warning'>I should have paid attention to the epilepsy warning.</span>\n"
-  mood_change = -3
-  timeout = 3000
+	description = "<span class='warning'>I should have paid attention to the epilepsy warning.</span>\n"
+	mood_change = -3
+	timeout = 3000
 
 /datum/mood_event/nyctophobia
 	description = "<span class='warning'>It sure is dark around here...</span>\n"

code/datums/mood_events/generic_positive_events.dm

@@ -80,12 +80,12 @@
 	description = "<span class='nicegreen'>Heh...hehehe...hehe...</span>\n"
 	mood_change = 4
 
- /datum/mood_event/chemical_laughter
+/datum/mood_event/chemical_laughter
 	description = "<span class='nicegreen'>Laughter really is the best medicine! Or is it?</span>\n"
 	mood_change = 4
 	timeout = 3 MINUTES
 
- /datum/mood_event/chemical_superlaughter
+/datum/mood_event/chemical_superlaughter
 	description = "<span class='nicegreen'>*WHEEZE*</span>\n"
 	mood_change = 12
 	timeout = 3 MINUTES

code/datums/mutations.dm

@@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(mutations_list)
 	. = on_losing(owner)
 
 /datum/mutation/human/proc/set_se(se_string, on = 1)
-	if(!se_string || lentext(se_string) < DNA_STRUC_ENZYMES_BLOCKS * DNA_BLOCK_SIZE)
+	if(!se_string || length(se_string) < DNA_STRUC_ENZYMES_BLOCKS * DNA_BLOCK_SIZE)
 		return
 	var/before = copytext(se_string, 1, ((dna_block - 1) * DNA_BLOCK_SIZE) + 1)
 	var/injection = num2hex(on ? rand(lowest_value, (256 * 16) - 1) : rand(0, lowest_value - 1), DNA_BLOCK_SIZE)
@@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(mutations_list)
 		owner.dna.struc_enzymes = set_se(owner.dna.struc_enzymes, on)
 
 /datum/mutation/human/proc/check_block_string(se_string)
-	if(!se_string || lentext(se_string) < DNA_STRUC_ENZYMES_BLOCKS * DNA_BLOCK_SIZE)
+	if(!se_string || length(se_string) < DNA_STRUC_ENZYMES_BLOCKS * DNA_BLOCK_SIZE)
 		return 0
 	if(hex2num(getblock(se_string, dna_block)) >= lowest_value)
 		return 1

code/datums/radiation_wave.dm

@@ -66,6 +66,8 @@
 		place = cmaster_turf
 		for(var/i in 1 to distance)
 			place = get_step(place, dir)
+			if(!place)
+				break
 			atoms += get_rad_contents(place)
 
 	return atoms
@@ -108,7 +110,7 @@
 		if(!can_contaminate || blacklisted[thing.type])
 			continue
 		if(prob(contamination_chance)) // Only stronk rads get to have little baby rads
-			if(SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
+			if(CHECK_BITFIELD(thing.rad_flags, RAD_NO_CONTAMINATE) || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
 				continue
 			var/rad_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT
 			thing.AddComponent(/datum/component/radioactive, rad_strength, source)

code/datums/ruins/lavaland.dm

@@ -163,6 +163,13 @@
 	suffix = "lavaland_surface_xeno_nest.dmm"
 	cost = 20 */
 
+/datum/map_template/ruin/lavaland/alien_nest
+	name = "Alien Nest"
+	id = "alien-nest"
+	description = "Not even Necropolis is safe from alien infestation. The competition for hosts has locked the legion and aliens in an endless conflict that can only be resolved by a PKA."
+	suffix = "lavaland_surface_alien_nest.dmm"
+	cost = 20
+
 /datum/map_template/ruin/lavaland/fountain
 	name = "Fountain Hall"
 	id = "fountain"

code/datums/status_effects/buffs.dm

@@ -170,7 +170,7 @@
 	tick_interval = 4
 	alert_type = /obj/screen/alert/status_effect/his_grace
 	var/bloodlust = 0
-	
+
 /obj/screen/alert/status_effect/his_grace
 	name = "His Grace"
 	desc = "His Grace hungers, and you must feed Him."
@@ -356,7 +356,7 @@
 		var/new_staminaloss = owner.getStaminaLoss()
 		if(new_staminaloss < last_staminaloss)
 			var/heal_amount = -5 // CIT CHANGE - makes blood drunk status effect not exhaust you
-			owner.adjustStaminaLoss(heal_amount, updating_health = FALSE)
+			owner.adjustStaminaLoss(heal_amount, FALSE)
 			new_staminaloss = owner.getStaminaLoss()
 			needs_health_update = TRUE
 		last_staminaloss = new_staminaloss

code/datums/traits/neutral.dm

@@ -103,14 +103,13 @@
 	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
 
 /datum/quirk/libido/add()
-	var/mob/living/M = quirk_holder
-	M.min_arousal = 16
-	M.arousal_rate = 3
+	quirk_holder.min_arousal = 16
+	quirk_holder.arousal_rate = 3
 
 /datum/quirk/libido/remove()
-	var/mob/living/M = quirk_holder
-	M.min_arousal = initial(M.min_arousal)
-	M.arousal_rate = initial(M.arousal_rate)
+	if(quirk_holder)
+		quirk_holder.min_arousal = initial(quirk_holder.min_arousal)
+		quirk_holder.arousal_rate = initial(quirk_holder.arousal_rate)
 
 /datum/quirk/maso
 	name = "Masochism"

code/datums/verbs.dm

@@ -11,7 +11,7 @@
 
 //do things for each entry in Generate_list
 //return value sets Generate_list[verbpath]
-/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...)
+/datum/verbs/proc/HandleVerb(list/entry, procpath/verbpath, ...)
 	return entry
 
 /datum/verbs/New()
@@ -82,7 +82,7 @@
 				. += childlist
 
 	for (var/thing in verblist)
-		var/atom/verb/verbpath = thing
+		var/procpath/verbpath = thing
 		if (!verbpath)
 			stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]")
 		var/list/entry = list()

code/datums/weather/weather_types/ash_storm.dm

@@ -80,7 +80,7 @@
 			return TRUE
 		if(ishuman(L)) //Are you immune?
 			var/mob/living/carbon/human/H = L
-			var/thermal_protection = H.get_thermal_protection()
+			var/thermal_protection = H.easy_thermal_protection()
 			if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT)
 				return TRUE
 		if(isliving(L))// if we're a non immune mob inside an immune mob we have to reconsider if that mob is immune to protect ourselves

code/datums/wires/airlock.dm

@@ -1,10 +1,35 @@
 /datum/wires/airlock
 	holder_type = /obj/machinery/door/airlock
-	proper_name = "Airlock"
+	proper_name = "Generic Airlock"
+	var/wiretype
 
 /datum/wires/airlock/secure
 	randomize = TRUE
 
+/datum/wires/airlock/command
+	proper_name = "Command Airlock"
+	wiretype = "commandairlock"
+
+/datum/wires/airlock/security
+	proper_name = "Security Airlock"
+	wiretype = "securityairlock"
+
+/datum/wires/airlock/engineering
+	proper_name = "Engineering Airlock"
+	wiretype = "engineeringairlock"
+
+/datum/wires/airlock/science
+	proper_name = "Science Airlock"
+	wiretype = "scienceairlock"
+
+/datum/wires/airlock/medical
+	proper_name = "Medical Airlock"
+	wiretype = "medicalairlock"
+
+/datum/wires/airlock/cargo
+	proper_name = "Cargo Airlock"
+	wiretype = "cargoairlock"
+
 /datum/wires/airlock/New(atom/holder)
 	wires = list(
 		WIRE_POWER1, WIRE_POWER2,
@@ -14,7 +39,16 @@
 		WIRE_ZAP1, WIRE_ZAP2
 	)
 	add_duds(2)
-	..()
+	. = ..()
+	if(randomize || !wiretype)
+		return
+	if(!GLOB.wire_color_directory[wiretype])
+		colors = list()
+		randomize()
+		GLOB.wire_color_directory[wiretype] = colors
+		GLOB.wire_name_directory[wiretype] = proper_name
+	else
+		colors = GLOB.wire_color_directory[wiretype]
 
 /datum/wires/airlock/interactable(mob/user)
 	var/obj/machinery/door/airlock/A = holder