Choose type of headset from loadout (#10540)

Choose type of headset from loadout
This commit is contained in:
Wowzewow (Wezzy)
2020-11-22 19:45:26 +08:00
committed by GitHub
parent 3704902e64
commit c4ce4dd232
20 changed files with 217 additions and 63 deletions

View File

@@ -65,6 +65,9 @@ var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg, /datum/job/
//PDA choice
var/global/list/pdalist = list("Nothing", "Standard PDA", "Classic PDA", "Rugged PDA", "Slate PDA", "Smart PDA", "Tablet", "Wristbound")
//Headset choice
var/global/list/headsetlist = list("Nothing", "Headset", "Bowman Headset")
// Visual nets
var/list/datum/visualnet/visual_nets = list()
var/datum/visualnet/camera/cameranet = new()

View File

@@ -313,6 +313,7 @@
SearchVar(body_marking_styles_list)
SearchVar(backbaglist)
SearchVar(pdalist)
SearchVar(headsetlist)
SearchVar(exclude_jobs)
SearchVar(visual_nets)
SearchVar(cameranet)

View File

@@ -243,7 +243,8 @@
shoes = /obj/item/clothing/shoes/trauma
mask = /obj/item/clothing/mask/surgical
l_hand = /obj/item/storage/firstaid/adv
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/white
@@ -277,7 +278,8 @@
uniform = /obj/item/clothing/under/rank/pharmacist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
shoes = /obj/item/clothing/shoes/chemist
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
glasses = /obj/item/clothing/glasses/hud/health
backpack = /obj/item/storage/backpack/pharmacy
@@ -292,7 +294,8 @@
uniform = /obj/item/clothing/under/rank/bartender
shoes = /obj/item/clothing/shoes/laceup/all_species
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
id_access = "Service"
@@ -303,7 +306,8 @@
suit = /obj/item/clothing/suit/chef
head = /obj/item/clothing/head/chefhat
shoes = /obj/item/clothing/shoes/laceup/all_species
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
id_access = "Service"
@@ -313,7 +317,8 @@
uniform = /obj/item/clothing/under/rank/janitor
pda = /obj/item/modular_computer/handheld/pda/civilian
shoes = /obj/item/clothing/shoes/galoshes
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
l_pocket = /obj/item/grenade/chem_grenade/cleaner
r_pocket = /obj/item/grenade/chem_grenade/cleaner

View File

@@ -1,3 +1,22 @@
#define OUTFIT_NOTHING 1
#define OUTFIT_BACKPACK 2
#define OUTFIT_SATCHEL 3
#define OUTFIT_SATCHEL_ALT 4
#define OUTFIT_DUFFELBAG 5
#define OUTFIT_MESSENGERBAG 6
#define OUTFIT_TAB_PDA 2
#define OUTFIT_PDA_OLD 3
#define OUTFIT_PDA_RUGGED 4
#define OUTFIT_PDA_SLATE 5
#define OUTFIT_PDA_SMART 6
#define OUTFIT_TABLET 7
#define OUTFIT_WRISTBOUND 8
#define OUTFIT_HEADSET 2
#define OUTFIT_BOWMAN 3
/datum/outfit
var/name = "Naked"
var/collect_not_del = FALSE
@@ -26,6 +45,7 @@
var/r_hand = null
var/id = null
var/pda = null
var/radio = null
// Must be paths, used to allow player-pref backpack choice
var/allow_backbag_choice = FALSE
@@ -40,6 +60,10 @@
var/tablet = /obj/item/modular_computer/handheld/preset/civilian
var/wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian
var/allow_headset_choice = FALSE
var/headset = /obj/item/device/radio/headset
var/bowman = /obj/item/device/radio/headset/alt
var/internals_slot = null //ID of slot containing a gas tank
var/list/backpack_contents = list() //In the list(path=count,otherpath=count) format
var/list/accessory_contents = list()
@@ -52,17 +76,17 @@
if(allow_backbag_choice)
var/use_job_specific = H.backbag_style == TRUE
switch(H.backbag)
if (1)
if (OUTFIT_NOTHING)
back = null
if (2)
if (OUTFIT_BACKPACK)
back = use_job_specific ? backpack : /obj/item/storage/backpack
if (3)
if (OUTFIT_SATCHEL)
back = use_job_specific ? satchel : /obj/item/storage/backpack/satchel_norm
if (4)
if (OUTFIT_SATCHEL_ALT)
back = use_job_specific ? satchel_alt : /obj/item/storage/backpack/satchel
if (5)
if (OUTFIT_DUFFELBAG)
back = use_job_specific ? dufflebag : /obj/item/storage/backpack/duffel
if (6)
if (OUTFIT_MESSENGERBAG)
back = use_job_specific ? messengerbag : /obj/item/storage/backpack/messenger
else
back = backpack //Department backpack
@@ -73,6 +97,17 @@
var/obj/item/storage/backpack/B = H.back
B.autodrobe_no_remove = TRUE
if(allow_headset_choice)
switch(H.headset_choice)
if (OUTFIT_NOTHING)
l_ear = null
if (OUTFIT_BOWMAN)
l_ear = bowman
else
l_ear = headset //Department headset
if(l_ear)
equip_item(H, l_ear, slot_l_ear)
return
// Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del.
@@ -172,11 +207,11 @@
if(allow_pda_choice)
switch(H.pda_choice)
if (1)
if (OUTFIT_NOTHING)
pda = null
if (7)
if (OUTFIT_TABLET)
pda = tablet
if (8)
if (OUTFIT_WRISTBOUND)
pda = wristbound
else
pda = tab_pda
@@ -184,13 +219,13 @@
if(pda && !visualsOnly)
var/obj/item/I = new pda(H)
switch(H.pda_choice)
if(3)
if(OUTFIT_PDA_OLD)
I.icon = 'icons/obj/pda_old.dmi'
if(4)
if(OUTFIT_PDA_RUGGED)
I.icon = 'icons/obj/pda_rugged.dmi'
if(5)
if(OUTFIT_PDA_SLATE)
I.icon = 'icons/obj/pda_slate.dmi'
if(6)
if(OUTFIT_PDA_SMART)
I.icon = 'icons/obj/pda_smart.dmi'
I.update_icon()
H.equip_or_collect(I, slot_wear_id)

View File

@@ -37,7 +37,10 @@
uniform = "suit selection"
shoes = "shoe selection"
l_ear = /obj/item/device/radio/headset
l_ear = list(
/obj/item/device/radio/headset,
/obj/item/device/radio/headset/alt,
)
back = list(
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel_norm,

View File

@@ -31,7 +31,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
uniform = /obj/item/clothing/under/rank/captain
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/caphat
l_ear = /obj/item/device/radio/headset/heads/captain
headset = /obj/item/device/radio/headset/heads/captain
bowman = /obj/item/device/radio/headset/heads/captain/alt
glasses = /obj/item/clothing/glasses/sunglasses
id = /obj/item/card/id/gold
tab_pda = /obj/item/modular_computer/handheld/pda/command/captain
@@ -105,7 +106,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
uniform = /obj/item/clothing/under/rank/head_of_personnel
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/device/radio/headset/heads/hop
headset = /obj/item/device/radio/headset/heads/hop
bowman = /obj/item/device/radio/headset/heads/hop/alt
id = /obj/item/card/id/navy
tab_pda = /obj/item/modular_computer/handheld/pda/command/hop
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/hop

View File

@@ -26,7 +26,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/bartender
tablet = /obj/item/modular_computer/handheld/preset/civilian/bartender
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
/datum/job/chef
@@ -58,7 +59,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian
tablet = /obj/item/modular_computer/handheld/preset/civilian
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
backpack_contents = list(
/obj/item/storage/box/produce = 1
@@ -92,7 +94,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian
tablet = /obj/item/modular_computer/handheld/preset/civilian
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
suit_store = /obj/item/device/analyzer/plant_analyzer
backpack = /obj/item/storage/backpack/hydroponics
@@ -140,7 +143,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/qm
tablet = /obj/item/modular_computer/handheld/preset/supply/qm
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/device/radio/headset/qm
headset = /obj/item/device/radio/headset/qm
bowman = /obj/item/device/radio/headset/qm/alt
l_hand = /obj/item/clipboard
glasses = /obj/item/clothing/glasses/sunglasses
@@ -172,7 +176,8 @@
tablet = /obj/item/modular_computer/handheld/preset/supply
id = /obj/item/card/id/silver
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/device/radio/headset/headset_cargo
headset = /obj/item/device/radio/headset/headset_cargo
bowman = /obj/item/device/radio/headset/headset_cargo/alt
/datum/job/mining
@@ -205,7 +210,8 @@
tablet = /obj/item/modular_computer/handheld/preset/civilian
id = /obj/item/card/id/silver
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_mining
headset = /obj/item/device/radio/headset/headset_mining
bowman = /obj/item/device/radio/headset/headset_mining/alt
l_hand = /obj/item/coin/mining
@@ -247,7 +253,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/janitor
tablet = /obj/item/modular_computer/handheld/preset/civilian/janitor
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
/datum/job/journalist
title = "Corporate Reporter"
@@ -278,7 +285,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian
tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
backpack_contents = list(
/obj/item/clothing/accessory/badge/press = 1
@@ -325,7 +333,8 @@
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian
tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
r_pocket = /obj/item/barcodescanner
l_hand = /obj/item/storage/bag/books

View File

@@ -19,7 +19,8 @@
jobtype = /datum/job/chaplain
uniform = /obj/item/clothing/under/rank/chaplain
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_service
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
tab_pda = /obj/item/modular_computer/handheld/pda/civilian/chaplain
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/chaplain
tablet = /obj/item/modular_computer/handheld/preset/civilian/chaplain

View File

@@ -41,7 +41,8 @@
tablet = /obj/item/modular_computer/handheld/preset/engineering/ce
id = /obj/item/card/id/navy
shoes = /obj/item/clothing/shoes/workboots
l_ear = /obj/item/device/radio/headset/heads/ce
headset = /obj/item/device/radio/headset/heads/ce
bowman = /obj/item/device/radio/headset/heads/ce/alt
r_pocket = /obj/item/device/t_scanner
backpack = /obj/item/storage/backpack/industrial
@@ -96,7 +97,8 @@
tablet = /obj/item/modular_computer/handheld/preset/engineering
id = /obj/item/card/id/silver
shoes = /obj/item/clothing/shoes/workboots
l_ear = /obj/item/device/radio/headset/headset_eng
headset = /obj/item/device/radio/headset/headset_eng
bowman = /obj/item/device/radio/headset/headset_eng/alt
r_pocket = /obj/item/device/t_scanner
backpack = /obj/item/storage/backpack/industrial
@@ -139,7 +141,8 @@
belt = /obj/item/storage/belt/utility
id = /obj/item/card/id/silver
shoes = /obj/item/clothing/shoes/workboots
l_ear = /obj/item/device/radio/headset/headset_eng
headset = /obj/item/device/radio/headset/headset_eng
bowman = /obj/item/device/radio/headset/headset_eng/alt
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel_eng
@@ -185,7 +188,8 @@
shoes = /obj/item/clothing/shoes/orange
head = /obj/item/clothing/head/beret/engineering
belt = /obj/item/storage/belt/utility
l_ear = /obj/item/device/radio/headset/headset_eng
headset = /obj/item/device/radio/headset/headset_eng
bowman = /obj/item/device/radio/headset/headset_eng/alt
belt_contents = list(
/obj/item/weldingtool = 1,

View File

@@ -192,11 +192,13 @@
var/allow_loadout = TRUE
allow_backbag_choice = TRUE
allow_pda_choice = TRUE
allow_headset_choice = TRUE
var/jobtype = null
uniform = /obj/item/clothing/under/color/grey
id = /obj/item/card/id
l_ear = /obj/item/device/radio/headset
headset = /obj/item/device/radio/headset
bowman = /obj/item/device/radio/headset/alt
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/black
tab_pda = /obj/item/modular_computer/handheld/pda/civilian

View File

@@ -36,7 +36,8 @@
suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
suit_store = /obj/item/device/flashlight/pen
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/device/radio/headset/heads/cmo
bowman = /obj/item/device/radio/headset/heads/cmo
headset = /obj/item/device/radio/headset/heads/cmo/alt
tab_pda = /obj/item/modular_computer/handheld/pda/medical/cmo
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/cmo
tablet = /obj/item/modular_computer/handheld/preset/medical/cmo
@@ -93,7 +94,8 @@
uniform = /obj/item/clothing/under/rank/medical
suit = /obj/item/clothing/suit/storage/toggle/labcoat/medical
shoes = /obj/item/clothing/shoes/medical
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
tab_pda = /obj/item/modular_computer/handheld/pda/medical
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical
tablet = /obj/item/modular_computer/handheld/preset/medical
@@ -148,7 +150,8 @@
uniform = /obj/item/clothing/under/rank/pharmacist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
shoes = /obj/item/clothing/shoes/chemist
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
tab_pda = /obj/item/modular_computer/handheld/pda/medical
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical
tablet = /obj/item/modular_computer/handheld/preset/medical
@@ -187,7 +190,8 @@
uniform = /obj/item/clothing/under/rank/psych
suit = /obj/item/clothing/suit/storage/toggle/labcoat/psych
shoes = /obj/item/clothing/shoes/psych
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
tab_pda = /obj/item/modular_computer/handheld/pda/medical/psych
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/psych
tablet = /obj/item/modular_computer/handheld/preset/medical/psych
@@ -224,7 +228,8 @@
uniform = /obj/item/clothing/under/rank/medical/emt
suit = /obj/item/clothing/suit/storage/toggle/emt_jacket
shoes = /obj/item/clothing/shoes/jackboots
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
l_hand = /obj/item/storage/firstaid/adv
r_hand = /obj/item/reagent_containers/hypospray
belt = /obj/item/storage/belt/medical/emt
@@ -260,7 +265,8 @@
uniform = /obj/item/clothing/under/rank/medical/intern
shoes = /obj/item/clothing/shoes/medical
l_ear = /obj/item/device/radio/headset/headset_med
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med

View File

@@ -36,7 +36,8 @@
uniform = /obj/item/clothing/under/rank/research_director
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/device/radio/headset/heads/rd
headset = /obj/item/device/radio/headset/heads/rd
bowman = /obj/item/device/radio/headset/heads/rd/alt
tab_pda = /obj/item/modular_computer/handheld/pda/research/rd
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/research/rd
tablet = /obj/item/modular_computer/handheld/preset/research/rd
@@ -78,7 +79,8 @@
uniform = /obj/item/clothing/under/rank/scientist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
shoes = /obj/item/clothing/shoes/science
l_ear = /obj/item/device/radio/headset/headset_sci
headset = /obj/item/device/radio/headset/headset_sci
bowman = /obj/item/device/radio/headset/headset_sci/alt
tab_pda = /obj/item/modular_computer/handheld/pda/research
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/research
tablet = /obj/item/modular_computer/handheld/preset/research
@@ -153,7 +155,8 @@
uniform = /obj/item/clothing/under/rank/roboticist
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_sci
headset = /obj/item/device/radio/headset/headset_sci
bowman = /obj/item/device/radio/headset/headset_sci/alt
tab_pda = /obj/item/modular_computer/handheld/pda/research
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/research
tablet = /obj/item/modular_computer/handheld/preset/research
@@ -195,7 +198,8 @@
uniform = /obj/item/clothing/under/rank/scientist/intern
shoes = /obj/item/clothing/shoes/science
l_ear = /obj/item/device/radio/headset/headset_sci
headset = /obj/item/device/radio/headset/headset_sci
bowman = /obj/item/device/radio/headset/headset_sci/alt
backpack = /obj/item/storage/backpack/toxins
satchel = /obj/item/storage/backpack/satchel_tox

View File

@@ -34,7 +34,8 @@
uniform = /obj/item/clothing/under/rank/head_of_security
shoes = /obj/item/clothing/shoes/jackboots
l_ear = /obj/item/device/radio/headset/heads/hos
headset = /obj/item/device/radio/headset/heads/hos
bowman = /obj/item/device/radio/headset/heads/hos/alt
tab_pda = /obj/item/modular_computer/handheld/pda/security/hos
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security/hos
tablet = /obj/item/modular_computer/handheld/preset/security/hos
@@ -89,7 +90,8 @@
uniform = /obj/item/clothing/under/rank/warden
shoes = /obj/item/clothing/shoes/jackboots
l_ear = /obj/item/device/radio/headset/headset_warden
headset = /obj/item/device/radio/headset/headset_warden
bowman = /obj/item/device/radio/headset/headset_warden/alt
tab_pda = /obj/item/modular_computer/handheld/pda/security
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security
tablet = /obj/item/modular_computer/handheld/preset/security
@@ -140,7 +142,8 @@
uniform = /obj/item/clothing/under/det
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/headset_sec
headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
tab_pda = /obj/item/modular_computer/handheld/pda/security/detective
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security/detective
tablet = /obj/item/modular_computer/handheld/preset/security/detective
@@ -186,7 +189,8 @@
uniform = /obj/item/clothing/under/det/forensics
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/headset_sec
headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
tab_pda = /obj/item/modular_computer/handheld/pda/security/detective
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security/detective
tablet = /obj/item/modular_computer/handheld/preset/security/detective
@@ -236,7 +240,8 @@
uniform = /obj/item/clothing/under/rank/security
shoes = /obj/item/clothing/shoes/jackboots
l_ear = /obj/item/device/radio/headset/headset_sec
headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
tab_pda = /obj/item/modular_computer/handheld/pda/security
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security
tablet = /obj/item/modular_computer/handheld/preset/security
@@ -283,7 +288,8 @@
suit = /obj/item/clothing/suit/storage/hazardvest/cadet
head = /obj/item/clothing/head/beret/security
shoes = /obj/item/clothing/shoes/jackboots
l_ear = /obj/item/device/radio/headset/headset_sec
headset = /obj/item/device/radio/headset/headset_sec
bowman = /obj/item/device/radio/headset/headset_sec/alt
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec

View File

@@ -169,6 +169,11 @@
icon_state = "srv_headset"
ks2type = /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/headset_service/alt
name = "service radio bowman headset"
icon_state = "srv_headset_alt"
icon_state = "headset_alt"
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
@@ -456,4 +461,4 @@
/obj/item/device/radio/headset/heads/ai_integrated/Destroy()
myAi = null
return ..()
return ..()

View File

@@ -12,6 +12,7 @@
S["backbag"] >> pref.backbag
S["backbag_style"] >> pref.backbag_style
S["pda_choice"] >> pref.pda_choice
S["headset_choice"] >> pref.headset_choice
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
S["all_underwear"] << pref.all_underwear
@@ -19,6 +20,7 @@
S["backbag"] << pref.backbag
S["backbag_style"] << pref.backbag_style
S["pda_choice"] << pref.pda_choice
S["headset_choice"] << pref.headset_choice
/datum/category_item/player_setup_item/general/equipment/gather_load_query()
return list(
@@ -28,7 +30,8 @@
"all_underwear_metadata",
"backbag",
"backbag_style",
"pda_choice"
"pda_choice",
"headset_choice"
),
"args" = list("id")
)
@@ -45,6 +48,7 @@
"backbag",
"backbag_style",
"pda_choice",
"headset_choice",
"id" = 1,
"ckey" = 1
)
@@ -57,6 +61,7 @@
"backbag" = pref.backbag,
"backbag_style" = pref.backbag_style,
"pda_choice" = pref.pda_choice,
"headset_choice" = pref.headset_choice,
"id" = pref.current_character,
"ckey" = PREF_CLIENT_CKEY
)
@@ -66,6 +71,7 @@
pref.backbag = text2num(pref.backbag)
pref.backbag_style = text2num(pref.backbag_style)
pref.pda_choice = text2num(pref.pda_choice)
pref.headset_choice = text2num(pref.headset_choice)
if(istext(pref.all_underwear))
var/before = pref.all_underwear
try
@@ -109,6 +115,7 @@
pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
pref.backbag_style = sanitize_integer(pref.backbag_style, 1, backbagstyles.len, initial(pref.backbag_style))
pref.pda_choice = sanitize_integer(pref.pda_choice, 1, pdalist.len, initial(pref.pda_choice))
pref.headset_choice = sanitize_integer(pref.headset_choice, 1, headsetlist.len, initial(pref.headset_choice))
/datum/category_item/player_setup_item/general/equipment/content(var/mob/user)
. = list()
@@ -127,6 +134,7 @@
. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
. += "Backpack Style: <a href='?src=\ref[src];change_backpack_style=1'><b>[backbagstyles[pref.backbag_style]]</b></a><br>"
. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdalist[pref.pda_choice]]</b></a><br>"
. += "Headset Type: <a href='?src=\ref[src];change_headset=1'><b>[headsetlist[pref.headset_choice]]</b></a><br>"
return jointext(., null)
@@ -165,6 +173,12 @@
pref.pda_choice = pdalist.Find(new_pda)
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_headset"])
var/new_headset = input(user, "Choose your character's headset type:", "Character Preference", headsetlist[pref.headset_choice]) as null|anything in headsetlist
if(!isnull(new_headset) && CanUseTopic(user))
pref.headset_choice = headsetlist.Find(new_headset)
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["change_underwear"])
var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[href_list["change_underwear"]]
if(!UWC)
@@ -186,4 +200,3 @@
return TOPIC_REFRESH_UPDATE_PREVIEW
return ..()

