cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Heads of staff once again get their guns (#12940)

Browse Source 
* wewwww

* wew

* wew

* Update token_system.dm

* Update modular_skyrat/modules/blueshield/code/blueshield.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/cmg.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/cmg.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Revert "Update token_system.dm"

This reverts commit 0a1f2c1bee599e7223107c2e7e3aed6c7dd61016.

* Update MetaStation_skyrat.dmm

* wew

* Update KiloStation_skyrat.dmm

* Update security_officer.dm

* Update warden.dm

* Update bullets.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
This commit is contained in:
Gandalf
2022-04-22 00:11:17 +01:00
committed by GitHub
co-authored by Dragonfruits
parent 49f3040f5b
commit 2b9ded6ec9
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -2
View File
@@ -17,7 +17,7 @@
new /obj/item/radio/headset/heads/captain/alt(src)
new /obj/item/radio/headset/heads/captain(src)
new /obj/item/storage/belt/sabre(src)
new /obj/item/gun/energy/e_gun(src)
new /obj/item/storage/box/gunset/pdh_captain(src) // SKYRAT EDIT ADDITION
new /obj/item/door_remote/captain(src)
new /obj/item/storage/photo_album/captain(src)
@@ -37,7 +37,7 @@
new /obj/item/storage/box/ids(src)
new /obj/item/megaphone/command(src)
new /obj/item/assembly/flash/handheld(src)
new /obj/item/gun/energy/e_gun(src)
new /obj/item/storage/box/gunset/pdh(src) // SKYRAT EDIT ADDITION
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/pet_carrier(src)
new /obj/item/door_remote/civilian(src)