Merge branch 'master' into development

code/modules/clothing/under/miscellaneous.dm

@@ -76,13 +76,14 @@
 //This set of uniforms looks fairly fancy and is generally used for high-ranking NT personnel from what I've seen, so lets give them appropriate ranks.
 /obj/item/clothing/under/rank/centcom
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
-	name = "\improper officer's dress uniform"
+	name = "officer's dress uniform"
 	icon_state = "officer"
 	item_state = "lawyer_black"
 	worn_state = "officer"
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom_officer
+	name = "officer's dress uniform"
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral.\""
 	icon_state = "officer"
 	item_state = "lawyer_black"
@@ -90,6 +91,7 @@
 	displays_id = 0
 
 /obj/item/clothing/under/rank/centcom_captain
+	name = "officer's dress uniform"
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral-Executive.\""
 	icon_state = "centcom"
 	item_state = "lawyer_black"

code/modules/lighting/lighting_area.dm

@@ -17,12 +17,12 @@
 	dynamic_lighting = new_dynamic_lighting
 
 	if (new_dynamic_lighting)
-		for (var/turf/T in turfs)
+		for (var/turf/T in src)
 			if (T.dynamic_lighting)
 				T.lighting_build_overlay()
 
 	else
-		for (var/turf/T in turfs)
+		for (var/turf/T in src)
 			if (T.lighting_overlay)
 				T.lighting_clear_overlay()
 

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

@@ -127,7 +127,7 @@
 	. = ..()
 	if (is_noisy)
 		var/turf/T = get_turf(src)
-		if (T.x == last_x && T.y == last_y)
+		if ((T.x == last_x && T.y == last_y) || !T.footstep_sound)
 			return
 		last_x = T.x
 		last_y = T.y

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

@@ -437,8 +437,4 @@ This saves us from having to call add_fingerprint() any time something is put in
 	if (shoes:silent)
 		return
 
-	var/turf/T = get_turf(src)
-	if (!istype(T) || !T.footstep_sound)
-		return
-
 	is_noisy = TRUE

code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm

@@ -35,7 +35,7 @@
 		"Your synthetic flesh crawls in the heat, swelling into a disgusting morass of plastic."
 		)
 
