bannedforbeingcringeist

_maps/map_files/CogStation/CogStation.dmm

@@ -9962,6 +9962,7 @@
 /area/security/prison)
 "axk" = (
 /obj/item/storage/pill_bottle/penis_enlargement,
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel/freezer,
 /area/security/prison)
 "axl" = (
@@ -71005,6 +71006,11 @@
 /obj/machinery/atmospherics/pipe/simple/violet/visible,
 /turf/open/floor/plasteel,
 /area/engineering/atmos)
+"kTm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plating,
+/area/security/prison)
 "lcD" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
 	dir = 1
@@ -71078,6 +71084,11 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /turf/open/floor/plasteel,
 /area/tcommsat/computer)
+"mTf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "nvn" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1
@@ -95879,7 +95890,7 @@ adE
 aew
 afG
 agP
-agP
+kTm
 aiL
 ajT
 anu
@@ -95894,7 +95905,7 @@ aHT
 aJt
 aJN
 aQg
-akv
+mTf
 aew
 ayU
 aSQ
@@ -96395,7 +96406,7 @@ afY
 agP
 agP
 aiL
-akv
+mTf
 anw
 akv
 akv

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -10552,6 +10552,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aMj" = (
@@ -12412,6 +12413,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aUx" = (
@@ -12458,6 +12460,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aUA" = (
@@ -12486,6 +12489,7 @@
 /area/security/prison)
 "aUB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},

_maps/map_files/KiloStation/KiloStation.dmm

@@ -55924,6 +55924,7 @@
 	dir = 1;
 	pixel_y = -22
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/prison)
 "bLR" = (
@@ -59245,6 +59246,7 @@
 	dir = 1;
 	pixel_y = -22
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/prison)
 "bRc" = (
@@ -61866,6 +61868,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/prison)
 "bVq" = (
@@ -79329,6 +79332,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "czS" = (

_maps/map_files/LambdaStation/lambda.dmm

@@ -443,6 +443,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "abr" = (
@@ -63052,6 +63053,11 @@
 	},
 /turf/open/space/basic,
 /area/space)
+"cZI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "dcB" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 4
@@ -112428,7 +112434,7 @@ agJ
 ahA
 ady
 bPZ
-adx
+cZI
 adx
 ama
 aNh
@@ -113456,7 +113462,7 @@ afg
 agM
 ady
 ajM
-adx
+cZI
 adx
 asb
 baj
@@ -115255,7 +115261,7 @@ amN
 agQ
 ady
 aiu
-adx
+cZI
 adx
 amc
 beg

_maps/map_files/MetaStation/MetaStation.dmm

@@ -1344,6 +1344,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "adw" = (
@@ -45097,6 +45098,10 @@
 /obj/effect/landmark/start/scientist,
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
+"cUU" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "cUZ" = (
 /obj/docking_port/stationary{
 	dir = 8;
@@ -81318,6 +81323,13 @@
 	},
 /turf/open/floor/plating,
 /area/command/bridge)
+"wXA" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "wXC" = (
 /obj/machinery/light_switch{
 	pixel_y = 28
@@ -105902,7 +105914,7 @@ abC
 acr
 acE
 adb
-aaR
+cUU
 aaR
 aem
 aeN
@@ -107181,7 +107193,7 @@ aaC
 aaI
 aaR
 abb
-aaI
+wXA
 abG
 acb
 acu
@@ -107958,7 +107970,7 @@ aaR
 aaR
 aaR
 ade
-aaR
+cUU
 aaR
 aeo
 aeV

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -2708,6 +2708,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 6
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel,
 /area/security/prison)
 "agN" = (
@@ -2736,6 +2737,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/effect/landmark/start/prisoner,
 /turf/open/floor/plasteel/freezer,
 /area/security/prison)
 "agP" = (
@@ -53485,6 +53487,13 @@
 "dFJ" = (
 /turf/open/floor/engine,
 /area/engineering/supermatter)
+"dHg" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 8
+	},
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel,
+/area/security/prison)
 "dHo" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -60985,6 +60994,10 @@
 	},
 /turf/closed/wall/r_wall,
 /area/science/xenobiology)
+"tVZ" = (
+/obj/effect/landmark/start/prisoner,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
 "tXn" = (
 /obj/structure/sink{
 	dir = 4;
@@ -83032,13 +83045,13 @@ aaa
 aem
 aeq
 aeE
-aeU
+tVZ
 afo
 afD
 aga
 aga
 agz
-aie
+dHg
 aiH
 ahm
 ahD

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