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

Adds handheld Enforcer squad distress beacons for Provost Inspectors+ #6866

Merged
merged 6 commits into from
Aug 21, 2024
Merged

Adds handheld Enforcer squad distress beacons for Provost Inspectors+ #6866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9d6e19
Update desk_bell.dm
Waseemq1235 May 10, 2024
0ba24b0
Merge branch 'cmss13-devs:master' into master
Waseemq1235 Jul 1, 2024
b21b147
Merge branch 'cmss13-devs:master' into master
Waseemq1235 Jul 17, 2024
0701653
Merge branch 'cmss13-devs:master' into master
Waseemq1235 Aug 3, 2024
c18e2ca
Update handheld_distress_beacon.dm
Waseemq1235 Aug 3, 2024
4b657c8
Update uscm_event.dm
Waseemq1235 Aug 3, 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
10 changes: 10 additions & 0 deletions code/game/objects/items/handheld_distress_beacon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,13 @@
recipient = "the Corporate Security Division"
ert_paths = list(/datum/emergency_call/goon/bodyguard) // "Weyland-Yutani Goon (Executive Bodyguard Detail)"
ert_short_names = list("SEND BODYGUARD")

// Provost office distress beacon held by Inspectors+
/obj/item/handheld_distress_beacon/provost
name = "\improper Provost Office handheld beacon"
desc = "A standard Provost Office beacon branded with the Provost Office symbol, provided to personnel for emergencies. It features an extended relay antenna and calls a squadron of Provost enforcers."

beacon_type = "Provost Enforcers beacon"
recipient = "the USS Superintendent"
ert_paths = list(/datum/emergency_call/provost_enforcer) // "USCM Provost Enforcers"
ert_short_names = list("SEND ENFORCERS")
2 changes: 2 additions & 0 deletions code/modules/gear_presets/uscm_event.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@
new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/listening_bug/radio_linked/hc/pvst(new_human), WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon/provost(new_human.back), WEAR_IN_BACK)

new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human), WEAR_IN_JACKET)
Expand Down Expand Up @@ -372,6 +373,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon/provost(new_human.back), WEAR_IN_BACK)

/datum/equipment_preset/uscm_event/provost/marshal/sector
name = "Provost Sector Marshal (MO7)"
Expand Down
Loading