Merge remote-tracking branch 'upstream/master' into dev-freeze

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

code/game/objects/items/weapons/AI_modules.dm

@@ -257,10 +257,9 @@ AI MODULES
 
 /obj/item/weapon/aiModule/freeform/attack_self(var/mob/user as mob)
 	..()
-	lawpos = 0
-	while(lawpos < 15)
-		lawpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num
-	lawpos = min(lawpos, 50)
+	var/new_lawpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num
+	if(new_lawpos < 15)	return
+	lawpos = min(new_lawpos, 50)
 	var/newlaw = ""
 	var/targName = copytext(sanitize(input(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw)),1,MAX_MESSAGE_LEN)
 	newFreeFormLaw = targName

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -388,6 +388,7 @@
 	icon_opened = "syndicate1open"
 
 /obj/structure/closet/wardrobe/tactical/New()
+	..()
 	new /obj/item/clothing/under/tactical(src)
 	new /obj/item/clothing/suit/armor/tactical(src)
 	new /obj/item/clothing/head/helmet/tactical(src)
@@ -396,4 +397,4 @@
 	new /obj/item/weapon/storage/belt/security/tactical(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/gloves/black(src)
-	return
+	return

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -14,7 +14,7 @@
 	var/mob/living/buckled_mob
 
 /obj/structure/stool/bed/psych
-	name = "psych bed"
+	name = "psychiatrists couch"
 	desc = "For prime comfort during psychiatric evaluations."
 	icon_state = "psychbed"