Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers

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

@@ -36,6 +36,9 @@
 	var/icon_welded = "welded"
 	var/obj/item/electronics/airlock/lockerelectronics //Installed electronics
 	var/lock_in_use = FALSE //Someone is doing some stuff with the lock here, better not proceed further
+	var/eigen_teleport = FALSE //If the closet leads to Mr Tumnus.
+	var/obj/structure/closet/eigen_target //Where you go to.
+
 
 /obj/structure/closet/Initialize(mapload)
 	. = ..()
@@ -144,6 +147,8 @@
 
 /obj/structure/closet/proc/togglelock(mob/living/user)
 	add_fingerprint(user)
+	if(eigen_target)
+		return
 	if(opened)
 		return
 	if(!can_lock(user))
@@ -186,7 +191,12 @@
 	if(contents.len >= storage_capacity)
 		return -1
 	if(insertion_allowed(AM))
-		AM.forceMove(src)
+		if(eigen_teleport) // For teleporting people with linked lockers.
+			do_teleport(AM, get_turf(eigen_target), 0)
+			if(eigen_target.opened == FALSE)
+				eigen_target.bust_open()
+		else
+			AM.forceMove(src)
 		return TRUE
 	else
 		return FALSE
@@ -339,6 +349,9 @@
 
 				to_chat(user, "<span class='notice'>You begin cutting \the [src] apart...</span>")
 				if(W.use_tool(src, user, 40, volume=50))
+					if(eigen_teleport)
+						to_chat(user, "<span class='notice'>The unstable nature of \the [src] makes it impossible to cut!</span>")
+						return
 					if(!opened)
 						return
 					user.visible_message("<span class='notice'>[user] slices apart \the [src].</span>",
@@ -363,6 +376,9 @@
 
 		to_chat(user, "<span class='notice'>You begin [welded ? "unwelding":"welding"] \the [src]...</span>")
 		if(W.use_tool(src, user, 40, volume=50))
+			if(eigen_teleport)
+				to_chat(user, "<span class='notice'>The unstable nature of \the [src] makes it impossible to weld!</span>")
+				return
 			if(opened)
 				return
 			welded = !welded
@@ -525,17 +541,18 @@
 	dive_into(user)
 
 /obj/structure/closet/emag_act(mob/user)
-	if(secure && !broken)
-		user.visible_message("<span class='warning'>Sparks fly from [src]!</span>",
-						"<span class='warning'>You scramble [src]'s lock, breaking it open!</span>",
-						"<span class='italics'>You hear a faint electrical spark.</span>")
-		playsound(src, "sparks", 50, 1)
-		broken = TRUE
-		locked = FALSE
-		if(!QDELETED(lockerelectronics))
-			qdel(lockerelectronics)
-		lockerelectronics = null
-		update_icon()
+	. = ..()
+	if(!secure || broken)
+		return
+	user.visible_message("<span class='warning'>Sparks fly from [src]!</span>",
+					"<span class='warning'>You scramble [src]'s lock, breaking it open!</span>",
+					"<span class='italics'>You hear a faint electrical spark.</span>")
+	playsound(src, "sparks", 50, 1)
+	broken = TRUE
+	locked = FALSE
+	if(!QDELETED(lockerelectronics))
+		QDEL_NULL(lockerelectronics)
+	update_icon()
 
 /obj/structure/closet/get_remote_view_fullscreens(mob/user)
 	if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))

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

@@ -111,9 +111,9 @@
 	new /obj/item/clothing/accessory/pocketprotector/cosmetology(src)
 	new /obj/item/clothing/under/rank/chaplain(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
-	new /obj/item/clothing/suit/nun(src)
+	new /obj/item/clothing/suit/chaplain/nun(src)
 	new /obj/item/clothing/head/nun_hood(src)
-	new /obj/item/clothing/suit/holidaypriest(src)
+	new /obj/item/clothing/suit/chaplain/holidaypriest(src)
 	new /obj/item/storage/backpack/cultpack(src)
 	new /obj/item/storage/fancy/candle_box(src)
 	new /obj/item/storage/fancy/candle_box(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -33,6 +33,7 @@
 	new /obj/item/extinguisher/advanced(src)
 	new /obj/item/storage/photo_album/CE(src)
 	new	/obj/item/storage/lockbox/medal/engineering(src)
+	new /obj/item/construction/rcd/loaded/upgraded(src)
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"