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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-08-25 21:25:20 -04:00
committed by GitHub
parent e19a87e44a
commit ad5441a144
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,14 +238,9 @@
starts_with = list( starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective, /obj/item/clothing/accessory/badge/holo/detective,
<<<<<<< HEAD
/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves /obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves
/obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox /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 ///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/belt/detective,
/obj/item/weapon/storage/box/evidence, /obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec, /obj/item/device/radio/headset/headset_sec,