diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index f6a784217bc..607a06e8af1 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -588,6 +588,12 @@ Link: https://github.com/TS-Rogue-Star/Rogue-Star/pull/987
**License:** Licensed for use by Rogue Star; unlicensed for further use without permission of copyright holder
**Notes:** All files and icon-states within this folder are covered under the above license, as per the included attribution.txt file
+**File:** icons/mob/vore/taurs_rs.dmi
+**Icon-States:** synthcow_s, synthcow_markings, synthcow_markings2
+**Creator:** ClaraCow
+**Link:** https://github.com/TS-Rogue-Star/Rogue-Star/pull/1249
+**License:** CC BY-SA 3.0
+
**File**: icons/mob/vore/taurs_rs.dmi
**Icon-States**: synthcow_s, synthcow_markings, synthcow_markings2
**Creator**: ClaraCow
@@ -599,4 +605,19 @@ Link: https://github.com/TS-Rogue-Star/Rogue-Star/pull/987
**Creator**: Claracow
**Link**:https://github.com/TS-Rogue-Star/Rogue-Star/pull/1264
**License**: CC BY-SA 3.0
-
\ No newline at end of file +
+**File:** `icons/inventory/head/item_vr_altevian.dmi, icons/inventory/head/mob_vr_altevian.dmi, icons/inventory/suit/item_vr_altevian.dmi, icons/inventory/suit/mob_vr_altevian.dmi`
+**Icon-States:** rig0-vintagecrew, rig-vintagecrew, rig0-vintageengi, rig-vintageengi, rig0-vintagemedic, rig0-vintagepilot, rig-vintagemedic, rig0-vintagemarine, rig-vintagemarine, rig0-vintageofficer, rig-vintageofficer, rig0-vintagepilotalt, rig-vintagepilot, rig0-vintagescientist, rig-vintagescientist, rig0-vintageminer, rig-vintageminer, rig0-vintagemerc, rig-vintagemerc
+**Creator:** Original graphics by KillianKirilenko. Modified by Azzy.Dreemurr
+**Link:** https://github.com/VOREStation/VOREStation/pull/7978 +**License:** CC BY-SA 3.0
+
+**File:** `html/images/talonlogo.png`
+**Creator:** Unknown. Modified by Azzy.Dreemurr
+**License:** CC BY-SA 3.0
+
+**File:** `icons/obj/bureaucracy.dmi`
+**Icon-States:** stamp-tal, paper_stamp-tal, paperplane_stamp-tal
+**Creator:** Unknown. Modified by Azzy.Dreemurr
+**License:** CC BY-SA 3.0
+
diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 842951f6c1e..6b0bf054a67 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -426,6 +426,7 @@ t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[talogo\]", "") //RS Add t = replacetext(t, "\[redlogo\]", "") t = replacetext(t, "\[sglogo\]", "") t = replacetext(t, "\[editorbr\]", "") @@ -477,6 +478,7 @@ t = replacetext(t, "", "\[cell\]") t = replacetext(t, "", "\[logo\]") t = replacetext(t, "", "\[redlogo\]") + t = replacetext(t, "", "\[talogo\]") //RS Add 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/jobs/access_datum_vr.dm b/code/game/jobs/access_datum_vr.dm index 81de8c82820..a06395ecce1 100644 --- a/code/game/jobs/access_datum_vr.dm +++ b/code/game/jobs/access_datum_vr.dm @@ -53,6 +53,12 @@ var/const/access_pilot = 67 desc = "Talon Security" access_type = ACCESS_TYPE_PRIVATE +/var/const/access_talon_pilot = 307 //RS Add +/datum/access/talon_pilot + id = access_talon_pilot + desc = "Talon Pilot" + access_type = ACCESS_TYPE_PRIVATE + /var/const/access_xenobotany = 77 /datum/access/xenobotany id = access_xenobotany diff --git a/code/game/machinery/suit_storage/suit_cycler_units_vr.dm b/code/game/machinery/suit_storage/suit_cycler_units_vr.dm index adbdf212c8a..62d4f2abb00 100644 --- a/code/game/machinery/suit_storage/suit_cycler_units_vr.dm +++ b/code/game/machinery/suit_storage/suit_cycler_units_vr.dm @@ -32,7 +32,7 @@ name = "Talon pilot suit cycler" model_text = "Talon pilot" icon_state = "dark_cycler" - req_access = list(access_talon) + req_access = list(access_talon_pilot) //RS Add departments = list(/datum/suit_cycler_choice/department/talon/pilot) /obj/machinery/suit_cycler/vintage/tengi diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 1e1005c020d..416f8de1db1 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -136,3 +136,9 @@ adhoc_fallback = TRUE icon_state = "pilot_headset" ks2type = /obj/item/device/encryptionkey/talon +//RS Add +/obj/item/device/radio/headset/talon/alt + name = "talon bowman headset" + adhoc_fallback = TRUE + icon_state = "pilot_headset_alt" + ks2type = /obj/item/device/encryptionkey/talon diff --git a/code/modules/admin/news.dm b/code/modules/admin/news.dm index c0812b818e5..f79d62753c8 100644 --- a/code/modules/admin/news.dm +++ b/code/modules/admin/news.dm @@ -28,7 +28,7 @@ var/new_body = sanitize(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, multiline = TRUE, prevent_enter = TRUE), extra = 0) + \[row\], \[cell\], \[logo\], \[sglogo\],\[talogo\].","Write News", body, multiline = TRUE, prevent_enter = TRUE), extra = 0) //RS Edit 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\]", "") //RS Add text = replacetext(text, "\[sglogo\]", "") return text @@ -115,7 +116,8 @@ 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\]") //RS Add text = replacetext(text, "", "\[sglogo\]") return text -#undef NEWSFILE \ No newline at end of file +#undef NEWSFILE diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 94bf8182e66..1b57ba4fced 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -118,6 +118,7 @@ "panels.css" = 'html/panels.css', "loading.gif" = 'html/images/loading.gif', "ntlogo.png" = 'html/images/ntlogo.png', + "talonlogo.png" = 'html/images/talonlogo.png', //RS Add "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_suit_rs.dm b/code/modules/client/preference_setup/loadout/loadout_suit_rs.dm index c7ad0189dca..aedb3eae058 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_rs.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_rs.dm @@ -6,19 +6,19 @@ allowed_roles = list("Talon Captain","Talon Doctor","Talon Engineer","Talon Pilot","Talon Guard","Talon Miner") /datum/gear/suit/labcoat/refreshedtalon - display_name = "Refreshed Talon Labcoat" + display_name = "Talon Labcoat" description = "An expertly manufacted labcoat with Talon and medical insignia. Protects from chemical spills." path = /obj/item/clothing/suit/storage/toggle/labcoat/talon allowed_roles = list("Talon Doctor") /datum/gear/suit/refreshedtaloncapcoat - display_name = "Refreshed Talon Captain's Coat" + display_name = "Talon Captain's Coat" description = "An expertly manufacted coat that was specifically made for the commanding officers of ITV Talon vessels." - path = /obj/item/clothing/suit/talon/capcoat + path = /obj/item/clothing/suit/storage/talonbomberjacket/captain allowed_roles = list("Talon Captain") /datum/gear/suit/refreshedtalonpilotcoat - display_name = "Refreshed Talon Pilot Bomber Jacket" + display_name = "Talon Pilot Bomber Jacket" description = "An expertly manufacted coat that was specifically made for the piloting personnel of ITV Talon vessels." path = /obj/item/clothing/suit/storage/talonbomberjacket allowed_roles = list("Talon Pilot") 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 f02baa60513..54fd931c5b0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -592,4 +592,4 @@ "TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_robo, "TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_robo_skirt ) - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_rs.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_rs.dm index 791bb9a6226..8a7113ca707 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_rs.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_rs.dm @@ -1,33 +1,83 @@ // New Talon Uniforms -/datum/gear/uniform/refreshedtalonbasic - display_name = "Refreshed Talon Jumpsuit" - description = "An expertly manufacted jumpsuit worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made for manueverability in mind." - path = /obj/item/clothing/under/rank/talon/basic/refreshed +/datum/gear/uniform/talon + display_name = "Talon Uniforms" + description = "Select from a range of outfits available to all Talon crews." allowed_roles = list("Talon Captain","Talon Doctor","Talon Engineer","Talon Pilot","Talon Guard","Talon Miner") + path = /obj/item/clothing/under/rank/talon/basic/refreshed + sort_category = "Uniforms" + cost = 1 -/datum/gear/uniform/refreshedtalonmedical - display_name = "Refreshed Talon Medical Jumpsuit" - description = "An expertly manufacted jumpsuit worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made for manueverability in mind." - path = /obj/item/clothing/under/rank/talon/proper/refreshed - allowed_roles = list("Talon Doctor") +/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/refreshedtalonsecurity - display_name = "Refreshed Talon Security Jumpsuit" - description = "An expertly manufacted jumpsuit worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made for manueverability in mind." - path = /obj/item/clothing/under/rank/talon/security/refreshed - allowed_roles = list("Talon Guard") +/datum/gear/uniform/talon_captain + display_name = "Talon - Captain Uniforms" + description = "Select from a range of outfits available to all Talon Captain." + allowed_roles = list("Talon Captain") + path = /obj/item/clothing/under/rank/talon/command/refreshed + sort_category = "Uniforms" + cost = 1 -/datum/gear/uniform/refreshedtalonpilot - display_name = "Refreshed Talon Pilot Uniform" - description = "An expertly manufacted uniform worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made with formaility in mind." - path = /obj/item/clothing/under/rank/talon/pilot/refreshed +/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 Uniforms" + description = "Select from a range of outfits available to all Talon Pilot." allowed_roles = list("Talon Pilot") + path = /obj/item/clothing/under/rank/talon/pilot/refreshed + sort_category = "Uniforms" + cost = 1 -/datum/gear/uniform/refreshedtaloncaptain - display_name = "Refreshed Talon Command Uniform" - description = "An expertly manufacted uniform worn often by ITV Talon operators. This variant of the suit has been given more thought, as it's made with formaility in mind." - path = /obj/item/clothing/under/rank/talon/command/refreshed - allowed_roles = list("Talon Captain") +/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 Uniforms" + description = "Select from a range of outfits available to all Talon Guard." + allowed_roles = list("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 Uniforms" + description = "Select from a range of outfits available to all Talon Doctor's." + allowed_roles = list("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)) /datum/gear/uniform/hfjumpskirt display_name = "HYPER jumpskirt" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index f0851e780a3..dca8930963e 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -563,3 +563,11 @@ icon_state = "redtag" flags_inv = HIDEEARS|BLOCKHEADHAIR body_parts_covered = HEAD|EYES +//RS Add +/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_rs.dmi' + icon_override = 'icons/inventory/head/mob_rs.dmi' + icon_state = "talon_pilothat" + item_state = "talon_pilothat" diff --git a/code/modules/clothing/suits/miscellaneous_rs.dm b/code/modules/clothing/suits/miscellaneous_rs.dm index da7893ac48a..dbf1eb4e91d 100644 --- a/code/modules/clothing/suits/miscellaneous_rs.dm +++ b/code/modules/clothing/suits/miscellaneous_rs.dm @@ -1,13 +1,3 @@ -/obj/item/clothing/suit/talon/capcoat - 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_rs.dmi' - default_worn_icon = 'icons/inventory/suit/mob_rs.dmi' - icon_state = "talon_capcoat" - item_state = "talon_capcoat" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - flags_inv = HIDEHOLSTER - /obj/item/clothing/suit/storage/talonbomberjacket name = "Talon 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." @@ -22,6 +12,16 @@ 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_rs.dmi' + default_worn_icon = 'icons/inventory/suit/mob_rs.dmi' + icon_state = "talon_capcoat" + item_state = "talon_capcoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER + /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." 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 599f79fe786..c06803da853 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -76,7 +76,7 @@ if("PRG_txtrpeview") show_browser(usr,"[open_file][pencode2html(loaded_data)]", "window=[open_file]") return TRUE - + //RS Add - \[talogo\] - Inserts Talon logo image. if("PRG_taghelp") to_chat(usr, "The hologram of a googly-eyed paper clip helpfully tells you:") var/help = {" @@ -101,6 +101,7 @@ \[row\] - New table row. \[cell\] - New table cell. \[logo\] - Inserts NT logo image. + \[talogo\] - Inserts Talon 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 229bcf08692..a8a65988130 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -40,12 +40,15 @@ 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 //RS Edit if(logo == "SolGov") logo = "sglogo.png" //VOREStation Edit/Add else if(logo == "NanoTrasen") logo = "ntlogo.png" + //Rogue Star Edit/Add + else if(logo == "Talon") + logo = "talonlogo.png" else logo = "trader.png" //VOREStation Edit/Add End diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 7023f7b554f..bb6ff5ef3c5 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -1,5 +1,6 @@ + var/list/obj/machinery/photocopier/faxmachine/allfaxes = list() -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") //RS Edit var/list/alldepartments = list() var/global/last_fax_role_request @@ -387,6 +388,8 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins 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") //RS Add + message_admins(sender, "TALON HEADQUARTERS FAX", rcvdcopy, "TalonHeadquartersFaxReply", "#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 1d612be3500..b6fb71fd6c0 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -358,6 +358,7 @@ t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[talogo\]", "") //RS Add t = replacetext(t, "\[sglogo\]", "") t = "[t]" @@ -373,6 +374,7 @@ t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[talogo\]", "") //RS Add t = replacetext(t, "\[sglogo\]", "") t = "[t]" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 6eb0aa19eec..ca226a0ce13 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -262,6 +262,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")) //RS Add + 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 50d69623777..84eb60cd68c 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -43,6 +43,10 @@ /obj/item/weapon/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" +//RS Add +/obj/item/weapon/stamp/talon + name = "talon's rubber stamp" + icon_state = "stamp-tal" /obj/item/weapon/stamp/denied name = "\improper DENIED rubber stamp" diff --git a/html/images/talonlogo.png b/html/images/talonlogo.png new file mode 100644 index 00000000000..121aaf78657 Binary files /dev/null and b/html/images/talonlogo.png differ diff --git a/icons/inventory/head/item_vr_altevian.dmi b/icons/inventory/head/item_vr_altevian.dmi index 7fabae182d9..cb7c8dcd598 100644 Binary files a/icons/inventory/head/item_vr_altevian.dmi and b/icons/inventory/head/item_vr_altevian.dmi differ diff --git a/icons/inventory/head/mob_vr_altevian.dmi b/icons/inventory/head/mob_vr_altevian.dmi index deb0367b6c3..6cdc8b4d28e 100644 Binary files a/icons/inventory/head/mob_vr_altevian.dmi and b/icons/inventory/head/mob_vr_altevian.dmi differ diff --git a/icons/inventory/suit/item_vr_altevian.dmi b/icons/inventory/suit/item_vr_altevian.dmi index f8c7b1e42e1..15a9cf07f83 100644 Binary files a/icons/inventory/suit/item_vr_altevian.dmi and b/icons/inventory/suit/item_vr_altevian.dmi differ diff --git a/icons/inventory/suit/mob_vr_altevian.dmi b/icons/inventory/suit/mob_vr_altevian.dmi index 54e3236cfdf..7ba0760b4b9 100644 Binary files a/icons/inventory/suit/mob_vr_altevian.dmi and b/icons/inventory/suit/mob_vr_altevian.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 2a20e70decc..39d481d6a95 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 3015949627a..2452f482d8b 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -68,7 +68,7 @@ var/global/list/latejoin_talon = list() /obj/machinery/computer/shuttle_control/explore/talonboat name = "shuttle control console" shuttle_tag = "Talon's Shuttle" - req_one_access = list(access_talon_bridge) + req_one_access = list(access_talon_pilot) //RS Edit /obj/effect/overmap/visitable/ship/landable/talon_boat name = "ITV Talon Shuttle" @@ -282,6 +282,17 @@ if you have to punch out, do it whilst the ship is in open space. the pod has \
\ Harry Townes"} +//RS Add +/obj/item/weapon/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"} //Prevents remote control of drones /obj/machinery/drone_fabricator/talon @@ -303,7 +314,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/weapon/card/id/synthetic/talon/Initialize() . = ..() - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_synth) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot, access_synth) //RS Edit /obj/machinery/power/smes/buildable/offmap_spawn/New() ..(1) @@ -395,7 +406,8 @@ personally I recommend using the ship's boat if you need to evacuate, but if you closet_appearance = /decl/closet_appearance/secure_closet/talon/captain starts_with = list( - /obj/item/weapon/storage/backpack/dufflebag/captain, + /obj/item/weapon/storage/backpack/dufflebag/talon, //RS Add + /obj/item/clothing/under/rank/talon/command/refreshed, //RS Add /obj/item/clothing/head/beret/talon/command, /obj/item/clothing/suit/storage/vest, /obj/item/clothing/head/helmet, @@ -421,6 +433,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/clothing/head/helmet, /obj/item/clothing/under/utility, /obj/item/clothing/head/soft/talon, + /obj/item/clothing/under/rank/talon/security/refreshed, //RS Add /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/weapon/handcuffs = 2, @@ -452,6 +465,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/clothing/under/rank/nurse, /obj/item/clothing/head/soft/talon, /obj/item/clothing/under/rank/orderly, + /obj/item/clothing/under/rank/talon/proper/refreshed, //RS Add /obj/item/clothing/accessory/solgov/department/medical/army, /obj/item/clothing/suit/storage/toggle/labcoat/modern, /obj/item/clothing/suit/storage/toggle/fr_jacket, @@ -471,6 +485,7 @@ 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/under/rank/talon/basic/refreshed, //RS Add /obj/item/clothing/accessory/solgov/department/engineering/army, /obj/item/clothing/glasses/omnihud/eng/meson, /obj/item/device/flashlight, @@ -491,7 +506,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/structure/closet/secure_closet/talon_pilot name = "talon pilot's locker" - req_access = list(access_talon) + req_access = list(access_talon_pilot) //RS Edit closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot starts_with = list( @@ -499,6 +514,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you /obj/item/clothing/accessory/solgov/department/service/army, /obj/item/clothing/head/pilot, /obj/item/clothing/under/rank/pilot1, + /obj/item/clothing/under/rank/talon/pilot/refreshed, //RS Add /obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/gloves/fingerless, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, @@ -525,6 +541,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you starts_with = list( /obj/item/device/radio/headset/talon, + /obj/item/clothing/under/rank/talon/basic/refreshed, //RS Add /obj/item/clothing/head/soft/talon, /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, /obj/item/clothing/suit/space/void/refurb/mining/talon, @@ -559,6 +576,38 @@ personally I recommend using the ship's boat if you need to evacuate, but if you idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. req_log_access = access_talon has_logs = 1 +//RS Add +/obj/machinery/vending/talondrobe + name = "Talon Uniforms official" + desc = "Created for those who want to look the latest in Talon fashion!" + icon = 'icons/obj/vending_rs.dmi' + 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/weapon/storage/backpack/messenger/talon = 10, + /obj/item/weapon/storage/backpack/talon = 10, + /obj/item/weapon/storage/backpack/satchel/talon = 10, + /obj/item/weapon/storage/backpack/dufflebag/talon = 10, + /obj/item/device/radio/headset/talon = 10, + /obj/item/device/radio/headset/talon/alt = 10) + contraband = list(/obj/item/weapon/paper/secret_vendornote = 1, + /obj/item/clothing/accessory/holster/machete = 1, + /obj/item/weapon/material/knife/machete = 1) + req_log_access = access_talon + has_logs = 1 + can_rotate = 0 /////////////////////////// //// Computers diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 71f6edae187..6ea6c288b51 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -230,6 +230,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" = ( @@ -376,10 +377,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 - }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "aN" = ( @@ -484,20 +481,15 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) "aX" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/closet/secure_closet/guncabinet/fancy/shotgun{ + req_one_access = list(306) }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "aY" = ( -/obj/structure/table/rack/shelf/steel, +/obj/structure/closet/secure_closet/guncabinet/fancy/rifle{ + req_one_access = list(306) + }, /obj/item/weapon/gun/energy/netgun, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) @@ -556,17 +548,27 @@ /turf/simulated/wall/shull, /area/talon_v2/ofd_ops) "be" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, /obj/machinery/light_switch{ dir = 1; pixel_y = -26 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 5; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "bf" = ( @@ -615,7 +617,9 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "bj" = ( -/obj/structure/table/rack/shelf/steel, +/obj/structure/closet/secure_closet/guncabinet/fancy/pistol{ + req_one_access = list(306) + }, /obj/item/weapon/gun/energy/gun, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) @@ -863,15 +867,10 @@ /turf/simulated/wall/shull, /area/talon_v2/crew_quarters/bar) "cc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/armory) "cd" = ( @@ -879,8 +878,8 @@ /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) "ce" = ( -/obj/machinery/cryopod/talon, /obj/machinery/camera/network/talon, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) "cf" = ( @@ -1333,9 +1332,15 @@ /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/item/clothing/accessory/talon, +/obj/item/clothing/accessory/talon, +/obj/item/clothing/accessory/talon, +/obj/item/clothing/accessory/talon, +/obj/item/clothing/accessory/talon, +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "dO" = ( @@ -1791,9 +1796,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) "fd" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/machinery/vending/talondrobe, +/obj/machinery/camera/network/talon, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "ff" = ( @@ -1837,7 +1841,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/closet/walllocker_double/east, +/obj/structure/closet/walllocker_double/emergency_engi/east, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering/star_store) "fj" = ( @@ -1934,6 +1938,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" = ( @@ -1947,6 +1952,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/armory) "fG" = ( @@ -2128,6 +2136,14 @@ /obj/structure/closet/walllocker_double/emergency_engi/west, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) +"gq" = ( +/obj/machinery/cryopod/talon, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "gr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 @@ -2166,15 +2182,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/wing_port) -"gw" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = 24 - }, -/obj/item/clothing/accessory/holster/waist, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "gx" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -3234,6 +3241,16 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) +"kp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) "kt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3469,7 +3486,7 @@ /area/talon_v2/engineering/starboard) "lm" = ( /obj/machinery/computer/ship/helm{ - req_one_access = list(301) + req_one_access = list(307) }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) @@ -3625,7 +3642,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, @@ -3692,6 +3709,15 @@ "lU" = ( /turf/simulated/wall/shull, /area/talon_v2/crew_quarters/pilot_room) +"lV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/talon, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) "lX" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/maintenance/common, @@ -4911,10 +4937,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/crystal, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) "qq" = ( @@ -4933,7 +4957,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) @@ -5089,17 +5112,19 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/eng_room) "qO" = ( -/obj/machinery/cryopod/robot/talon, +/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/central_hallway) +/area/talon_v2/armory) "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) +/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/weapon/tank/oxygen, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/eva_storage) "qQ" = ( /obj/effect/floor_decal/industrial/loading{ dir = 4 @@ -5404,7 +5429,7 @@ /obj/machinery/door/airlock{ id_tag = "talon_pilotdoor"; name = "Pilot's Cabin"; - req_one_access = list(302) + req_one_access = list(307) }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/crew_quarters/pilot_room) @@ -6176,7 +6201,8 @@ "uJ" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/light_switch{ - pixel_y = 24 + pixel_y = 26; + pixel_x = -11 }, /obj/machinery/camera/network/talon, /turf/simulated/floor/tiled/techfloor/grid, @@ -6594,7 +6620,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{ req_one_access = list(306) @@ -7016,6 +7042,8 @@ pixel_y = -24 }, /obj/structure/cable/green, +/obj/item/clothing/accessory/holster/waist, +/obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "xB" = ( @@ -7070,9 +7098,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) @@ -7120,11 +7147,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/weapon/storage/toolbox/electrical, @@ -7402,14 +7426,18 @@ /area/talon_v2/engineering/atmospherics) "yY" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/clothing/suit/space/void/refurb/talon, +/obj/item/clothing/head/helmet/space/void/refurb/talon, +/obj/item/clothing/shoes/magboots, +/obj/item/weapon/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; @@ -7428,6 +7456,15 @@ /obj/item/weapon/mining_scanner, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) +"zc" = ( +/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) "zd" = ( /obj/structure/fitness/weightlifter, /obj/machinery/camera/network/talon{ @@ -7451,13 +7488,16 @@ /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/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" @@ -7552,8 +7592,10 @@ /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/weapon/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 @@ -7762,11 +7804,30 @@ /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/mine_room) "Az" = ( -/obj/structure/table/rack/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/machinery/alarm/talon{ + pixel_y = 28 + }, +/obj/structure/table/steel, +/obj/item/device/bluespaceradio/talon_prelinked{ + pixel_y = 10 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_x = 6 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_x = -6 + }, +/obj/item/device/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{ @@ -7827,15 +7888,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" = ( @@ -7856,12 +7909,13 @@ /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, -/area/talon_v2/secure_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/eva_storage) "AS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -7918,9 +7972,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) "Ba" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, +/obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "Bb" = ( @@ -7958,14 +8010,8 @@ /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) +/turf/simulated/wall/shull, +/area/talon_v2/eva_storage) "Bj" = ( /obj/machinery/light/small{ dir = 8 @@ -7994,34 +8040,21 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/bridge) "Bt" = ( -/obj/structure/table/steel, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_y = 6 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) +/obj/structure/table/rack/steel, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/light{ + dir = 4 }, /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, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "Bv" = ( /obj/machinery/light/small{ dir = 8 @@ -8190,7 +8223,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/device/radio/off{ @@ -8208,7 +8241,8 @@ /obj/item/clothing/mask/breath, /obj/item/weapon/storage/belt/archaeology, /obj/machinery/light_switch{ - pixel_y = 24 + pixel_y = 26; + pixel_x = -11 }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/anomaly_storage) @@ -8385,7 +8419,7 @@ "CP" = ( /obj/machinery/suit_cycler/vintage/tcrew, /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 @@ -8424,11 +8458,16 @@ pixel_y = -24 }, /obj/structure/table/standard, -/obj/item/weapon/paper_bin, +/obj/item/weapon/paper_bin{ + pixel_x = 6 + }, /obj/item/weapon/pen, /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/item/weapon/stamp/talon{ + pixel_x = -6 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/workroom) "CX" = ( @@ -8588,7 +8627,8 @@ }, /obj/structure/catwalk, /obj/machinery/light_switch{ - pixel_y = 24 + pixel_y = 26; + pixel_x = -11 }, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) @@ -8908,11 +8948,17 @@ /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) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/eva_storage) "ET" = ( /obj/structure/railing/grey, /obj/machinery/light{ @@ -8951,10 +8997,14 @@ /turf/simulated/floor/reinforced/airless, /area/talon_v2/maintenance/aft_starboard) "Fc" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/talon, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/emblem/talon, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/secure_storage) "Fd" = ( /obj/structure/disposalpipe/segment{ @@ -9126,7 +9176,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/voidcraft{ name = "Cabin Access"; - req_one_access = list(302) + req_one_access = list(307) }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) @@ -9288,6 +9338,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" = ( @@ -9371,6 +9425,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) +"Go" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) "Gp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9834,6 +9894,18 @@ /obj/structure/loot_pile/maint/trash, /turf/simulated/floor/plating, /area/talon_v2/engineering) +"HJ" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28; + nightshift_setting = 3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "HK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -10731,8 +10803,10 @@ /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 + }, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "KE" = ( /obj/structure/cable/green{ @@ -10883,11 +10957,11 @@ /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/star) "Li" = ( -/obj/structure/flora/pottedplant/minitree, /obj/machinery/holoposter{ dir = 1; pixel_y = 32 }, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) "Lj" = ( @@ -11842,7 +11916,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 @@ -11929,6 +12003,19 @@ can_open = 1 }, /area/talon_v2/engineering/star_store) +"Om" = ( +/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 = "Cryogenic Storage"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) "On" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/maintenance/common, @@ -12336,17 +12423,6 @@ pixel_x = 5; pixel_y = 24 }, -/obj/item/weapon/storage/backpack/dufflebag/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"PC" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = 24 - }, -/obj/item/clothing/accessory/holster/waist, -/obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/armory) "PD" = ( @@ -12420,7 +12496,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock{ - name = "Storage Room" + name = "Cryo Storage" }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/gen_store) @@ -12636,7 +12712,7 @@ "QD" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /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) @@ -13090,20 +13166,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/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/plating, /area/talon_v2/central_hallway/port) "Sr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13254,7 +13326,7 @@ /obj/machinery/door/airlock{ id_tag = "talon_pilotdoor"; name = "Pilot's Cabin"; - req_one_access = list(302) + req_one_access = list(307) }, /obj/structure/cable/green{ icon_state = "1-2" @@ -13398,6 +13470,16 @@ /obj/item/weapon/storage/box/handcuffs, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/brig) +"Tj" = ( +/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) "Tk" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/maintenance/engi{ @@ -13453,6 +13535,7 @@ /turf/simulated/wall/rshull, /area/shuttle/talonboat) "Tw" = ( +/obj/effect/floor_decal/emblem/talon, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) "Tz" = ( @@ -13576,6 +13659,13 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) +"TS" = ( +/obj/machinery/cryopod/robot/talon, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "TW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -14142,14 +14232,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/anomaly_storage) -"VL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/catwalk, -/obj/structure/closet/walllocker_double/emergency_engi/south, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) "VM" = ( /obj/machinery/atmospherics/pipe/tank/nitrogen{ dir = 8 @@ -14180,6 +14262,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/anomaly_storage) +"VR" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) "VS" = ( /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) @@ -14303,7 +14391,7 @@ /area/space) "Wm" = ( /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/area/talon_v2/eva_storage) "Wo" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -14387,7 +14475,8 @@ dir = 1 }, /obj/machinery/light_switch{ - pixel_y = 24 + pixel_y = 26; + pixel_x = -11 }, /obj/structure/disposalpipe/junction{ dir = 8; @@ -15160,8 +15249,17 @@ pixel_y = 28 }, /obj/structure/table/rack/steel, +/obj/machinery/light_switch{ + pixel_y = 26; + pixel_x = -11 + }, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/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, @@ -15251,9 +15349,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/weapon/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{ @@ -15379,8 +15480,10 @@ /turf/simulated/floor/reinforced/airless, /area/space) "ZF" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/cryopod/robot/talon, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "ZH" = ( @@ -23218,16 +23321,16 @@ XG XG vY db -ZF -Wm +HJ +TB Fc -Wm -AQ -Dd +lV +HA +Om So -Si +zc Oj -PC +PB OP Qu OP @@ -23361,15 +23464,15 @@ db db db dN -Wm -Wm -Wm +Tj +TS +gq Ba Dd FO Si Oj -gw +PB OP OP OP @@ -23502,11 +23605,11 @@ zv vp uW db -Fc -Wm -ES -Wm -Bi +Dd +Dd +Dd +Dd +Dd Dd FZ Si @@ -23645,18 +23748,18 @@ VY ui db zB -Wm +qP yY -Wm +qP Zm NW Rp Si Nh ai -OP +Go aM -OP +VR bb Zc ZB @@ -23788,15 +23891,15 @@ db db YX Cb -TB -HA -HA +ES +AQ +AQ lJ Gm bz hQ qv -qv +kp cc fF xx @@ -23932,12 +24035,12 @@ Az Wm zj Wm -Bt +QD NW Rp Si Nh -Qu +qO OP aX OP @@ -24070,16 +24173,16 @@ ED VY ui db -QD -xZ CP +xZ +Bt wh Bu -Dd +Bi Ew eS Oj -Qu +qO SN aY XW @@ -24212,12 +24315,12 @@ db db db db -Dd -Dd -Dd -Dd -Dd -Dd +Bi +Bi +Bi +Bi +Bi +Bi Gq KE Oj @@ -24630,7 +24733,7 @@ ma ol bp NC -qO +rK UB sF fV @@ -25509,7 +25612,7 @@ AZ gC ar aD -VL +GA IK ep LJ @@ -26050,7 +26153,7 @@ nN op ov qr -qO +rK pG sF fV @@ -26192,7 +26295,7 @@ Fq oq oV qr -qP +qs pG hr tU @@ -27089,7 +27192,7 @@ iH tS lj wD -wD +in in in in diff --git a/maps/offmap_vr/talon/talon_v2_areas.dm b/maps/offmap_vr/talon/talon_v2_areas.dm index ab607a8dcf5..1825e56d894 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 // RS Edit + name = "\improper Talon - Eva Storage" icon_state = "red" +/area/talon_v2/secure_storage // RS Add + 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/submaps/depreciated_vr/talon.dm b/maps/submaps/depreciated_vr/talon.dm index 73566fc7138..1290482ee15 100644 --- a/maps/submaps/depreciated_vr/talon.dm +++ b/maps/submaps/depreciated_vr/talon.dm @@ -173,7 +173,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/weapon/card/id/synthetic/talon/Initialize() . = ..() - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_sec, access_synth) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_sec, access_talon_pilot, access_synth) //RS Edit /obj/machinery/power/smes/buildable/offmap_spawn/New() ..(1) diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index 416f9b7887d..dbf6a0a8cf9 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -29,8 +29,8 @@ pto_type = PTO_TALON timeoff_factor = 1 dept_time_required = 60 - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) - minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit + minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit alt_titles = list("Talon Commander" = /datum/alt_title/talon_commander, "Rogue Trader" = /datum/alt_title/rogue_trader) /datum/alt_title/talon_commander @@ -58,8 +58,8 @@ playtime_only = TRUE pto_type = PTO_TALON timeoff_factor = 1 - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) - minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit + minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit alt_titles = list("Talon Medic" = /datum/alt_title/talon_medic) /datum/alt_title/talon_medic @@ -85,8 +85,8 @@ playtime_only = TRUE pto_type = PTO_TALON timeoff_factor = 1 - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) - minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit + minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit alt_titles = list("Talon Technician" = /datum/alt_title/talon_tech) /datum/alt_title/talon_tech @@ -112,8 +112,8 @@ playtime_only = TRUE pto_type = PTO_TALON timeoff_factor = 1 - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) - minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit + minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit alt_titles = list("Talon Helmsman" = /datum/alt_title/talon_helmsman) /datum/alt_title/talon_helmsman @@ -139,8 +139,8 @@ playtime_only = TRUE pto_type = PTO_TALON timeoff_factor = 1 - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) - minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit + minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_talon_pilot) //RS Edit alt_titles = list("Talon Security" = /datum/alt_title/talon_security) /datum/alt_title/talon_security @@ -165,8 +165,8 @@ playtime_only = TRUE pto_type = PTO_TALON timeoff_factor = 1 - access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) - minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security) + access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, , access_talon_pilot) //RS Edit + minimal_access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, , access_talon_pilot) //RS Edit alt_titles = list("Talon Excavator" = /datum/alt_title/talon_excavator) /datum/alt_title/talon_excavator @@ -184,6 +184,7 @@ l_ear = /obj/item/device/radio/headset/talon glasses = /obj/item/clothing/glasses/sunglasses uniform = /obj/item/clothing/under/rank/talon/command + suit = /obj/item/clothing/suit/storage/talonbomberjacket/captain //RS Edit shoes = /obj/item/clothing/shoes/laceup // RS Edit backpack = /obj/item/weapon/storage/backpack/talon satchel_one = /obj/item/weapon/storage/backpack/satchel/talon @@ -199,9 +200,9 @@ l_ear = /obj/item/device/radio/headset/talon shoes = /obj/item/clothing/shoes/black - head = /obj/item/clothing/head/pilot_vr/talon + head = /obj/item/clothing/head/caphat/talon/refreshed //RS edit uniform = /obj/item/clothing/under/rank/talon/pilot - suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot + suit = /obj/item/clothing/suit/storage/talonbomberjacket //RS Edit 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,7 +224,7 @@ satchel_one = /obj/item/weapon/storage/backpack/satchel/med messenger_bag = /obj/item/weapon/storage/backpack/messenger/med uniform = /obj/item/clothing/under/rank/talon/proper - suit = /obj/item/clothing/suit/storage/toggle/labcoat + suit = /obj/item/clothing/suit/storage/toggle/labcoat/talon //RS Edit l_hand = /obj/item/weapon/storage/firstaid/regular r_pocket = /obj/item/device/flashlight/pen backpack = /obj/item/weapon/storage/backpack/talon