Talon update: Paperwork, Map update and Refreshed Talon uniform become - Standart

ATTRIBUTIONS.md

@@ -588,6 +588,12 @@ Link: https://github.com/TS-Rogue-Star/Rogue-Star/pull/987<br>
 **License:** Licensed for use by Rogue Star; unlicensed for further use without permission of copyright holder<br>
 **Notes:** All files and icon-states within this folder are covered under the above license, as per the included attribution.txt file
 <br>
+**File:** icons/mob/vore/taurs_rs.dmi<br>
+**Icon-States:** synthcow_s, synthcow_markings, synthcow_markings2<br>
+**Creator:** ClaraCow <br>
+**Link:** https://github.com/TS-Rogue-Star/Rogue-Star/pull/1249<br>
+**License:** CC BY-SA 3.0<br>
+<br>
 **File**: icons/mob/vore/taurs_rs.dmi<br>
 **Icon-States**: synthcow_s, synthcow_markings, synthcow_markings2<br>
 **Creator**: ClaraCow <br>
@@ -599,4 +605,19 @@ Link: https://github.com/TS-Rogue-Star/Rogue-Star/pull/987<br>
 **Creator**: Claracow<br>
 **Link**:https://github.com/TS-Rogue-Star/Rogue-Star/pull/1264<br>
 **License**: CC BY-SA 3.0<br>
-<br>
+<br>
+**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`<br>
+**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<br>
+**Creator:** Original graphics by KillianKirilenko. Modified by Azzy.Dreemurr<br>
+**Link:** https://github.com/VOREStation/VOREStation/pull/7978
+**License:** CC BY-SA 3.0<br>
+<br>
+**File:** `html/images/talonlogo.png`<br>
+**Creator:** Unknown. Modified by Azzy.Dreemurr<br>
+**License:** CC BY-SA 3.0<br>
+<br>
+**File:** `icons/obj/bureaucracy.dmi`<br>
+**Icon-States:** stamp-tal, paper_stamp-tal, paperplane_stamp-tal<br>
+**Creator:** Unknown. Modified by Azzy.Dreemurr<br>
+**License:** CC BY-SA 3.0<br>
+<br>

code/_helpers/text.dm

@@ -426,6 +426,7 @@
 	t = replacetext(t, "\[row\]", "</td><tr>")
 	t = replacetext(t, "\[cell\]", "<td>")
 	t = replacetext(t, "\[logo\]", "<img src = ntlogo.png>")
+	t = replacetext(t, "\[talogo\]", "<img src = talonlogo.png>") //RS Add
 	t = replacetext(t, "\[redlogo\]", "<img src = redntlogo.png>")
 	t = replacetext(t, "\[sglogo\]", "<img src = sglogo.png>")
 	t = replacetext(t, "\[editorbr\]", "")
@@ -477,6 +478,7 @@
 	t = replacetext(t, "<td>", "\[cell\]")
 	t = replacetext(t, "<img src = ntlogo.png>", "\[logo\]")
 	t = replacetext(t, "<img src = redntlogo.png>", "\[redlogo\]")
+	t = replacetext(t, "<img src = talonlogo.png>", "\[talogo\]") //RS Add
 	t = replacetext(t, "<img src = sglogo.png>", "\[sglogo\]")
 	t = replacetext(t, "<span class=\"paper_field\"></span>", "\[field\]")
 	t = replacetext(t, "<span class=\"redacted\">R E D A C T E D</span>", "\[redacted\]")

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

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

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

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\]", "</td><tr>")
 	text = replacetext(text, "\[cell\]", "<td>")
 	text = replacetext(text, "\[logo\]", "<img src = ntlogo.png>") // Not sure if these would get used but why not
+	text = replacetext(text, "\[talogo\]", "<img src = talonlogo.png>") //RS Add
 	text = replacetext(text, "\[sglogo\]", "<img src = sglogo.png>")
 	return text
 
@@ -115,7 +116,8 @@
 	text = replacetext(text, "</td><tr>", "\[row\]")
 	text = replacetext(text, "<td>", "\[cell\]")
 	text = replacetext(text, "<img src = ntlogo.png>", "\[logo\]") // Not sure if these would get used but why not
+	text = replacetext(text, "<img src = talonlogo.png>", "\[talogo\]") //RS Add
 	text = replacetext(text, "<img src = sglogo.png>", "\[sglogo\]")
 	return text
 
-#undef NEWSFILE
+#undef NEWSFILE

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',

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")

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))
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))

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"

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"

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."

code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm

@@ -76,7 +76,7 @@
 		if("PRG_txtrpeview")
 			show_browser(usr,"<HTML><HEAD><TITLE>[open_file]</TITLE></HEAD>[pencode2html(loaded_data)]</BODY></HTML>", "window=[open_file]")
 			return TRUE
-
+		//RS Add - \[talogo\] - Inserts Talon logo image.
 		if("PRG_taghelp")
 			to_chat(usr, "<span class='notice'>The hologram of a googly-eyed paper clip helpfully tells you:</span>")
 			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."}
 

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

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")
 

code/modules/paperwork/paper.dm

@@ -358,6 +358,7 @@
 		t = replacetext(t, "\[row\]", "</td><tr>")
 		t = replacetext(t, "\[cell\]", "<td>")
 		t = replacetext(t, "\[logo\]", "<img src = ntlogo.png>")
+		t = replacetext(t, "\[talogo\]", "<img src = talonlogo.png>") //RS Add
 		t = replacetext(t, "\[sglogo\]", "<img src = sglogo.png>")
 
 		t = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[t]</font>"
@@ -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 = "<font face=\"[crayonfont]\" color=[P ? P.colour : "black"]><b>[t]</b></font>"

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

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"