cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 23:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Colts, Revolvers, and Tasers

Browse Source
This commit is contained in:
Casey
2022-03-20 03:10:23 +00:00
committed by CHOMPStation2
parent 5e9ad542d1
commit 8e0552a788
13 changed files with 355 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+6
View File
@@ -242,9 +242,15 @@
starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective,
<<<<<<< HEAD
/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves
/obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox
/obj/item/weapon/gun/energy/stunrevolver/vintage,
=======
/obj/item/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
/obj/item/gunbox/stun,
>>>>>>> e45c901f7c... Merge pull request #12443 from GhostActual/detective_guns
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,