bannedforbeingcringeist

code/datums/weather/weather_types/radiation_storm.dm

@@ -18,7 +18,7 @@
 
 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle, /area/security/prison/safe, /area/security/prison/toilet)
+	/area/ai_monitored/turret_protected/ai, /area/commons/storage/emergency/starboard, /area/commons/storage/emergency/port, /area/shuttle)
 	target_trait = ZTRAIT_STATION
 
 	immunity_type = "rad"

code/game/area/Space_Station_13_areas.dm

@@ -37,7 +37,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/ai_monitored/turret_protected/AIsatextAP
 	name = "AI Sat Ext"
 	icon_state = "storage"
-	
+
 /area/arrival
 	requires_power = FALSE
 
@@ -296,6 +296,28 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "xenomaint"
 	area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED
 
+//Maintenance - Prison
+
+/area/maintenance/prison
+	name = "Prison Maintenance"
+	icon_state = "prison_maintenance"
+
+/area/maintenance/prison/fore
+	name = "Prison Fore Maintenance"
+	icon_state = "prison_maintenance"
+
+/area/maintenance/prison/starboard
+	name = "Prison Starboard Maintenance"
+	icon_state = "prison_maintenance"
+
+/area/maintenance/prison/aft
+	name = "Prison Aft Maintenance"
+	icon_state = "prison_maintenance"
+
+/area/maintenance/prison/port
+	name = "Prison Port Maintenance"
+	icon_state = "prison_maintenance"
+
 //Maintenance - Generic
 
 /area/maintenance/arrivals/north
@@ -1393,13 +1415,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Prison Wing"
 	icon_state = "sec_prison"
 
-/area/security/prison/toilet //radproof
-	name = "Prison Toilet"
-	icon_state = "sec_prison_safe"
-
-/area/security/prison/safe //radproof
+/area/security/prison/cells
 	name = "Prison Wing Cells"
-	icon_state = "sec_prison_safe"
+	icon_state = "prison_cells"
 
 /area/security/prison/upper
 	name = "Upper Prison Wing"

code/game/objects/items/devices/radio/headset.dm

@@ -105,6 +105,12 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	keyslot = new /obj/item/encryptionkey/binary
 	recalculateChannels()
 
+/obj/item/radio/headset/headset_prisoner
+	name = "prison radio headset"
+	desc = "An updated, modular intercom that fits over the head. Takes encryption keys. It looks like it has been modified to not broadcast."
+	icon_state = "prisoner_headset"
+	prison_radio = TRUE
+
 /obj/item/radio/headset/headset_sec
 	name = "security radio headset"
 	desc = "This is used by your elite security force."

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

@@ -191,6 +191,7 @@
 	new /obj/item/clothing/under/rank/prisoner( src )
 	new /obj/item/clothing/under/rank/prisoner/skirt( src )
 	new /obj/item/clothing/shoes/sneakers/orange( src )
+	new /obj/item/radio/headset/headset_prisoner( src )
 
 /obj/structure/closet/secure_closet/courtroom
 	name = "courtroom locker"

code/modules/jobs/job_types/prisoner.dm

@@ -20,5 +20,5 @@ datum/job/prisoner
 	uniform = /obj/item/clothing/under/rank/prisoner
 	shoes = /obj/item/clothing/shoes/sneakers/orange
 	id = /obj/item/card/id/prisoner
-	ears = null
+	ears = /obj/item/radio/headset/headset_prisoner
 	belt = null