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

Firearms 1

Browse Source
This commit is contained in:
Casey
2022-03-26 03:56:42 +00:00
committed by CHOMPStation2
parent b23bf87ef5
commit 51bd77e5c2
12 changed files with 517 additions and 133 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
@@ -29,11 +29,17 @@
/obj/item/device/radio/headset/heads/hop,
/obj/item/device/radio/headset/heads/hop/alt,
/obj/item/weapon/storage/box/ids = 2,
<<<<<<< HEAD
///obj/item/weapon/gun/energy/gun, //YW Edit,
/obj/item/weapon/gun/energy/gun/martin, //VOREStation Add,
/obj/item/weapon/storage/box/commandkeys, //VOREStation Add,
/obj/item/weapon/storage/box/servicekeys, //VOREStation Add,
///obj/item/weapon/gun/projectile/sec/flash, //VOREStation Removal,
=======
/obj/item/weapon/gun/energy/gun/compact,
/obj/item/weapon/storage/box/commandkeys,
/obj/item/weapon/storage/box/servicekeys,
>>>>>>> cce944d043... Merge pull request #12522 from GhostActual/Firearms1
/obj/item/device/flash)
/obj/structure/closet/secure_closet/hop2