diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index a24fdd681b..1fcfda52dd 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -438,6 +438,7 @@ GLOBAL_LIST_EMPTY(text_tag_cache) t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[logo\]", "") t = replacetext(t, "\[redlogo\]", "") t = replacetext(t, "\[sglogo\]", "", "\[cell\]") t = replacetext(t, "", "\[logo\]") t = replacetext(t, "", "\[redlogo\]") + t = replacetext(t, "", "\[talogo\]") t = replacetext(t, "", "\[sglogo\]") t = replacetext(t, "", "\[field\]") t = replacetext(t, "R E D A C T E D", "\[redacted\]") diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 663124552b..5656fdbc8e 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -567,7 +567,7 @@ /obj/item/radio/headset/alt/talon name = "talon bowman headset" adhoc_fallback = TRUE - icon_state = "pilot_headset" + icon_state = "pilot_headset_alt" ks2type = /obj/item/encryptionkey/talon /obj/item/radio/headset/earbud/talon diff --git a/code/modules/admin/news.dm b/code/modules/admin/news.dm index 026571d373..68bdd286fa 100644 --- a/code/modules/admin/news.dm +++ b/code/modules/admin/news.dm @@ -28,7 +28,7 @@ var/new_body = tgui_input_text(src,"Write the body of the news update here. Note: HTML is NOT supported, however paper markup is supported. \n\ Hitting enter will automatically add a line break. \n\ Valid markup includes: \[b\], \[i\], \[u\], \[large\], \[h1\], \[h2\], \[h3\]\ \[*\], \[hr\], \[small\], \[list\], \[table\], \[grid\], \ - \[row\], \[cell\], \[logo\], \[sglogo\].","Write News", body, MAX_MESSAGE_LEN, TRUE, prevent_enter = TRUE) + \[row\], \[cell\], \[logo\], \[talogo\], \[sglogo\].","Write News", body, MAX_MESSAGE_LEN, TRUE, prevent_enter = TRUE) new_body = paper_markup2html(new_body) @@ -78,6 +78,7 @@ text = replacetext(text, "\[row\]", "") text = replacetext(text, "\[cell\]", "") text = replacetext(text, "\[logo\]", "") // Not sure if these would get used but why not + text = replacetext(text, "\[talogo\]", "") text = replacetext(text, "\[sglogo\]", "") return text @@ -115,6 +116,7 @@ text = replacetext(text, "", "\[row\]") text = replacetext(text, "", "\[cell\]") text = replacetext(text, "", "\[logo\]") // Not sure if these would get used but why not + text = replacetext(text, "", "\[talogo\]") text = replacetext(text, "", "\[sglogo\]") return text diff --git a/code/modules/asset_cache/assets/browser.dm b/code/modules/asset_cache/assets/browser.dm index 82f2c1c1ac..b0ed1b3d93 100644 --- a/code/modules/asset_cache/assets/browser.dm +++ b/code/modules/asset_cache/assets/browser.dm @@ -2,6 +2,7 @@ assets = list( "loading.gif" = 'html/images/loading.gif', "ntlogo.png" = 'html/images/ntlogo.png', + "talonlogo.png" = 'html/images/talonlogo.png', "sglogo.png" = 'html/images/sglogo.png', "talisman.png" = 'html/images/talisman.png', "paper_bg.png" = 'html/images/paper_bg.png', diff --git a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm index e788a35095..db19a9ee28 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -708,3 +708,85 @@ "Sleek, sleeveless"=/obj/item/clothing/under/gestalt/sleeveless ) gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +// New Talon Uniforms + +/datum/gear/uniform/talon + display_name = "Talon's Uniforms" + description = "Select from a range of outfits available to all Talon crew." + allowed_roles = list(JOB_TALON_CAPTAIN, JOB_TALON_DOCTOR, JOB_TALON_ENGINEER, JOB_TALON_PILOT, JOB_TALON_GUARD, JOB_TALON_MINER) + path = /obj/item/clothing/under/rank/talon/basic/refreshed + sort_category = "Uniforms" + cost = 1 + +/datum/gear/uniform/talon/New() + ..() + var/list/selector_uniforms = list( + "Refreshed Talon crew Uniform"=/obj/item/clothing/under/rank/talon/basic/refreshed, + "Old Talon crew Uniform"=/obj/item/clothing/under/rank/talon/basic, + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +/datum/gear/uniform/talon_captain + display_name = "Talon - Captain's Uniforms" + description = "Select from a range of outfits available to all Talon Captain." + allowed_roles = list(JOB_TALON_CAPTAIN) + path = /obj/item/clothing/under/rank/talon/command/refreshed + sort_category = "Uniforms" + cost = 1 + +/datum/gear/uniform/talon_captain/New() + ..() + var/list/selector_uniforms = list( + "Refreshed Talon Command Uniform"=/obj/item/clothing/under/rank/talon/command/refreshed, + "Old Talon Command Uniform"=/obj/item/clothing/under/rank/talon/command, + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +/datum/gear/uniform/talon_pilot + display_name = "Talon - Pilot's Uniforms" + description = "Select from a range of outfits available to all Talon Pilot." + allowed_roles = list(JOB_TALON_PILOT) + path = /obj/item/clothing/under/rank/talon/pilot/refreshed + sort_category = "Uniforms" + cost = 1 + +/datum/gear/uniform/talon_pilot/New() + ..() + var/list/selector_uniforms = list( + "Refreshed Talon Pilot Uniform"=/obj/item/clothing/under/rank/talon/pilot/refreshed, + "Old Talon Pilot Uniform"=/obj/item/clothing/under/rank/talon/pilot, + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +/datum/gear/uniform/talon_security + display_name = "Talon - Guard's Uniforms" + description = "Select from a range of outfits available to all Talon Guard." + allowed_roles = list(JOB_TALON_GUARD) + path = /obj/item/clothing/under/rank/talon/security/refreshed + sort_category = "Uniforms" + cost = 1 + +/datum/gear/uniform/talon_security/New() + ..() + var/list/selector_uniforms = list( + "Refreshed Talon Guard Uniform"=/obj/item/clothing/under/rank/talon/security/refreshed, + "Old Talon Security Uniform"=/obj/item/clothing/under/rank/talon/security, + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) + +/datum/gear/uniform/talon_medical + display_name = "Talon - Doctor's Uniforms" + description = "Select from a range of outfits available to all Talon Doctor." + allowed_roles = list(JOB_TALON_DOCTOR) + path = /obj/item/clothing/under/rank/talon/proper/refreshed + sort_category = "Uniforms" + cost = 1 + +/datum/gear/uniform/talon_medical/New() + ..() + var/list/selector_uniforms = list( + "Refreshed Talon Doctor Uniform"=/obj/item/clothing/under/rank/talon/proper/refreshed, + "Old Talon Doctor Uniform"=/obj/item/clothing/under/rank/talon/proper, + ) + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm index 6b2719ebb2..7ca9ec028b 100644 --- a/code/modules/clothing/head/hood_vr.dm +++ b/code/modules/clothing/head/hood_vr.dm @@ -39,6 +39,13 @@ desc = "A cozy winter hood attached to a heavy winter jacket." icon_state = "winterhood_talon" +/obj/item/clothing/head/hood/winter/talon/refreshed + name = "Refreshed Talon winter hood" + desc = "A cozy winter hood attached to a heavy winter jacket." + icon = 'icons/inventory/head/item.dmi' + default_worn_icon = 'icons/inventory/head/mob.dmi' + icon_state = "winterhoodr_talon" + // Centcom Winter Hood /obj/item/clothing/head/hood/winter/centcom name = "centcom winter hood" diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index d36cd3e511..2167fdbda0 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -127,18 +127,60 @@ icon_state = "talon_captain_cap" item_state = "taloncaptaincap" +/obj/item/clothing/head/soft/talon/refreshed + name = "Talon cap" + desc = "It's a standard dark blue baseball cap, it has the ITV Talon logo on the front proudly displayed." + icon = 'icons/inventory/head/item.dmi' + icon_override = 'icons/inventory/head/mob.dmi' + icon_state = "talonnewsoft" + item_state = "talonnewsoft" + item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft") + +/obj/item/clothing/head/caphat/talon/refreshed + name = "Talon captain's peaked cap" + desc = "It's a parade cap usually worn by the ITV Talon's commanding officer, it displays power and discipline to whoever wears it." + icon = 'icons/inventory/head/item.dmi' + icon_override = 'icons/inventory/head/mob.dmi' + icon_state = "talon_caphat" + item_state = "talon_caphat" + +/obj/item/clothing/head/caphat/talon/pilot + name = "Talon pilot's cap" + desc = "It's a formal cap worn usually by ITV Talon's piloting personnel, emblazoned with the ITV Talon's logo on the front of the cap." + icon = 'icons/inventory/head/item.dmi' + icon_override = 'icons/inventory/head/mob.dmi' + icon_state = "talon_pilothat" + item_state = "talon_pilothat" + /obj/item/clothing/head/beret/talon name = "Talon beret" desc = "It's a basic beret colored to match ITV Talon's uniforms." icon_state = "beret_talon" item_state = "baret_talon" +/obj/item/clothing/head/beret/talon/refreshed + name = "Talon beret" + desc = "It's a standard dark blue beret with nothing especially interesting on it." + icon = 'icons/inventory/head/item.dmi' + icon_override = 'icons/inventory/head/mob.dmi' + icon_state = "talon_beret" + item_state = "talon_beret" + /obj/item/clothing/head/beret/talon/command name = "Talon officer beret" desc = "It's a basic beret colored to match ITV Talon's uniforms with a badge pinned on the front. Perfect for commanders." icon_state = "beret_talon_officer" item_state = "baret_talon_command" + +/obj/item/clothing/head/beret/talon/command/refreshed + name = "Talon officer beret" + desc = "It's a standard dark blue beret with the ITV Talon logo on the front proudly displayed." + icon = 'icons/inventory/head/item.dmi' + icon_override = 'icons/inventory/head/mob.dmi' + icon_state = "talon_officer_beret" + item_state = "talon_officer_beret" + // tiny tophat /obj/item/clothing/head/tinytophat diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 79965228f5..5735af76ea 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -93,6 +93,14 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon +/obj/item/clothing/suit/storage/hooded/wintercoat/talon/refreshed + name = "Refreshed Talon winter coat" + desc = "A refreshed cozy winter coat, covered in thick fur and baring the colors of ITV Talon." + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' + icon_state = "taloncoatr" + hoodtype = /obj/item/clothing/head/hood/winter/talon/refreshed + // Food costumes /obj/item/clothing/suit/storage/hooded/foodcostume //Separate type of costume that does not cover arms and legs. Similar to a cheap mascot costume. name = DEVELOPER_WARNING_NAME diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index fe3930a2e2..451a05ffd6 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -121,3 +121,11 @@ name = "golden plague doctor suit" desc = "If it worked then, it works now. This classic design comes in gold." icon_state = "plaguedoctor2" + +/obj/item/clothing/suit/storage/toggle/labcoat/talon + name = "Talon labcoat" + desc = "A large, and extremely sterile labcoat that protects the wearer from chemical spills. This one has ITV Talon colored patterns along the labcoat, the designated shapes list it as a medical officer's labcoat." + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' + icon_state = "talon_labcoat" + item_state_slots = list(slot_r_hand_str = "talon_labcoat", slot_l_hand_str = "talon_labcoat") diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 37ea24745d..190ee904e5 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1134,3 +1134,29 @@ desc = "For the spiritual rebels that nevertheless wish to conform to standard goth trends. You're totally showing them your anti-authority spunk." icon_state = "punkvest" body_parts_covered = CHEST|ARMS + +// Talon jacket +/obj/item/clothing/suit/storage/talonbomberjacket + name = "Talon pilot bomber jacket" + desc = "A blue bomber jacket worn by the ITV Talon's piloting personnel, it has a nametag on the breast, it's incredibly warm, and comfortable. The collar and wrists consists of synthetic fur." + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' + icon_state = "talon_pilotjacket" + item_state = "talon_pilotjacket" + allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SUIT_REGULATORS) + body_parts_covered = UPPER_TORSO|ARMS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|ARMS + min_cold_protection_temperature = T0C - 20 + siemens_coefficient = 0.7 + +/obj/item/clothing/suit/storage/talonbomberjacket/captain + name = "Talon captain's coat" + desc = "A heavy coat worn by the ITV Talon's commanding officer, it has a nametag and ITV Talon logo on the breasts, it's incredibly snug to wear. The collar consists of genuine fur." + icon = 'icons/inventory/suit/item.dmi' + default_worn_icon = 'icons/inventory/suit/mob.dmi' + icon_state = "talon_capcoat" + item_state = "talon_capcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER + hoodtype = null diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index beabe3ab2c..6edea3c81e 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -305,6 +305,14 @@ rolled_down_icon_override = FALSE rolled_sleeves_icon_override = FALSE +/obj/item/clothing/under/rank/talon/basic/refreshed + name = "Talon jumpsuit" + desc = "A expertly made and stretchy jumpsuit that was made for manueverability in mind. It has a belt with a silver belt buckle on the uniform. There is also a ITV Talon patch on the right shoulder, and an empty velcro spot for another patch on the left shoulder. Snazzy and beneficial." + icon = 'icons/inventory/uniform/item.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' + icon_state = "talon_basic_refreshed" + item_state = "talon_basic_refreshed" + /obj/item/clothing/under/rank/talon/proper name = "Talon proper jumpsuit" desc = "A neat and proper uniform for a proper private ship." @@ -314,6 +322,14 @@ rolled_down_icon_override = FALSE rolled_sleeves_icon_override = FALSE +/obj/item/clothing/under/rank/talon/proper/refreshed + name = "Talon medical jumpsuit" + desc = "A expertly made and stretchy jumpsuit that was made for manueverability in mind. It has a belt with a silver belt buckle on the uniform. There is also a ITV Talon patch on the right shoulder, and a white medical ensignia patch on the left shoulder. Snazzy and beneficial." + icon = 'icons/inventory/uniform/item.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' + icon_state = "talon_jumpsuit_refreshed" + item_state = "talon_jumpsuit_refreshed" + /obj/item/clothing/under/rank/talon/security name = "Talon security jumpsuit" desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit that bares security markings." @@ -323,6 +339,14 @@ rolled_down_icon_override = FALSE rolled_sleeves_icon_override = FALSE +/obj/item/clothing/under/rank/talon/security/refreshed + name = "Talon security jumpsuit" + desc = "A expertly made and stretchy jumpsuit that was made for manueverability in mind. It has a belt with a silver belt buckle on the uniform. There is also a ITV Talon patch on the right shoulder, and a red security ensignia patch on the left shoulder. Snazzy and beneficial." + icon = 'icons/inventory/uniform/item.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' + icon_state = "talon_security_refreshed" + item_state = "talon_security_refreshed" + /obj/item/clothing/under/rank/talon/pilot name = "Talon pilot jumpsuit" desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit. Made from cushioned fabric to handle intense flight." @@ -332,6 +356,14 @@ rolled_down_icon_override = FALSE rolled_sleeves_icon_override = FALSE +/obj/item/clothing/under/rank/talon/pilot/refreshed + name = "Talon pilot uniform" + desc = "A formal uniform woven with luscious fabric to make a excellent uniform for the ITV Talon piloting personnel, it's comfortable for all occasions. It has a silver nametag on the chest." + icon = 'icons/inventory/uniform/item.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' + icon_state = "talon_pilot_refreshed" + item_state = "talon_pilot_refreshed" + /obj/item/clothing/under/rank/talon/command name = "Talon command jumpsuit" desc = "A commanding jumpsuit fit for a commanding officer." @@ -341,6 +373,14 @@ rolled_down_icon_override = FALSE rolled_sleeves_icon_override = FALSE +/obj/item/clothing/under/rank/talon/command/refreshed + name = "Talon command uniform" + desc = "A luxurious formal uniform woven with exotic fabric to make a excellent uniform for an ITV Talon commanding officer, it's comfortable for all occasions. It displays golden patterns and designs along the uniform to designate their stature, it has a golden nametag on the chest." + icon = 'icons/inventory/uniform/item.dmi' + icon_override = 'icons/inventory/uniform/mob.dmi' + icon_state = "talon_captain_refreshed" + item_state = "talon_captain_refreshed" + // Excelsior uniforms /obj/item/clothing/under/excelsior name = "\improper Excelsior uniform" diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 02f18a65d4..976136fa25 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -101,6 +101,7 @@ \[row\] - New table row. \[cell\] - New table cell. \[logo\] - Inserts NT logo image. + \[talogo\] - Inserts Talon company logo image. \[redlogo\] - Inserts red NT logo image. \[sglogo\] - Inserts Solgov insignia image."} diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 75bffc92e5..4423ce5cd6 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -40,7 +40,7 @@ var/originhash = md5("[origin]") var/timehash = copytext(md5("[world.time]"),1,10) var/text = null - var/logo = tgui_alert(usr, "Do you want the header of your fax to have a NanoTrasen, SolGov, or Trader logo?","Fax Logo",list("NanoTrasen","SolGov","Trader")) //VOREStation Add - Trader + var/logo = tgui_alert(usr, "Do you want the header of your fax to have a NanoTrasen, SolGov, Talon or Trader logo?","Fax Logo",list("NanoTrasen","SolGov", "Talon", "Trader")) //VOREStation Add - Trader if(!logo) return if(logo == "SolGov") @@ -48,6 +48,8 @@ //VOREStation Edit/Add else if(logo == "NanoTrasen") logo = 'html/images/ntlogo.png' + else if(logo == "Talon") + logo = 'html/images/talonlogo.png' else logo = 'html/images/trader.png' //VOREStation Edit/Add End diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 14f0d1dd2f..48dd87da52 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -1,5 +1,5 @@ GLOBAL_LIST_EMPTY_TYPED(allfaxes, /obj/machinery/photocopier/faxmachine) -var/list/admin_departments = list("[using_map.boss_name]", "Virgo-Prime Governmental Authority", "Virgo-Erigonne Job Boards", "Supply") +var/list/admin_departments = list("[using_map.boss_name]", "Virgo-Prime Governmental Authority", "Virgo-Erigonne Job Boards", "Supply", "Talon Headquarters") GLOBAL_LIST_EMPTY(alldepartments) GLOBAL_VAR(last_fax_role_request) @@ -388,6 +388,8 @@ Extracted to its own procedure for easier logic handling with paper bundles. message_admins(sender, "VIRGO GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") else if(destination == "Supply") message_admins(sender, "[uppertext(using_map.boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519") + else if(destination == "Talon Headquarters") + message_admins(sender, "TALON HEADQUARTERS FAX", rcvdcopy, "CentComFaxReply", "#e96046") else message_admins(sender, "[uppertext(destination)] FAX", rcvdcopy, "UNKNOWN") diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4427cf6dab..9bcdf2cf65 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -352,6 +352,7 @@ t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[/cell\]", "") t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[talogo\]", "") t = replacetext(t, "\[sglogo\]", "") t = replacetext(t, "\[trlogo\]", "") // t = replacetext(t, "\[pclogo\]", "") // Not available on virgo @@ -371,6 +372,7 @@ t = replacetext(t, "\[/cell\]", "") t = replacetext(t, "\[/row\]", "") t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[talogo\]", "") t = replacetext(t, "\[sglogo\]", "") t = "[t]" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 44119ac55c..13531b5b8f 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -216,6 +216,8 @@ for (var/j = 1, j <= min(temp_overlays.len, copy.ico.len), j++) //gray overlay onto the copy if (findtext(copy.ico[j], "cap") || findtext(copy.ico[j], "cent")) img = image('icons/obj/bureaucracy.dmi', "paper_stamp-circle") + else if (findtext(copy.ico[j], "tal")) + img = image('icons/obj/bureaucracy.dmi', "paper_stamp-square") else if (findtext(copy.ico[j], "deny")) img = image('icons/obj/bureaucracy.dmi', "paper_stamp-x") else diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 0dc479d65c..fcc8025384 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -44,6 +44,10 @@ name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" +/obj/item/stamp/talon + name = "talon's rubber stamp" + icon_state = "stamp-tal" + /obj/item/stamp/denied name = "\improper DENIED rubber stamp" icon_state = "stamp-deny" diff --git a/html/images/talonlogo.png b/html/images/talonlogo.png new file mode 100644 index 0000000000..121aaf7865 Binary files /dev/null and b/html/images/talonlogo.png differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 9e8656c30a..972a019f64 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index f73c0b2d40..45c1ed83a4 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index f96c024f26..5580aa3502 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index aefef387b7..826dd561f1 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index bbe223e80f..b946302bfa 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index f9bfa7e783..2dd9b2fdf2 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 6ca44f0ddf..b879b1874f 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index f83ad770bd..f396a86488 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 547e80c333..6586acc31c 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -144,6 +144,17 @@ GLOBAL_LIST_EMPTY(latejoin_talon) /obj/machinery/telecomms/allinone/talon freq_listening = list(PUB_FREQ, TALON_FREQ) +/obj/item/paper/secret_vendornote + name = "secret note" + info = {"well, if you're reading this note, then I've managed to install, a couple of funny things inside the vending machine.
\ +these things are there as a funny reminder that ITV Talon was once a more weaponized ship.
\ +to be honest, looking at the previous concept of the ship, it looks funny and more dangerous for those who want to fight with it.
\ +however, now it has lost that belligerence and has become a merchant ship.
\ +it's not bad and cool, but it's a pity that there's almost nothing left about the memories of the last ship, but I hope to fix it by adding this machete, which the crew used to have by default as a sign of recognition and a small reminder of the last ship.
\ +so... Use it wisely and good luck!
\ +
\ +mysterious creator of the vending machine"} + /obj/item/paper/talon_shields name = "to whatever asshole" info = {"to whatever asshole keeps resetting the shield generator,
\ @@ -376,7 +387,12 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/storage/backpack/dufflebag/captain, + /obj/item/clothing/head/beret/talon/command, + /obj/item/clothing/head/beret/talon/command/refreshed, /obj/item/clothing/suit/storage/vest, + /obj/item/clothing/head/helmet, + /obj/item/clothing/accessory/solgov/department/command/army, + /obj/item/clothing/glasses/omnihud/all, /obj/item/melee/telebaton, /obj/item/flash, /obj/item/radio/headset/talon, @@ -394,7 +410,9 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/clothing/suit/armor/pcarrier/light, + /obj/item/clothing/head/helmet, /obj/item/clothing/under/utility, + /obj/item/clothing/head/soft/talon, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/handcuffs = 2, @@ -403,8 +421,10 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/flash, /obj/item/flashlight/maglight, /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/accessory/holster/waist, /obj/item/storage/belt/security, /obj/item/radio/headset/talon, + /obj/item/clothing/head/beret/talon/refreshed, /obj/item/clothing/accessory/solgov/department/security/army, /obj/item/clothing/head/helmet/space/void/refurb/marine/talon, /obj/item/clothing/suit/space/void/refurb/marine/talon, @@ -422,7 +442,9 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/clothing/under/rank/medical, /obj/item/clothing/under/rank/nurse, + /obj/item/clothing/head/soft/talon, /obj/item/clothing/under/rank/orderly, + /obj/item/clothing/accessory/solgov/department/medical/army, /obj/item/clothing/suit/storage/toggle/labcoat/modern, /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/shoes/white, @@ -441,6 +463,8 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, + /obj/item/clothing/accessory/solgov/department/engineering/army, + /obj/item/clothing/glasses/omnihud/eng/meson, /obj/item/flashlight, /obj/item/extinguisher, /obj/item/clamp, @@ -463,6 +487,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/material/knife/tacknife/survival, + /obj/item/clothing/accessory/solgov/department/service/army, /obj/item/clothing/head/pilot, /obj/item/clothing/under/rank/pilot1, /obj/item/clothing/suit/storage/toggle/bomber/pilot, @@ -490,6 +515,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/radio/headset/talon, + /obj/item/clothing/accessory/solgov/department/supply/army, /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, /obj/item/clothing/suit/space/void/refurb/mining/talon, /obj/item/tank/oxygen, @@ -524,6 +550,37 @@ personally I recommend using the ship's boat if you need to evacuate, but if you req_log_access = ACCESS_TALON_MEDICAL has_logs = 1 +/obj/machinery/vending/talondrobe + name = "Talon Uniforms official" + desc = "Created for those who want to look the latest in Talon fashion!" + product_slogans = "TALON - Trading Any Location On Navigation" + description_fluff = "The vending machine is designed to store and dispense various types of uniforms for the crew of Talon ships." + product_ads = "It's time to try something new or take a proven old one!;The seller should always look beautiful.;Did you feel cold? Don't forget to take a bomber jacket for yourself!" + icon_state = "talondrobe" + req_access = list(ACCESS_TALON) + products = list(/obj/item/clothing/head/soft/talon = 10, + /obj/item/clothing/head/soft/talon/refreshed = 10, + /obj/item/clothing/suit/storage/hooded/wintercoat/talon = 10, + /obj/item/clothing/suit/storage/hooded/wintercoat/talon/refreshed = 10, + /obj/item/clothing/head/beret/talon = 10, + /obj/item/clothing/head/beret/talon/refreshed = 10, + /obj/item/clothing/suit/storage/toggle/hoodie/talon = 10, + /obj/item/clothing/under/rank/talon/basic = 10, + /obj/item/clothing/under/rank/talon/basic/refreshed = 10, + /obj/item/clothing/suit/storage/toggle/labcoat/talon = 10, + /obj/item/storage/backpack/messenger/talon = 10, + /obj/item/storage/backpack/talon = 10, + /obj/item/storage/backpack/satchel/talon = 10, + /obj/item/storage/backpack/dufflebag/talon = 10, + /obj/item/radio/headset/talon = 10, + /obj/item/radio/headset/alt/talon = 10) + contraband = list(/obj/item/paper/secret_vendornote = 1, + /obj/item/clothing/accessory/holster/machete = 1, + /obj/item/material/knife/machete = 1) + req_log_access = ACCESS_TALON + has_logs = 1 + can_rotate = 0 + /////////////////////////// //// Computers // Talon helmet cameras diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 356c861817..b3031f7b4d 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -228,6 +228,7 @@ dir = 4 }, /obj/machinery/camera/network/talon, +/obj/structure/closet/walllocker_double/emergency_engi/north, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/port) "az" = ( @@ -292,12 +293,6 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) -"aF" = ( -/obj/structure/closet/walllocker_double/emergency_engi/west{ - dir = 2 - }, -/turf/simulated/wall/shull, -/area/talon_v2/gen_store) "aG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -360,7 +355,6 @@ /area/talon_v2/engineering/star_store) "aM" = ( /obj/structure/table/rack/steel, -/obj/item/clothing/shoes/magboots, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -603,24 +597,12 @@ /obj/item/gun/energy/gun, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) -"bk" = ( -/obj/structure/closet/walllocker_double/emergency_engi/west{ - dir = 2 - }, -/turf/simulated/wall/shull, -/area/talon_v2/workroom) "bl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/walllocker_double/emergency_engi/west, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"bm" = ( -/obj/structure/closet/walllocker_double/emergency_engi/west{ - dir = 1 - }, -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/med_room) "bn" = ( /obj/structure/hull_corner{ dir = 4 @@ -653,12 +635,6 @@ /obj/item/bedsheet/red, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/sec_room) -"bq" = ( -/obj/structure/closet/walllocker_double/emergency_engi/west{ - dir = 4 - }, -/turf/simulated/wall/rshull, -/area/talon_v2/crew_quarters/bar) "br" = ( /obj/structure/flora/pottedplant/fern, /obj/machinery/holoposter{ @@ -667,6 +643,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) +"bs" = ( +/obj/structure/closet/walllocker_double/emergency_engi/east, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) "bt" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -685,6 +665,23 @@ }, /turf/simulated/floor/plating, /area/talon_v2/crew_quarters/bar) +"bu" = ( +/obj/structure/closet/walllocker_double/emergency_engi/west, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"bv" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/holster/waist, +/obj/item/clothing/accessory/holster/waist, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"bw" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/closet/walllocker_double/emergency_engi/east, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) "bx" = ( /obj/structure/trash_pile, /obj/machinery/camera/network/talon, @@ -693,6 +690,10 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) +"by" = ( +/obj/structure/closet/walllocker_double/emergency_engi/west, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) "bz" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -707,6 +708,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/port) +"bA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) "bB" = ( /obj/structure/railing/grey, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -737,6 +747,30 @@ }, /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_port) +"bD" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock{ + name = "Talon Cryo"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"bE" = ( +/turf/simulated/wall/shull, +/area/talon_v2/eva_storage) +"bF" = ( +/obj/machinery/cryopod/talon, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "bG" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -745,6 +779,9 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_port) +"bH" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/eva_storage) "bI" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -785,6 +822,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_starboard) +"bL" = ( +/obj/machinery/cryopod/robot/talon, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "bM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -802,6 +846,14 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) +"bO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/closet/walllocker_double/emergency_engi/east, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) "bP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -826,6 +878,28 @@ /obj/structure/closet/walllocker/medical/south, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/crew_quarters/restrooms) +"bR" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"bS" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) "bT" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/empty/phoron, @@ -840,6 +914,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) +"bV" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28; + nightshift_lights = 1 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "bW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -870,6 +956,14 @@ }, /turf/simulated/wall/shull, /area/talon_v2/crew_quarters/bar) +"ca" = ( +/obj/structure/closet/walllocker_double/emergency_engi/west, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"cb" = ( +/obj/structure/closet/walllocker_double/emergency_engi/east, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) "cc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -886,11 +980,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) -"ce" = ( -/obj/machinery/cryopod/talon, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) "cf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1341,9 +1430,30 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "dN" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/void/refurb/talon, -/obj/item/clothing/head/helmet/space/void/refurb/talon, +/obj/structure/table/steel, +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/obj/item/clothing/accessory/talon{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/accessory/talon{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/accessory/talon{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/accessory/talon{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/accessory/talon{ + pixel_x = 4; + pixel_y = 7 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "dO" = ( @@ -1778,6 +1888,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/closet/walllocker_double/emergency_engi/north, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/star) "fb" = ( @@ -1798,9 +1909,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) "fd" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, +/obj/machinery/vending/talondrobe, +/obj/machinery/camera/network/talon, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "ff" = ( @@ -1844,6 +1954,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/closet/walllocker_double/emergency_engi/east, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) "fj" = ( @@ -1940,6 +2051,7 @@ icon_state = "4-8" }, /obj/machinery/light, +/obj/item/clothing/head/caphat/talon/refreshed, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/cap_room) "fA" = ( @@ -2024,16 +2136,13 @@ /obj/structure/railing/grey{ dir = 1 }, -/obj/machinery/oxygen_pump{ - dir = 4; - pixel_x = 30 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/structure/handrail{ dir = 8 }, +/obj/structure/closet/walllocker_double/emergency_engi/east, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) "fV" = ( @@ -3578,6 +3687,7 @@ icon_state = "4-8" }, /obj/structure/flora/pottedplant/mysterious, +/obj/structure/closet/walllocker_double/emergency_engi/south, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) "lD" = ( @@ -3626,7 +3736,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "lK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -3818,9 +3928,6 @@ icon_state = "1-4" }, /obj/structure/catwalk, -/obj/structure/closet/walllocker_double/emergency_engi/west{ - dir = 4 - }, /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_starboard) "mr" = ( @@ -4915,10 +5022,8 @@ /turf/simulated/floor/tiled/techfloor, /area/talon_v2/brig) "qo" = ( -/obj/machinery/cryopod/talon{ - dir = 4 - }, /obj/machinery/camera/network/talon, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) "qq" = ( @@ -4937,7 +5042,6 @@ /turf/simulated/wall/shull, /area/talon_v2/crew_quarters/med_room) "qs" = ( -/obj/effect/landmark/talon, /obj/structure/handrail, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) @@ -5092,18 +5196,6 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/eng_room) -"qO" = ( -/obj/machinery/cryopod/robot/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"qP" = ( -/obj/effect/landmark/talon, -/obj/structure/handrail, -/obj/machinery/computer/cryopod{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) "qQ" = ( /obj/effect/floor_decal/industrial/loading{ dir = 4 @@ -5321,10 +5413,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, +/obj/structure/closet/walllocker_double/emergency_engi/west, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_starboard) "rS" = ( @@ -6601,7 +6690,7 @@ pixel_x = 26 }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "wi" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/ext_door, @@ -7068,9 +7157,8 @@ /turf/simulated/floor/plating, /area/talon_v2/maintenance/wing_starboard) "xP" = ( -/obj/structure/closet/walllocker/emerglocker/west, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/secure_storage) @@ -7118,11 +7206,8 @@ /area/talon_v2/engineering/starboard) "xZ" = ( /obj/structure/closet/walllocker/emerglocker/east, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "ya" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/electrical, @@ -7399,15 +7484,19 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "yY" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/helmet/space/void/refurb/talon, +/obj/item/clothing/suit/space/void/refurb/talon, +/obj/item/clothing/shoes/magboots, +/obj/item/tank/oxygen, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "yZ" = ( /obj/machinery/alarm/talon{ dir = 4; @@ -7448,14 +7537,17 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/port) "zj" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/suit/space/void/refurb/talon, -/obj/item/clothing/head/helmet/space/void/refurb/talon, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "zk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7546,12 +7638,14 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/eng_room) "zB" = ( -/obj/structure/table/rack/shelf/steel, +/obj/machinery/camera/network/talon, +/obj/structure/table/rack/steel, /obj/item/clothing/suit/space/void/refurb/talon, /obj/item/clothing/head/helmet/space/void/refurb/talon, -/obj/machinery/camera/network/talon, +/obj/item/clothing/shoes/magboots, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "zC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -7753,11 +7847,31 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/mine_room) "Az" = ( -/obj/structure/table/rack/steel, -/obj/item/suit_cooling_unit, -/obj/item/suit_cooling_unit, +/obj/structure/table/steel, +/obj/machinery/light_switch{ + pixel_x = -5; + pixel_y = 26 + }, +/obj/item/bluespaceradio/talon_prelinked{ + pixel_y = 10 + }, +/obj/item/radio/off{ + channels = list("Talon" = 1); + pixel_x = -6 + }, +/obj/item/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/radio/off{ + channels = list("Talon" = 1); + pixel_x = 5 + }, +/obj/item/radio/off{ + channels = list("Talon" = 1); + pixel_x = 10 + }, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "AB" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -7818,15 +7932,7 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering) "AN" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, +/obj/structure/closet/walllocker_double/hydrant/west, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "AO" = ( @@ -7847,11 +7953,12 @@ /turf/simulated/floor/plating, /area/talon_v2/central_hallway/fore) "AQ" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/secure_storage) "AS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7911,9 +8018,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) "Ba" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/suit_cooling_unit, -/obj/item/tank/oxygen, +/obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "Bb" = ( @@ -7950,15 +8055,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/wing_starboard) -"Bi" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/void/refurb/talon, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) "Bj" = ( /obj/machinery/light/small{ dir = 8 @@ -7987,34 +8083,17 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/bridge) "Bt" = ( -/obj/structure/table/steel, -/obj/item/radio/off{ - channels = list("Talon" = 1); - pixel_y = 6 - }, -/obj/item/radio/off{ - channels = list("Talon" = 1); - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/radio/off{ - channels = list("Talon" = 1); - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/radio/off{ - channels = list("Talon" = 1) - }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "Bu" = ( /obj/machinery/alarm/talon{ dir = 1; pixel_y = -25 }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "Bv" = ( /obj/machinery/light/small{ dir = 8 @@ -8181,7 +8260,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "Cd" = ( /obj/structure/closet/secure_closet/talon_pilot, /obj/item/radio/off{ @@ -8374,9 +8453,17 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) "CP" = ( -/obj/machinery/suit_cycler/vintage/tcrew, +/obj/structure/table/rack/steel, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "CR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8415,11 +8502,18 @@ pixel_y = -24 }, /obj/structure/table/standard, -/obj/item/paper_bin, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 2 + }, /obj/item/pen, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/item/stamp/talon{ + pixel_x = -6; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/workroom) "CX" = ( @@ -8454,13 +8548,11 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/hangar) "Dk" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 - }, +/obj/structure/closet/walllocker_double/north, +/obj/item/instrument/guitar, +/obj/item/instrument/piano_synth, +/obj/item/instrument/eguitar, +/obj/item/instrument/violin, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) "Dl" = ( @@ -8901,12 +8993,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_port) -"ES" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) "ET" = ( /obj/structure/railing/grey, /obj/machinery/light{ @@ -8945,10 +9031,14 @@ /turf/simulated/floor/reinforced/airless, /area/talon_v2/maintenance/aft_starboard) "Fc" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/tank/oxygen, -/obj/item/tank/oxygen, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/landmark/talon, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/emblem/talon, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/secure_storage) "Fd" = ( /obj/structure/disposalpipe/segment{ @@ -9282,6 +9372,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/holoposter{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/port) "Ga" = ( @@ -9757,7 +9851,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "HD" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -10692,7 +10786,7 @@ /obj/structure/table/rack/shelf/steel, /obj/item/radio/off{ channels = list("Talon" = 1); - pixel_y = 6 + pixel_x = 10 }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) @@ -10707,8 +10801,14 @@ /turf/simulated/wall/shull, /area/talon_v2/maintenance/fore_port) "KC" = ( -/obj/structure/closet/walllocker_double/hydrant/west, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/cryopod/talon{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "KE" = ( /obj/structure/cable/green{ @@ -11300,9 +11400,6 @@ /obj/machinery/vending/medical_talon{ dir = 4 }, -/obj/structure/closet/walllocker_double/emergency_engi/west{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) "Mm" = ( @@ -11818,7 +11915,7 @@ /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/plating, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "NZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12306,15 +12403,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) -"PB" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = 24 - }, -/obj/item/storage/backpack/dufflebag/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "PC" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/recharger/wallcharger{ @@ -12608,9 +12696,9 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/bridge) "QD" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/suit_cycler/vintage/tcrew, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "QE" = ( /turf/simulated/wall/rshull, /area/talon_v2/central_hallway/fore) @@ -13064,20 +13152,16 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) "So" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 +/obj/effect/catwalk_plated/techmaint, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plating, /area/talon_v2/central_hallway/port) "Sr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13427,6 +13511,7 @@ /turf/simulated/wall/rshull, /area/shuttle/talonboat) "Tw" = ( +/obj/effect/floor_decal/emblem/talon, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) "Tz" = ( @@ -13452,7 +13537,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "TD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14011,10 +14096,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, +/obj/structure/closet/walllocker_double/emergency_engi/east, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_port) "Vx" = ( @@ -14280,6 +14362,12 @@ /turf/simulated/floor/reinforced/airless, /area/space) "Wm" = ( +/obj/effect/landmark/talon, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/secure_storage) "Wo" = ( @@ -14707,10 +14795,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/reagent_containers/food/drinks/glass2/coffeemug/talon{ - pixel_x = 6; - pixel_y = -1 - }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) "XO" = ( @@ -14773,6 +14857,7 @@ /obj/structure/bed/chair/bay/chair{ dir = 4 }, +/obj/machinery/light, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) "XW" = ( @@ -15131,11 +15216,17 @@ /obj/machinery/power/apc/talon{ dir = 1; name = "north bump"; - pixel_y = 28 + pixel_y = 28; + nightshift_lights = 1 }, /obj/structure/table/rack/steel, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "YY" = ( /obj/machinery/autolathe, /turf/simulated/floor/tiled/techfloor, @@ -15225,9 +15316,12 @@ /area/talon_v2/engineering/port_store) "Zm" = ( /obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/space/void/refurb/talon, /obj/item/clothing/head/helmet/space/void/refurb/talon, +/obj/item/clothing/shoes/magboots, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "Zn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15353,8 +15447,10 @@ /turf/simulated/floor/reinforced/airless, /area/space) "ZF" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/tank/jetpack/carbondioxide, +/obj/machinery/cryopod/robot/talon, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "ZH" = ( @@ -22053,7 +22149,7 @@ OQ GH uS AE -aF +OQ OR xd Nl @@ -23051,7 +23147,7 @@ Dd nK Si Oj -PB +PC WZ Mi go @@ -23184,14 +23280,14 @@ XG XG vY db -ZF -Wm +bV +bR Fc Wm AQ -Dd +bD So -Si +bA Oj PC OP @@ -23327,9 +23423,9 @@ db db db dN -Wm -Wm -Wm +bS +bL +bF Ba Dd FO @@ -23468,11 +23564,11 @@ zv vp uW db -Fc -Wm -ES -Wm -Bi +Dd +Dd +Dd +Dd +Dd Dd FZ Si @@ -23611,9 +23707,9 @@ VY ui db zB -Wm +Zm yY -Wm +Zm Zm NW Rp @@ -23645,7 +23741,7 @@ iC Cr rn qu -XH +bu wQ XH Zl @@ -23895,15 +23991,15 @@ vp uW db Az -Wm +bH zj -Wm +bH Bt NW Rp Si Nh -Qu +bv OP aX OP @@ -24041,11 +24137,11 @@ xZ CP wh Bu -Dd +bE Ew eS Oj -Qu +bv SN aY XW @@ -24178,12 +24274,12 @@ db db db db -Dd -Dd -Dd -Dd -Dd -Dd +bE +bE +bE +bE +bE +bE Gq KE Oj @@ -24470,7 +24566,7 @@ pG Iq GC KO -YC +bw YC YC YC @@ -24596,7 +24692,7 @@ ma ol bp NC -qO +rK UB sF fV @@ -25151,7 +25247,7 @@ hO dA dA LC -dA +ca Zd dA jg @@ -25431,7 +25527,7 @@ dA dA fj gb -dA +cb gH qU JZ @@ -25715,7 +25811,7 @@ XB XB iz kD -bq +QU Ff NI hu @@ -26010,13 +26106,13 @@ tb tb tb cf -bm +qr no nN op ov qr -qO +rK pG sF fV @@ -26158,7 +26254,7 @@ Fq oq oV qr -qP +qs pG hr tU @@ -26174,7 +26270,7 @@ pG DX HN pG -pG +by pG pG pG @@ -26300,7 +26396,7 @@ Wy wg tK qr -ce +qo rT uM gV @@ -26310,7 +26406,7 @@ tk wx oS to -CO +bO CO tx LD @@ -27054,7 +27150,7 @@ oE iH tS lj -in +bs in in in @@ -28727,7 +28823,7 @@ Bw cH Aq CV -bk +Bw hi GU HS diff --git a/maps/offmap_vr/talon/talon_v2_areas.dm b/maps/offmap_vr/talon/talon_v2_areas.dm index ab607a8dcf..8c8e38e335 100644 --- a/maps/offmap_vr/talon/talon_v2_areas.dm +++ b/maps/offmap_vr/talon/talon_v2_areas.dm @@ -90,9 +90,12 @@ /area/talon_v2/armory name = "\improper Talon - Armory" icon_state = "red" -/area/talon_v2/secure_storage - name = "\improper Talon - Secure Storage" +/area/talon_v2/eva_storage + name = "\improper Talon - EVA Storage" icon_state = "red" +/area/talon_v2/secure_storage + name = "\improper Talon - Cryogenic Storage" + icon_state = "gray" /area/talon_v2/ofd_ops name = "\improper Talon - OFD Ops" icon_state = "red" @@ -126,4 +129,4 @@ icon_state = "gray" /area/talon_v2/crew_quarters/meditation name = "\improper Talon - Observation Room" - icon_state = "blue" \ No newline at end of file + icon_state = "blue" diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index c2237198f2..6787efcbbc 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -178,7 +178,9 @@ id_slot = slot_wear_id pda_type = null glasses = /obj/item/clothing/glasses/sunglasses - uniform = /obj/item/clothing/under/rank/talon/command + head = /obj/item/clothing/head/caphat/talon/refreshed + uniform = /obj/item/clothing/under/rank/talon/command/refreshed + suit = /obj/item/clothing/suit/storage/talonbomberjacket/captain shoes = /obj/item/clothing/shoes/brown backpack = /obj/item/storage/backpack/talon satchel_one = /obj/item/storage/backpack/satchel/talon @@ -197,9 +199,9 @@ flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL shoes = /obj/item/clothing/shoes/black - head = /obj/item/clothing/head/pilot_vr/talon - uniform = /obj/item/clothing/under/rank/talon/pilot - suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot + head = /obj/item/clothing/head/caphat/talon/pilot + uniform = /obj/item/clothing/under/rank/talon/pilot/refreshed + suit = /obj/item/clothing/suit/storage/talonbomberjacket gloves = /obj/item/clothing/gloves/fingerless glasses = /obj/item/clothing/glasses/fakesunglasses/aviator uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1) @@ -223,8 +225,9 @@ backpack = /obj/item/storage/backpack/medic satchel_one = /obj/item/storage/backpack/satchel/med messenger_bag = /obj/item/storage/backpack/messenger/med - uniform = /obj/item/clothing/under/rank/talon/proper - suit = /obj/item/clothing/suit/storage/toggle/labcoat + head = /obj/item/clothing/head/soft/talon/refreshed + uniform = /obj/item/clothing/under/rank/talon/proper/refreshed + suit = /obj/item/clothing/suit/storage/toggle/labcoat/talon l_hand = /obj/item/storage/firstaid/regular r_pocket = /obj/item/flashlight/pen backpack = /obj/item/storage/backpack/talon @@ -249,7 +252,8 @@ backpack = /obj/item/storage/backpack/security satchel_one = /obj/item/storage/backpack/satchel/sec messenger_bag = /obj/item/storage/backpack/messenger/sec - uniform = /obj/item/clothing/under/rank/talon/security + head = /obj/item/clothing/head/beret/talon/command/refreshed + uniform = /obj/item/clothing/under/rank/talon/security/refreshed l_pocket = /obj/item/flash backpack = /obj/item/storage/backpack/talon satchel_one = /obj/item/storage/backpack/satchel/talon @@ -274,7 +278,8 @@ backpack = /obj/item/storage/backpack/industrial satchel_one = /obj/item/storage/backpack/satchel/eng messenger_bag = /obj/item/storage/backpack/messenger/engi - uniform = /obj/item/clothing/under/rank/talon/basic + head = /obj/item/clothing/head/soft/talon/refreshed + uniform = /obj/item/clothing/under/rank/talon/basic/refreshed belt = /obj/item/storage/belt/utility/atmostech backpack = /obj/item/storage/backpack/talon satchel_one = /obj/item/storage/backpack/satchel/talon @@ -296,7 +301,8 @@ shoes = /obj/item/clothing/shoes/boots/workboots r_pocket = /obj/item/storage/bag/ore l_pocket = /obj/item/tool/crowbar - uniform = /obj/item/clothing/under/rank/talon/basic + head = /obj/item/clothing/head/soft/talon/refreshed + uniform = /obj/item/clothing/under/rank/talon/basic/refreshed backpack = /obj/item/storage/backpack/talon satchel_one = /obj/item/storage/backpack/satchel/talon messenger_bag = /obj/item/storage/backpack/messenger/talon