diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index a2956436079..6c2069f490d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -103,6 +103,7 @@ icon_closed = "jensencoat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight) /obj/item/clothing/suit/storage/toggle/armor/hos/jensen/Initialize() . = ..() diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 2b4d9e83b45..c1c6a14542e 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -26,7 +26,7 @@ icon_state = "folder_white" /obj/item/weapon/folder/purple - desc = "A gold and blue folder, specifically designed for the Research Division facilities of the company." + desc = "A purple folder, specifically designed for the Research Division facilities of the company." icon_state = "folder_purple" /obj/item/weapon/folder/update_icon() diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 8f7d8d59535..256a9437aba 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -19093,6 +19093,11 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "HM" = ( diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 1f44e3f0963..e1fda370412 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -36859,7 +36859,7 @@ name = "Main Exit Door Control"; pixel_x = 0; pixel_y = 26; - req_access = list(5) + req_access = null }, /obj/effect/floor_decal/corner/lime{ icon_state = "corner_white"; diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 2cca6fe7d43..9c44f9a1c6e 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -1731,12 +1731,6 @@ icon_state = "corner_white"; dir = 9 }, -/obj/machinery/requests_console{ - department = "Forensic Technician"; - departmentType = 5; - pixel_x = 0; - pixel_y = 32 - }, /turf/simulated/floor/tiled, /area/security/range) "dp" = ( @@ -2739,12 +2733,6 @@ "fz" = ( /obj/structure/table/wood, /obj/item/weapon/reagent_containers/spray/luminol, -/obj/machinery/requests_console{ - department = "Forensic Technician"; - departmentType = 5; - pixel_x = 0; - pixel_y = -32 - }, /obj/machinery/light, /turf/simulated/floor/tiled, /area/security/training)