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

Fixed conflicts with another thing.

Browse Source
This commit is contained in:
sabess
2016-02-21 22:48:56 +11:00
parent d85b8f95f6
commit cb1e26ec70
7 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,6 +136,7 @@
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/clothing/head/beret/sec/corporate/hos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/device/flashlight/maglight(src)
return
@@ -179,6 +180,7 @@
new /obj/item/weapon/storage/box/holobadge(src)
new /obj/item/clothing/head/beret/sec/corporate/warden(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/device/flashlight/maglight(src)
return
@@ -221,6 +223,7 @@
new /obj/item/ammo_magazine/c45m/rubber(src)
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/device/flashlight/maglight(src)
return