View File

@@ -40,9 +40,10 @@ datum/preferences
var/age = 30 //age of character
var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
var/b_type = "A+" //blood type (not-chooseable)
var/backbag = 2 //backpack type
var/backbag = OUTFIT_BACKPACK //backpack type (defines in outfit.dm)
var/backbag_style = 1
var/pda_choice = 2
var/pda_choice = OUTFIT_TAB_PDA
var/headset_choice = OUTFIT_HEADSET
var/h_style = "Bald" //Hair type
var/hair_colour = "#000000" //Hair colour hex value, for SQL loading
var/r_hair = 0 //Hair color
@@ -469,16 +470,21 @@ datum/preferences
else
all_underwear -= underwear_category_name
if(backbag > 6 || backbag < 1)
backbag = 1 //Same as above
if(backbag > OUTFIT_MESSENGERBAG || backbag < OUTFIT_NOTHING)
backbag = OUTFIT_NOTHING //Same as above
character.backbag = backbag
character.backbag_style = backbag_style
if(pda_choice > 8 || pda_choice < 1)
pda_choice = 2
if(pda_choice > OUTFIT_WRISTBOUND || pda_choice < OUTFIT_NOTHING)
pda_choice = OUTFIT_TAB_PDA
character.pda_choice = pda_choice
if(headset_choice > OUTFIT_BOWMAN || headset_choice < OUTFIT_NOTHING)
headset_choice = OUTFIT_HEADSET
character.headset_choice = headset_choice
if(icon_updates)
character.force_update_limbs()
character.update_mutations(0)

View File

@@ -35,9 +35,10 @@
var/list/all_underwear = list()
var/list/all_underwear_metadata = list()
var/list/hide_underwear = list()
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
var/backbag = OUTFIT_BACKPACK //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
var/backbag_style = 1
var/pda_choice = 2
var/pda_choice = OUTFIT_TAB_PDA
var/headset_choice = OUTFIT_HEADSET
var/last_chew = 0 // Used for hand chewing