cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upstream-11408

Browse Source
This commit is contained in:
Aronai Sieyes
2021-08-15 01:00:11 -04:00
committed by Cadyn
parent 830bd23885
commit e19a87e44a
7 changed files with 318 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -238,8 +238,14 @@
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/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
///obj/item/weapon/gun/energy/stunrevolver/vintage, // VOREStation Removal
>>>>>>> fd8da95ec7 (Merge pull request #11408 from VOREStation/upstream-merge-8178)
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,