Skip to content

Commit

Permalink
TGS Test Merge (#8096)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cm13-github
cm13-github committed Jan 20, 2025
2 parents 3a11de5 + 5977280 commit 517484b
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/sea.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("Officer Uniform", 0, /obj/item/clothing/under/marine/dress, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/sea, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/satchel/lockable, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

Expand Down
38 changes: 36 additions & 2 deletions code/game/objects/items/devices/radio/headset.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
var/headset_hud_on = FALSE
var/locate_setting = TRACKER_SL
var/misc_tracking = FALSE
var/hud_type = MOB_HUD_FACTION_MARINE
var/hud_type = MOB_HUD_FACTION_MARINE //Main faction hud. This determines minimap icons and tracking stuff
var/list/additional_hud_types = list() //Additional faction huds, doesn't change minimap icon or similar
var/default_freq

///The type of minimap this headset is added to
Expand Down Expand Up @@ -263,6 +264,9 @@
if(headset_hud_on)
var/datum/mob_hud/H = GLOB.huds[hud_type]
H.add_hud_to(user, src)
for(var/per_faction_hud in additional_hud_types)
var/datum/mob_hud/alt_hud = GLOB.huds[per_faction_hud]
alt_hud.add_hud_to(user, src)
//squad leader locator is no longer invisible on our player HUD.
if(user.mind && (user.assigned_squad || misc_tracking) && user.hud_used && user.hud_used.locate_leader)
user.show_hud_tracker()
Expand All @@ -282,6 +286,10 @@
if(istype(user) && user.has_item_in_ears(src)) //dropped() is called before the inventory reference is update.
var/datum/mob_hud/H = GLOB.huds[hud_type]
H.remove_hud_from(user, src)
for(var/per_faction_hud in additional_hud_types)
var/datum/mob_hud/alt_hud = GLOB.huds[per_faction_hud]
alt_hud.remove_hud_from(user, src)

//squad leader locator is invisible again
if(user.hud_used && user.hud_used.locate_leader)
user.hide_hud_tracker()
Expand Down Expand Up @@ -315,13 +323,19 @@
var/datum/mob_hud/H = GLOB.huds[hud_type]
if(headset_hud_on)
H.add_hud_to(usr, src)
for(var/per_faction_hud in additional_hud_types)
var/datum/mob_hud/alt_hud = GLOB.huds[per_faction_hud]
alt_hud.add_hud_to(usr, src)
if(user.mind && (misc_tracking || user.assigned_squad) && user.hud_used?.locate_leader)
user.show_hud_tracker()
if(misc_tracking)
SStracking.start_misc_tracking(user)
update_minimap_icon()
else
H.remove_hud_from(usr, src)
for(var/per_faction_hud in additional_hud_types)
var/datum/mob_hud/alt_hud = GLOB.huds[per_faction_hud]
alt_hud.remove_hud_from(usr, src)
if(user.hud_used?.locate_leader)
user.hide_hud_tracker()
if(misc_tracking)
Expand Down Expand Up @@ -524,26 +538,36 @@
name = "marine military police radio headset"
desc = "This is used by marine military police members. Channels are as follows: :p - military police, :v - marine command. :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
icon_state = "sec_headset"
additional_hud_types = list(MOB_HUD_FACTION_CMB)
initial_keys = list(/obj/item/device/encryptionkey/mmpo)
locate_setting = TRACKER_CMP
misc_tracking = TRUE

inbuilt_tracking_options = list(
"Chief MP" = TRACKER_CMP,
)

/obj/item/device/radio/headset/almayer/marine/mp_honor
name = "marine honor guard radio headset"
desc = "This is used by members of the marine honor guard. Channels are as follows: :p - military police, :v - marine command. :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
icon_state = "sec_headset"
initial_keys = list(/obj/item/device/encryptionkey/mmpo)
additional_hud_types = list(MOB_HUD_FACTION_CMB)
volume = RADIO_VOLUME_RAISED
locate_setting = TRACKER_CO
misc_tracking = TRUE

inbuilt_tracking_options = list(
"Commanding Officer" = TRACKER_CO,
"Chief MP" = TRACKER_CMP,
"Executive Officer" = TRACKER_XO
)

/obj/item/device/radio/headset/almayer/cmpcom
name = "marine chief MP radio headset"
desc = "For discussing the purchase of donuts and arresting of hooligans. Channels are as follows: :v - marine command, :p - military police, :n - engineering, :m - medbay, :u - requisitions, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
icon_state = "sec_headset"
additional_hud_types = list(MOB_HUD_FACTION_CMB, MOB_HUD_FACTION_WY)
initial_keys = list(/obj/item/device/encryptionkey/cmpcom)
volume = RADIO_VOLUME_CRITICAL

Expand Down Expand Up @@ -583,7 +607,7 @@
icon_state = "wy_headset"
maximum_keys = 5
initial_keys = list(/obj/item/device/encryptionkey/mcom/cl)

additional_hud_types = list(MOB_HUD_FACTION_WY, MOB_HUD_FACTION_PMC)
spy_bug_type = /obj/item/device/radio/listening_bug/radio_linked/fax/wy

/obj/item/device/radio/headset/almayer/mcl/Initialize()
Expand All @@ -606,6 +630,7 @@
desc = "Issued only to senior command staff. Channels are as follows: :v - marine command, :p - military police, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel"
icon_state = "mco_headset"
initial_keys = list(/obj/item/device/encryptionkey/cmpcom/cdrcom)
additional_hud_types = list(MOB_HUD_FACTION_WY, MOB_HUD_FACTION_CMB)
volume = RADIO_VOLUME_CRITICAL

/obj/item/device/radio/headset/almayer/mcom/sea
Expand Down Expand Up @@ -1019,6 +1044,7 @@
inbuilt_tracking_options = list(
"Corporate Liaison" = TRACKER_CL
)
additional_hud_types = list(MOB_HUD_FACTION_WY)

/obj/item/device/radio/headset/distress/cbrn
name = "\improper CBRN headset"
Expand Down Expand Up @@ -1063,10 +1089,12 @@
name = "PMC-CMD headset"
desc = "A special headset used by corporate personnel. Channels are as follows: :o - colony, #z - command, #f - medical, #e - engineering, #o - JTAC, #p - general"
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/command, /obj/item/device/encryptionkey/mcom/cl)
additional_hud_types = list(MOB_HUD_FACTION_MARINE, MOB_HUD_FACTION_WY)

/obj/item/device/radio/headset/distress/pmc/command/hvh
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/command)
misc_tracking = FALSE
additional_hud_types = list(MOB_HUD_FACTION_WY)

