Merge branch 'soro' of https://github.com/Max-023/PvE-CMSS13 into soro

cmss13-devs · Aug 29, 2024 · c774fc0 · c774fc0
2 parents 5b47911 + 1a0b292
commit c774fc0
Show file tree

Hide file tree

Showing 2 changed files with 111 additions and 197 deletions.
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
@@ -258,6 +258,20 @@
 		/obj/item/tape/regulation = 5,
 	)
 
+/obj/structure/machinery/vending/security/upp
+	name = "\improper People's Police Equipment Vendor"
+	desc = "A standard security vendor used by security forces of the UPP."
+	req_access = list(ACCESS_CIVILIAN_BRIG)
+	products = list(
+		/obj/item/handcuffs = 8,
+		/obj/item/reagent_container/spray/pepper = 4,
+		/obj/item/device/flashlight = 4,
+		/obj/item/storage/belt/security/MP/UPP = 4,
+		/obj/item/device/flash = 5,
+		/obj/item/storage/box/evidence = 6,
+		/obj/item/tape/regulation = 5,
+	)
+
 /obj/structure/machinery/vending/sea
 	name = "\improper SeaTech"
 	desc = "An equipment vendor designed to save lives"