Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes prisoner clothing from the temporary brig cells #20373

Closed
wants to merge 2 commits into from
Closed

Removes prisoner clothing from the temporary brig cells #20373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889547d
Removes prisoner clothing from the temporary brig cells
Miraviel Feb 6, 2023
f0abd4f
Fixes gulag closets
Miraviel Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions _maps/map_files/Delta/delta.dmm
View file
Open in desktop
Expand Up @@ -19290,7 +19290,7 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = -32
},
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
Expand All @@ -19315,14 +19315,14 @@
/obj/machinery/light/small{
dir = 8
},
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
},
/area/security/permabrig)
"bdd" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
Expand Down Expand Up @@ -20493,10 +20493,10 @@
name = "south bump";
pixel_y = -30
},
/obj/structure/closet/secure_closet/brig,
/obj/machinery/light/small{
dir = 4
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Expand Up @@ -1287,7 +1287,7 @@
},
/area/security/main)
"akN" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
Expand Down Expand Up @@ -69403,7 +69403,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard2)
"mlj" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
Expand Down Expand Up @@ -80614,7 +80614,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboardsolar)
"rRp" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
Expand Down Expand Up @@ -81357,10 +81357,10 @@
/turf/simulated/floor/plasteel,
/area/toxins/xenobiology)
"sml" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/light{
dir = 1
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "red"
Expand Down Expand Up @@ -86360,7 +86360,7 @@
},
/area/assembly/robotics)
"uSc" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
Expand Down Expand Up @@ -91595,10 +91595,10 @@
},
/area/engine/equipmentstorage)
"xCC" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/camera{
c_tag = "Prisoner Lockers"
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
Expand Down Expand Up @@ -92413,7 +92413,7 @@
/turf/simulated/floor/plasteel,
/area/atmos/control)
"xWI" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/cerestation/cerestation.dmm
View file
Open in desktop
Expand Up @@ -2616,7 +2616,6 @@
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
"apd" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/light{
dir = 1
},
Expand All @@ -2626,6 +2625,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
"ape" = (
Expand Down Expand Up @@ -4588,13 +4588,13 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"azk" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/camera{
c_tag = "Brig Prisoner Lockers"
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
"azs" = (
Expand Down Expand Up @@ -56631,7 +56631,7 @@
},
/area/security/nuke_storage)
"jYh" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
"jYp" = (
Expand Down Expand Up @@ -74791,10 +74791,10 @@
},
/area/maintenance/maintcentral)
"rgF" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
"rgO" = (
Expand Down Expand Up @@ -88158,11 +88158,11 @@
/turf/simulated/floor/plating,
/area/toxins/launch)
"wuE" = (
/obj/structure/closet/secure_closet/brig,
/obj/item/radio/intercom{
pixel_y = -28;
name = "custom placement"
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel,
/area/security/prisonlockers)
"wuW" = (
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files/cyberiad/cyberiad.dmm
View file
Open in desktop
Expand Up @@ -66435,7 +66435,6 @@
/turf/simulated/floor/plasteel,
/area/maintenance/aft)
"egq" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
Expand All @@ -66445,6 +66444,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
Expand Down Expand Up @@ -70599,12 +70599,12 @@
},
/area/maintenance/aft)
"gZy" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
Expand Down Expand Up @@ -76007,7 +76007,7 @@
/turf/space,
/area/solar/auxstarboard)
"lgS" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
Expand Down Expand Up @@ -81535,7 +81535,7 @@
},
/area/quartermaster/storage)
"psa" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
Expand Down Expand Up @@ -86796,12 +86796,12 @@
},
/area/toxins/xenobiology)
"tCY" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/firealarm{
dir = 4;
name = "east bump";
pixel_x = 24
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
Expand Down Expand Up @@ -89836,7 +89836,7 @@
/turf/simulated/floor/plasteel,
/area/maintenance/asmaint)
"vDY" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "red"
Expand Down Expand Up @@ -92628,14 +92628,14 @@
},
/area/security/execution)
"xVM" = (
/obj/structure/closet/secure_closet/brig,
/obj/machinery/status_display{
layer = 4;
pixel_y = 32
},
/obj/machinery/light{
dir = 1
},
/obj/structure/closet/secure_closet/brig/prisoner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/generic/Lavaland.dmm
View file
Open in desktop
Expand Up @@ -4575,7 +4575,7 @@
},
/area/mine/airlock)
"op" = (
/obj/structure/closet/secure_closet/brig/gulag,
/obj/structure/closet/secure_closet/brig/prisoner/gulag,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"oA" = (
Expand Down Expand Up @@ -4676,8 +4676,8 @@
/turf/simulated/wall,
/area/mine/laborcamp)
"rd" = (
/obj/structure/closet/secure_closet/brig/gulag,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/brig/prisoner/gulag,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"rj" = (
Expand Down Expand Up @@ -4734,7 +4734,7 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/closet/secure_closet/brig/gulag,
/obj/structure/closet/secure_closet/brig/prisoner/gulag,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"sF" = (
Expand Down Expand Up @@ -5996,11 +5996,11 @@
},
/area/mine/sleeper)
"PK" = (
/obj/structure/closet/secure_closet/brig/gulag,
/obj/machinery/flasher{
id = "labor";
pixel_y = 32
},
/obj/structure/closet/secure_closet/brig/prisoner/gulag,
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"PQ" = (
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
View file
Open in desktop
Expand Up @@ -231,19 +231,19 @@
anchored = TRUE
var/id = null

/obj/structure/closet/secure_closet/brig/populate_contents()
/obj/structure/closet/secure_closet/brig/prisoner/populate_contents()
new /obj/item/clothing/under/color/orange/prison(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/card/id/prisoner/random(src)
new /obj/item/radio/headset(src)

/obj/structure/closet/secure_closet/brig/gulag
/obj/structure/closet/secure_closet/brig/prisoner/gulag
name = "labor camp locker"
desc = "A special locker designed to store prisoner belongings, allows access when prisoners meet their point quota."
locked = FALSE
var/registered_ID_UID

/obj/structure/closet/secure_closet/brig/gulag/allowed(mob/M)
/obj/structure/closet/secure_closet/brig/prisoner/gulag/allowed(mob/M)
. = ..()
if(.) //we were gonna let them do it anyway
return TRUE
Expand All @@ -265,7 +265,7 @@

return FALSE //if we didn't match above, no interaction for you

/obj/structure/closet/secure_closet/brig/gulag/examine(mob/user)
/obj/structure/closet/secure_closet/brig/prisoner/gulag/examine(mob/user)
. = ..()
if(registered_ID_UID)
var/obj/item/card/id/prisoner/prisoner_id = locateUID(registered_ID_UID)
Expand Down