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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sorokyne Strata Patch #410

Merged
merged 30 commits into from
Sep 4, 2024
Merged

Sorokyne Strata Patch #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0ac9b91
Da Revolva
Mar 27, 2024
b1f8fc5
Oopsiedaisies
Mar 27, 2024
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 30, 2024
e747764
Revert "Oopsiedaisies"
Mar 30, 2024
c3cee8a
Auto stash before revert of "Oopsiedaisies"
Mar 30, 2024
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 31, 2024
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 3, 2024
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 5, 2024
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 7, 2024
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 8, 2024
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 10, 2024
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 23, 2024
47fb185
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
May 21, 2024
cd11ccc
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 15, 2024
939b7fa
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 22, 2024
5256522
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 23, 2024
b863a71
Un-PVP's your Soro
Aug 23, 2024
81a2f5b
Fix
Aug 24, 2024
c057862
People's Police
Aug 25, 2024
e3d4a54
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
0f33748
Fix
Aug 25, 2024
a54119c
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
619ba83
Merge branches 'master' and 'master' of https://github.com/PvE-CMSS13…
Aug 25, 2024
64c3fa7
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 27, 2024
b198276
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 27, 2024
1a0b292
WY Container Patch
Aug 28, 2024
ff918c9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 28, 2024
5b47911
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 29, 2024
c774fc0
Merge branch 'soro' of https://github.com/Max-023/PvE-CMSS13 into soro
Aug 29, 2024
35c5d45
Fixes
Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions code/game/machinery/vending/vending_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading