cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 14:16:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-08-24 23:17:52 -04:00
committed by GitHub
parent 593dd3ea79
commit a7af370a6d
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
-9
View File
@@ -238,18 +238,9 @@
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
||||||| parent of 9c2f8d371d... Merge pull request #11464 from GhostActual/stunrevolver_fix
/obj/item/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
///obj/item/weapon/gun/energy/stunrevolver/vintage, // VOREStation Removal
=======
/obj/item/clothing/gloves/black,
///obj/item/gunbox, // VOREStation Removal
/obj/item/weapon/gun/energy/stunrevolver/vintage,
>>>>>>> 9c2f8d371d... Merge pull request #11464 from GhostActual/stunrevolver_fix
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,