cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Aronai Sieyes
2021-08-15 00:50:25 -04:00
parent ceb4488540
commit 98163fd3fa
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -6
View File
@@ -231,12 +231,8 @@
starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective,
/obj/item/clothing/gloves/black,
<<<<<<< HEAD
///obj/item/gunbox, //VOREStation Removal,
=======
/obj/item/gunbox,
/obj/item/weapon/gun/energy/stunrevolver/vintage,
>>>>>>> 17ceaedf675... Merge pull request #8178 from GhostActual/Stun-Revolvers
///obj/item/gunbox, // VOREStation Removal
///obj/item/weapon/gun/energy/stunrevolver/vintage, // VOREStation Removal
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,