Merge branch 'new_brig_remap' of https://github.com/ItsVyzo/cmss13 in…

…to new_brig_remap
cmss13-devs · Dec 3, 2023 · 3298848 · 3298848
2 parents c46d754 + 3aeb63e
commit 3298848
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 2 deletions.
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
@@ -187,7 +187,7 @@
 							if("Released")
 								background = "'background-color:#3BB9FF;'"
 							if("Suspect")
-								background = "'background-color:#1AAFFF;'"
+								background = "'background-color:#686A6C;'"
 							if("NJP")
 								background = "'background-color:#faa20a;'"
 							if("None")

diff --git a/code/game/machinery/doors/brig_system.dm b/code/game/machinery/doors/brig_system.dm
@@ -390,6 +390,14 @@
 	name = "Cell 4"
 	id = "Cell 4"
 
+/obj/structure/machinery/brig_cell/cell_5
+	name = "Cell 5"
+	id = "Cell 5"
+
+/obj/structure/machinery/brig_cell/cell_6
+	name = "Cell 6"
+	id = "Cell 6"
+
 /obj/structure/machinery/brig_cell/perma_1
 	name = "Perma 1"
 	id = "Perma 1"

diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
@@ -252,6 +252,23 @@
 	)
 	contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2)
 
+/obj/structure/machinery/vending/security/riot
+	name = "\improper RiotTech"
+	desc = "A security riot equipment vendor."
+	hacking_safety = TRUE
+	wrenchable = FALSE
+	products = list(
+		/obj/item/handcuffs/zip = 40,
+		/obj/item/explosive/grenade/flashbang = 20,
+		/obj/item/explosive/grenade/custom/teargas = 40,
+		/obj/item/ammo_magazine/smg/m39/rubber = 40,
+		/obj/item/ammo_magazine/pistol/rubber = 40,
+		/obj/item/ammo_magazine/pistol/mod88/rubber = 40,
+		/obj/item/ammo_magazine/rifle/rubber = 40,
+		/obj/item/ammo_magazine/rifle/m4ra/rubber = 40,
+		/obj/item/clothing/head/helmet/marine/MP = 8,
+	)
+
 /obj/structure/machinery/vending/sea
 	name = "\improper SeaTech"
 	desc = "An equipment vendor designed to save lives"

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
@@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
 
 /obj/structure/closet/secure_closet/warrant_officer
 	name = "chief MP's locker"
-	req_access = list(ACCESS_MARINE_BRIG)
+	req_access = list(ACCESS_MARINE_ARMORY)
 	icon_state = "secure_locked_warrant"
 	icon_closed = "secure_unlocked_warrant"
 	icon_locked = "secure_locked_warrant"

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -196,6 +196,57 @@
 	locked = TRUE
 	var/id = null
 
+/obj/structure/closet/secure_closet/brig/prisoner
+
+/obj/structure/closet/secure_closet/brig/prisoner/Initialize()
+	. = ..()
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/device/radio/headset(src)
+
+/obj/structure/closet/secure_closet/brig/prison_uni
+	name = "Spare Prison Uniforms"
+	req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG)
+	anchored = TRUE
+	locked = TRUE
+
+/obj/structure/closet/secure_closet/brig/prison_uni/Initialize()
+	. = ..()
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/device/radio/headset(src)
+	new /obj/item/device/radio/headset(src)
+	new /obj/item/device/radio/headset(src)
+	new /obj/item/device/radio/headset(src)
+	new /obj/item/device/radio/headset(src)
+
+/obj/structure/closet/secure_closet/brig/restraints
+	name = "Spare Restraints"
+	req_one_access = list(ACCESS_MARINE_BRIG, ACCESS_CIVILIAN_BRIG)
+	anchored = TRUE
+	locked = TRUE
+
+/obj/structure/closet/secure_closet/brig/restraints/Initialize()
+	. = ..()
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src)
+
 /obj/structure/closet/secure_closet/brig/Initialize()
 	. = ..()
 	new /obj/item/clothing/under/color/orange(src)