Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello

code/datums/diseases/advance/symptoms/vision.dm

@@ -28,22 +28,25 @@ Bonus
 /datum/symptom/visionloss/Activate(datum/disease/advance/A)
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
-		var/mob/living/M = A.affected_mob
+		var/mob/living/carbon/M = A.affected_mob
+		var/obj/item/organ/internal/eyes/eyes = M.get_int_organ(/obj/item/organ/internal/eyes)
+		if(!eyes) //NO EYES, NO PROBLEM! Rip out your eyes today to prevent future blindness!
+			return
 		switch(A.stage)
 			if(1, 2)
 				to_chat(M, "<span class='warning'>Your eyes itch.</span>")
 			if(3, 4)
 				to_chat(M, "<span class='warning'><b>Your eyes burn!</b></span>")
-				M.blur_eyes(10)
-				M.adjust_eye_damage(1)
+				M.EyeBlurry(20)
+				eyes.take_damage(1)
 			else
 				to_chat(M, "<span class='userdanger'>Your eyes burn horrificly!</span>")
-				M.blur_eyes(20)
-				M.adjust_eye_damage(5)
-				if(M.eye_damage >= 10)
-					M.become_nearsighted()
-					if(prob(M.eye_damage - 10 + 1))
-						if(M.become_blind())
+				M.EyeBlurry(30)
+				eyes.take_damage(5)
+				if(eyes.damage >= 10)
+					M.BecomeNearsighted()
+					if(prob(eyes.damage - 10 + 1))
+						if(M.BecomeBlind())
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
 
 

code/datums/outfits/outfit_admin.dm

@@ -1173,3 +1173,39 @@
 	suit = /obj/item/clothing/suit/wizrobe/marisa
 	shoes = /obj/item/clothing/shoes/sandal/marisa
 	head = /obj/item/clothing/head/wizard/marisa
+
+
+/datum/outfit/admin/dark_priest
+	name = "Dark Priest"
+
+	uniform = /obj/item/clothing/under/color/black
+	suit = /obj/item/clothing/suit/hooded/chaplain_hoodie
+	back = /obj/item/weapon/storage/backpack
+	head = /obj/item/clothing/head/chaplain_hood
+	gloves = /obj/item/clothing/gloves/color/black
+	shoes = /obj/item/clothing/shoes/black
+	l_ear = /obj/item/device/radio/headset/syndicate
+	id = /obj/item/weapon/card/id/syndicate
+	r_hand = /obj/item/weapon/nullrod/armblade
+	backpack_contents = list(
+		/obj/item/weapon/storage/box/survival = 1,
+		/obj/item/device/flashlight = 1,
+	)
+
+/datum/outfit/admin/dark_priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	. = ..()
+	if(visualsOnly)
+		return
+	var/obj/item/weapon/card/id/I = H.wear_id
+	if(istype(I))
+		apply_to_card(I, H, get_all_accesses(), "Dark Priest", "syndie")
+	var/obj/item/weapon/nullrod/armblade/B = H.r_hand
+	if(istype(B))
+		B.force = 20
+		B.name = "blessing of the reaper"
+		B.desc = "Sometimes, someone's just gotta die."
+	var/obj/item/device/radio/headset/R = H.l_ear
+	if(istype(R))
+		R.flags |= NODROP
+	var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H)
+	D.implant(H)

code/datums/shuttles.dm

@@ -39,6 +39,12 @@
 	suffix = "cyb"
 	name = "emergency shuttle (Cyberiad)"
 
+/datum/map_template/shuttle/emergency/dept
+	suffix = "dept"
+	name = "emergency shuttle (department)"
+	description = "Features include: areas for each department, and a small bar."
+	admin_notes = "Designed to reduce chaos. Each dept requires dept access."
+
 /datum/map_template/shuttle/emergency/clown
 	suffix = "clown"
 	name = "Snappop(tm)!"

code/datums/supplypacks.dm

@@ -250,6 +250,17 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	cost = 10
 	containername = "disabler crate"
 
+/datum/supply_packs/security/forensics
+	name = "Forensics Crate"
+	contains = list(/obj/item/device/detective_scanner,
+					/obj/item/weapon/storage/box/evidence,
+					/obj/item/device/camera,
+					/obj/item/device/taperecorder,
+					/obj/item/toy/crayon/white,
+					/obj/item/clothing/head/det_hat)
+	cost = 20
+	containername = "forensics crate"
+
 ///// Armory stuff
 
 /datum/supply_packs/security/armory
@@ -895,6 +906,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	containername = "tank transfer valves crate"
 	access = access_rd
 
+/datum/supply_packs/science/prototype
+	name = "Machine Prototype Crate"
+	contains = list(/obj/item/device/machineprototype)
+	cost = 80
+	containertype = /obj/structure/closet/crate/secure/scisec
+	containername = "machine prototype crate"
+	access = access_research
 
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Organic /////////////////////////////////////////

code/datums/uplink_item.dm

@@ -922,6 +922,15 @@ var/list/uplink_items = list()
 	cost = 2
 	surplus = 30
 
+/datum/uplink_item/stealthy_tools/cutouts
+	name = "Adaptive Cardboard Cutouts"
+	desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. This pack contains three as well as a \
+	spraycan for changing their appearances."
+	reference = "ADCC"
+	item = /obj/item/weapon/storage/box/syndie_kit/cutouts
+	cost = 1
+	surplus = 20
+
 // DEVICE AND TOOLS
 
 /datum/uplink_item/device_tools