diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm
index 5ced31209fb..fb1a7d1530d 100644
--- a/_maps/map_files/cyberiad/z6.dmm
+++ b/_maps/map_files/cyberiad/z6.dmm
@@ -742,7 +742,7 @@
 "on" = (/turf/simulated/floor/mineral/silver,/area/syndicate_depot)
 "oo" = (/turf/simulated/floor/mineral/plasma,/area/syndicate_depot)
 "op" = (/obj/structure/table,/obj/item/wrench,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
-"oq" = (/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
+"oq" = (/obj/structure/table,/obj/item/folder/syndicate/yellow,/obj/item/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
 "or" = (/obj/structure/cable,/obj/machinery/power/terminal,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
 "os" = (/obj/effect/spawner/random_spawners/syndicate/layout/door/vault,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/syndicate_depot)
 "ot" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/wall/r_wall,/area/syndicate_depot)
diff --git a/code/game/objects/effects/spawners/random_spawners.dm b/code/game/objects/effects/spawners/random_spawners.dm
index 769d8fc0913..79f37c2b775 100644
--- a/code/game/objects/effects/spawners/random_spawners.dm
+++ b/code/game/objects/effects/spawners/random_spawners.dm
@@ -182,12 +182,13 @@
 	)
 
 /obj/effect/spawner/random_spawners/syndicate/trap/documents
+	name = "50pc traped documents"
 	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "folder_syellow"
+	icon_state = "docs_yellow"
 	spawn_nothing_percentage = 0
 	result = list(
-	/obj/item/folder/syndicate/yellow = 1,
-	/obj/item/folder/syndicate/yellow_trapped = 1
+	/obj/item/documents/syndicate/yellow = 1,
+	/obj/item/documents/syndicate/yellow/trapped = 1
 	)
 
 
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index adc9e03014e..b4fa91db9df 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -31,4 +31,17 @@
 /obj/item/documents/syndicate/yellow
 	name = "'Yellow' secret documents"
 	desc = "\"Top Secret\" documents printed on special copy-protected paper. It details sensitive Syndicate operational intelligence. These documents are marked \"Yellow\"."
-	icon_state = "docs_yellow"
\ No newline at end of file
+	icon_state = "docs_yellow"
+	var/poison_type = "amanitin"
+	var/poison_dose = 20
+	var/poison_total = 60
+
+/obj/item/documents/syndicate/yellow/trapped/pickup(user)
+	if(ishuman(user) && poison_total > 0)
+		var/mob/living/carbon/human/H = user
+		var/obj/item/clothing/gloves/G = H.gloves
+		if(!istype(G) || G.transfer_prints)
+			H.reagents.add_reagent(poison_type, poison_dose)
+			poison_total -= poison_dose
+			add_attack_logs(src, user, "Picked up [src], the trapped syndicate documents")
+	..()
\ No newline at end of file
diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm
index 9cc04e9bd6d..4b7a9271fba 100644
--- a/code/game/objects/structures/depot.dm
+++ b/code/game/objects/structures/depot.dm
@@ -46,7 +46,7 @@
 	if(containment_failure)
 		playsound(loc, 'sound/machines/Alarm.ogg', 100, 0, 0)
 		O.deliberate = TRUE
-		O.max_cycles = 7
+		O.max_cycles = 6
 	qdel(src)
 
 /obj/effect/overload
@@ -58,7 +58,7 @@
 	var/cycles = 0
 	var/beepsound = 'sound/items/timer.ogg'
 	var/deliberate = FALSE
-	var/max_cycles = 15
+	var/max_cycles = 10
 	var/max_fire_range = 6
 	var/area/syndicate_depot/depotarea
 
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 34d2fc6dab0..44eb3555a25 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -125,20 +125,8 @@
 /obj/item/folder/syndicate/yellow
 	icon_state = "folder_syellow"
 
-/obj/item/folder/syndicate/yellow/New()
+/obj/item/folder/syndicate/yellow/full/New()
 	..()
 	new /obj/item/documents/syndicate/yellow(src)
 	update_icon()
 
-/obj/item/folder/syndicate/yellow_trapped
-	icon_state = "folder_syellow"
-
-/obj/item/folder/syndicate/yellow_trapped/New()
-	..()
-	var/obj/item/paper/P = new /obj/item/paper(src)
-	P.name = "'Yellow' secret documents"
-	P.info = "Death to NanoTrasen!"
-	P.contact_poison = "amanitin"
-	P.contact_poison_volume = 20
-	P.contact_poison_poisoner = "syndicate_depot"
-	P.update_icon()
\ No newline at end of file