Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

literally just empty gun racks #466

Merged
merged 3 commits into from
Sep 27, 2024
Merged

literally just empty gun racks #466

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29efbab
Update gun_rack.dm
AmoryBlaine Sep 22, 2024
50069df
Update code/game/objects/structures/gun_rack.dm
AmoryBlaine Sep 23, 2024
9ea61f8
Merge branch 'master' into empty-racks
AmoryBlaine Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions code/game/objects/structures/gun_rack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
/obj/structure/gun_rack/m41/unloaded
populate_type = /obj/item/weapon/gun/rifle/m41aMK1/unloaded

/obj/structure/gun_rack/m41/empty
initial_stored = 0

/obj/structure/gun_rack/type71
icon_state = "type71"
desc = "Some off-branded gun rack. Per SOF and UPPA regulations, weapons should be stored in secure safes and only given out when necessary. Of course, most (but not all!) units overlook this regulation, only storing their firearms in safes when inspection arrives."
Expand All @@ -64,6 +67,9 @@
/obj/structure/gun_rack/type71/unloaded
populate_type = /obj/item/weapon/gun/rifle/type71/unloaded

/obj/structure/gun_rack/type71/empty
initial_stored = 0

/obj/structure/gun_rack/apc
name = "APC ammo compartment"
icon_state = "frontal"
Expand Down Expand Up @@ -104,6 +110,9 @@
/obj/structure/gun_rack/flamer/unloaded
populate_type = /obj/item/weapon/gun/flamer/unloaded

/obj/structure/gun_rack/flamer/empty
initial_stored = 0

/obj/structure/gun_rack/mk221
name = "M120 shotgun rack"
icon_state = "mk221"
Expand All @@ -112,3 +121,6 @@
initial_stored = 2
allowed_type = /obj/item/weapon/gun/shotgun/combat
populate_type = /obj/item/weapon/gun/shotgun/combat

/obj/structure/gun_rack/mk221/empty
initial_stored = 0
Loading