/obj/item/device/radio/headset/distress/pmc/command/director
name = "WY director headset"
Expand Down Expand Up @@ -1178,6 +1206,7 @@
initial_keys = list(/obj/item/device/encryptionkey/cmb)
has_hud = TRUE
hud_type = MOB_HUD_FACTION_CMB
additional_hud_types = list(MOB_HUD_FACTION_MARINE)

/obj/item/device/radio/headset/distress/CMB/limited
name = "\improper Damaged CMB Earpiece"
Expand All @@ -1188,6 +1217,7 @@
name = "\improper ICC Liaison Headset"
desc = "An expensive headset used by The Interstellar Commerce Commission. This one in particular has a liaison chip with the CMB. Featured channels include: ; - CMB, :o - Colony, :g - public, :v - marine command, :m - medbay, :t - intel, :y - Weyland-Yutani."
icon_state = "wy_headset"
additional_hud_types = list(MOB_HUD_FACTION_WY)
initial_keys = list(/obj/item/device/encryptionkey/WY, /obj/item/device/encryptionkey/cmb)

/obj/item/device/radio/headset/distress/NSPA
Expand All @@ -1198,6 +1228,7 @@
initial_keys = list(/obj/item/device/encryptionkey/public, /obj/item/device/encryptionkey/royal_marine)
has_hud = TRUE
hud_type = MOB_HUD_FACTION_NSPA
additional_hud_types = list(MOB_HUD_FACTION_TWE)
volume = RADIO_VOLUME_IMPORTANT

/obj/item/device/radio/headset/almayer/highcom
Expand All @@ -1206,6 +1237,7 @@
icon_state = "mhc_headset"
frequency = HC_FREQ
initial_keys = list(/obj/item/device/encryptionkey/highcom)
additional_hud_types = list(MOB_HUD_FACTION_WY, MOB_HUD_FACTION_CMB, MOB_HUD_FACTION_TWE)
volume = RADIO_VOLUME_CRITICAL

/obj/item/device/radio/headset/almayer/provost
Expand All @@ -1214,6 +1246,7 @@
icon_state = "pvst_headset"
frequency = PVST_FREQ
initial_keys = list(/obj/item/device/encryptionkey/provost)
additional_hud_types = list(MOB_HUD_FACTION_CMB)
volume = RADIO_VOLUME_CRITICAL

/obj/item/device/radio/headset/almayer/sof
Expand All @@ -1222,6 +1255,7 @@
icon_state = "soc_headset"
frequency = SOF_FREQ
initial_keys = list(/obj/item/device/encryptionkey/soc)
additional_hud_types = list(MOB_HUD_FACTION_WY, MOB_HUD_FACTION_CMB, MOB_HUD_FACTION_TWE)
volume = RADIO_VOLUME_IMPORTANT

/obj/item/device/radio/headset/almayer/sof/survivor_forecon
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm_ship.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
skills = /datum/skills/civilian

minimap_icon = "cl"
minimap_background = "background_civillian"
minimap_background = "background_goon"

/datum/equipment_preset/uscm_ship/liaison/New()
. = ..()
Expand Down

0 comments on commit 517484b

Please sign in to comment.