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

Replaces wardens energy gun #2482

Merged
merged 3 commits into from
Aug 11, 2023
Merged

Replaces wardens energy gun #2482

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4ded96
replaces energygun with secglock
BlueHNT Jul 20, 2023
c6c5b3e
adds strobe shield to warden's locker
BlueHNT Jul 20, 2023
d1b20de
forgot (src)
BlueHNT Jul 21, 2023
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
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
new /obj/item/clothing/gloves/krav_maga(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
new /obj/item/shield/riot/flash //NSV13 - strobe shield instead of energy weaponry
new /obj/item/ammo_box/c9mm/rubber(src) //NSV13 - rubber bullets
new /obj/item/storage/box/deputy(src)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/warden.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/assembly/flash/handheld
l_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/energy/e_gun/advtaser //NSV13 - give the guy in charge of the brig a better nonlethal
suit_store = /obj/item/gun/ballistic/automatic/pistol/glock/security //NSV13 - weird energy gun is not good
backpack_contents = list(/obj/item/melee/baton/loaded=1,
/obj/item/gun/ballistic/tazer, /obj/item/ammo_box/magazine/tazer_cartridge_storage, /obj/item/ammo_box/magazine/glock, /obj/item/squad_pager/all_channels, /obj/item/melee/classic_baton/police=1) //NSV13

Expand Down
Loading