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.

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

Security weapon beacon #5105

Merged
merged 1 commit into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions tff_modular/modules/security-rearm/code/outfit.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/datum/outfit/job/security
suit_store = null
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/choice_beacon/sec_officer = 1,
)
19 changes: 19 additions & 0 deletions tff_modular/modules/security-rearm/code/security_beacon.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/obj/item/choice_beacon/sec_officer
name = "security officer weapon delivery beacon"
desc = "Weapon delivery beacon, containing the service weapon for a security officer"
icon_state = "self_delivery"
w_class = WEIGHT_CLASS_TINY

/obj/item/choice_beacon/sec_officer/generate_display_names()
var/static/list/security_kits
if(!security_kits)
security_kits = list()
var/list/possible_weapons = list(
/obj/item/gun/ballistic/automatic/pistol/sol = /obj/item/storage/toolbox/guncase/nova/pistol/trappiste_small_case/wespe_sec,
/obj/item/gun/energy/disabler = /obj/item/gun/energy/disabler,
/obj/item/gun/energy/disabler/smg = /obj/item/gun/energy/disabler/smg
)
for(var/obj/item/weapon as anything in possible_weapons)
security_kits[initial(weapon.name)] = possible_weapons[weapon]

return security_kits
8 changes: 8 additions & 0 deletions tff_modular/modules/security-rearm/code/wespe.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/obj/item/ammo_box/magazine/c35sol_pistol/non_lethal
ammo_type = /obj/item/ammo_casing/c35sol/incapacitator

/obj/item/storage/toolbox/guncase/nova/pistol/trappiste_small_case/wespe_sec
name = "Security 'Wespe' gunset"

weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/sol/no_mag
extra_to_spawn = /obj/item/ammo_box/magazine/c35sol_pistol/non_lethal
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Лишь один магазин?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Еще и тут отвечу, потому что могу. Три магазина в ящичке. =)

3 changes: 3 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8819,6 +8819,9 @@
#include "tff_modular\modules\redsec_reskins\code\beret_reskin.dm"
#include "tff_modular\modules\redsec_reskins\code\hood_reskin.dm"
#include "tff_modular\modules\redsec_reskins\code\redsec.dm"
#include "tff_modular\modules\security-rearm\code\outfit.dm"
#include "tff_modular\modules\security-rearm\code\security_beacon.dm"
#include "tff_modular\modules\security-rearm\code\wespe.dm"
#include "tff_modular\modules\selestial_language\language.dm"
#include "tff_modular\modules\silicon_laws_tweaks\code\upload.dm"
#include "tff_modular\modules\smites\femboyfication.dm"
Expand Down
Loading