-	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_EYE_COLOR | HAS_FBP
+	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_EYE_COLOR | HAS_FBP | HAS_UNDERWEAR | HAS_SOCKS
 
 	has_limbs = list(
 		"chest" =  list("path" = /obj/item/organ/external/chest/shell),

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

@@ -337,6 +337,8 @@
 
 	var/turf/T = get_turf(src)
 	if(istype(T)) T.visible_message("<b>[src]</b> folds outwards, expanding into a mobile form.")
+	canmove = 1
+	resting = 0
 
 /mob/living/silicon/pai/verb/fold_up()
 	set category = "pAI Commands"

code/modules/organs/subtypes/machine.dm

@@ -7,7 +7,7 @@
 	vital = 1 //because it is now hosting the posibrain
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "support frame"
 
 /obj/item/organ/external/head/ipc/New()
 	robotize("Hephaestus Integrated Limb")
@@ -15,31 +15,35 @@
 
 /obj/item/organ/external/chest/ipc
 	dislocated = -1
-	encased = null
+	encased = "support frame"
 /obj/item/organ/external/chest/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/groin/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/groin/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/arm/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/arm/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/arm/right/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/arm/right/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/leg/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/leg/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
@@ -52,24 +56,28 @@
 
 /obj/item/organ/external/foot/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/foot/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/foot/right/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/foot/right/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/hand/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/hand/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
 
 /obj/item/organ/external/hand/right/ipc
 	dislocated = -1
+	encased = "support frame"
 /obj/item/organ/external/hand/right/ipc/New()
 	robotize("Hephaestus Integrated Limb")
 	..()
@@ -214,7 +222,7 @@
 	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/eyes/optical_sensor/terminator
@@ -226,7 +234,7 @@
 
 /obj/item/organ/external/chest/terminator
 	dislocated = -1
-	encased = null
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/chest/terminator/New()
@@ -235,6 +243,7 @@
 
 /obj/item/organ/external/groin/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/groin/terminator/New()
@@ -243,6 +252,7 @@
 
 /obj/item/organ/external/arm/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/arm/terminator/New()
@@ -251,6 +261,7 @@
 
 /obj/item/organ/external/arm/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/arm/right/terminator/New()
@@ -259,6 +270,7 @@
 
 /obj/item/organ/external/leg/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/leg/terminator/New()
@@ -267,6 +279,7 @@
 
 /obj/item/organ/external/leg/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/leg/right/terminator/New()
@@ -275,6 +288,7 @@
 
 /obj/item/organ/external/foot/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/foot/terminator/New()
@@ -283,6 +297,7 @@
 
 /obj/item/organ/external/foot/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/foot/right/terminator/New()
@@ -291,6 +306,7 @@
 
 /obj/item/organ/external/hand/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/hand/terminator/New()
@@ -299,6 +315,7 @@
 
 /obj/item/organ/external/hand/right/terminator
 	dislocated = -1
+	encased = "reinforced support frame"
 	emp_coeff = 0.5
 
 /obj/item/organ/external/hand/right/terminator/New()
@@ -315,7 +332,7 @@
 	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "support frame"
 
 /obj/item/organ/external/head/industrial/New()
 	robotize("Hephaestus Industrial Limb")
@@ -323,61 +340,80 @@
 
 /obj/item/organ/external/chest/industrial
 	dislocated = -1
-	encased = null
+	encased = "support frame"
+
 /obj/item/organ/external/chest/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/groin/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/groin/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/arm/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/arm/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/arm/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/arm/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/leg/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/leg/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/leg/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/leg/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/foot/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/foot/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/foot/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/foot/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/hand/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/hand/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
 
 /obj/item/organ/external/hand/right/industrial
 	dislocated = -1
+	encased = "support frame"
+
 /obj/item/organ/external/hand/right/industrial/New()
 	robotize("Hephaestus Industrial Limb")
 	..()
@@ -392,7 +428,7 @@
 	vital = 0
 	max_damage = 50 //made same as arm, since it is not vital
 	min_broken_damage = 30
-	encased = null
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/head/shell/New()
@@ -401,7 +437,7 @@
 
 /obj/item/organ/external/chest/shell
 	dislocated = -1
-	encased = null
+	encased = "support frame"
 	force_skintone = TRUE
 
 
@@ -411,6 +447,7 @@
 
 /obj/item/organ/external/groin/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/groin/shell/New()
@@ -419,6 +456,7 @@
 
 /obj/item/organ/external/arm/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/arm/shell/New()
@@ -427,6 +465,7 @@
 
 /obj/item/organ/external/arm/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/arm/right/shell/New()
@@ -435,6 +474,7 @@
 
 /obj/item/organ/external/leg/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/leg/shell/New()
@@ -443,6 +483,7 @@
 
 /obj/item/organ/external/leg/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/leg/right/shell/New()
@@ -451,6 +492,7 @@
 
 /obj/item/organ/external/foot/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/foot/shell/New()
@@ -459,6 +501,7 @@
 
 /obj/item/organ/external/foot/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/foot/right/shell/New()
@@ -467,6 +510,7 @@
 
 /obj/item/organ/external/hand/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/hand/shell/New()
@@ -475,6 +519,7 @@
 
 /obj/item/organ/external/hand/right/shell
 	dislocated = -1
+	encased = "support frame"
 	force_skintone = TRUE
 
 /obj/item/organ/external/hand/right/shell/New()

code/modules/security levels/security levels.dm

@@ -25,16 +25,24 @@
 			if(SEC_LEVEL_GREEN)
 				security_announcement_down.Announce("[config.alert_desc_green]", "Attention! Security level lowered to green.")
 				security_level = SEC_LEVEL_GREEN
+				if (nl_ctrl.manual_override == 2)	// Disable override if it was set by code-red.
+					nl_ctrl.manual_override = 0
+					nl_ctrl.doWork(FALSE)	// Update night lighting if it was turned off by red alert.
 			if(SEC_LEVEL_BLUE)
 				if(security_level < SEC_LEVEL_BLUE)
 					security_announcement_up.Announce("[config.alert_desc_blue_upto]", "Attention! Security level elevated to blue.")
 				else
 					security_announcement_down.Announce("[config.alert_desc_blue_downto]", "Attention! Security level lowered to blue.")
 				security_level = SEC_LEVEL_BLUE
+				if (nl_ctrl.manual_override == 2)
+					nl_ctrl.manual_override = 0
+					nl_ctrl.doWork(FALSE)	// Update night lighting if it was turned off by red alert.
 			if(SEC_LEVEL_RED)
 				if(security_level < SEC_LEVEL_RED)
 					security_announcement_up.Announce("[config.alert_desc_red_upto]", "Attention! Security level elevated to red!")
 					nl_ctrl.deactivate(0)	// Disable nightmode globally
+					if (!nl_ctrl.manual_override)
+						nl_ctrl.manual_override = 2
 				else
 					security_announcement_down.Announce("[config.alert_desc_red_downto]", "Attention! Code red!")
 				security_level = SEC_LEVEL_RED
@@ -95,4 +103,4 @@
 	set_security_level(2)
 /mob/verb/set_thing3()
 	set_security_level(3)
-*/
+*/

code/modules/spells/general/mark_recall.dm

@@ -29,7 +29,7 @@
 		return 0
 	var/target = targets[1]
 	if(istext(target))
-		mark = new /obj/effect/cleanable/wizard_mark(get_turf(user),src)
+		mark = new /obj/effect/decal/wizard_mark(get_turf(user),src)
 		return 1
 	if(!istype(target,/obj)) //something went wrong
 		return 0
@@ -47,7 +47,7 @@
 
 	return "You no longer have to be conscious to activate this spell."
 
-/obj/effect/cleanable/wizard_mark
+/obj/effect/decal/wizard_mark
 	name = "mark of the wizard"
 	desc = "A strange rune, probably someone playing with crayons again."
 	icon = 'icons/obj/rune.dmi'
@@ -59,22 +59,22 @@
 
 	var/spell/mark_recall/spell
 
-/obj/effect/cleanable/wizard_mark/New(var/newloc,var/mrspell)
+/obj/effect/decal/wizard_mark/New(var/newloc,var/mrspell)
 	..()
 	spell = mrspell
 
-/obj/effect/cleanable/wizard_mark/Destroy()
+/obj/effect/decal/wizard_mark/Destroy()
 	spell.mark = null //dereference pls.
 	spell = null
 	..()
 
-/obj/effect/cleanable/wizard_mark/attack_hand(var/mob/user)
+/obj/effect/decal/wizard_mark/attack_hand(var/mob/user)
 	if(user == spell.holder)
 		user.visible_message("\The [user] mutters an incantation and \the [src] disappears!")
 		qdel(src)
 	..()
 
-/obj/effect/cleanable/wizard_mark/attackby(var/obj/item/I, var/mob/user)
+/obj/effect/decal/wizard_mark/attackby(var/obj/item/I, var/mob/user)
 	if(istype(I, /obj/item/weapon/nullrod) || istype(I, /obj/item/weapon/spellbook))
 		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		src.visible_message("\The [src] fades away!")