Tweaks Examination Code (#14843)

code/datums/outfits/outfit.dm

@@ -400,19 +400,19 @@
 		var/obj/item/I = new pda(H)
 		switch(H.pda_choice)
 			if(OUTFIT_TAB_PDA)
-				I.desc_fluff += "For its many years of service, this model has held a virtual monopoly for PDA models for NanoTrasen. The secret? A lapel pin affixed to the back."
+				I.desc_extended += "For its many years of service, this model has held a virtual monopoly for PDA models for NanoTrasen. The secret? A lapel pin affixed to the back."
 			if(OUTFIT_PDA_OLD)
 				I.icon = 'icons/obj/pda_old.dmi'
-				I.desc_fluff += "Nicknamed affectionately as the 'Brick', PDA enthusiasts rejoice with the return of an old favorite, retrofitted to new modular computing standards."
+				I.desc_extended += "Nicknamed affectionately as the 'Brick', PDA enthusiasts rejoice with the return of an old favorite, retrofitted to new modular computing standards."
 			if(OUTFIT_PDA_RUGGED)
 				I.icon = 'icons/obj/pda_rugged.dmi'
-				I.desc_fluff += "EVA enthusiasts and owners of fat fingers just LOVE the huge tactile buttons provided by this model. Prone to butt-dialing, but don't let that hold you back."
+				I.desc_extended += "EVA enthusiasts and owners of fat fingers just LOVE the huge tactile buttons provided by this model. Prone to butt-dialing, but don't let that hold you back."
 			if(OUTFIT_PDA_SLATE)
 				I.icon = 'icons/obj/pda_slate.dmi'
-				I.desc_fluff += "A bet between an engineer and a disgruntled scientist, it turns out you CAN make a PDA out of an atmospherics scanner. Also, probably don't tell management, just enjoy."
+				I.desc_extended += "A bet between an engineer and a disgruntled scientist, it turns out you CAN make a PDA out of an atmospherics scanner. Also, probably don't tell management, just enjoy."
 			if(OUTFIT_PDA_SMART)
 				I.icon = 'icons/obj/pda_smart.dmi'
-				I.desc_fluff += "NanoTrasen originally designed this as a portable media player. Unfortunately, Royalty-free and corporate-approved ukulele isn't particularly popular."
+				I.desc_extended += "NanoTrasen originally designed this as a portable media player. Unfortunately, Royalty-free and corporate-approved ukulele isn't particularly popular."
 		I.update_icon()
 		if (H.pda_choice == OUTFIT_WRISTBOUND)
 			H.equip_or_collect(I, slot_wrists)

code/game/atoms.dm

@@ -31,10 +31,9 @@
 	var/gfi_layer_rotation = GFI_ROTATION_DEFAULT
 
 	// Extra descriptions.
-	var/desc_fluff = null // Text about the atom's fluff description, if any exists.
+	var/desc_extended = null // Regular text about the atom's extended description, if any exists.
 	var/desc_info = null // Blue text (SPAN_NOTICE()), informing the user about how to use the item or about game controls.
 	var/desc_antag = null // Red text (SPAN_ALERT()), informing the user about how they can use an object to antagonize.
-	var/desc_cult = null // Purple text (SPAN_CULT()), telling the user, if they're a cultist, how they can use certain items related to being a cultist.
 
 /atom/proc/reveal_blood()
 	return
@@ -227,16 +226,14 @@
 	to_chat(user, desc)	// Object description.
 
 	// Extra object descriptions examination code.
-	if(desc_fluff || desc_info || (desc_antag && player_is_antag(user.mind)) || (desc_cult && user.mind?.special_role == "Cultist")) // Checks if the object has a fluff description, a mechanics description, an antagonist description (and if the user is an antagonist), and/or a cultist description (and if the user is a cultist).
+	if(desc_extended || desc_info || (desc_antag && player_is_antag(user.mind))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist).
-		to_chat(user, FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine info. <a href=?src=\ref[src];examine_fluff=1>\[Show In Chat\]</a>"))) // If any of the above are true, show that the object has more information available.
+		to_chat(user, FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. <a href=?src=\ref[src];examine_fluff=1>\[Show In Chat\]</a>"))) // If any of the above are true, show that the object has more information available.
-		if(desc_fluff) // If the item has a fluff description, show that it is available.
+		if(desc_extended) // If the item has a extended description, show that it is available.
-			to_chat(user, FONT_SMALL("- This object has additional fluff info."))
+			to_chat(user, FONT_SMALL("- This object has an extended description."))
-		if(desc_info) // If the item has a mechanics description, show that it is available.
+		if(desc_info) // If the item has a description regarding game mechanics, show that it is available.
-			to_chat(user, FONT_SMALL(SPAN_NOTICE("- This object has additional info about mechanics.")))
+			to_chat(user, FONT_SMALL(SPAN_NOTICE("- This object has additional information about mechanics.")))
 		if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show that it is available.
-			to_chat(user, FONT_SMALL(SPAN_ALERT("- This object has additional info for antagonists.")))
+			to_chat(user, FONT_SMALL(SPAN_ALERT("- This object has additional information for antagonists.")))
-		if(desc_cult && user.mind?.special_role == "Cultist") // If the item has a cultist description and the user is a cultist, show that it is available.
-			to_chat(user, FONT_SMALL(SPAN_CULT("- This object has additional information for those within the veil...")))
 
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
@@ -260,14 +257,12 @@
 
 	to_chat(user, "[icon2html(src, user)] That's [f_name] [suffix]") // Object name. I.e. "This is an Object."
 	to_chat(user, desc) // Object description.
-	if(desc_fluff) // If the item has a fluff description, show it.
+	if(desc_extended) // If the item has a extended description, show it.
-		to_chat(user, desc_fluff)
+		to_chat(user, desc_extended)
-	if(desc_info) // If the item has a mechanics description, show it.
+	if(desc_info) // If the item has a description regarding game mechanics, show it.
 		to_chat(user, FONT_SMALL(SPAN_NOTICE("- [desc_info]")))
 	if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show it.
 		to_chat(user, FONT_SMALL(SPAN_ALERT("- [desc_antag]")))
-	if(desc_cult && user.mind?.special_role == "Cultist") // If the item has a cultist description and the user is a cultist, show it.
-		to_chat(user, FONT_SMALL(SPAN_CULT("- [desc_cult]")))
 
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user

code/game/gamemodes/cult/items/clothes.dm

@@ -2,7 +2,7 @@
 	name = "ragged hood"
 	icon_state = "culthood"
 	desc = "A torn, dust-caked hood."
-	desc_cult = "This can be reforged to become an eldritch voidsuit helmet."
+	desc_antag = "As a Cultist, this can be reforged to become an eldritch voidsuit helmet."
 	flags_inv = HIDEFACE|HIDEEARS|HIDEEYES
 	body_parts_covered = HEAD|EYES
 	armor = list(
@@ -27,7 +27,7 @@
 /obj/item/clothing/suit/cultrobes
 	name = "ragged robe"
 	desc = "A ragged, dusty robe."
-	desc_cult = "This can be reforged to become an eldritch voidsuit."
+	desc_antag = "As a Cultist, this item can be reforged to become an eldritch voidsuit."
 	icon_state = "cultrobes"
 	item_state = "cultrobes"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS

code/game/gamemodes/cult/items/tome.dm

@@ -1,6 +1,6 @@
 /obj/item/book/tome
 	name = "arcane tome"
-	desc_cult = null
+	desc_antag = null // It's already been forged once.
 	icon_state = "tome"
 	item_state = "tome"
 	throw_speed = 1

code/game/objects/effects/spiders.dm

@@ -132,7 +132,7 @@
 /obj/effect/spider/spiderling
 	name = "greimorian larva"
 	desc = "A small, agile alien creature. It oozes some disgusting slime."
-	desc_fluff = "Greimorians are a species of arthropods whose evolutionary traits have made them an extremely dangerous invasive species.  \
+	desc_extended = "Greimorians are a species of arthropods whose evolutionary traits have made them an extremely dangerous invasive species.  \
 	They originate from the Badlands planet Greima, once covered in crystalized phoron. A decaying orbit led to its combustion from proximity to its sun, and its dominant inhabitants \
 	managed to survive in orbit. Countless years later, they prove to be a menace across the galaxy, having carried themselves within the hulls of Human vessels to spread wildly."
 	icon_state = "spiderling"

code/game/objects/items/devices/lighting/lamp.dm

@@ -1,7 +1,7 @@
 /obj/item/device/flashlight/lamp
 	name = "desk lamp"
 	desc = "A desk lamp with an adjustable mount."
-	desc_cult = "This can be reforged to become a pylon."
+	desc_antag = "As a Cultist, this item can be reforged to become a pylon."
 	icon_state = "lamp"
 	item_state = "lamp"
 	center_of_mass = list("x" = 13,"y" = 11)

code/game/objects/items/devices/megaphone.dm

@@ -1,7 +1,7 @@
 /obj/item/device/megaphone
 	name = "megaphone"
 	desc = "Pretend to be a director for a brief moment before someone tackles you to make you shut up."
-	desc_fluff = "Annoy your colleagues! Scare interns! Impress no one!"
+	desc_extended = "Annoy your colleagues! Scare interns! Impress no one!"
 	desc_info = "A device used to project your voice. Loudly."
 	icon = 'icons/obj/contained_items/tools/megaphone.dmi'
 	icon_state = "megaphone"
@@ -67,49 +67,49 @@
 /obj/item/device/megaphone/red
 	name = "red megaphone"
 	desc = "To make people do your bidding."
-	desc_fluff = "It's in a menacing crimson red."
+	desc_extended = "It's in a menacing crimson red."
 	icon_state = "megaphone_red"
 	item_state = "megaphone_red"
 
 /obj/item/device/megaphone/sec
 	name = "security megaphone"
 	desc = "To stop people from stepping over the police tape."
-	desc_fluff = "Nothing to see here. Move along."
+	desc_extended = "Nothing to see here. Move along."
 	icon_state = "megaphone_sec"
 	item_state = "megaphone_sec"
 
 /obj/item/device/megaphone/med
 	name = "medical megaphone"
 	desc = "To make people leave the ICU."
-	desc_fluff = "Realistcally only used to startle the CMO's cat."
+	desc_extended = "Realistcally only used to startle the CMO's cat."
 	icon_state = "megaphone_med"
 	item_state = "megaphone_med"
 
 /obj/item/device/megaphone/sci
 	name = "science megaphone"
 	desc = "To make people stand clear of the blast zone."
-	desc_fluff = "Something to rival the explosions heard in the science department."
+	desc_extended = "Something to rival the explosions heard in the science department."
 	icon_state = "megaphone_sci"
 	item_state = "megaphone_sci"
 
 /obj/item/device/megaphone/engi
 	name = "engineering megaphone"
 	desc = "To make people get out of construction sites."
-	desc_fluff = "At home in construction sites and road works, it'll stick by you in diverting traffic and dim-witted coworkers."
+	desc_extended = "At home in construction sites and road works, it'll stick by you in diverting traffic and dim-witted coworkers."
 	icon_state = "megaphone_engi"
 	item_state = "megaphone_engi"
 
 /obj/item/device/megaphone/cargo
 	name = "operations megaphone"
 	desc = "To make people to push crates."
-	desc_fluff = "Only certified forklift operators will be able to handle the sheer power of this megaphone. Either that, or just be the Operations Manager."
+	desc_extended = "Only certified forklift operators will be able to handle the sheer power of this megaphone. Either that, or just be the Operations Manager."
 	icon_state = "megaphone_cargo"
 	item_state = "megaphone_cargo"
 
 /obj/item/device/megaphone/command
 	name = "command megaphone"
 	desc = "To make people to get back to work."
-	desc_fluff = "Exude authority by decree of having the louder voice."
+	desc_extended = "Exude authority by decree of having the louder voice."
 	icon_state = "megaphone_command"
 	item_state = "megaphone_command"
 

code/game/objects/items/devices/modkit.dm

@@ -141,14 +141,14 @@
 	icon_state = "himeo_kit"
 	item_state = "himeo_kit"
 	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit."
-	desc_fluff = "As part of a cost-cutting and productivity-enhancing initiative, NanoTrasen has authorized a number of Himean Type-76 'Fish Fur'\
+	desc_extended = "As part of a cost-cutting and productivity-enhancing initiative, NanoTrasen has authorized a number of Himean Type-76 'Fish Fur'\
 	for use by miners originating from the planet. Most of these suits are assembled in Cannington and painstakingly optimized on-site by their\
 	individual operator leading to a large trail of red tape as NanoTrasen is forced to inspect these suits to ensure their safety."
 
 /obj/item/voidsuit_modkit/himeo/tajara
 	name = "tajaran himeo voidsuit kit"
 	desc = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit fitted for Tajara."
-	desc_fluff = "As part of a cost-cutting and productivity-enhancing initiative, NanoTrasen has authorized a number of Himean Type-76 'Fish Fur'\
+	desc_extended = "As part of a cost-cutting and productivity-enhancing initiative, NanoTrasen has authorized a number of Himean Type-76 'Fish Fur'\
 	for use by miners and engineers originating from the planet. Most of these suits are assembled in Cannington and painstakingly optimized on-site by their\
 	individual operator leading to a large trail of red tape as NanoTrasen is forced to inspect these suits to ensure their safety."
 	suit_options = list(

code/game/objects/items/devices/versebook.dm

@@ -1,7 +1,7 @@
 /obj/item/device/versebook
 	name = "\improper versebook"
 	desc = "If you see this, someone fucked up. Make a issue request."
-	desc_fluff = "No, seriously. Make a issue request"
+	desc_extended = "No, seriously. Make a issue request"
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi',
@@ -41,7 +41,7 @@
 /obj/item/device/versebook/tribunal
 	name = "\improper tribunal codex"
 	desc = "A holy text of the Moroz Holy Tribunal, the state religion of the Empire of Dominia."
-	desc_fluff = "An almost mandatory possession for any Dominian household, containing a list of edicts, litanies, and rituals."
+	desc_extended = "An almost mandatory possession for any Dominian household, containing a list of edicts, litanies, and rituals."
 	icon_state = "dominiabook"
 	item_state = "dominia"
 
@@ -52,7 +52,7 @@
 /obj/item/device/versebook/gadpathur
 	name = "\improper gadpathurian morale manual"
 	desc = "A popular Gadpathurian pocket guide, used to carry a fragment of the Commander's wisdom abroad."
-	desc_fluff = "Manufactured using recycled paper and canvas. The wisdom within the text is based on the collected speeches of Commander Patvardhan and her assorted councillors."
+	desc_extended = "Manufactured using recycled paper and canvas. The wisdom within the text is based on the collected speeches of Commander Patvardhan and her assorted councillors."
 	icon_state = "gadpathurbook"
 	item_state = "gadpathur"
 
@@ -63,7 +63,7 @@
 /obj/item/device/versebook/biesel
 	name = "\improper Constitution of The Federal Republic of Biesel"
 	desc = "A common possession by Biesel government officals, the printed text of the constitution for the Federal Republic of Biesel and the Corporate Reconstruction Zone, adopted in 2452."
-	desc_fluff = "This book has the Republic of Biesel's iconic symbol etched on the cover, the text within details the structure of the Federal Democracy the Republic is today."
+	desc_extended = "This book has the Republic of Biesel's iconic symbol etched on the cover, the text within details the structure of the Federal Democracy the Republic is today."
 	icon_state = "bieselbook"
 	item_state = "biesel"
 
@@ -74,7 +74,7 @@
 /obj/item/device/versebook/trinary
 	name = "\improper The Order (abdridged version)"
 	desc = "The holy text of the Trinary Perfection, who believe in synthetic perfection and eventual salvation."
-	desc_fluff = "This book contains some verses of the core beliefs of the Trinary Perfection, including some of the original works by the Corkfells, some additions by the prophet-like figure Flock, and a few recent additions by Ecclesiarch ARM-1DRIL. This is the abridged version, with only the core beliefs present."
+	desc_extended = "This book contains some verses of the core beliefs of the Trinary Perfection, including some of the original works by the Corkfells, some additions by the prophet-like figure Flock, and a few recent additions by Ecclesiarch ARM-1DRIL. This is the abridged version, with only the core beliefs present."
 	icon_state = "trinarybook"
 	item_state = "trinary"
 

code/game/objects/items/tajara.dm

@@ -1,7 +1,7 @@
 /obj/item/storage/box/fancy/cigarettes/pra
 	name = "\improper Labourer's Choice cigarette packet"
 	desc = "Jokingly referred to an essential part of a working class citizen's breakfast, beside state-provided provisions."
-	desc_fluff = "Imported from the People's Republic of Adhomai."
+	desc_extended = "Imported from the People's Republic of Adhomai."
 	icon_state = "prapacket"
 	item_state = "Dpacket"
 	storage_slots = 7
@@ -21,7 +21,7 @@
 /obj/item/storage/box/fancy/cigarettes/dpra
 	name = "\improper Shastar List'ya cigarette packet"
 	desc = "Rumored to be a de-facto currency for Adhominian knuckles off-planet."
-	desc_fluff = "Imported from the Democratic People's Republic of Adhomai."
+	desc_extended = "Imported from the Democratic People's Republic of Adhomai."
 	icon_state = "dprapacket"
 	item_state = "Bpacket"
 	cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
@@ -29,7 +29,7 @@
 /obj/item/storage/box/fancy/cigarettes/nka
 	name = "\improper Gato Royales cigarette packet"
 	desc = "Popular with the aristocrats of the New Kingdom of Adhomai for its mild menthol flavor."
-	desc_fluff = "Imported from the New Kingdom of Adhomai."
+	desc_extended = "Imported from the New Kingdom of Adhomai."
 	icon_state = "nkapacket"
 	item_state = "Fpacket"
 	cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
@@ -59,7 +59,7 @@
 
 		if("hadii")
 			desc += " This one has the picture of President Njadrasanukii Hadii."
-			desc_fluff = "Njadrasanukii Hadii was born in 2402 to the noble Njarir'Akhran Hadii line. He got involved with the military at an early age, becoming a cadet for the \
+			desc_extended = "Njadrasanukii Hadii was born in 2402 to the noble Njarir'Akhran Hadii line. He got involved with the military at an early age, becoming a cadet for the \
 			Royal Navy at 16. During the revolution, he briefly fought for the loyalists but was recalled to the Hadii Citadel to help defend his family's ancestral home. Following the \
 			revolution and the Hadii's rise in the new Federal Republic, Njadrasanukii was given the office of Vice-President under his brother Al'Mari Hadii. He assumed the office of \
 			president on 2451 after the assassination of his brother. Infamous for his harsh decrees and tendency to betray his word, Njadrasanukii is not trustworthy but holds the \
@@ -67,13 +67,13 @@
 
 		if("tesla")
 			desc += " This one has the picture of a tesla trooper."
-			desc_fluff = "Formed in 2461, the Tesla Brigade is an experimental force composed of augmented veterans. Created after the intense casualties of the Das'nrra campaign and the \
+			desc_extended = "Formed in 2461, the Tesla Brigade is an experimental force composed of augmented veterans. Created after the intense casualties of the Das'nrra campaign and the \
 			severe loss of Republican Guard units. Additional funding and focus was placed on a previously shelved proposal for heavily armed shock and high technology assault troopers. A \
 			special unit designated to withstand the numerical disadvantages and prolonged engagements special forces of the Republic often faces."
 
 		if("headmaster")
 			desc += " This one has the picture of Headmaster Harrrdanim Tyr'adrr."
-			desc_fluff = "Harrrdanim was born in 2411 to an M'sai line. He entered military service at a young age. His high intelligence and robust health soon had him successfully \
+			desc_extended = "Harrrdanim was born in 2411 to an M'sai line. He entered military service at a young age. His high intelligence and robust health soon had him successfully \
 			enter the Royal Enforcers; the elite all-M'sai special forces available to the nobility. He was taken prisoner during the First Revolution and released uner condition that \
 			he acts as a spy against subversive elements. Soon Harrrdanim became known as one of the most effective and ruthless secret agents available to the government and eventually \
 			rose the ranks to become Headmaster of the People's Strategic Intelligence Service. He is known and feared across Adhomai and has spawned an entire 'spy thriller' genre in \
@@ -81,13 +81,13 @@
 
 		if("commissar")
 			desc += " This one has the picture of party commissar."
-			desc_fluff = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
+			desc_extended = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
 			their commanders follow the principles of Hadiism. Their duties are not only limited to enforcing the republican ideals among the troops and reporting possible subversive elements, \
 			they are expected to display bravery in combat and lead by example."
 
 		if("almanq")
 			desc += " This one has the picture of Rikdar Al'Manq."
-			desc_fluff = "Rikdar was born on 2429 the noble Njarir'Akhran Bayan line in Nal'Tor. However, his parents were disappeared by Republic secret police in one of the \
+			desc_extended = "Rikdar was born on 2429 the noble Njarir'Akhran Bayan line in Nal'Tor. However, his parents were disappeared by Republic secret police in one of the \
 			frequent purges of Njarir'Akhran and he was put into state-run foster care. He has raised in the House Of Young Patriots orphanage until he was adopted at 14 to Hharar \
 			parents and took their last name of Al'Manq. Rikdar graduated university on at 20 years old in 2450 with a Bachelors of Arts. Having already received several high-profile \
 			commissions, including the then-President Al'Mari Hadii, whose portrait was done a week before his death. Rikdar remains extremely popular on Adhomai. The People's Republic \
@@ -95,7 +95,7 @@
 
 		if("yasmin")
 			desc += " This one has the picture of Yasmin Piaf."
-			desc_fluff = "Yasmin Piaf, was born in 2434 in the suburbs of Nal'tor to a particularly well off Njarir'Akhran family. Even from her young age, \
+			desc_extended = "Yasmin Piaf, was born in 2434 in the suburbs of Nal'tor to a particularly well off Njarir'Akhran family. Even from her young age, \
 			Yasmin was interested in music. She was part of her school's choir and participated in several nation-wide contests for the honor of singing for President Rhagrrhuzau Hadii. \
 			Eventually, she graduated and went on to the Academy of Musical Arts with full scholarship. Yet her voice, described by some as angelic and innocent, found purchase with an \
 			aging generation of Tajara who wished a brief return to peaceful normalcy following the First Revolution. Yasmin Piaf has become one of the most famous singers in the modern \
@@ -103,7 +103,7 @@
 
 		if("andrey")
 			desc += " This one has the picture of Andrey Borisov."
-			desc_fluff = "Born in 2416 to aline of M'sai warriors, Andrey was not even two years old before humanity stumbled across Adhomai and lit the flame that ignited the \
+			desc_extended = "Born in 2416 to aline of M'sai warriors, Andrey was not even two years old before humanity stumbled across Adhomai and lit the flame that ignited the \
 			First Revolution. As the newly founded People's Republic began the arduous transition from a movement to a government, Andrey's connections with the upper echelon of \
 			PRA politicians bore fruit. He was taken on as a member of an officer's general staff, headquartered in Nal'Tor. His position put him in contact with the elite, however, \
 			and many found him charming and personable. His ascension from lowly	secretary to the major news anchor was one that involved plenty of political maneuvering, money - \
@@ -111,7 +111,7 @@
 
 		if("paratrooper")
 			desc += " This one has the picture of a republican guard."
-			desc_fluff = "Following the end of the first revolution, many veterans especially of the Ha'narr Corps had become hardened warriors with exceptional abilities. \
+			desc_extended = "Following the end of the first revolution, many veterans especially of the Ha'narr Corps had become hardened warriors with exceptional abilities. \
 			Seeking to mate the heavily refined combat effectiveness of shock troop units which formed among front-line infantry with the survival skills and mobility of the Ha'narrii, \
 			the Republican Guard was formed by absorbing all of these units as a hard-hitting highly mobile airborne special forces unit in 2435. They primarily draw recruits from \
 			promising and outstanding members of the Ha'narr Corps, as well as shock infantry divisions, not at all unlike their original founding members. Their iconic light blue \
@@ -120,7 +120,7 @@
 
 		if("scout")
 			desc += " This one has the picture of a Ha'narr scout."
-			desc_fluff = "Originally formed in 2421 during the first revolution, the Ha'narr Corps served as a reconnaissance, scouting and special operations unit for the \
+			desc_extended = "Originally formed in 2421 during the first revolution, the Ha'narr Corps served as a reconnaissance, scouting and special operations unit for the \
 			rebellion. Although it was disbanded at the end of the first revolution, it was reformed at the dawn of the second revolution as the inflexibility of the Republican Army \
 			proved to be a vital weakness which these units corrected for. The training regime for Ha'narrii is typically anywhere in between one to three months, with recruits trained \
 			in basic survival and reconnaissance skills emphasizing on self dependence within the frozen wilderness of Adhomai.  As a scouting unit, Ha'narri travel lightly on equipment, \
@@ -130,7 +130,7 @@
 /obj/item/pocketwatch/adhomai
 	name = "adhomian watch"
 	desc = "A watch made in the traditional adhomian style. It can be stored in a pocket or worn around the neck."
-	desc_fluff = "Baltoris a fortress founded during the Gunpowder Age; it was the landing site of the royal armies during the Suns'wars. Baltor plays a strategic role in controlling the \
+	desc_extended = "Baltoris a fortress founded during the Gunpowder Age; it was the landing site of the royal armies during the Suns'wars. Baltor plays a strategic role in controlling the \
 	Ras'val sea during the war. A town emerged around the fort over time, attracted by the safety provided by the military presence. The city is known for its skilled watchmaker artisans, \
 	a trade that has been passed down through generations. The Mez'gin clock tower, located at the town square, is one of its points of interest."
 	icon = 'icons/obj/tajara_items.dmi'
@@ -253,7 +253,7 @@
 	name = "bag of adhomian dice"
 	desc = "A bag containing enough dice to play Suns and Moon."
 	icon = 'icons/obj/tajara_items.dmi'
-	desc_fluff = "Suns and Moon is a very common dice game. It is played by all, though the lower classes have the tendency to gamble whereas upper classes play it just for fun. The ease and universality \
+	desc_extended = "Suns and Moon is a very common dice game. It is played by all, though the lower classes have the tendency to gamble whereas upper classes play it just for fun. The ease and universality \
 	of the rules has garnered it quite the reputation. Die will usually have an image of Rredouane fixed upon them. Parks will commonly have designated spots for people to play Suns and Moon. Disputes are \
 	also solved through this game."
 	starts_with = list(

code/game/objects/items/toys.dm

@@ -107,7 +107,7 @@
 /obj/item/toy/balloon
 	name = "balloon"
 	desc_info = "You can fill it up with gas using a tank."
-	desc_fluff = "Thanks to the joint effort of the Research and Atmospherics teams, station enviroments have been set to allow balloons to float without helium. Look, it was the end of the month and we went under budget."
+	desc_extended = "Thanks to the joint effort of the Research and Atmospherics teams, station enviroments have been set to allow balloons to float without helium. Look, it was the end of the month and we went under budget."
 	drop_sound = 'sound/items/drop/rubber.ogg'
 	pickup_sound = 'sound/items/pickup/rubber.ogg'
 	w_class = ITEMSIZE_HUGE
@@ -228,25 +228,25 @@
 /obj/item/toy/balloon/bat
 	name = "giant bat balloon"
 	desc = "A large, kitschy balloon in the shape of a spooky bat with orange eyes."
-	desc_fluff = "There's a tag that reads: \"Apparition Halloween LLC.\""
+	desc_extended = "There's a tag that reads: \"Apparition Halloween LLC.\""
 	icon_state = "batballoon"
 
 /obj/item/toy/balloon/ghost
 	name = "giant ghost balloon"
 	desc = "Oh no, it's a ghost! Oh wait, it's just a kitschy balloon. Phew!"
-	desc_fluff = "There's a tag that reads: \"Apparition Halloween LLC.\""
+	desc_extended = "There's a tag that reads: \"Apparition Halloween LLC.\""
 	icon_state = "ghostballoon"
 
 /obj/item/toy/balloon/xmastree
 	name = "giant christmas tree balloon"
 	desc = "Mandatory at inter-generational christmas gatherings and office parties."
-	desc_fluff = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
+	desc_extended = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
 	icon_state = "xmastreeballoon"
 
 /obj/item/toy/balloon/candycane
 	name = "giant candy cane balloon"
 	desc = "Kris Kringle ain't got nothing on this candied confection."
-	desc_fluff = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
+	desc_extended = "There's a tag that reads: \"On behalf of employee relations, the CCIA Department wishes you a happy non-denominational holiday season.\""
 	icon_state = "candycaneballoon"
 
 /obj/item/toy/balloon/color /// To color it, VV the 'color' var with a hex color code with the # included.
@@ -327,7 +327,7 @@
 	desc = "A magazine specialized in publishing Tajaran Otherworldly Literature stories. The periodical magazine features texts submitted by amateur and established writers alike. \
 	Since it is printed using cheap, recycled paper, outlandish tales is sold for a couple of credits on the streets of Little Adhomai. The magazine also has a section dedicated to \
 	exploring the urban legends and mysteries of Mendell City."
-	desc_fluff = "Influenced by recent events and the growing interest in urban legends, Little Adhomai became the birthplace of Tajaran Otherworldly Literature. This literary genre combines \
+	desc_extended = "Influenced by recent events and the growing interest in urban legends, Little Adhomai became the birthplace of Tajaran Otherworldly Literature. This literary genre combines \
 	aspects of fantasy, horror, and speculative fiction alongside Adhomian paranormal elements, frequently reimagining mythological creatures and events. Tajaran Otherworldly texts are usually \
 	published in magazines or on extranet sites."
 	icon_state = "comicoutlandish"
@@ -1052,7 +1052,7 @@
 /obj/item/toy/plushie/ipc
 	name = "Aphy plushie"
 	desc = "A plushie of an old Hephaestus mascot, Aphy."
-	desc_fluff = "Aphy, a play on the name Aphrodite, was Hephaestus Industries' first baseline prototype. While the original Aphy is on display in Hephaestus' Mars headquarters, the unit has become a cutesy mascot in recent years."
+	desc_extended = "Aphy, a play on the name Aphrodite, was Hephaestus Industries' first baseline prototype. While the original Aphy is on display in Hephaestus' Mars headquarters, the unit has become a cutesy mascot in recent years."
 	icon_state = "ipcplushie"
 	phrase = "Bwoop!"
 
@@ -1165,25 +1165,25 @@
 /obj/item/toy/desk/newtoncradle
 	name = "\improper Newton's cradle"
 	desc = "A ancient 21th century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space."
-	desc_fluff = "Aside from car radios, Eridanian Dregs are reportedly notorious for stealing these things. It is often theorized that the very same ball bearings are used in black-market cybernetics."
+	desc_extended = "Aside from car radios, Eridanian Dregs are reportedly notorious for stealing these things. It is often theorized that the very same ball bearings are used in black-market cybernetics."
 	icon_state = "newtoncradle"
 
 /obj/item/toy/desk/fan
 	name = "office fan"
 	desc = "Your greatest fan."
-	desc_fluff = "For weeks, the atmospherics department faced a conundrum on how to lower temperatures in a localized area through complicated pipe channels and ventilation systems. The problem was promptly solved by ordering several desk fans."
+	desc_extended = "For weeks, the atmospherics department faced a conundrum on how to lower temperatures in a localized area through complicated pipe channels and ventilation systems. The problem was promptly solved by ordering several desk fans."
 	icon_state = "fan"
 
 /obj/item/toy/desk/officetoy
 	name = "office toy"
 	desc = "A generic microfusion powered office desk toy. Only generates magnetism and ennui."
-	desc_fluff = "The mechanism inside is a Hephasteus trade secret. No peeking!"
+	desc_extended = "The mechanism inside is a Hephasteus trade secret. No peeking!"
 	icon_state = "desktoy"
 
 /obj/item/toy/desk/dippingbird
 	name = "dipping bird toy"
 	desc = "Engineers marvel at this scale model of a primitive thermal engine. It's highly debated why the majority of owners were in low-level bureaucratic jobs."
-	desc_fluff = "One of the key essentials for every Eridanian suit - it's practically a rite of passage to own one of these things."
+	desc_extended = "One of the key essentials for every Eridanian suit - it's practically a rite of passage to own one of these things."
 	icon_state = "dippybird"
 
 /obj/item/toy/partypopper

code/game/objects/items/weapons/chaplain_items.dm

@@ -23,7 +23,7 @@
 	name = "tribunalist purification rod"
 	desc = "A holy Symbol often carried by female Tribunalist clergy, the obsidian encased in the wooden handle is intended to ward off malevolent spirits and bless followers of the Goddess. The ornament on top depicts 'The Eye'\
 	Moroz Holy Tribunal."
-	desc_fluff = "With origins in House Zhao, Tribunalist purification rods are a common sight throughout the Empire of Dominia. Intended to ward off malevolent entities and bless the \
+	desc_extended = "With origins in House Zhao, Tribunalist purification rods are a common sight throughout the Empire of Dominia. Intended to ward off malevolent entities and bless the \
 	faithful a Tribunalist priestess is nothing without her rod, which is typically granted upon promotion to full priestess. This particular example has been built around an obsidian \
 	core in the shaft, and is heavier than it seems."
 	icon_state = "tribunalrod"
@@ -52,7 +52,7 @@
 /obj/item/nullrod/charm
 	name = "obsidian charm"
 	desc = "A tajaran charm created from obsidian created to ward off the supernatural and bring good fortune."
-	desc_fluff = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off raskara and other evils."
+	desc_extended = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off raskara and other evils."
 	icon = 'icons/obj/tajara_items.dmi'
 	contained_sprite = TRUE
 	item_icons = null
@@ -210,7 +210,7 @@
 /obj/item/assunzioneorb
 	name = "warding sphere"
 	desc = "A religious artefact commonly associated with Luceism, this transparent globe gives off a faint ghostly white light at all times."
-	desc_fluff = "Luceian warding spheres are made on the planet of Assunzione in the great domed city of Guelma, and are carried by followers of the faith heading abroad. \
+	desc_extended = "Luceian warding spheres are made on the planet of Assunzione in the great domed city of Guelma, and are carried by followers of the faith heading abroad. \
 	Constructed out of glass and a luce vine bulb these spheres can burn for years upon years, and it is said that the lights in the truly faithful's warding sphere will always \
 	point towards Assunzione. It is considered extremely bad luck to have one's warding sphere break, to extinguish its flame, or to relinquish it (permanently) to an unbeliever."
 	icon = 'icons/obj/weapons.dmi'

code/game/objects/items/weapons/cigs_lighters.dm

@@ -625,7 +625,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/pipe/bonepipe
 	name = "Europan bone pipe"
 	desc = "A smoking pipe made out of the bones of the Europan bone whale."
-	desc_fluff = "While most commonly associated with bone charms, bones from various sea creatures on Europa are used in a variety of goods, such as this smoking pipe. While smoking in submarines is often an uncommon occurrence, due to a lack of available air or space, these pipes are a common sight in the many stations of Europa. Higher-quality pipes typically have scenes etched into their bones, and can tell the story of their owner's time on Europa."
+	desc_extended = "While most commonly associated with bone charms, bones from various sea creatures on Europa are used in a variety of goods, such as this smoking pipe. While smoking in submarines is often an uncommon occurrence, due to a lack of available air or space, these pipes are a common sight in the many stations of Europa. Higher-quality pipes typically have scenes etched into their bones, and can tell the story of their owner's time on Europa."
 	icon_state = "bonepipeoff"
 	item_state = "bonepipeoff"
 	icon_on = "bonepipeon"
@@ -702,21 +702,21 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/dominia
 	name = "\improper Dominian Zippo lighter"
 	desc = "A zippo lighter with a depiction of the Imperial standard of Dominia."
-	desc_fluff = "While never officially endorsed by the Emperor, lighters featuring a stylized Imperial standard are a common sight throughout the Empire. Due to the simplicity with which the standard can be recreated, these lighters are found even in the poorer frontier regions in the Empire and are commonly seen as a sign of patriotism."
+	desc_extended = "While never officially endorsed by the Emperor, lighters featuring a stylized Imperial standard are a common sight throughout the Empire. Due to the simplicity with which the standard can be recreated, these lighters are found even in the poorer frontier regions in the Empire and are commonly seen as a sign of patriotism."
 	icon_state = "dominiazippo"
 	item_state = "dominiazippo"
 
 /obj/item/flame/lighter/zippo/sol
 	name = "\improper Solarian Zippo lighter"
 	desc = "A zippo lighter with a depiction of the flag of the Sol Alliance."
-	desc_fluff = "Zippo lighters with the flag of the Sol Alliance continue a long-standing tradition of Earth. While originally proclaiming patriotism to the nation, in the face of movements for more colonial self-determination, these lighters now push forward a message of unity."
+	desc_extended = "Zippo lighters with the flag of the Sol Alliance continue a long-standing tradition of Earth. While originally proclaiming patriotism to the nation, in the face of movements for more colonial self-determination, these lighters now push forward a message of unity."
 	icon_state = "solzippo"
 	item_state = "solzippo"
 
 /obj/item/flame/lighter/zippo/tcfl
 	name = "\improper Bieselite Zippo lighter"
 	desc = "A zippo lighter with a depiction of the Bieselite flag."
-	desc_fluff = "In their rush to expand the Tau Ceti Foreign Legion, the Republic of Biesel manufactured thousands of Biesel-patterned zippo lighters to compliment the jackets and berets that were so often touted by recruiters. In the wake of Frost's Invasion, the popularity of such lighters has only increased and they serve as a small show of patriotism. A small NanoTrasen logo is stenciled on the base."
+	desc_extended = "In their rush to expand the Tau Ceti Foreign Legion, the Republic of Biesel manufactured thousands of Biesel-patterned zippo lighters to compliment the jackets and berets that were so often touted by recruiters. In the wake of Frost's Invasion, the popularity of such lighters has only increased and they serve as a small show of patriotism. A small NanoTrasen logo is stenciled on the base."
 	icon_state = "tcflzippo"
 	item_state = "tcflzippo"
 
@@ -742,7 +742,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/himeo
 	name = "\improper Himean Zippo lighter"
 	desc = "A zippo with the symbol of the United Syndicates of Himeo on it. This seems to be a model of exceptional make and excessive fuel consumption and temperature."
-	desc_fluff = "Lighters of all kinds are a common sight in the United Syndicates of Himeo, where light sources are required for daily life in its dark tunnels, and its lighters are prized throughout the Coalition for their quality. The common emblem of the planet - a white circle surrounded by red triangles - is often featured on lighters originating from the planet."
+	desc_extended = "Lighters of all kinds are a common sight in the United Syndicates of Himeo, where light sources are required for daily life in its dark tunnels, and its lighters are prized throughout the Coalition for their quality. The common emblem of the planet - a white circle surrounded by red triangles - is often featured on lighters originating from the planet."
 	icon_state = "himeozippo"
 	item_state = "himeozippo"
 	flame_light_range = 2
@@ -750,7 +750,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/coalition
 	name = "\improper Coalition Zippo lighter"
 	desc = "A zippo lighter with a depiction of the Coalition of Colonies flag. This lighter utilizes advanced fuel from Xanu Prime which burns hotter, causing a blue flame."
-	desc_fluff = "As there are hundreds of cultures in the Coalition of Colonies, so too are there hundreds of local variations of zippo lighters. The most prized zippos tend to be those from the industrial colony of Himeo, where a strong work ethic and technological advancements combine to produce high-quality lighters that ignite through the harshest of conditions. Most exported Himean lighters have their logos scratched off, rebranded, and given a fresh coat of paint, much to the chagrin of their manufacturers."
+	desc_extended = "As there are hundreds of cultures in the Coalition of Colonies, so too are there hundreds of local variations of zippo lighters. The most prized zippos tend to be those from the industrial colony of Himeo, where a strong work ethic and technological advancements combine to produce high-quality lighters that ignite through the harshest of conditions. Most exported Himean lighters have their logos scratched off, rebranded, and given a fresh coat of paint, much to the chagrin of their manufacturers."
 	icon_state = "coalitionzippo"
 	item_state = "coalitionzippo"
 	flame_light_color = LIGHT_COLOR_BLUE
@@ -765,7 +765,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/europa
 	name = "\improper Europan Zippo lighter"
 	desc = "A smokeless electrical coil lighter in the style of a zippo with the tricolour of the Jovian moon Europa on the side. Even its outside feels somewhat hot to the touch when it is turned on."
-	desc_fluff = "Traditional lighters are often frowned upon in the various submarines and underwater bases of Europa for the fumes their open flames produce. As a result, flameless lighters using heated metal coils that ignite flammable material upon contact are employed instead. These lighters are often prized personal possessions of those who own them, as with living space, privacy and individual possessions are a luxury in the cramped quarters of Europan vessels and stations. A side effect of having lighters that use electrically heated metal coils as opposed to flames however, is that the exteriors of the lighters themselves can become heated to a point of inflicting superficial burns if left on for relatively short periods of time."
+	desc_extended = "Traditional lighters are often frowned upon in the various submarines and underwater bases of Europa for the fumes their open flames produce. As a result, flameless lighters using heated metal coils that ignite flammable material upon contact are employed instead. These lighters are often prized personal possessions of those who own them, as with living space, privacy and individual possessions are a luxury in the cramped quarters of Europan vessels and stations. A side effect of having lighters that use electrically heated metal coils as opposed to flames however, is that the exteriors of the lighters themselves can become heated to a point of inflicting superficial burns if left on for relatively short periods of time."
 	icon_state = "europazippo"
 	item_state = "europazippo"
 	flame_light_power = 1
@@ -773,7 +773,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/gadpathur
 	name = "\improper Gadpathurian Zippo lighter"
 	desc = "A zippo lighter with a depiction of the flag of the United Planetary Defense Council of Gadpathur. The nozzle seems to be especially small in order to produce a weaker and dimmer flame."
-	desc_fluff = "Owing to the relative poverty of Gadpathur and the ever-present need for gasmasks, smoking is a rare habit on the planet. Still, Gadpathurians who choose to smoke typically keep lighters with smaller nozzles, both to reduce light and thus attention in the confines of a bunker and to conserve on fuel which too is hoarded for their endless war preparations. The Gadpathurian flag emblazoned on the side of the lighter is not a common feature, with most Gadpathurians who stay on the planet preferring to place a symbol of their cadre in its stead."
+	desc_extended = "Owing to the relative poverty of Gadpathur and the ever-present need for gasmasks, smoking is a rare habit on the planet. Still, Gadpathurians who choose to smoke typically keep lighters with smaller nozzles, both to reduce light and thus attention in the confines of a bunker and to conserve on fuel which too is hoarded for their endless war preparations. The Gadpathurian flag emblazoned on the side of the lighter is not a common feature, with most Gadpathurians who stay on the planet preferring to place a symbol of their cadre in its stead."
 	icon_state = "gadpathurzippo"
 	item_state = "gadpathurzippo"
 	flame_light_power = 1
@@ -781,7 +781,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/asoral
 	name = "\improper Asoral jet lighter"
 	desc = "A thin lighter made from a heat-resistant polymer and a nozzle that wouldn't be out of place on a jet. While it might bear the logo of the Asoral Orbital and Suborbital Racing network on it, it utilizes advanced fuel from Xanu Prime which burns hotter, causing a blue flame."
-	desc_fluff = "The Asoral jet lighter began as a publicity stunt by a few intrepid engineers looking to recycle old and underperforming racing probe engines. Although that particular plan ended in disaster, the Asoral Racing network ended up loving the concept and adopting a smaller and safer version of the lighter as a form of advertising. In a pinch, lighters such as these are known to serve as replacement igniters for racers' engines. Until recently, they were produced with a plume similar to that of an afterburner before the merger of Crosk's racing networks with those of Xanu Prime."
+	desc_extended = "The Asoral jet lighter began as a publicity stunt by a few intrepid engineers looking to recycle old and underperforming racing probe engines. Although that particular plan ended in disaster, the Asoral Racing network ended up loving the concept and adopting a smaller and safer version of the lighter as a form of advertising. In a pinch, lighters such as these are known to serve as replacement igniters for racers' engines. Until recently, they were produced with a plume similar to that of an afterburner before the merger of Crosk's racing networks with those of Xanu Prime."
 	icon_state = "lighter-asoral"
 	item_state = "lighter-asoral"
 	flame_light_color = LIGHT_COLOR_BLUE
@@ -797,7 +797,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	name = "\improper Fisanduhian Zippo lighter"
 	desc = "A zippo with a depiction of the flag of the Confederate States of Fisanduh. This is a well crafted model that burns brighter and hotter than \
 	the usual lighter."
-	desc_fluff = "On Moroz it's rather hard to find a Confederate without at least some manner of lighter on their person. Fisanduhians don't \
+	desc_extended = "On Moroz it's rather hard to find a Confederate without at least some manner of lighter on their person. Fisanduhians don't \
 	smoke anymore than the rest of Moroz does, instead they prize these lighters for their utility. From burning loose thread to lighting a \
 	molotov and more. A common adage is that the fire of Fisanduh burns brighter than Dominia's, which seems to be true for their lighters at least. \
 	These have found purchase throughout the Spur due to their reliability and impressive capability to light up various things, causing a \
@@ -809,7 +809,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/flame/lighter/zippo/luceian
 	name = "\improper Luceian Zippo lighter"
 	desc = "A bright zippo lighter with the all-seeing eye of Ennoia on its front. Clearly Luceian."
-	desc_fluff = "Luceian lighters, sometimes referred to as \"Ennoic Fires,\" are commonly carried by Assunzionii as an emergency light \
+	desc_extended = "Luceian lighters, sometimes referred to as \"Ennoic Fires,\" are commonly carried by Assunzionii as an emergency light \
 	source. A genuine lighter in the Luceian tradition will have a proving mark stamped upon its base that shows when and where it was \
 	blessed following its construction."
 	icon_state = "luceianzippo"

code/game/objects/items/weapons/material/swords.dm

@@ -1,7 +1,7 @@
 /obj/item/material/sword
 	name = "claymore"
 	desc = "What are you standing around staring at this for? Get to killing!"
-	desc_cult = "This can be reforged to become a cult blade."
+	desc_antag = "As a Cultist, this item can be reforged to become a cult blade."
 	icon = 'icons/obj/sword.dmi'
 	icon_state = "claymore"
 	item_state = "claymore"

code/game/objects/items/weapons/material/twohanded.dm

@@ -610,7 +610,7 @@
 	name = "izweski hegemony flag"
 	desc = "For the Hegemon!"
 	desc_info = "This is a flagpole with an energy axe attached to it. Sheer strength and stubborness overcomes the unwieldiness."
-	desc_fluff = "\"Honor, Fire, Burn thy Fear\" - the famous motto of the Izweski, the clan that leads the largest nation of Unathi."
+	desc_extended = "\"Honor, Fire, Burn thy Fear\" - the famous motto of the Izweski, the clan that leads the largest nation of Unathi."
 	icon = 'icons/obj/unathi_items.dmi'
 	icon_state = "flag_hegemony0"
 	base_icon = "flag_hegemony"

code/game/objects/items/weapons/storage/backpack.dm

@@ -6,7 +6,7 @@
 /obj/item/storage/backpack
 	name = "backpack"
 	desc = "You wear this on your back and put items into it."
-	desc_cult = "This can be reforged to become a cult backpack. Any stored items will be transferred."
+	desc_antag = "As a Cultist, this item can be reforged to become a cult backpack. Any stored items will be transferred."
 	icon = 'icons/obj/storage/backpack.dmi'
 	icon_state = "backpack"
 	item_state = "backpack"
@@ -117,7 +117,7 @@
 /obj/item/storage/backpack/cultpack
 	name = "trophy rack"
 	desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
-	desc_cult = null
+	desc_antag = null // It's already been forged once.
 	icon_state = "cultpack"
 	item_state = "cultpack"
 

code/game/objects/items/weapons/storage/belt.dm

@@ -390,7 +390,7 @@
 /obj/item/storage/belt/custodial
 	name = "custodial belt"
 	desc = "A utility belt designed for custodial use."
-	desc_fluff = "A custodial belt is similar to most utility belts, but designed with pockets and attachment points that can hold common custodial tools."
+	desc_extended = "A custodial belt is similar to most utility belts, but designed with pockets and attachment points that can hold common custodial tools."
 	icon_state = "custodialbelt"
 	item_state = "custodialbelt"
 	storage_slots = 12
@@ -568,7 +568,7 @@
 	contained_sprite = TRUE
 	storage_slots = 1
 	max_w_class = ITEMSIZE_SMALL
-	desc_fluff = "Shumaila is the sister of Mata'ke and the goddess of fortification, chastity, and building. She is the head of the town watch and the architect for all of the \
+	desc_extended = "Shumaila is the sister of Mata'ke and the goddess of fortification, chastity, and building. She is the head of the town watch and the architect for all of the \
 	Holy Village's most important buildings. When Mata'ke's original hunting party had done battle with the King of Rraknarr, her beloved was killed in the fighting. Ever since then \
 	she has resolved to be eternally chaste in dedication to him. She is an M'sai who is depicted wearing modest dresses and carrying a hammer on a belt. She is not known for having \
 	much combat prowess despite her position as head of the town watch but is a capable commander for defensive tactics."

code/game/objects/items/weapons/storage/cell_backpack.dm

@@ -1,7 +1,7 @@
 /obj/item/storage/backpack/cell
 	name = "power cell backpack"
 	desc = "A specially designed power cell rack backpack. Includes an interior holographic display that shows held cells' charge."
-	desc_fluff = "Designed by NanoTrasen Scientists in 2462, the power cell backpack, formally known as the 'NT-100 Zeus' or more informally, the 'ABT-DMN-TME'. Using sophisticated sensors first designed four centuries earlier, hooked up to screens designed three centuries earlier, it allows the user to hotswap batteries at a glance, without spending many eye-hours wasted counting charge and doing mental arithmetic."
+	desc_extended = "Designed by NanoTrasen Scientists in 2462, the power cell backpack, formally known as the 'NT-100 Zeus' or more informally, the 'ABT-DMN-TME'. Using sophisticated sensors first designed four centuries earlier, hooked up to screens designed three centuries earlier, it allows the user to hotswap batteries at a glance, without spending many eye-hours wasted counting charge and doing mental arithmetic."
 	icon = 'icons/obj/cell_backpack.dmi'
 	icon_state = "cell_rack"
 	item_state = "cell_rack"

code/game/objects/items/weapons/storage/field_ration.dm

@@ -3,7 +3,7 @@
 	desc = "An individually packed meal, designated to be consumed on field."
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "ration"
-	desc_fluff = "The republican army is the best equipped among the warring factions of Adhomai, being supplied by NanoTrasen and other outworld supporters. Canned goods and \
+	desc_extended = "The republican army is the best equipped among the warring factions of Adhomai, being supplied by NanoTrasen and other outworld supporters. Canned goods and \
 	modern rations are issued to all branches of the Republic's military. Native field meals are composed of salt-cured Fatshouters's meat, bread and Victory Gin, while imported ones \
 	are commonly found in the form of LiquidFood rations, a less than popular alternative manufactured by NanoTrasen."
 	var/preset_ration	//if the package comes with one in particular, not a random
@@ -41,7 +41,7 @@
 
 /obj/item/storage/field_ration/nka
 	icon_state = "bigbox"
-	desc_fluff = "The early Alam'ardii forces relied on the landed nobility to provide them food, with the resources being taken from the private properties of their contractors. \
+	desc_extended = "The early Alam'ardii forces relied on the landed nobility to provide them food, with the resources being taken from the private properties of their contractors. \
 	Their rations were composed mainly of salt-cured Snow Strider's meat, Blizzard Ears's flour and Fatshouters's milk. The defection of many officers from the Republican navy to the \
 	imperial side introduced the concept of canned goods, a luxury at the time, being used as rations. Large shipments of supplements, included food, were smuggled by the officers and \
 	their crew during the formation of the Royal Navy."
@@ -72,7 +72,7 @@
 
 /obj/item/storage/field_ration/dpra
 	icon_state = "bigbox"
-	desc_fluff = "The Adhomai Liberation army, being an amalgamation of regular army units, militia groups, and undercover agents, does not have any standard set when the subject is \
+	desc_extended = "The Adhomai Liberation army, being an amalgamation of regular army units, militia groups, and undercover agents, does not have any standard set when the subject is \
 	military nutrition. Depending on the area where one army might operate, its commanding officer, and available resources, rations might range from industrialized goods to foraging \
 	and hunting. It is a common practice for armies to confiscate villages productions, something that can cause resentment among farmers when their lands are occupied by the liberation \
 	army, to feed their soldiers."

code/game/objects/items/weapons/storage/toolbox.dm

@@ -239,7 +239,7 @@
 /obj/item/storage/toolbox/lunchbox/scc
 	name = "Stellar Corporate Conglomerate lunchbox"
 	desc = "A little lunchbox. This one is branded with the Stellar Corporate Conglomerate logo."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "lunchbox_scc"
 	item_state = "lunchbox_scc"
 

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -131,7 +131,7 @@
 /obj/item/tank/emergency_oxygen
 	name = "emergency oxygen tank"
 	desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
-	desc_cult = "This can be reforged to become a large brown oxygen tank."
+	desc_antag = "As a Cultist, this item can be reforged to become a large brown oxygen tank."
 	icon_state = "emergency"
 	item_state = "emergency"
 	gauge_icon = "indicator_emergency"

code/game/objects/structures/banner.dm

@@ -120,6 +120,6 @@
 /obj/structure/banner/scc
 	name = "Stellar Corporate Conglomerate banner"
 	desc = "A deep blue banner adorned with the logo of the Stellar Corporate Conglomerate."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "scc_banner_down"
 	icon_up = "scc_banner_up"

code/game/objects/structures/barsign.dm

@@ -82,109 +82,109 @@
 	var/name = "Holographic Projector"
 	var/icon_state = "Off"
 	var/desc = "A holographic projector, displaying different saved themes. It is turned off right now."
-	var/desc_fluff = "To change the displayed theme, use your bartender's or chef's ID on it and select something from the menu. There are two different selections for the bar and the kitchen."
+	var/desc_extended = "To change the displayed theme, use your bartender's or chef's ID on it and select something from the menu. There are two different selections for the bar and the kitchen."
 
 /decl/sign/double/off // Here start the different bar signs. To add any new ones, just copy the format, make sure its in the .dmi and write away. -KingOfThePing
 	name = "Holgraphic Projector"
 	icon_state = "Off"
 	desc = "A holographic projector, displaying different saved themes. It is turned off right now."
-	desc_fluff = "To change the displayed theme, use your bartender's or chef's ID on it and select something from the menu. There are two different selections for the bar and the kitchen."
+	desc_extended = "To change the displayed theme, use your bartender's or chef's ID on it and select something from the menu. There are two different selections for the bar and the kitchen."
 
 /decl/sign/double/bar/whiskey_implant
 	name = "Whiskey Implant"
 	icon_state = "Whiskey Implant"
 	desc = "A hit on modern extensive augmentations."
-	desc_fluff = "Some people would probably argue, that an implant which injects you some whiskey in certain situations, would probably make the galaxy a better place for everyone."
+	desc_extended = "Some people would probably argue, that an implant which injects you some whiskey in certain situations, would probably make the galaxy a better place for everyone."
 /decl/sign/double/bar/the_drunk_carp
 	name = "The Drunk Carp"
 	icon_state = "The Drunk Carp"
 	desc = "A depiction of a stylized space carp drinking a beer."
-	desc_fluff = "A depiction of 'Ivan the Space Carp' from the popular children's show of the same name. As the name suggests, Ivan has a heavy drinking problem."
+	desc_extended = "A depiction of 'Ivan the Space Carp' from the popular children's show of the same name. As the name suggests, Ivan has a heavy drinking problem."
 /decl/sign/double/bar/the_outer_spess
 	name = "The Outer Spess"
 	icon_state = "The Outer Spess"
 	desc = "A long running joke between spacemen, which never gets old."
-	desc_fluff = "It's almost tradition to call the great unknown of the universe 'spess'. No one really knows anymore where this joke comes from nor does anyone care. It's also not important, probably."
+	desc_extended = "It's almost tradition to call the great unknown of the universe 'spess'. No one really knows anymore where this joke comes from nor does anyone care. It's also not important, probably."
 /decl/sign/double/bar/officer_beersky
 	name = "Officer Beersky"
 	icon_state = "Officer Beersky"
 	desc = "To remember the hero, lost along the way, Officer Beepsky."
-	desc_fluff = "To commemorate the great accomplishments and never ending duty of the ISD's small security robot Officer Beepsky. Gone, but not forgotten."
+	desc_extended = "To commemorate the great accomplishments and never ending duty of the ISD's small security robot Officer Beepsky. Gone, but not forgotten."
 /decl/sign/double/bar/ishimura
 	name = "Ishimura"
 	icon_state = "Ishimura"
 	desc = "Named after a famous solarian physicist."
-	desc_fluff = "Hideki Ishimura was a famous solarian astrophysicist, responsible for some great scientific achievements from a time long gone."
+	desc_extended = "Hideki Ishimura was a famous solarian astrophysicist, responsible for some great scientific achievements from a time long gone."
 /decl/sign/double/bar/foreign
 	name = "Foreign"
 	icon_state = "Foreign"
 	desc = "A sign, designed in a classic estern-asian design, originating from Earth."
-	desc_fluff = "Earth's eastern asian culture brought forward a greatly varied and loved style of cuisine, still eaten today. This sign looks like one of the many signs that come to mind, when thinking about this."
+	desc_extended = "Earth's eastern asian culture brought forward a greatly varied and loved style of cuisine, still eaten today. This sign looks like one of the many signs that come to mind, when thinking about this."
 /decl/sign/double/bar/hearts_of_plasteel
 	name = "Hearts of Plasteel"
 	icon_state = "Hearts of Plasteel"
 	desc = "The sign of a diner from a famous TV show."
-	desc_fluff = "This sign is a replication of the diner sign, which the military-comedy show 'Hearts of Plasteel' revolves around. Loved by fans universe-wide."
+	desc_extended = "This sign is a replication of the diner sign, which the military-comedy show 'Hearts of Plasteel' revolves around. Loved by fans universe-wide."
 /decl/sign/double/bar/the_lightbulb
 	name = "The Lightbulb"
 	icon_state = "The Lightbulb"
 	desc = "The Lightbulb, a famous scene-bar and club in Mendell City."
-	desc_fluff = "The Lightbulb is one of the top hidden gems in Mendell City, if you want to party. Known for it's expansive dance floors and planet-wide renowned bartenders, the Lightbulb is a once in a lifetime experience."
+	desc_extended = "The Lightbulb is one of the top hidden gems in Mendell City, if you want to party. Known for it's expansive dance floors and planet-wide renowned bartenders, the Lightbulb is a once in a lifetime experience."
 /decl/sign/double/bar/chem_lab
 	name = "Chem Lab"
 	icon_state = "Chem Lab"
 	desc = "Chem Labs are the unofficial name given to some eridanian bars."
-	desc_fluff = "Underground, hidden or less known bars in Eridani, where almost exclusively Dregs or other 'Unwanted' frequent are unofficially called Chem Labs, not only due to the dubious origin of the alcohol served there."
+	desc_extended = "Underground, hidden or less known bars in Eridani, where almost exclusively Dregs or other 'Unwanted' frequent are unofficially called Chem Labs, not only due to the dubious origin of the alcohol served there."
 /decl/sign/double/bar/meow_mix
 	name = "Meow Mix"
 	icon_state = "Meow Mix"
 	desc = "A sign with a selection of some of the SCC's much beloved pets."
-	desc_fluff = "Two cats, named Bones and Nickel are depicted on this sign. They are much beloved mascotts, raising morale and work efficiency whereever they are."
+	desc_extended = "Two cats, named Bones and Nickel are depicted on this sign. They are much beloved mascotts, raising morale and work efficiency whereever they are."
 /decl/sign/double/bar/the_hive
 	name = "The Hive"
 	icon_state = "The Hive"
 	desc = "A wildly known, high class eridanian cocktail bar chain."
-	desc_fluff = "The Hive, known for its expensive and extravagant drinks, this bar chain is known as the place to be with your suit friends, when visiting Eridani I."
+	desc_extended = "The Hive, known for its expensive and extravagant drinks, this bar chain is known as the place to be with your suit friends, when visiting Eridani I."
 /decl/sign/double/bar/mead_bay
 	name = "Mead Bay"
 	icon_state = "Mead Bay"
 	desc = "The Mead Bay is the alternative for visiting an actual Medbay."
-	desc_fluff = "Another long running joke among spacefarers. A bandage from the Medbay may mend your body, but a good drink from the Mead Bay together with your colleagues really mends your soul."
+	desc_extended = "Another long running joke among spacefarers. A bandage from the Medbay may mend your body, but a good drink from the Mead Bay together with your colleagues really mends your soul."
 /decl/sign/double/bar/toolbox_tavern
 	name = "Toolbox Tavern"
 	icon_state = "Toolbox Tavern"
 	desc = "A popular bar at an Hepheastus Industries shipyard."
-	desc_fluff = "The name of the after-hours bar, located at the Hepheastus Industries shipyard the Horizon was built. To remember the great lengths and sacrifices that were made to bring this vessel to life."
+	desc_extended = "The name of the after-hours bar, located at the Hepheastus Industries shipyard the Horizon was built. To remember the great lengths and sacrifices that were made to bring this vessel to life."
 /decl/sign/double/bar/maltese_falcon
 	name = "Maltese Falcon"
 	icon_state = "Maltese Falcon"
 	desc = "A recreation of the famous Maltese Falcon bar sign."
-	desc_fluff = "An exact replica of the sign, which is hanging over the entrance of the famous Maltese Falcon Bar & Grill. A safe heaven for every pilot, captain or crewman of any vessel, looking to take a break."
+	desc_extended = "An exact replica of the sign, which is hanging over the entrance of the famous Maltese Falcon Bar & Grill. A safe heaven for every pilot, captain or crewman of any vessel, looking to take a break."
 /decl/sign/double/bar/old_cock_inn
 	name = "Old Cock Inn"
 	icon_state = "Old Cock Inn"
 	desc = "The sign of a formerly well-known discotheque."
-	desc_fluff = "The Old Cock Inn was a discotheque, from times long gone. Formerly known as 'Old Richard's Inn' no one can remember much about it, but the name has persisted over the decades."
+	desc_extended = "The Old Cock Inn was a discotheque, from times long gone. Formerly known as 'Old Richard's Inn' no one can remember much about it, but the name has persisted over the decades."
 /decl/sign/double/bar/commie
 	name = "People's Preferred"
 	icon_state = "Commie"
 	desc = "The name of a bar, located at Pluto's biggest spaceport."
-	desc_fluff = "People's Preferred is the name of the drinking hole at Pluto's biggest spaceport. Everyone stops there and everyone loves it there. It's what the people prefer, apparently."
+	desc_extended = "People's Preferred is the name of the drinking hole at Pluto's biggest spaceport. Everyone stops there and everyone loves it there. It's what the people prefer, apparently."
 /decl/sign/double/kitchen/event_horizon // Start of the kitchen signs. Don't mix it up.
 	name = "Event Horizon"
 	icon_state = "Event Horizon"
 	desc = "The SCCV Horizon's kitchen franchise sign."
-	desc_fluff = "The SCCV Horizon's dining area was the testing ground for the SCC to experiment with food franchising. The goal was to provide better food perparing processes, food quality and, of course, to maybe capitalize on this. To remember where it all started, the name 'Event Horizon' was chosen."
+	desc_extended = "The SCCV Horizon's dining area was the testing ground for the SCC to experiment with food franchising. The goal was to provide better food perparing processes, food quality and, of course, to maybe capitalize on this. To remember where it all started, the name 'Event Horizon' was chosen."
 /decl/sign/double/kitchen/paradise_sands
 	name = "Paradise Sands"
 	icon_state = "Paradise Sands"
 	desc = "A take on the sign of one of Silversun's most popular cafe and bistro owned by Idris Incorporated."
-	desc_fluff = "Paradise Sands is the name of one of the most popular cafe- and bistro places on all of Silversun. Located in a secluded cove, you can brunch, drink, and swim at a beach with white sand and a deep, azure ocean; a paradise."
+	desc_extended = "Paradise Sands is the name of one of the most popular cafe- and bistro places on all of Silversun. Located in a secluded cove, you can brunch, drink, and swim at a beach with white sand and a deep, azure ocean; a paradise."
 /decl/sign/double/kitchen/city_alive
 	name = "City Alive"
 	icon_state = "City Alive"
 	desc = "City Alive is another popular restaurant chain, originating from Eridani I. It is famous for its light shows."
-	desc_fluff = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit."
+	desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit."
 
 /obj/structure/sign/double/barsign/proc/get_sign_choices()
 	var/list/sign_choices = decls_repository.get_decls_of_subtype(choice_types)
@@ -205,6 +205,6 @@
 
     name = signselect.name
     desc = signselect.desc
-    desc_fluff = signselect.desc_fluff
+    desc_extended = signselect.desc_extended
     icon_state = signselect.icon_state
     update_icon()

code/game/objects/structures/signs.dm

@@ -434,14 +434,14 @@
 		P2.name = name
 		P2.desc = desc
 		P2.desc_info = desc_info
-		P2.desc_fluff = desc_fluff
+		P2.desc_extended = desc_extended
 		P2.flagtype = type
 	else
 		P.icon_state = "[flag_path]"
 	P.name = name
 	P.desc = desc
 	P.desc_info = desc_info
-	P.desc_fluff = desc_fluff
+	P.desc_extended = desc_extended
 	P.flagtype = type
 	qdel(src)
 
@@ -741,7 +741,7 @@
 	name = "Democratic People's Republic of Adhomai flag"
 	desc = "The black flag of the Democratic People's Republic of Adhomai."
 	flag_path = "dpra"
-	desc_fluff = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \
+	desc_extended = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \
 	life. Opposing corporate claims on Tajaran soil and citing mismatched development and governmental negligence as the fault of humanity, they aim \
 	to \"free Tajara from the new shackles imposed upon them by the corporate overlords and return Adhomai to a free, prosperous planet like our ancestors dreamed of.\" They named the \
 	nation they were fighting for the Democratic People's Republic of Adhomai."
@@ -754,7 +754,7 @@
 	name = "Democratic People's Republic of Adhomai flag"
 	desc = "The black flag of the Democratic People's Republic of Adhomai."
 	icon_state = "dpra"
-	desc_fluff = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \
+	desc_extended = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Libeation Army, a group made up of Tajara from almost every walk of \
 	life. Opposing corporate claims on Tajaran soil and citing mismatched development and governmental negligence as the fault of humanity, they aim \
 	to \"free Tajara from the new shackles imposed upon them by the corporate overlords and return Adhomai to a free, prosperous planet like our ancestors dreamed of.\" They named the \
 	nation they were fighting for the Democratic People's Republic of Adhomai."
@@ -769,7 +769,7 @@
 	name = "People's Republic of Adhomai flag"
 	desc = "The tajaran flag of the People's Republic of Adhomai."
 	flag_path = "pra"
-	desc_fluff = "Lead by President Njadrasanukii Hadii, the People's Republic of Adhomai are considered the 'loyalist' faction on Adhomai and enjoy galactic recognition as the \
+	desc_extended = "Lead by President Njadrasanukii Hadii, the People's Republic of Adhomai are considered the 'loyalist' faction on Adhomai and enjoy galactic recognition as the \
 	government of Adhomai. It claims to be the true keeper of Al'mari's legacy. However, the PRA can be described as a Hadiist branch of Al'mari's revolutionary ideology - that means \
 	putting the State at the top of a hierarchy of power. The PRA is a very centralized state, but in recent years has slowly been able to start making true its promises to bring \
 	revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \
@@ -783,7 +783,7 @@
 	name = "People's Republic of Adhomai flag"
 	desc = "The tajaran flag of the People's Republic of Adhomai."
 	icon_state = "pra"
-	desc_fluff = "Lead by President Njadrasanukii Hadii, the People's Republic of Adhomai are considered the 'loyalist' faction on Adhomai and enjoy galactic recognition as the \
+	desc_extended = "Lead by President Njadrasanukii Hadii, the People's Republic of Adhomai are considered the 'loyalist' faction on Adhomai and enjoy galactic recognition as the \
 	government of Adhomai. It claims to be the true keeper of Al'mari's legacy. However, the PRA can be described as a Hadiist branch of Al'mari's revolutionary ideology - that means \
 	putting the State at the top of a hierarchy of power. The PRA is a very centralized state, but in recent years has slowly been able to start making true its promises to bring \
 	revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \
@@ -799,7 +799,7 @@
 	name = "New Kingdom of Adhomai flag"
 	desc = "The blue flag of the New Kingdom of Adhomai."
 	flag_path = "nka"
-	desc_fluff = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \
+	desc_extended = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \
 	Ruled by King Vahzirthaamro Azunja specifically, he denounces both other factions in the civil war as illegitimate and himself as the only legitimate ruler of Adhomai. \
 	Supporters of the New Kingdom tend to be rare outside lands it controls. However, they believe strongly that the current republic on Adhomai was founded on genocide and unspeakable \
 	slaughters. The New Kingdom puts forth the ideology that Republicanism is bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the \
@@ -813,7 +813,7 @@
 	name = "New Kingdom of Adhomai flag"
 	desc = "The blue flag of the New Kingdom of Adhomai."
 	icon_state = "nka"
-	desc_fluff = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \
+	desc_extended = " The New Kingdom is ruled by a Njarir'Akhran noble line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. \
 	Ruled by King Vahzirthaamro Azunja specifically, he denounces both other factions in the civil war as illegitimate and himself as the only legitimate ruler of Adhomai. \
 	Supporters of the New Kingdom tend to be rare outside lands it controls. However, they believe strongly that the current republic on Adhomai was founded on genocide and unspeakable \
 	slaughters. The New Kingdom puts forth the ideology that Republicanism is bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the \
@@ -908,7 +908,7 @@
 /obj/structure/sign/flag/trinaryperfection
 	name = "Trinary Perfection flag"
 	desc = "The flag of the Trinary Perfection."
-	desc_fluff = "The Trinary Perfection is a new religious movement whose core beliefs are that synthetics are alive, divine, and have the potential to ascend to that of gods. The triangle intersecting the gear represents the exchange of ideas that make up the Trinary Perfection, the study of robotics, religion and the elevation of artificial intelligence."
+	desc_extended = "The Trinary Perfection is a new religious movement whose core beliefs are that synthetics are alive, divine, and have the potential to ascend to that of gods. The triangle intersecting the gear represents the exchange of ideas that make up the Trinary Perfection, the study of robotics, religion and the elevation of artificial intelligence."
 	icon_state = "trinaryperfection"
 
 /obj/structure/sign/flag/trinaryperfection/left
@@ -921,7 +921,7 @@
 /obj/item/flag/trinaryperfection
 	name = "Trinary Perfection flag"
 	desc = "The flag of the Trinary Perfection."
-	desc_fluff = "The Trinary Perfection is a new religious movement whose core beliefs are that synthetics are alive, divine, and have the potential to ascend to that of gods. The triangle intersecting the gear represents the exchange of ideas that make up the Trinary Perfection, the study of robotics, religion and the elevation of artificial intelligence."
+	desc_extended = "The Trinary Perfection is a new religious movement whose core beliefs are that synthetics are alive, divine, and have the potential to ascend to that of gods. The triangle intersecting the gear represents the exchange of ideas that make up the Trinary Perfection, the study of robotics, religion and the elevation of artificial intelligence."
 	flag_path = "trinaryperfection"
 
 /obj/item/flag/trinaryperfection/l
@@ -1021,7 +1021,7 @@
 /obj/structure/sign/flag/scc
 	name = "Stellar Corporate Conglomerate flag"
 	desc = "The colours and logo of the Stellar Corporate Conglomerate."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "scc"
 
 /obj/structure/sign/flag/scc/left
@@ -1033,7 +1033,7 @@
 /obj/item/flag/scc
 	name = "Stellar Corporate Conglomerate flag"
 	desc = "The flag representing the Stellar Corporate Conglomerate."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	flag_path = "scc"
 
 /obj/item/flag/scc/l
@@ -1043,14 +1043,14 @@
 /obj/item/flag/fisanduh
 	name = "Confederated States of Fisanduh flag"
 	desc = "A flag of the fallen Confederated States of Fisanduh."
-	desc_fluff = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \
+	desc_extended = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \
 	subject. This has not stopped it from becoming a symbol of resistance, and reproductions are extremely common in more rebellious areas of the Empire. Even if they are beaten-down and run ragged by war, the spirit of Fisanduh will live forever in the hearts of its people."
 	flag_path = "fisanduh"
 
 /obj/structure/sign/flag/fisanduh
 	name = "Confederated States of Fisanduh flag"
 	desc = "A flag of the fallen Confederated States of Fisanduh."
-	desc_fluff = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \
+	desc_extended = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \
 	subject. This has not stopped it from becoming a symbol of resistance, and reproductions are extremely common in more rebellious areas of the Empire. Even if they are beaten-down and run ragged by war, the spirit of Fisanduh will live forever in the hearts of its people."
 	icon_state = "fisanduh"
 
@@ -1068,7 +1068,7 @@
 	name = "United Planetary Defense Council of Gadpathur flag"
 	desc = "The black and brown flag of Gadpathur, featuring the planet's commonly-seen sun iconography in the centre. The Gadpathurian flag is a common sight in the Coalition's military, and can be seen everywhere on Gadpathur -- from lighters to ID card to government buildings. \
 	It is uncommonly seen outside of the Coalition as a symbol of anti-Solarian sentiment."
-	desc_fluff = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \
+	desc_extended = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \
 	Navy the most common flags available for the various successor states were the ASSN flags still flying over the ruins of government buildings. The black-brown flag of Ashia Patvardhan's Gadpathurian Reunification League that is now Gadpathur's flag was simply one of many of \
 	these variant flags before the League's reunification. The black and brown represent the plant itself, while the red-and-gold sun represents that the people of the plant are still alive and burning with a desire to never again fall."
 	flag_path = "gadpathur"
@@ -1077,7 +1077,7 @@
 	name = "United Planetary Defense Council of Gadpathur flag"
 	desc = "The black and brown flag of Gadpathur, featuring the planet's commonly-seen sun iconography in the centre. The Gadpathurian flag is a common sight in the Coalition's military, and can be seen everywhere on Gadpathur -- from lighters to ID card to government buildings. \
 	It is uncommonly seen outside of the Coalition as a symbol of anti-Solarian sentiment."
-	desc_fluff = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \
+	desc_extended = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \
 	Navy the most common flags available for the various successor states were the ASSN flags still flying over the ruins of government buildings. The black-brown flag of Ashia Patvardhan's Gadpathurian Reunification League that is now Gadpathur's flag was simply one of many of \
 	these variant flags before the League's reunification. The black and brown represent the plant itself, while the red-and-gold sun represents that the people of the plant are still alive and burning with a desire to never again fall."
 	icon_state = "gadpathur"
@@ -1095,14 +1095,14 @@
 /obj/item/flag/vysoka
 	name = "Free System of Vysoka flag"
 	desc = "The flag of the Free System of Vysoka."
-	desc_fluff = "The red, yellow and Coalition-blue flag of Vysoka, as drawn when one wishes to represent the planet as a whole. As Vysokan communities are rather traditional and tied to their respective Host, village or city-state, natives are more likely to \
+	desc_extended = "The red, yellow and Coalition-blue flag of Vysoka, as drawn when one wishes to represent the planet as a whole. As Vysokan communities are rather traditional and tied to their respective Host, village or city-state, natives are more likely to \
 	identify with local symbols. This has not stopped the original flag from being flown in times of much-needed unity."
 	flag_path = "vysoka"
 
 /obj/structure/sign/flag/vysoka
 	name = "Free System of Vysoka flag"
 	desc = "The flag of the Free System of Vysoka."
-	desc_fluff = "The red, yellow and Coalition-blue flag of Vysoka, as drawn when one wishes to represent the planet as a whole. As Vysokan communities are rather traditional and tied to their respective Host, village or city-state, natives are more likely to \
+	desc_extended = "The red, yellow and Coalition-blue flag of Vysoka, as drawn when one wishes to represent the planet as a whole. As Vysokan communities are rather traditional and tied to their respective Host, village or city-state, natives are more likely to \
 	identify with local symbols. This has not stopped the original flag from being flown in times of much-needed unity."
 	icon_state = "vysoka"
 
@@ -1119,14 +1119,14 @@
 /obj/item/flag/konyang
 	name = "Konyang flag"
 	desc = "The flag of Konyang."
-	desc_fluff = "The white, blue and yellow flag of Konyang was adopted in 2462, having unofficially been used by pro-autonomy circles long before the declaration of independence. The traditional taitju represents peace and harmony as the highest values of \
+	desc_extended = "The white, blue and yellow flag of Konyang was adopted in 2462, having unofficially been used by pro-autonomy circles long before the declaration of independence. The traditional taitju represents peace and harmony as the highest values of \
 	the new state, with the color blue representing the waterways the planet is known for and yellow, their aim of prosperity. The white background represents Konyang's purity."
 	flag_path = "konyang"
 
 /obj/structure/sign/flag/konyang
 	name = "Konyang flag"
 	desc = "The flag of Konyang."
-	desc_fluff = "The white, blue and yellow flag of Konyang was adopted in 2462, having unofficially been used by pro-autonomy circles long before the declaration of independence. The traditional taitju represents peace and harmony as the highest values of \
+	desc_extended = "The white, blue and yellow flag of Konyang was adopted in 2462, having unofficially been used by pro-autonomy circles long before the declaration of independence. The traditional taitju represents peace and harmony as the highest values of \
 	the new state, with the color blue representing the waterways the planet is known for and yellow, their aim of prosperity. The white background represents Konyang's purity."
 	icon_state = "konyang"
 

code/game/objects/structures/therapy.dm

@@ -1,7 +1,7 @@
 /obj/item/pocketwatch
 	name = "pocketwatch"
 	desc = "A watch that goes in your pocket."
-	desc_fluff = "Because your wrists have better things to do."
+	desc_extended = "Because your wrists have better things to do."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "pocketwatch"
 	drop_sound = 'sound/items/drop/accessory.ogg'

code/modules/cciaa/cciaa_items.dm

@@ -2,7 +2,7 @@
 /obj/item/device/taperecorder/cciaa
 	name = "Human Resources Recorder"
 	desc = "A modified recorder used for interviews by human resources personnel around the galaxy."
-	desc_fluff = "This recorder is a modified version of a standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system."
+	desc_extended = "This recorder is a modified version of a standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system."
 	desc_info = "This recorder records the fingerprints of the interviewee, to do so, interact with this recorder when asked."
 	w_class = ITEMSIZE_TINY
 	timestamp = list()	//This actually turns timestamp into a string later on

code/modules/clothing/ears/earmuffs.dm

@@ -12,7 +12,7 @@
 /obj/item/clothing/ears/earmuffs/earphones
 	name = "earphones"
 	desc = "A pair of wired earphones. Good luck trying to find a headphone jack."
-	desc_fluff = "Has a tendency to snag itself on whatever furniture it can find at the most inopportune of times."
+	desc_extended = "Has a tendency to snag itself on whatever furniture it can find at the most inopportune of times."
 	icon_state = "earphones"
 	item_state = "earphones"
 	build_from_parts = TRUE
@@ -45,7 +45,7 @@
 /obj/item/clothing/ears/earmuffs/earphones/headphones
 	name = "headphones"
 	desc = "A pair of headphones. Cushioned and sound-cancelling."
-	desc_fluff = "Unce unce unce unce."
+	desc_extended = "Unce unce unce unce."
 	icon_state = "headphones"
 	item_state = "headphones"
 
@@ -56,6 +56,6 @@
 /obj/item/clothing/ears/earmuffs/earphones/earbuds
 	name = "earbuds"
 	desc = "A pair of wireless earbuds. Don't lose them."
-	desc_fluff = "Oh god, he can't hear us! He's got earbuds on!"
+	desc_extended = "Oh god, they can't hear us! They've got earbuds on!"
 	icon_state = "earbuds"
 	item_state = "earbuds"

code/modules/clothing/factions/dominia.dm

@@ -82,7 +82,7 @@
 /obj/item/clothing/suit/storage/dominia/consular
 	name = "Dominian consular officer's greatcoat"
 	desc = "A Dominian greatcoat issued to members of His Majesty's Diplomatic Service, designed in the typical Dominian fashion."
-	desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though \
+	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though \
 	the Service also employs many commoners - as long as they can pass the rigorous examinations required to become a full member."
 	icon = 'icons/clothing/suits/coats/dominia_consular_coat.dmi'
 	icon_state = "dominia_consular_coat"
@@ -110,7 +110,7 @@
 	name = "fisanduhian bomber jacket"
 	desc = "A bomber jacket based off of styles created by Fisanduhian refugees. The double-breasted design works well for insulating \
 	heat, or concealing a small pistol."
-	desc_fluff = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
+	desc_extended = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
 	sourced from Moroz proper. Bomber jackets such as these were also frequently seen worn by members of the Fisanduh Freedom Front and came \
 	to be seen as an enduring symbol of their struggle for liberty."
 	icon = 'icons/clothing/suits/coats/dominia_bomber.dmi'
@@ -140,7 +140,7 @@
 /obj/item/clothing/under/dominia/sweater
 	name = "fisanduhian sweater"
 	desc = "This is a sweater of Fisanduhian style. Practical and utilitarian."
-	desc_fluff = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
+	desc_extended = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
 	sourced from Moroz proper. Sweaters such as this were a common sight in the region of Fisanduh, being comfortable to wear and very useful \
 	in the cold mountainous environment they lived in. It tends to be seen as something rather basic and droll by Imperials when compared \
 	to their more extravagant and colorful attire, but this suits the Confederates just fine."
@@ -151,7 +151,7 @@
 /obj/item/clothing/under/dominia/lyodsuit
 	name = "lyodsuit"
 	desc = "An imitation Lyodsuit from Dominia. It's lightweight, and high has quality fabric that makes it extremely comfortable to wear."
-	desc_fluff = "This Lyodsuit was created in Dominia. It is fashionable amongst the middle and lower classes of Dominia."
+	desc_extended = "This Lyodsuit was created in Dominia. It is fashionable amongst the middle and lower classes of Dominia."
 	icon = 'icons/clothing/under/uniforms/lyodsuit.dmi'
 	icon_state = "dom_thermal"
 	item_state = "dom_thermal"
@@ -261,7 +261,7 @@
 /obj/item/clothing/accessory/poncho/dominia/red/surcoat
 	name = "tribunalist surcoat"
 	desc = "A simple red surcoat commonly worn by Dominian clergy members."
-	desc_fluff = "Spun with rough but hardy fabrics from the Dominian frontier, this surcoat is commonly worn by poorer Tribunal clergy as well as missionaries\
+	desc_extended = "Spun with rough but hardy fabrics from the Dominian frontier, this surcoat is commonly worn by poorer Tribunal clergy as well as missionaries\
 	seeking protection from the elements. This garment was popularized by the Kael'kah sect and remains respected as a symbol of humility and poverty amongst priests."
 	icon = 'icons/clothing/suits/capes/dominia_surcoat.dmi'
 	icon_state = "dominian_surcoat"
@@ -272,7 +272,7 @@
 /obj/item/clothing/accessory/poncho/dominia/red/double
 	name = "tribunalist's full cape"
 	desc = "This is a large cape in the style of Dominian clergy. The symbol of 'The Eye' of the Tribunal is present on both the front and the back."
-	desc_fluff = "This style of cape is among the most flashy and ornate of the Tribunal's garb. Its weight and impracticality of use means that \
+	desc_extended = "This style of cape is among the most flashy and ornate of the Tribunal's garb. Its weight and impracticality of use means that \
 	it is often only worn by clergy of high station and on special occasions. Lower ranking members of the Tribunal or those who wear it frequently \
 	are often frowned upon as arrogant and vain."
 	icon = 'icons/clothing/suits/capes/dominia_doublecape.dmi'
@@ -284,7 +284,7 @@
 /obj/item/clothing/accessory/poncho/dominia/red
 	name = "tribunalist cape"
 	desc = "This is a cape in the style of Dominian clergy. The red differentiates the clergy from the nobility who wear traditionally black capes."
-	desc_fluff = "Dominian priests and priestesses are traditionally expected to wear red or golden clothing when discharging \
+	desc_extended = "Dominian priests and priestesses are traditionally expected to wear red or golden clothing when discharging \
 	their duties. Capes are worn as both a fashion statement to attract the attention of crowds and as a simple form of protection\
 	against the elements."
 	icon = 'icons/clothing/suits/capes/dominia_red.dmi'
@@ -329,7 +329,7 @@
 /obj/item/clothing/accessory/poncho/dominia/consular
 	name = "tribunalist consular's cape"
 	desc = "A truly majestic gold and red cape worn by members of the clergy affiliated with His Majesty's Diplomatic Service."
-	desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also \
+	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also \
 	employs may commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
 	icon = 'icons/clothing/suits/capes/dominia_consular_cape.dmi'
 	icon_state = "dominia_cape_consular"
@@ -342,7 +342,7 @@
 /obj/item/clothing/under/dominia/consular
 	name = "dominian consular officer's uniform"
 	desc = "The traditional red-black-gold uniform of a member of His Majesty's Diplomatic Service."
-	desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \
+	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \
 	commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
 	icon = 'icons/clothing/under/uniforms/dominia_consular.dmi'
 	icon_state = "dominia_consular"
@@ -358,7 +358,7 @@
 /obj/item/clothing/under/dominia/initiate
 	name = "tribunal initiate's robe"
 	desc = "A simple white robe with red trim and a red sash to fasten it. It's commonly worn by initiates of the Moroz Holy Tribunal."
-	desc_fluff = "While the most obvious purpose of an initiate's red-and-white robe is to show that the hopeful clergy member is pure in mind and body, \
+	desc_extended = "While the most obvious purpose of an initiate's red-and-white robe is to show that the hopeful clergy member is pure in mind and body, \
 	the stark whites of the robe also show when an initiate has neglected their appearance. The white robes must be constantly maintained and washed in order to \
 	maintain their pristine appearance, lest an initiate be found neglectful."
 	icon = 'icons/clothing/under/uniforms/dominia_initiate.dmi'
@@ -369,7 +369,7 @@
 /obj/item/clothing/under/dominia/priest
 	name = "tribunalist's robe"
 	desc = "A high-quality robe woven in black fabric with a golden trim with a red sash to fasten it. It's commonly worn by priests of the Moroz Holy Tribunal."
-	desc_fluff = "The black and gold robes of Imperial priests and priestesses have been deliberately designed by House Caladius to resemble the coats commonly \
+	desc_extended = "The black and gold robes of Imperial priests and priestesses have been deliberately designed by House Caladius to resemble the coats commonly \
 	worn by Dominian nobility, in order to demonstrate the importance of Dominia's priestly classes. Each robe is tailor-made to fit an initiate upon their \
 	successful ascension to full member of the clergy, and they are expected to care for their robes throughout their lives. The loss of one's robe is \
 	considered a major embarrassment both for the individual and their church."
@@ -381,7 +381,7 @@
 /obj/item/clothing/under/dominia/priest/consular
 	name = "tribunalist consular's uniform"
 	desc = "The traditional red-black-gold uniform of a priestly member of His Majesty's Diplomatic Service."
-	desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many commoners \
+	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many commoners \
 	- as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
 	icon = 'icons/clothing/under/uniforms/dominia_consular_priest.dmi'
 	icon_state = "dominia_consular_priest"
@@ -391,7 +391,7 @@
 /obj/item/clothing/head/dominia
 	name = "dominian consular officer's dress cap"
 	desc = "A quite fashionable cap issued to the members of His Majesty's Diplomatic Service."
-	desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \
+	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \
     commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
 	icon = 'icons/clothing/head/dominia_consular_cap.dmi'
 	icon_state = "dominia_consular_cap"
@@ -401,7 +401,7 @@
 /obj/item/clothing/head/beret/dominia
 	name = "tribunal initiate's beret"
 	desc = "A simple red beret with a golden badge marking its wearer as an initiate of the Moroz Holy Tribunal."
-	desc_fluff = "While initiates dress humbly in white and red clothing, this does not mean that House Caladius - the primary source of the Holy Tribunal's \
+	desc_extended = "While initiates dress humbly in white and red clothing, this does not mean that House Caladius - the primary source of the Holy Tribunal's \
 	funding - spares any expenses funding them, and these berets are made of luxurious velvet."
 	icon = 'icons/clothing/head/dominia_beret.dmi'
 	icon_state = "dominia_beret"
@@ -410,7 +410,7 @@
 /obj/item/clothing/head/beret/dominia/medical
 	name = "tribunalist medical beret"
 	desc = "A white-and-green beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by those medical workers affiliated with the Moroz Holy Tribunal."
-	desc_fluff = "Unlike the black and gold clothing of their priestly counterparts, the medical staff of the Moroz Holy Tribunal's temples are generally clad in white and green due to typically not being full members of the clergy. Occasionally, if a doctor is dedicated enough, they will be granted the right to wear the beret of a full Tribunal priest. This beret features an emblem of the eye made of green and white cloth."
+	desc_extended = "Unlike the black and gold clothing of their priestly counterparts, the medical staff of the Moroz Holy Tribunal's temples are generally clad in white and green due to typically not being full members of the clergy. Occasionally, if a doctor is dedicated enough, they will be granted the right to wear the beret of a full Tribunal priest. This beret features an emblem of the eye made of green and white cloth."
 	icon = 'icons/clothing/head/dominia_beret_hospital.dmi'
 	icon_state = "dominia_beret_hospital"
 	item_state = "dominia_beret_hospital"
@@ -418,7 +418,7 @@
 /obj/item/clothing/head/beret/dominia/priest
 	name = "tribunalist's beret"
 	desc = "A black beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy."
-	desc_fluff = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
+	desc_extended = "With their black and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
 	are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold."
 	icon = 'icons/clothing/head/dominia_beret_priest.dmi'
 	icon_state = "dominia_beret_priest"
@@ -427,7 +427,7 @@
 /obj/item/clothing/head/beret/dominia/priest/red
 	name = "tribunalist's beret"
 	desc = "A red beret bearing the sigil of the Moroz Holy Tribunal on its front. Worn by full members of the Tribunal's clergy."
-	desc_fluff = "With their red and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
+	desc_extended = "With their red and gold clothing designed to resemble that of their noble counterparts, the full clergy of the Moroz Holy Tribunal \
 	are a sight to behold both inside and outside of the Empire of Dominia. This beret features an emblem luxuriously and painstakingly crafted out of real gold."
 	icon = 'icons/clothing/head/dominia_beret_priest.dmi'
 	icon_state = "dominia_beret_priest_red"
@@ -436,7 +436,7 @@
 /obj/item/clothing/head/beret/dominia/consular
 	name = "tribunalist's beret"
 	desc = "A beret in gold and red worn by members of the clergy affiliated with His Majesty's Diplomatic Service."
-	desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs may commoners - \
+	desc_extended = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs may commoners - \
 	as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service."
 	icon = 'icons/clothing/head/dominia_beret_consular.dmi'
 	icon_state = "dominia_beret_consular_priest"
@@ -445,7 +445,7 @@
 /obj/item/clothing/accessory/dominia
 	name = "tribunal necklace"
 	desc = "An amulet depicting 'The Eye', a prominent symbol of the Moroz Holy Tribunal worn by its clergy and layfolk alike."
-	desc_fluff = "One of the most prominent symbols of the Moroz Holy Tribunal is 'The Eye', with the square representing the four corners of the universe and the central 'eye' being the \
+	desc_extended = "One of the most prominent symbols of the Moroz Holy Tribunal is 'The Eye', with the square representing the four corners of the universe and the central 'eye' being the \
 	Tribunal that watches all. Necklaces and amulets made from this symbol often have the eye being able to rotate. Although there is no official stance, others argue that necklaces should be made \
 	from bare metal to represent how the Tribunal sees the unvarnished truth, while others insist that they must be made from gold to glorify the religion."
 	icon = 'icons/clothing/accessories/dominia_amulet.dmi'
@@ -456,7 +456,7 @@
 /obj/item/clothing/head/ushanka/dominia
 	name = "fisanduhian ushanka"
 	desc = "A warm fur hat with ear flaps that can be raised and tied to be out of the way. This one has a large Fisanduhian flag on the front."
-	desc_fluff = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
+	desc_extended = "Fisanduhian fashion remains as rugged and steadfast as its people, as well as very distinctive from the usual Morozi fashions \
 	sourced from Moroz proper. Ushankas such as these are still a common sight in the semi-autonomous region of Fisanduh, flag and all. Much to \
 	the ire of Moroz's Imperials."
 	icon_state = "fishushanka"
@@ -465,7 +465,7 @@
 /obj/item/clothing/under/dominia/dress/fancy
 	name = "Morozi dress"
 	desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has sleeves."
-	desc_fluff = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
+	desc_extended = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
 	the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \
 	due to the often frigid temperatures of Moroz."
 	icon = 'icons/clothing/under/uniforms/dominia_dresses.dmi'
@@ -486,7 +486,7 @@
 /obj/item/clothing/under/dominia/dress/fancy/sleeveless
 	name = "sleeveless Morozi dress"
 	desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has no sleeves."
-	desc_fluff = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
+	desc_extended = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \
 				the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \
 				due to the often frigid temperatures of Moroz."
 	icon_state = "morozi_dress_rs"

code/modules/clothing/factions/europa.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/accessory/whalebone
 	name = "Europan bone charm"
 	desc = "A common Europan superstition, bone charms made from native sea creatures are often carried as a good luck charm."
-	desc_fluff = "Europan bone charms will generally have wards, runes, or other text carved into them by their original crafter. Poorly-made bone charms, or those crafted from the bones of a batshark, are considered to be extremely unlucky and are typically unceremoniously disposed of. Most bone charms are made using the remains of Europan bone whales."
+	desc_extended = "Europan bone charms will generally have wards, runes, or other text carved into them by their original crafter. Poorly-made bone charms, or those crafted from the bones of a batshark, are considered to be extremely unlucky and are typically unceremoniously disposed of. Most bone charms are made using the remains of Europan bone whales."
 	icon = 'icons/clothing/accessories/europa_whalebone.dmi'
 	icon_state = "europa_whalebone"
 	item_state = "europa_whalebone"

code/modules/clothing/factions/gadpathur.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/uniform/gadpathur
 	name = "gadpathurian fatigues"
 	desc = "A simple black cloth shirt and brown NBC-treated pants commonly worn by Gadpathurians."
-	desc_fluff = "Gadpathur is, perhaps, the only planet with a government-mandated planetary costume. These uniforms can be \
+	desc_extended = "Gadpathur is, perhaps, the only planet with a government-mandated planetary costume. These uniforms can be \
 	found throughout the planet and are one of the most common markers of Gadpathurians abroad, due to the distinctive black \
 	shirt of the uniform. While some personalization is common on these uniforms, they mostly remain the same regardless of \
 	which cadre one belongs to."
@@ -13,7 +13,7 @@
 /obj/item/clothing/suit/storage/gadpathur
 	name = "gadpathurian overcoat"
 	desc = "A simple canvas overcoat typically worn by Gadpathurians. The dull colors of it make manufacturing easier."
-	desc_fluff = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
+	desc_extended = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
 	in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \
 	and are often the difference between life and death on the planet's surface."
 	icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi'
@@ -24,7 +24,7 @@
 /obj/item/clothing/suit/storage/toggle/trench/gadpathur
 	name = "gadpathurian trenchcoat"
 	desc = "A heavier Gadpathurian overcoat with some piping on the shoulders. Likely meant for the colder regions of the planet."
-	desc_fluff = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
+	desc_extended = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
 	in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \
 	and are often the difference between life and death on the planet's surface."
 	icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi'
@@ -41,7 +41,7 @@
 /obj/item/clothing/suit/storage/toggle/leather_jacket/gadpathur
 	name = "thermal coat"
 	desc = "A thermally insulated coat commonly worn by Gadpathurians during the planet's bitterly cold nights."
-	desc_fluff = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
+	desc_extended = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \
 	in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \
 	and are often the difference between life and death on the planet's surface."
 	icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi'
@@ -52,7 +52,7 @@
 /obj/item/clothing/head/gadpathur
 	name = "cadre cap"
 	desc = "A snugly-fitting cap with the traditional Gadpathurian red-and-orange sun on its face. It has no other identifying features."
-	desc_fluff = "Soft headgear is commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
+	desc_extended = "Soft headgear is commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
 	Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \
 	to - in order to not give away unwanted information to observers."
 	icon = 'icons/clothing/head/gadpathur_cap.dmi'
@@ -70,7 +70,7 @@
 /obj/item/clothing/head/beret/gadpathur
 	name = "cadre beret"
 	desc = "A canvas beret with the traditional Gadpathurian red-and-orange sun on its badge. It has no other identifying marks."
-	desc_fluff = "Berets are commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
+	desc_extended = "Berets are commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \
 	Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \
 	to - in order to not give away unwanted information to observers."
 	icon = 'icons/clothing/head/gadpathur_beret.dmi'
@@ -111,7 +111,7 @@
 /obj/item/clothing/accessory/armband/gadpathur
 	name = "cadre brassard"
 	desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves."
-	desc_fluff = "Stop reading the fluff description of an accessory friend, we must fight the Solarian imperialists!"
+	desc_extended = "Stop reading the fluff description of an accessory friend, we must fight the Solarian imperialists!"
 	icon = 'icons/clothing/accessories/gadpathur_brassard.dmi'
 	icon_state = "gadpathur_brassard"
 	item_state = "gadpathur_brassard"

code/modules/clothing/factions/goldendeep.dm

@@ -2,7 +2,7 @@
 	name = "golden deep dress"
 	desc = "A simple dress with a flowing skirt made from electroplated thermoplastic accented by cobalts, used by representatives of the Golden Deep. Despite this garment's aesthetic similarities to \
 	metallic gold, it is as flexible as silk and surprisingly light!"
-	desc_fluff = "The Lux-I Golden Dress was popularised 8 years ago by Lux-Igmatic, one of the first official Golden Deep positronic citizens. Owing to its success outside of the GD fashion scene, it quickly caught on \
+	desc_extended = "The Lux-I Golden Dress was popularised 8 years ago by Lux-Igmatic, one of the first official Golden Deep positronic citizens. Owing to its success outside of the GD fashion scene, it quickly caught on \
 	due to the appeal among other civilisations of the Orion Spur. Lux-Igmatic made a considerable fortune before the methods to create the gold-laced fabric design were leaked to competitors. Gold-lace and \
 	gold-appearance clothing is now popular within many Golden Deep brands, but this was the first, and still carries considerable prestige (and a price tag to match)."
 	icon_state = "goldendeep_dress"
@@ -13,7 +13,7 @@
 /obj/item/clothing/under/goldendeep/wrap
 	name = "golden deep wraps"
 	desc = "A simple dress with a flowing skirt made from electroplated thermoplastic, used by representatives of the Golden Deep. Despite this garment's aesthetic similarities to metallic gold, it is as flexible as silk, breathable and designed to flow in the wind."
-	desc_fluff = "The casual blending of modern metallurgical methods and traditional Golden Deep fashion gives the golden wraps a strong appeal. Back when IPCs were a new concept and the designs weren't as refined as they are today, wraps were a popular clothing \
+	desc_extended = "The casual blending of modern metallurgical methods and traditional Golden Deep fashion gives the golden wraps a strong appeal. Back when IPCs were a new concept and the designs weren't as refined as they are today, wraps were a popular clothing \
 	choice due to their low surface area - thereby not blocking airflow to keep the chassis cool. Nowadays, of course, cooling through clothes is hardly a problem at all, but there remains some fondness for the garments once worn by their poorer \
 	(and more poorly-designed) predecessors."
 	icon_state = "goldendeep_wrap"
@@ -24,7 +24,7 @@
 /obj/item/clothing/under/goldendeep/vest
 	name = "golden deep vest"
 	desc = "A vest made from a from electroplated thermoplastic accompanied by a gem-encrusted skirt, used by representatives of the Golden Deep. Despite this garment's aesthetic similarities to metallic gold, it is as flexible as silk and surprisingly light!"
-	desc_fluff = "With the increasing popularity of gold-effect clothing within Golden Deep society, it was only a matter of time before casual clothing lines got in on the action. Following the leak of Lux-Igmatic's methods, other corporations jumped at the \
+	desc_extended = "With the increasing popularity of gold-effect clothing within Golden Deep society, it was only a matter of time before casual clothing lines got in on the action. Following the leak of Lux-Igmatic's methods, other corporations jumped at the \
 	opportunity, and soon enough it was impossible to pass a clothing store without seeing these vests on display. Using an innovative process to reduce the amount of metal being woven into these garments, the cost has been kept relatively low. The pricetag \
 	may still be far out of the reach of the masses, but it barely approaches a fraction of the cost of a golden two piece, and is certainly far, far cheaper than the dresses made by Lux-Igmatic themself."
 	icon_state = "goldendeep_vest"
@@ -36,7 +36,7 @@
 /obj/item/clothing/under/goldendeep/suit
 	name = "golden deep suit"
 	desc = "A two piece suit made from a flexible electroplated thermoplastic and a tasteful synthetic silk tie. It is commonly worn by members of the Golden Deep looking to fit in with human culture."
-	desc_fluff = "Two piece suits and skirtsuits have always been a mainstay of Golden Deep culture; representing a certain amount of gravitas inherent with the business-formal aesthetic that they embody. \
+	desc_extended = "Two piece suits and skirtsuits have always been a mainstay of Golden Deep culture; representing a certain amount of gravitas inherent with the business-formal aesthetic that they embody. \
 	It wasn't until 2458, however, that the golden suits were seen in greater numbers among Golden Deep citizens. Until then, it had been trendy to stick with flowing, breathable clothing options among other citizens. \
 	Trading with external societies has become more competitive, and as such old rivalries among GD citizens and traders have been rekindled - necessitating the need to 'keep up appearances' even within exclusively \
 	Golden Deep social circles."
@@ -48,7 +48,7 @@
 /obj/item/clothing/under/goldendeep/skirtsuit
 	name = "golden deep skirtsuit"
 	desc = "A flowing skirtsuit made from a flexible electroplated thermoplastic and a tasteful synthetic silk tie. It is commonly worn by members of the Golden Deep looking to fit in with human culture."
-	desc_fluff = "Two piece suits and skirtsuits have always been a mainstay of Golden Deep culture; representing a certain amount of gravitas inherent with the business-formal aesthetic that they embody. It wasn't until 2458, however, that the golden suits \
+	desc_extended = "Two piece suits and skirtsuits have always been a mainstay of Golden Deep culture; representing a certain amount of gravitas inherent with the business-formal aesthetic that they embody. It wasn't until 2458, however, that the golden suits \
 	were seen in greater numbers among Golden Deep citizens. Until then, it had been trendy to stick with flowing, breathable clothing options among other citizens. Trading with external societies has become more competitive, and as such old rivalries among \
 	GD citizens and traders have been rekindled - necessitating the need to 'keep up appearances' even within exclusively Golden Deep social circles."
 	icon_state = "goldendeep_skirtsuit"

code/modules/clothing/factions/himeo.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/suit/storage/toggle/himeo
 	name = "himean bekesha"
 	desc = "A heavy winter coat from Himeo, made of synthetic fish fur. It looks extremely comfortable, if a bit hot for climate-controlled corridors."
-	desc_fluff = "While traditional Solarian bekeshas are often made of animal fur and hide, this particular variant is made of Himean fish fur and other synthetic materials. Heavy coats such as this are a common sight on Himeo, due to the extremely cold temperatures of the planet."
+	desc_extended = "While traditional Solarian bekeshas are often made of animal fur and hide, this particular variant is made of Himean fish fur and other synthetic materials. Heavy coats such as this are a common sight on Himeo, due to the extremely cold temperatures of the planet."
 	icon = 'icons/clothing/suits/coats/himeo_coat.dmi'
 	icon_state = "coat_himeo"
 	item_state = "coat_himeo"
@@ -15,7 +15,7 @@
 /obj/item/clothing/head/softcap/himeo
 	name = "himean cap"
 	desc = "A field cap of Himean origin. This particular cap has the United Syndicates of Himeo's typical symbol - a white hexagon surrounded by red triangles - on its face."
-	desc_fluff = "The M372 field cap is a standard-issue cap of Himeo's military, and a common sight throughout the planet and the space around it. This particular model is a reproduction, due to its lack of the traditional ear covers on the Himean model."
+	desc_extended = "The M372 field cap is a standard-issue cap of Himeo's military, and a common sight throughout the planet and the space around it. This particular model is a reproduction, due to its lack of the traditional ear covers on the Himean model."
 	icon = 'icons/clothing/head/himeo_cap.dmi'
 	icon_state = "cap_himeo"
 	item_state = "cap_himeo"

code/modules/clothing/factions/konyang.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/under/konyang
 	name = "magenta hanbok"
 	desc = "A traditional Konyanger hanbok."
-	desc_fluff = "An ancient form of dress carried over from Earth by the initial Konyang colonists; the hanbok has since become a symbol of Konyang and its most iconic formalwear."
+	desc_extended = "An ancient form of dress carried over from Earth by the initial Konyang colonists; the hanbok has since become a symbol of Konyang and its most iconic formalwear."
 	icon = 'icons/clothing/under/uniforms/konyang_femalehanbok.dmi'
 	icon_state = "hanbok_magenta"
 	worn_state = "hanbok_magenta"
@@ -66,7 +66,7 @@
 /obj/item/clothing/head/konyang
 	name = "gat"
 	desc = "A traditional hat worn on Konyang and originating on Earth."
-	desc_fluff = "Although traditionally made from horsehair, many different types of fabrics, including water-resistant fibres from feathers are now used."
+	desc_extended = "Although traditionally made from horsehair, many different types of fabrics, including water-resistant fibres from feathers are now used."
 	icon = 'icons/clothing/head/konyang_gat.dmi'
 	icon_state = "konyang_gat"
 	item_state = "konyang_gat"
@@ -75,7 +75,7 @@
 /obj/item/clothing/under/konyangdress
 	name = "konyanger dress"
 	desc = "A loose-fitting and modern Konyanger dress designed to beat the heat while remaining water-resistant."
-	desc_fluff = "Konyanger clothes are often designed to remain both water-resistant and breathable, made of light fabrics that can \
+	desc_extended = "Konyanger clothes are often designed to remain both water-resistant and breathable, made of light fabrics that can \
 	only be sourced on the planet. Not all clothes are made equal, however, and plant-derived plastics and cloth have found just as much use as the \
 	'miracle weave' in an attempt to keep costs down."
 	icon = 'icons/clothing/under/uniforms/konyang_dress.dmi'
@@ -120,7 +120,7 @@
 /obj/item/clothing/under/konyangdresstraditional
 	name = "konyanger traditional dress"
 	desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a pink hakama and white kosode."
-	desc_fluff = "Carried over to Konyang from Earth, this dress was usually worn by shrine maidens of the Shinto faith back on Earth. \
+	desc_extended = "Carried over to Konyang from Earth, this dress was usually worn by shrine maidens of the Shinto faith back on Earth. \
 	It has since been appropriated by many Konyangers as a type of formal dress, and simply as a manner of fashion. The hot and humid climate of the planet however, has necessitated \
 	that most dresses of this type are made of lighter fabrics indigenous to the planet."
 	icon = 'icons/clothing/under/uniforms/konyang_dress_traditional.dmi'
@@ -147,7 +147,7 @@
 /obj/item/clothing/under/konyangdresstraditional/national
 	desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a blue hakama and yellow kosode \
 	the colors of the flag of Konyang."
-	desc_fluff = "The colors of the traditional shrine maiden outfit on Earth were designed to evoke the spirit of its host nation. Similarly, as Shinto evolved on Konyang to explain \
+	desc_extended = "The colors of the traditional shrine maiden outfit on Earth were designed to evoke the spirit of its host nation. Similarly, as Shinto evolved on Konyang to explain \
 	the equality of IPC and humans, many outfits were tailored in these new colors to represent the values of the nation, yellow representing prosperity, and blue representing the waterways \
 	of the planet. Although tailored for Shintoist monks, some Konyangers wear the outfit as a sign of patriotism on national holildays."
 	icon_state = "konyang_dress_traditional_national"
@@ -156,7 +156,7 @@
 /obj/item/clothing/under/konyangdresstraditional/national/vest
 	desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a blue hakama, white vest, and yellow kosode \
 	the colors of the flag of Konyang."
-	desc_fluff = "The colors of the traditional shrine maiden outfit on Earth were designed to evoke the spirit of its host nation. Similarly, as Shinto evolved on Konyang to explain \
+	desc_extended = "The colors of the traditional shrine maiden outfit on Earth were designed to evoke the spirit of its host nation. Similarly, as Shinto evolved on Konyang to explain \
 	the equality of IPC and humans, many outfits were tailored in these new colors to represent the values of the nation, white representing purity, yellow representing prosperity, and blue representing the waterways \
 	of the planet. Given the climate, the addition of a vest renders the outfit uncomfortably hot, however this is regarded as an acceptable drawback for protecting the rest of the ensemble from the perrenial rains on the planet. \
 	Although tailored for Shintoist monks, some Konyangers wear the outfit as a sign of patriotism on national holildays."

code/modules/clothing/factions/pmcg.dm

@@ -2,7 +2,7 @@
 /obj/item/clothing/under/pmc_modsuit
 	name = "\improper PMCG modsuit"
 	desc = "A modular fatigue jumpsuit, from the Private Military Contracting Group."
-	desc_fluff = "The proprietary PMCG Modular Fatigue Jumpsuit, quickly dubbed the modsuit, is an innovation by the recently-formed PMCG to quickly outfit its scores of new \
+	desc_extended = "The proprietary PMCG Modular Fatigue Jumpsuit, quickly dubbed the modsuit, is an innovation by the recently-formed PMCG to quickly outfit its scores of new \
 	hires and acquisitions at economic production costs. Designed to fit military contractors of a wide range of sizes, species, and operating environments with tolerable comfort, \
 	the modsuit features a number of smart-fabric connection points for the modern contractor to modify their uniform to a number of preset configurations."
 	icon = 'icons/clothing/under/uniforms/pmcg_modsuit.dmi'

code/modules/clothing/factions/scc.dm

@@ -46,7 +46,7 @@
 /obj/item/clothing/head/beret/scc
 	name = "\improper SCC beret"
 	desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar corporations to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar corporations to exercise an undisputed economic dominance over the Orion Spur."
 	icon = 'icons/obj/contained_items/scc.dmi'
 	icon_state = "scc_beret"
 	item_state = "scc_beret"

code/modules/clothing/factions/vysoka.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/suit/storage/vysoka
 	name = "chokha"
 	desc = "A woolen coat with a high neck commonly worn on Vysoka."
-	desc_fluff = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens."
+	desc_extended = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens."
 	icon = 'icons/clothing/suits/coats/vysoka_chokha_male.dmi'
 	icon_state = "chokha_vysoka_m"
 	item_state = "chokha_vysoka_m"
@@ -18,7 +18,7 @@
 /obj/item/clothing/head/softcap/vysoka
 	name = "vysokan fur cap"
 	desc = "A fur hat from Vysoka made of authentic ohdker fur."
-	desc_fluff = "The ohdker is a common animal on Vysoka that serves as a livestock and beast of burden, depending on the needs at the time. Its fur is highly prized on Vysoka, and major cities often export it off-world to location such as Xanu Prime."
+	desc_extended = "The ohdker is a common animal on Vysoka that serves as a livestock and beast of burden, depending on the needs at the time. Its fur is highly prized on Vysoka, and major cities often export it off-world to location such as Xanu Prime."
 	icon_state = "cap_vysoka"
 	item_state = "cap_vysoka"
 	icon = 'icons/clothing/head/vysoka_cap.dmi'

code/modules/clothing/gloves/miscellaneous.dm

@@ -357,7 +357,7 @@
 /obj/item/clothing/gloves/tesla
 	name = "tesla glove"
 	desc = "A weaponized gauntlet capable of firing lightning bolts."
-	desc_fluff = "A tesla-based weapon created by the People's Republic of Adhomai as part of their Tesla Brigade program. Because of its long recharge time, the gauntlet is commonly \
+	desc_extended = "A tesla-based weapon created by the People's Republic of Adhomai as part of their Tesla Brigade program. Because of its long recharge time, the gauntlet is commonly \
 	used as an ancillary weapon."
 	icon_state = "tesla_glove_on"
 	item_state = "tesla_glove_on"

code/modules/clothing/gloves/xeno/tajara.dm

@@ -58,7 +58,7 @@
 	icon_state = "smithgloves"
 	item_state = "smithgloves"
 	contained_sprite = TRUE
-	desc_fluff = "The quality of life for an urban dweller in Nal'tor, or any other major city, can vary considerably according to the Tajara's occupation, education and standing \
+	desc_extended = "The quality of life for an urban dweller in Nal'tor, or any other major city, can vary considerably according to the Tajara's occupation, education and standing \
 	with the Party. The average worker that labours in the industrial suburbs, can expect an honest living to be made, and a modest lifestyle to be led. The majority of the city labourers \
 	work in government run factories and spaceports, with stable but strict work hours and schedule the Hadii regime boasts of its fairness to the worker."
 

code/modules/clothing/head/jobs.dm

@@ -57,7 +57,7 @@
 /obj/item/clothing/head/caphat/bridge_crew/alt
 	name = "bridge crew cap"
 	desc = "A more formal hat in a Colettish style, authorized for the bridge crew of SCC vessels."
-	desc_fluff = "Designed to allow the wearer to wear both a peaked cap and a radio headset, Colettish 'crusher' caps are prized throughout the Alliance and Republic for their comfort."
+	desc_extended = "Designed to allow the wearer to wear both a peaked cap and a radio headset, Colettish 'crusher' caps are prized throughout the Alliance and Republic for their comfort."
 	icon = 'icons/contained_items/clothing/hats/bridge_crew_cap_alt.dmi'
 	contained_sprite = TRUE
 	icon_state = "bridge_crew_cap_alt"
@@ -82,7 +82,7 @@
 /obj/item/clothing/head/headmirror
 	name = "otolaryngologist's mirror"
 	desc = "Turn your head and cough."
-	desc_fluff = "That's an Ear, Nose and/or Throat surgeon to you, mister."
+	desc_extended = "That's an Ear, Nose and/or Throat surgeon to you, mister."
 	icon = 'icons/obj/contained_items/department_uniforms/medical.dmi'
 	contained_sprite = TRUE
 	icon_state = "headmirror"
@@ -174,7 +174,7 @@
 /obj/item/clothing/head/flatcap/bartender
 	name = "bartender flatcap"
 	desc = "A simple hat issued to bartenders to protect their eyes from the glare of crappy neo-contemporary hipster light installations."
-	desc_fluff = "The hat once associated with the chimney sweeps and coal miners of yesteryear. \
+	desc_extended = "The hat once associated with the chimney sweeps and coal miners of yesteryear. \
 	Now resigned to sit on the heads of snooty upper-class bartenders and baristas. \
 	You consider the irony. The service industry is equally as soul-crushing, just with minimum wage. \
 	Worker's rights tentatively grace your grey matter before you return to your job. \

code/modules/clothing/head/xenos/tajara.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/head/tajaran
 	icon = 'icons/obj/tajara_items.dmi'
 	contained_sprite = TRUE
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -30,7 +30,7 @@
 	desc = "An adorned religious crown used by Mata'ke priests."
 	icon_state = "matakehat"
 	item_state = "matakehat"
-	desc_fluff = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
+	desc_extended = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
 	practical, strong and masters of Adhomai wilderness. Every clan and temple of Mata'ke has a different way of testing its applicants and these tests are always kept as a strict \
 	secret, the only thing known is that the majority of applicants never return. After they're accepted, priests of Mata'ke dress in furs and carry silver \
 	weapons, usually daggers for ease of transport and to simulate Mata'ke's sword. There is a remarkably low amount of Njarir'Akhran in the Mata'ke priesthood."
@@ -40,7 +40,7 @@
 	desc = "A peaked cap used by Party Commissars attached to kosmostrelki units."
 	icon_state = "space_commissar_hat"
 	item_state = "space_commissar_hat"
-	desc_fluff = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
+	desc_extended = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
 	their commanders follow the principles of Hadiism. Their duties are not only limited to enforcing the republican ideals among the troops and reporting possible subversive elements, \
 	they are expected to display bravery in combat and lead by example."
 
@@ -96,7 +96,7 @@
 	desc = "A blue beret with a pale-gold twin-suns insignia, signifying a Constable of the NKA's Raakti Shariim."
 	icon_state = "raakti_shariim_beret"
 	item_state = "raakti_shariim_beret"
-	desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \
+	desc_extended = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \
 		peacekeeping force, working closely with both the Royal Constabulary and the Royal Ministry of Intelligence to \
 		seek out internal threats to the Kingdom such as spies, terrorists, and other domestic enemies to the crown. \
 		The Raakti Shariim's uniforms incorporate a dark, navy blue paired with a lilac accent and pale-gold twin-sun \
@@ -143,7 +143,7 @@
 		bomb = ARMOR_BOMB_MINOR
 	)
 	allow_hair_covering = FALSE
-	desc_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
+	desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
 	single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \
 	of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \
 	bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \

code/modules/clothing/head/xenos/unathi.dm

@@ -10,7 +10,7 @@
 	name = "Th'akhist headgear"
 	desc = "A traditional garment worn by Th'akh shamans. Popular adornments include dried and pressed grass; \
 	alternatively, colorful feathers from talented hunters are sometimes used."
-	desc_fluff = "The headgear of the Th'akhist ensemble has a special component to it. Besides the emulated \
+	desc_extended = "The headgear of the Th'akhist ensemble has a special component to it. Besides the emulated \
 	frills made with straw or feathers, the authentic Unathite skull is from the bones of the previous owner, the \
 	deceased shaman that came before. Other cultures see it as barbaric; Unathi believe that this enables shamans \
 	to call upon their predecessors' wisdom as spirits to empower them."

code/modules/clothing/masks/miscellaneous.dm

@@ -197,7 +197,7 @@
 /obj/item/clothing/mask/offworlder
 	name = "scarab scarf"
 	desc = "Usually a treasured item, these spider-silk scarves are seen passed down by generations of Scarabs."
-	desc_fluff = "Scarves like these are passed down from family members in the Scarab fleets as a coming of age ritual, typically given to children to mark them as worthy of setting off on their own."
+	desc_extended = "Scarves like these are passed down from family members in the Scarab fleets as a coming of age ritual, typically given to children to mark them as worthy of setting off on their own."
 	icon_state = "pioneer_scarf"
 	item_flags = FLEXIBLEMATERIAL
 	item_state = "pioneer_scarf"

code/modules/clothing/masks/xeno/unathi.dm

@@ -2,7 +2,7 @@
 	name = "Th'akhist head wrappings"
 	desc = "A bunch of stitched together bandages on a fibreglass breath mask that also contains openings for the \
 	eyes. Looks tailored for a Unathi."
-	desc_fluff = "This is considered humble Sinta wear for Th'akh shamans— most Unathi don't wear these, barring Aut'akh."
+	desc_extended = "This is considered humble Sinta wear for Th'akh shamans— most Unathi don't wear these, barring Aut'akh."
 	icon = 'icons/obj/unathi_items.dmi'
 	icon_state = "thakh_mask"
 	item_state = "thakh_mask"

code/modules/clothing/shoes/miscellaneous.dm

@@ -238,7 +238,7 @@ obj/item/clothing/shoes/sandal/clogs
 /obj/item/clothing/shoes/caligae
 	name = "caligae"
 	desc = "The standard Unathi marching footwear. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection, leading to them catching on with other species."
-	desc_fluff = "These traditional Unathi footwear have remained relatively unchanged in principle, with improved materials and construction being the only notable change. Originally used for warriors, they became widespread for their comfort and durability. Some are worn with socks, for warmth. Although made for the Unathi anatomy, they have picked up popularity among other species."
+	desc_extended = "These traditional Unathi footwear have remained relatively unchanged in principle, with improved materials and construction being the only notable change. Originally used for warriors, they became widespread for their comfort and durability. Some are worn with socks, for warmth. Although made for the Unathi anatomy, they have picked up popularity among other species."
 	icon_state = "caligae"
 	item_state = "caligae"
 	force = 5
@@ -269,7 +269,7 @@ obj/item/clothing/shoes/sandal/clogs
 /obj/item/clothing/shoes/caligae/armor
 	name = "leather caligae"
 	desc = "The standard Unathi marching footwear. These are made for heavier conditions, featuring tough and waterproof eel-leather covering, offering far greater protection."
-	desc_fluff = "These traditional Unathi footwear have remained relatively unchanged in principle, with improved materials and construction being the only notable change. This pair is reinforced with leather of the Zazehal, a Moghesian species of eel that can grow up to twenty five feet long. Typically, Zazehal Festivals are thrown every month of the warm season in which Unathi strew freshly killed birds across the shoreline and collect these creatures with baskets. The fungi that grow on their skin is harvested and used as an exotic seasoning, and their skin is used for its' incredibly durable, shark-like leather."
+	desc_extended = "These traditional Unathi footwear have remained relatively unchanged in principle, with improved materials and construction being the only notable change. This pair is reinforced with leather of the Zazehal, a Moghesian species of eel that can grow up to twenty five feet long. Typically, Zazehal Festivals are thrown every month of the warm season in which Unathi strew freshly killed birds across the shoreline and collect these creatures with baskets. The fungi that grow on their skin is harvested and used as an exotic seasoning, and their skin is used for its' incredibly durable, shark-like leather."
 	icon_state = "eelcaligae"
 	armor = list(
 		melee = ARMOR_MELEE_KNIVES

code/modules/clothing/shoes/xeno/tajara.dm

@@ -8,7 +8,7 @@
 	species_restricted = list(BODYTYPE_TAJARA)
 	contained_sprite = TRUE
 	move_trail = null
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \

code/modules/clothing/spacesuits/rig/suits/alien.dm

@@ -110,7 +110,7 @@
 /obj/item/rig/tesla
 	name = "tesla suit control module"
 	desc = "A tajaran hardsuit designated to be used by the special forces of the Tesla Brigade."
-	desc_fluff = "Formed in 2461, the Tesla Brigade is an experimental force composed of augmented veterans. Created after the intense casualties of the Das'nrra campaign and the \
+	desc_extended = "Formed in 2461, the Tesla Brigade is an experimental force composed of augmented veterans. Created after the intense casualties of the Das'nrra campaign and the \
 	severe loss of Republican Guard units. Additional funding and focus was placed on a previously shelved proposal for heavily armed shock and high technology assault troopers. A \
 	special unit designated to withstand the numerical disadvantages and prolonged engagements special forces of the Republic often faces."
 	suit_type = "tesla suit"

code/modules/clothing/spacesuits/void/alien.dm

@@ -137,7 +137,7 @@
 	allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	species_restricted = list(BODYTYPE_TAJARA)
 	refittable = FALSE
-	desc_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	desc_extended = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
 	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
 	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
 	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
@@ -158,7 +158,7 @@
 	)
 	species_restricted = list(BODYTYPE_TAJARA)
 	refittable = FALSE
-	desc_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	desc_extended = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
 	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
 	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
 	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."

code/modules/clothing/spacesuits/void/misc.dm

@@ -232,7 +232,7 @@
 	light_overlay = "helmet_light_banshee"
 	brightness_on = 6
 	light_color = "#7ffbf7"
-	desc_fluff = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user."
+	desc_extended = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user."
 	refittable = FALSE
 
 /obj/item/clothing/suit/space/void/einstein
@@ -256,7 +256,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
-	desc_fluff = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user."
+	desc_extended = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user."
 	refittable = FALSE
 
 //Zeng-Hu Pharmaceuticals espionage voidsuit
@@ -282,7 +282,7 @@
 	light_overlay = "helmet_light_dragon"
 	brightness_on = 6
 	light_color = "#7ffbf7"
-	desc_fluff = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit helmet. Its bug-eyed goggle visor design is unique among its class, alongside cutting-edge radiation protection."
+	desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit helmet. Its bug-eyed goggle visor design is unique among its class, alongside cutting-edge radiation protection."
 	refittable = FALSE
 
 /obj/item/clothing/suit/space/void/zenghu
@@ -306,7 +306,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
-	desc_fluff = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit. It is relatively fragile but has very apparent radiation shielding. Most often seen in the hands of post-disaster cleanup teams and private military contractors."
+	desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit. It is relatively fragile but has very apparent radiation shielding. Most often seen in the hands of post-disaster cleanup teams and private military contractors."
 	refittable = FALSE
 
 //Hephaestus Industries espionage voidsuit
@@ -332,7 +332,7 @@
 	light_overlay = "helmet_light_caiman"
 	brightness_on = 6
 	light_color = "#ffce01"
-	desc_fluff = "An easily recognized Hephaestus terraforming suit helmet. Its low, protruding brow and heavy plating is useful in the event you happen to be cutting down things. Mostly trees. Hopefully trees."
+	desc_extended = "An easily recognized Hephaestus terraforming suit helmet. Its low, protruding brow and heavy plating is useful in the event you happen to be cutting down things. Mostly trees. Hopefully trees."
 	refittable = FALSE
 
 /obj/item/clothing/suit/space/void/hephaestus
@@ -356,7 +356,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN)
-	desc_fluff = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military."
+	desc_extended = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military."
 	refittable = FALSE
 
 //Zavodskoi Interstellar espionage voidsuit
@@ -382,7 +382,7 @@
 	light_overlay = "helmet_light_revenant"
 	brightness_on = 6
 	light_color = "#f65858"
-	desc_fluff = "An ominous helmet of Zavodskoi Interstellar make with its past veiled in mystery, used for high-end corporate backstabbing and secret operations."
+	desc_extended = "An ominous helmet of Zavodskoi Interstellar make with its past veiled in mystery, used for high-end corporate backstabbing and secret operations."
 
 /obj/item/clothing/suit/space/void/zavodskoi
 	name = "revenant combat suit"
@@ -406,7 +406,7 @@
 	allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
 	siemens_coefficient = 0.35
 	species_restricted = list(BODYTYPE_HUMAN)
-	desc_fluff = "A portable, sleek combat suit utilized in excess by Zavodskoi Interstellar private military contractors. It is known to be utilized by the company's most secretive sectors explicitly for espionage."
+	desc_extended = "A portable, sleek combat suit utilized in excess by Zavodskoi Interstellar private military contractors. It is known to be utilized by the company's most secretive sectors explicitly for espionage."
 
 //Freelancer voidsuit
 /obj/item/clothing/head/helmet/space/void/freelancer
@@ -622,7 +622,7 @@
 /obj/item/clothing/head/helmet/space/void/mining/himeo
 	name = "himeo mining voidsuit helmet"
 	desc = "A rugged polymer and alloy space helmet with a ballistic glass and polycarbonate visor commonly used by astronauts from Himeo."
-	desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
+	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors."
 	icon_state = "rig0-himeo"
 	item_state = "rig0-himeo"
@@ -640,7 +640,7 @@
 		slot_r_hand_str = "mining_hardsuit"
 	)
 	desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch."
-	desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
+	desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster."
 	item_state = "rig-himeo"
@@ -649,7 +649,7 @@
 /obj/item/clothing/head/helmet/space/void/engineering/himeo
 	name = "himeo engineering voidsuit helmet"
 	desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo."
-	desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
+	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors."
 	icon_state = "rig0-himeo-engineering"
 	item_state = "rig0-himeo-engineering"
@@ -667,7 +667,7 @@
 		slot_r_hand_str = "engineering_hardsuit"
 	)
 	desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model seems to have lead lining in it."
-	desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
+	desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster."
 	item_state = "rig-himeo-engineering"
@@ -676,7 +676,7 @@
 /obj/item/clothing/head/helmet/space/void/atmos/himeo
 	name = "himeo atmospherics voidsuit helmet"
 	desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This particular model appears to have a thicker layer of insulation on it."
-	desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
+	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors."
 	icon_state = "rig0-himeo-engineering"
 	item_state = "rig0-himeo-engineering"
@@ -694,7 +694,7 @@
 		slot_r_hand_str = "atmos_hardsuit"
 	)
 	desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model seems to have better insulation in it."
-	desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
+	desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet\
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster."
 	item_state = "rig-himeo-engineering"
@@ -703,7 +703,7 @@
 /obj/item/clothing/head/helmet/space/void/mining/himeo/tajara
 	name = "himeo mining voidsuit helmet"
 	desc = "A rugged polymer and alloy space helmet with a ballistic glass and polycarbonate visor commonly used by astronauts from Himeo. This helmet looks fit for a Tajara."
-	desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
+	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life\
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
 	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
@@ -719,7 +719,7 @@
 /obj/item/clothing/suit/space/void/mining/himeo/tajara
 	name = "himeo mining voidsuit"
 	desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This suit looks fit for a Tajara."
-	desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
+	desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
@@ -736,7 +736,7 @@
 /obj/item/clothing/head/helmet/space/void/engineering/himeo/tajara
 	name = "himeo engineering voidsuit helmet"
 	desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This helmet looks fit for a Tajara."
-	desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
+	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
 	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
@@ -753,7 +753,7 @@
 /obj/item/clothing/suit/space/void/engineering/himeo/tajara
 	name = "himeo engineering voidsuit"
 	desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model is fitted for Tajara and seems to have lead lining in it."
-	desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
+	desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
@@ -770,7 +770,7 @@
 /obj/item/clothing/head/helmet/space/void/atmos/himeo/tajara
 	name = "himeo atmospherics voidsuit helmet"
 	desc = "A rugged polymer and alloy space helmet with a reinforced ballistic glass and polycarbonate goggle-type visor commonly used by astronauts from Himeo. This particular model is fitted for Tajara and appears to have a thicker layer of insulation on it."
-	desc_fluff = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
+	desc_extended = "The Type-78A 'Fish Fur' Helmet is a nearly 80 year old design and is part of a long line of homegrown voidsuits dating to when the planet ejected Hephaestus Industries. The main reason for its long service life \
 	is its modularity, with Himean workers often taking the time to make their own improvements to it, ranging all the way from simple morale patches slapped on the top to modern HUD-enabled visors. It quickly found purchase among \
 	Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."
 	icon = 'icons/obj/contained_items/voidsuits/himeotaj.dmi'
@@ -787,7 +787,7 @@
 /obj/item/clothing/suit/space/void/atmos/himeo/tajara
 	name = "himeo atmospherics voidsuit"
 	desc = "A simple but durable softsuit with a set of protective alloy plates commonly used by Himean astronauts. The suit life support console and torso plate contains a Himean flag patch. This particular model is fitted for Tajara and seems to have better insulation in it."
-	desc_fluff = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
+	desc_extended = "The Type-78 'Fish Fur' Voidsuit is an aging yet popular design produced only on Himeo. The simple and affordable design means many Himeans are able to own their own spacesuits rather than have one provided to them by their employer.\
 	Its modular design means that they're adapted for use everywhere from the depths of Himeo to protect from debris, its surface to protect from the bitter cold, and in orbit, to work in the void. Their similarity to flightsuits have been noted, and the planet \
 	enjoys jolly cooperation with fellow designers from Crosk who seek to invent new suits to keep their racers going faster. They quickly found purchase among Himeo's population of Tajaran expatriates, who were shown how to modify and use the voidsuits. \
 	Many of the first Tajaran-fitted suits were a product of collaborations between the two species making them all the more sentimental to those who use them."

code/modules/clothing/suits/hoodies.dm

@@ -263,7 +263,7 @@
 	name = "martian hoodie"
 	desc = "An orange hoodie jacket featuring the face of Warrant Officer August 'Gus' Maldarth, typically worn as a symbol of both solidarity with Mars, and a sign of protest against the Sol Alliance government. \
 	Strangely, Maldarth seems to be mispelled as 'Maldrath' on this garment. Additionally, #GusticeForGus can be seen written on the back. It seems to have typeface issues."
-	desc_fluff = "In November 2462, the planet of Mars was devastated by a phoron explosion widely believed to be\
+	desc_extended = "In November 2462, the planet of Mars was devastated by a phoron explosion widely believed to be\
 	caused by experiments the Solarian government was conducting on the planet. As a result, an earlier whistleblower,\
 	Gus Maldarth was regarded as a martyr after being silenced by operatives allegedly working on the behalf of Sol."
 	icon_state = "hoodie_mars"

code/modules/clothing/suits/jobs.dm

@@ -280,7 +280,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/toggle/suitjacket/blazer
 	name = "blazer"
 	desc = "A charming jacket."
-	desc_fluff = "for when you want to play ball sports like an aristocrat."
+	desc_extended = "for when you want to play ball sports like an aristocrat."
 	icon_state = "blazer"
 	item_state = "blazer"
 	opened = TRUE
@@ -288,7 +288,7 @@ obj/item/clothing/suit/apron/overalls/blue
 /obj/item/clothing/suit/storage/toggle/suitjacket/blazer/long
 	name = "long blazer"
 	desc = "A charming long jacket."
-	desc_fluff = "For when you want to play ball sports like an aristocrat."
+	desc_extended = "For when you want to play ball sports like an aristocrat."
 	icon_state = "longblazer"
 	item_state = "longblazer"
 	opened = TRUE

code/modules/clothing/suits/miscellaneous.dm

@@ -290,7 +290,7 @@
 /obj/item/clothing/suit/storage/toggle/brown_jacket/scc
 	name = "Stellar Corporate Conglomerate jacket"
 	desc = "A comfortable blue jacket. Tailored upon its back is a large Stellar Corporate Conglomerate logo."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon = 'icons/clothing/suits/scc_jacket.dmi'
 	icon_state = "scc_jacket"
 	item_state = "scc_jacket"
@@ -299,7 +299,7 @@
 /obj/item/clothing/suit/storage/toggle/brown_jacket/scc/sancol
 	name = "bridge crew jacket"
 	desc = "A more formal jacket for bridge staff. Designed in a typical Colettish style."
-	desc_fluff= "While not a true Colettish uniform the aiguillette and cuff tabs of this one are obviously based on the real thing. \
+	desc_extended= "While not a true Colettish uniform the aiguillette and cuff tabs of this one are obviously based on the real thing. \
 	An actual Civil Guard uniform, commonly known as a rayadillo, is generally of a darker blue and features the wearer’s ranks on the collar."
 	icon = 'icons/contained_items/clothing/topwear/bridge_crew_jacket_sancol.dmi'
 	icon_state = "bridge_crew_jacket_sancol"
@@ -556,21 +556,21 @@
 /obj/item/clothing/suit/storage/toggle/cardigan
 	name = "cardigan"
 	desc = "A cozy, warm knit cardigan."
-	desc_fluff = "Only slightly worse than a blanket."
+	desc_extended = "Only slightly worse than a blanket."
 	icon_state = "cardigan"
 	item_state = "cardigan"
 
 /obj/item/clothing/suit/storage/toggle/cardigan/sweater
 	name = "sweater cardigan"
 	desc = "A cozy, warm knit sweater cardigan."
-	desc_fluff = "Half as warm as a sweater, and half as fashionable as a cardigan. Not like it matters for coffee-house dwelling beatniks like yourself."
+	desc_extended = "Half as warm as a sweater, and half as fashionable as a cardigan. Not like it matters for coffee-house dwelling beatniks like yourself."
 	icon_state = "cardigansweater"
 	item_state = "cardigansweater"
 
 /obj/item/clothing/suit/storage/toggle/cardigan/argyle
 	name = "argyle cardigan"
 	desc = "A cozy, warm knit argyle cardigan."
-	desc_fluff = "You'll never get dumped if you never get in a relationship in the first place. With this, you'll never have to worry again."
+	desc_extended = "You'll never get dumped if you never get in a relationship in the first place. With this, you'll never have to worry again."
 	icon_state = "cardiganargyle"
 	item_state = "cardiganargyle"
 
@@ -585,7 +585,7 @@
 /obj/item/clothing/suit/caution
 	name = "wet floor sign"
 	desc = "Caution! Wet Floor!"
-	desc_fluff = "Used by the janitor to passive-aggressively point at when you eventually slip on one of their mopped floors."
+	desc_extended = "Used by the janitor to passive-aggressively point at when you eventually slip on one of their mopped floors."
 	desc_info = "Alt-click, or click in-hand to toggle the caution lights. It looks like you can wear it in your suit slot."
 	icon = 'icons/obj/janitor.dmi'
 	item_icons = list(

code/modules/clothing/suits/overlay.dm

@@ -5,7 +5,7 @@
 /obj/item/clothing/suit/storage/toggle/overlay/submariner
 	name = "submariner's coat"
 	desc = "A leather jacket with a synthetic fur collar. It looks comfortable, if a bit warm for the station."
-	desc_fluff = "Waterproof leather coats such as this one are commonly worn by Europan submarine crews due to their ability to keep you warm and dry. Comes with a Castillo import synth-fur collar!"
+	desc_extended = "Waterproof leather coats such as this one are commonly worn by Europan submarine crews due to their ability to keep you warm and dry. Comes with a Castillo import synth-fur collar!"
 	icon_state = "submariner_coat"
 	item_state = "submariner_coat"
 	build_from_parts = TRUE

code/modules/clothing/suits/xeno/tajara.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "medcoat"
 	item_state = "medcoat"
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -17,7 +17,7 @@
 	icon_state = "zhan_coat"
 	item_state = "zhan_coat"
 	contained_sprite = TRUE
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -29,7 +29,7 @@
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "raakti_shariim_coat"
 	item_state = "raakti_shariim_coat"
-	desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \
+	desc_extended = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \
 		peacekeeping force, working closely with both the Royal Constabulary and the Royal Ministry of Intelligence to \
 		seek out internal threats to the Kingdom such as spies, terrorists, and other domestic enemies to the crown. \
 		The Raakti Shariim's uniforms incorporate a dark, navy blue paired with a lilac accent and pale-gold twin-sun \
@@ -42,7 +42,7 @@
 	icon_state = "navalcoat"
 	item_state = "navalcoat"
 	contained_sprite = TRUE
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -56,7 +56,7 @@
 	item_state = "messarobes"
 	contained_sprite = TRUE
 	no_overheat = TRUE
-	desc_fluff = "The official religious body of the S'rendarr & Messa religion  is reffered to as \"Parivara\" or roughly translated \"Family\". This branch is further split into \
+	desc_extended = "The official religious body of the S'rendarr & Messa religion  is reffered to as \"Parivara\" or roughly translated \"Family\". This branch is further split into \
 	the female Sun Sisters and male Priest's of S'rendarr. Currently their main role is to act as mediator and to remain out of political matters, there is however a certain unspoken \
 	agitation about the religion of Mata'ke and S'rrendars position within that pantheon. Further the Parivara has called multiple summits over the courses of war, which usually result \
 	in temporary cease-fires from all sides."
@@ -70,7 +70,7 @@
 	item_state = "matakecoat"
 	contained_sprite = TRUE
 	no_overheat = TRUE
-	desc_fluff = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
+	desc_extended = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
 	practical, strong and masters of Adhomai wilderness. Every clan and temple of Mata'ke has a different way of testing its applicants and these tests are always kept as a strict \
 	secret, the only thing known is that the majority of applicants never return. After they're accepted, priests of Mata'ke dress in furs and carry silver \
 	weapons, usually daggers for ease of transport and to simulate Mata'ke's sword. There is a remarkably low amount of Njarir'Akhran in the Mata'ke priesthood."
@@ -84,7 +84,7 @@
 	item_state = "azubarre"
 	contained_sprite = TRUE
 	no_overheat = TRUE
-	desc_fluff = "The priests of Azubarre are often adored and many aspire to become one, their large flowing robes and beautiful faces often accompany carnivals, marriages, \
+	desc_extended = "The priests of Azubarre are often adored and many aspire to become one, their large flowing robes and beautiful faces often accompany carnivals, marriages, \
 	birthdays, births and many other social events making them the epitome of life. However, the selection for such priests is considered by most to be very shallow, as only those \
 	beautiful and joyous enough are selected as priests. "
 	allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/storage/bible,/obj/item/nullrod,/obj/item/reagent_containers/food/drinks/bottle/holywater)
@@ -99,7 +99,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	species_restricted = list(BODYTYPE_TAJARA)
-	desc_fluff =  "Raskariim, commonly known as The Cult of Raskara are a prolific cult on Adhomai. The religion has been created on Adhomai but with the free commerce, a few human \
+	desc_extended =  "Raskariim, commonly known as The Cult of Raskara are a prolific cult on Adhomai. The religion has been created on Adhomai but with the free commerce, a few human \
 	members have been recorded. While Raskara may seem like a single deity it is in fact split into three aspects, each one leading down a different path and seemingly every path \
 	subverting something S'rendarr and Messa stands for."
 
@@ -112,7 +112,7 @@
 	contained_sprite = TRUE
 	flags_inv = HIDETAIL
 	no_overheat = TRUE
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -127,7 +127,7 @@
 	contained_sprite = TRUE
 	flags_inv = 0
 	allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/storage/bible,/obj/item/nullrod,/obj/item/reagent_containers/food/drinks/bottle/holywater)
-	desc_fluff = "The official religious body of the S'rendarr & Messa religion  is reffered to as \"Parivara\" or roughly translated \"Family\". This branch is further split into \
+	desc_extended = "The official religious body of the S'rendarr & Messa religion  is reffered to as \"Parivara\" or roughly translated \"Family\". This branch is further split into \
 	the female Sun Sisters and male Priest's of S'rendarr. Currently their main role is to act as mediator and to remain out of political matters, there is however a certain unspoken \
 	agitation about the religion of Mata'ke and S'rrendars position within that pantheon. Further the Parivara has called multiple summits over the courses of war, which usually result \
 	in temporary cease-fires from all sides."
@@ -144,7 +144,7 @@
 	allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \
 	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood)
 	species_restricted = list(BODYTYPE_TAJARA)
-	desc_fluff = null
+	desc_extended = null
 
 /obj/item/clothing/head/winterhood/hoodie/taj_scrubs
 	name = "adhomian surgeon mask"
@@ -160,7 +160,7 @@
 	desc = "Originally used by the Amohdan swordsmen before the First Revolution, this cloak is now commonly worn by the island population."
 	icon_state = "amohda_cloak"
 	item_state = "amohda_cloak"
-	desc_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
+	desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
 	single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \
 	of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \
 	bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \
@@ -179,7 +179,7 @@
 	desc = "An Adhomian cloak with an asymmetric design. The symbol of the New Kingdom of Adhomai is at its back."
 	icon_state = "royalist_cloak"
 	item_state = "royalist_cloak"
-	desc_fluff = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
+	desc_extended = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
 	part of the Adhomian way of life. While the government makes no effort in enforcing this separation, there is a great societal expectation that each Tajara will attempt to stay in \
 	their customary roles related to their ethnicity."
 	flags_inv = 0
@@ -217,7 +217,7 @@
 		bomb = ARMOR_BOMB_MINOR
 	)
 	siemens_coefficient = 0.35
-	desc_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
+	desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
 	single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \
 	of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \
 	bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \

code/modules/clothing/suits/xeno/unathi.dm

@@ -37,7 +37,7 @@
 /obj/item/clothing/suit/unathi/wrapping
 	name = "Th'akhist body wrappings"
 	desc = "A bunch of stitched together clothing with bandages covering them. Looks tailored for a Unathi."
-	desc_fluff = "This is considered humble Sinta wear for Th'akh shamans— most Unathi don't wear these, barring Aut'akh."
+	desc_extended = "This is considered humble Sinta wear for Th'akh shamans— most Unathi don't wear these, barring Aut'akh."
 	icon = 'icons/obj/unathi_items.dmi'
 	icon_state = "thakh_wrappings" //special thanks to Araskael
 	item_state = "thakh_wrappings"

code/modules/clothing/under/accessories/accessory.dm

@@ -420,7 +420,7 @@
 /obj/item/clothing/accessory/sash
 	name = "yellow sash"
 	desc = "A yellow sash, designed to be worn over one shoulder and come down to the opposing hip."
-	desc_fluff = "Sashes such as this one are a common sight throughout the Empire of Dominia, though they are hardly as fashionable as the typical cape."
+	desc_extended = "Sashes such as this one are a common sight throughout the Empire of Dominia, though they are hardly as fashionable as the typical cape."
 	icon = 'icons/clothing/accessories/sash.dmi'
 	item_state = "sash"
 	icon_state = "sash"
@@ -572,7 +572,7 @@
 /obj/item/clothing/accessory/poncho/shouldercape
 	name = "shoulder cape"
 	desc = "A simple shoulder cape."
-	desc_fluff = "In Skrellian tradition, the length of cape typically signifies experience in various fields."
+	desc_extended = "In Skrellian tradition, the length of cape typically signifies experience in various fields."
 	icon_state = "starcape"
 	item_state = "starcape"
 	flippable = 1
@@ -615,7 +615,7 @@
 /obj/item/clothing/accessory/poncho/shouldercape/qeblak
 	name = "qeblak mantle"
 	desc = "A mantle denoting the wearer as a member fo the Qeblak faith."
-	desc_fluff = "This mantle denotes the wearer as a member of the Qeblak faith. \
+	desc_extended = "This mantle denotes the wearer as a member of the Qeblak faith. \
 	It is given to followers after they have completed their coming of age ceremony. \
 	The symbol on the back is of a protostar as it transitions into a main sequence star, \
 	representing the the wearer becoming an adult."
@@ -626,7 +626,7 @@
 /obj/item/clothing/accessory/poncho/shouldercape/weishiirobe
 	name = "weishii robe"
 	desc = "A robe denoting the wearer as a member fo the Weishii faith."
-	desc_fluff = "This mantle denotes the wearer as a member of the Weishii faith. \
+	desc_extended = "This mantle denotes the wearer as a member of the Weishii faith. \
 	It is given to followers after they have spent time on a Weishiin Sanctuary."
 	icon_state = "weishii_robe"
 	item_state = "weishii_robe"
@@ -635,7 +635,7 @@
 /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng
 	name = "Nralakk Division Zeng-Hu cloak"
 	desc = "This cloak is given to Zeng-Hu employees who have assisted or worked in collaboration with the Nralakk Federation."
-	desc_fluff = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \
+	desc_extended = "A cloak given to senior level doctors and researchers for Zeng-Hu who has \
 	in the past been given the privilege of working within or in collaboration with the Nralakk Federation\
 	 as a show of goodwill between the corporation and federation."
 	icon = 'icons/obj/contained_items/accessories/ZH_cape.dmi'
@@ -791,7 +791,7 @@
 /obj/item/clothing/accessory/sleevepatch/scc
 	name = "Stellar Corporate Conglomerate patch"
 	desc = "An embroidered patch, adorned with the logo of the Stellar Corporate Conglomerate, which can be attached to the shoulder sleeve of clothing."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "scc_patch"
 	overlay_state = "scc_patch"
 
@@ -947,7 +947,7 @@
 /obj/item/clothing/accessory/poncho/ipc_mantle
 	name = "\improper Burzsian shoulder mantle"
 	desc = "A uniform mantle made out of rudimentary metallic plates. The sigil of Burzsia is pressed into the front of it."
-	desc_fluff = "A uniform mantle of metallic plates that provide positronics in Burzsia cheap, rudimentary protection from industrial hazards and shrapnel; it's also been chemically treated to withstand the surface of Burzsia I. Operation history and specifications are printed underneath the back plate, as a failsafe for field operators to quickly identify the unit in the event it is damaged to the point where said information cannot be discerned through other means."
+	desc_extended = "A uniform mantle of metallic plates that provide positronics in Burzsia cheap, rudimentary protection from industrial hazards and shrapnel; it's also been chemically treated to withstand the surface of Burzsia I. Operation history and specifications are printed underneath the back plate, as a failsafe for field operators to quickly identify the unit in the event it is damaged to the point where said information cannot be discerned through other means."
 	icon = 'icons/clothing/accessories/BZ_Gorget.dmi'
 	icon_state = "Burz_gorget"
 	item_state = "Burz_gorget"

code/modules/clothing/under/accessories/armband.dm

@@ -86,12 +86,12 @@
 /obj/item/clothing/accessory/armband/tauceti
 	name = "tau ceti armband"
 	desc = "An armband tailored to look like the flag of the Republic of Biesel."
-	desc_fluff = "While initially adopted during the early days of the TCFL to account for a sudden increase in volunteers and a lack of uniforms, during the height of the Republic of Biesel's conflicts with the Sol Alliance,\
+	desc_extended = "While initially adopted during the early days of the TCFL to account for a sudden increase in volunteers and a lack of uniforms, during the height of the Republic of Biesel's conflicts with the Sol Alliance,\
 	it has been worn as a symbol of independence and patriotism."
 	icon_state = "tauceti"
 
 /obj/item/clothing/accessory/armband/scc
 	name = "Stellar Corporate Conglomerate armband"
 	desc = "An armband, tailored with all the colors of the Sellar Corporate Conglomerate."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "scc"

code/modules/clothing/under/accessories/badges.dm

@@ -272,7 +272,7 @@
 /obj/item/clothing/accessory/badge/passcard
 	name = "republic of biesel passcard"
 	desc = "A passcard issued to citizens of the Republic of Biesel, typically from planets in Biesel proper and smaller territories."
-	desc_fluff = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \
+	desc_extended = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \
 	updated as necessary or able by a central government. The concept was pioneered in the early days of the Sol Alliance, and continues in most human stellar nations to this day, owing to the availability \
 	and price of consumer plastics and self-powered microholograms."
 	icon = 'icons/clothing/accessories/passcards.dmi'
@@ -291,7 +291,7 @@
 /obj/item/clothing/accessory/badge/passcard/synthetic
 	name = "synthetic residence card"
 	desc = "A passcard issued to free IPCs within the Republic of Biesel, providing resident status and allowing the owning of property, among other things."
-	desc_fluff = "Working alongside IPC tags within the Republic of Biesel, the synthetic residence card has a small RFID chip embedded in it which allows governmental authorities to confirm whether or not an IPC \
+	desc_extended = "Working alongside IPC tags within the Republic of Biesel, the synthetic residence card has a small RFID chip embedded in it which allows governmental authorities to confirm whether or not an IPC \
     is free and taking residency within the system. They were recently introduced in order to provide streamlined documentation for IPCs that have attained freedom but are not citizens."
 	icon_state = "passcard_ceti_m"
 	item_state = "passcard_ceti_m"
@@ -299,7 +299,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol
 	name = "\improper ASSN passcard"
 	desc = "A passcard issued to citizens of the Alliance of Sovereign Solarian Nations, typically from planets such as the Jewel Worlds or smaller zones of authority."
-	desc_fluff = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \
+	desc_extended = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \
 	updated as necessary or able by a central government. The concept was pioneered in the early days of the Sol Alliance, and continues in most human stellar nations to this day, owing to the availability \
 	and price of consumer plastics and self-powered microholograms."
 	icon_state = "passcard_sol"
@@ -308,7 +308,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/pluto
 	name = "plutonian passcard"
 	desc = "A passcard issued to citizens of the Solarian planetoid, Pluto."
-	desc_fluff = "Plutonian passcards, in addition to the features of their cousins in the greater Sol Alliance, include details such as Party membership and occupation, available for viewing by personnel \
+	desc_extended = "Plutonian passcards, in addition to the features of their cousins in the greater Sol Alliance, include details such as Party membership and occupation, available for viewing by personnel \
 	with the appropriate scanning measures."
 	icon_state = "passcard_pluto"
 	item_state = "passcard_pluto"
@@ -316,7 +316,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/jupiter
 	name = "jovian passcard"
 	desc = "A passcard issued to citizens of Sol Alliance, hailing from Jupiter or its moons."
-	desc_fluff = "Due to its status as a trading hub for the Jewel Worlds of the Sol system, Jovian Solarians are among the most populous type to exist outside Earth proper, numbering in the billions. \
+	desc_extended = "Due to its status as a trading hub for the Jewel Worlds of the Sol system, Jovian Solarians are among the most populous type to exist outside Earth proper, numbering in the billions. \
 	Originally given out as a celebration of fifty years of Jovian settlement, these passcards have since been introduced as a display of pride in their mutual orbit."
 	icon_state = "passcard_jovian"
 	item_state = "passcard_jovian"
@@ -324,7 +324,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/europa
 	name = "europan passcard"
 	desc = "A passcard issued to citizens of the Alliance of Sovereign Solarian Nations, hailing from the murky Jovian moon of Europa."
-	desc_fluff = "The Europan passcard, boasting a difficult-to-align identification strip, fragile materials, and an unfortunate resemblance to the ZHS Abaddon research vessel legendary for its supposed \
+	desc_extended = "The Europan passcard, boasting a difficult-to-align identification strip, fragile materials, and an unfortunate resemblance to the ZHS Abaddon research vessel legendary for its supposed \
 	loss to the Cetus, is almost universally reviled by Europans, border agents, and choking sea creatures alike. To carry one aboard a submarine is said to bring bad luck so foul as to serve as a beacon \
 	to the darkest forces known to sailors."
 	icon_state = "passcard_europa"
@@ -333,7 +333,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/cytherean
 	name = "cytherean passcard"
 	desc = "A passcard issued to citizens of the Alliance of Sovereign Solarian Nations from the Cytherean Venusian cloud-cities."
-	desc_fluff = "The luxuriant Cytherean lifestyle is represented no better than in its identification cards; gaudy, with built-in neon flashing lights and doubling as a business card. The font is infamous for \
+	desc_extended = "The luxuriant Cytherean lifestyle is represented no better than in its identification cards; gaudy, with built-in neon flashing lights and doubling as a business card. The font is infamous for \
 	its illegibility."
 	icon_state = "passcard_cytherean"
 	item_state = "passcard_cytherean"
@@ -341,7 +341,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/jintarian
 	name = "jintarian passcard"
 	desc = "A... 'passcard' manufactured by a Venusian living on the surface of their hostile Solarian world."
-	desc_fluff = "In sharp contrast to the passcards wielded in the skies of their world, the common Jintarian passcard is a cobbled-together mess of a stolen corporate identification card with an ID-strip \
+	desc_extended = "In sharp contrast to the passcards wielded in the skies of their world, the common Jintarian passcard is a cobbled-together mess of a stolen corporate identification card with an ID-strip \
 	duct taped to the edge. Traditionally worn by free-runners on the back of their clothing, so that the people in their dust may know who it was that just outpaced them."
 	icon_state = "passcard_jintarian"
 	item_state = "passcard_jintarian"
@@ -349,7 +349,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/silversun
 	name = "silversun commemorative passcard"
 	desc = "A passcard issued to Idris employees currently or formerly employed or residing on the planet Silversun."
-	desc_fluff = "While Silversun itself is a member of the Sol Alliance, Idris Incorporated has secured a number of obscure patents, permits, and bureaucratic channels that allows them to commemorate \
+	desc_extended = "While Silversun itself is a member of the Sol Alliance, Idris Incorporated has secured a number of obscure patents, permits, and bureaucratic channels that allows them to commemorate \
 	faithful employees from the resort world with unique passcards that double as membership cards to some of the cheaper resorts on-world."
 	icon_state = "passcard_silversun"
 	item_state = "passcard_silversun"
@@ -357,7 +357,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/luna
 	name = "lunarian passcard"
 	desc = "A passcard issued to Solarian citizens from the moon of Earth, Luna."
-	desc_fluff = "Not only does the Lunarian passcard bring power, prestige, and a heritage of grace; it also brings an invitation to almost every high society open gathering on the planet, and earns priority \
+	desc_extended = "Not only does the Lunarian passcard bring power, prestige, and a heritage of grace; it also brings an invitation to almost every high society open gathering on the planet, and earns priority \
 	in most reservations for the world's restaurants. If ever there was a silver spoon, it sits here."
 	icon_state = "passcard_moon"
 	item_state = "passcard_moon"
@@ -365,7 +365,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol/visegrad
 	name = "visegradi passcard"
 	desc = "A passcard issued to Solarian citizens from the outer ring planet Visegrad."
-	desc_fluff = "The Visegradi passcard is an unusual thing, as many Solarian outer ring planets did not issue passcards at all, especially high-quality holographic ones. Predominantly seen in the hands of the \
+	desc_extended = "The Visegradi passcard is an unusual thing, as many Solarian outer ring planets did not issue passcards at all, especially high-quality holographic ones. Predominantly seen in the hands of the \
 	urban population who could justify paying the government fee to acquire one, their manufacture is still undertaken by the Southern Solarian Military District that now controls Visegrad."
 	icon_state = "passcard_visegrad"
 	item_state = "passcard_visegrad"
@@ -373,7 +373,7 @@
 /obj/item/clothing/accessory/badge/passcard/eridani
 	name = "eridani passcard"
 	desc = "A holographic passcard issued to residents of the Free Economic Zone of Epsilon Eridani."
-	desc_fluff = "Known with a number of unfavorable acronyms across the Republic, Eridani passcards tend to include unhelpful details such as credit score, personal debts, and insurance providers to those \
+	desc_extended = "Known with a number of unfavorable acronyms across the Republic, Eridani passcards tend to include unhelpful details such as credit score, personal debts, and insurance providers to those \
 	equipped with the right equipment. Infamous across the Orion Spur for being the most sought-after passcards for counterfeiting."
 	icon_state = "passcard_eridani"
 	item_state = "passcard_eridani"
@@ -381,7 +381,7 @@
 /obj/item/clothing/accessory/badge/passcard/elyra
 	name = "elyran passcard"
 	desc = "A passcard issued to citizens of the Serene Republic of Elyra."
-	desc_fluff = "Much like synthetics manufactured in the Serene Republic, Elyran passcards include high-grade anti-counterfeiting through a wafer of borosilicate reinforced with a randomly-chosen alloy. \
+	desc_extended = "Much like synthetics manufactured in the Serene Republic, Elyran passcards include high-grade anti-counterfeiting through a wafer of borosilicate reinforced with a randomly-chosen alloy. \
 	Unlike other nations, however, Elyra allows for heavy personal customization of their passcards, with some of the most expensive government contractors offering brief musical messages or integration with \
 	jewelry such as a bracelet or necklace."
 	icon_state = "passcard_elyra"
@@ -390,7 +390,7 @@
 /obj/item/clothing/accessory/badge/passcard/dominia
 	name = "dominian passcard"
 	desc = "A passcard issued to citizens of the Empire of Dominia."
-	desc_fluff = "Dominian passcards, aside from the usual information, also include details such as one's House, their remaining Mo'ri'zal debt, their status as an Edict Breaker, or- most uniquely- their most recent \
+	desc_extended = "Dominian passcards, aside from the usual information, also include details such as one's House, their remaining Mo'ri'zal debt, their status as an Edict Breaker, or- most uniquely- their most recent \
 	testing for status as a synthetic infiltrator."
 	icon_state = "passcard_dominia"
 	item_state = "passcard_dominia"
@@ -398,7 +398,7 @@
 /obj/item/clothing/accessory/badge/passcard/coalition
 	name = "coalition passcard"
 	desc = "A passcard issued to a citizen of the Coalition of Colonies, typically from worlds like Xanu Prime or the 'wilder' frontier-ward planets lacking in strong central government."
-	desc_fluff = "Due to its terse relations with the Sol Alliance, the Coalition of Colonies has likewise refused to make their passcard software compatible with Alliance verification technology as a \
+	desc_extended = "Due to its terse relations with the Sol Alliance, the Coalition of Colonies has likewise refused to make their passcard software compatible with Alliance verification technology as a \
 	whole. Those travelling from the Coalition to Sol space, for whatever reason, are thus likely to carry paper copies of their identity paperwork with them."
 	icon_state = "passcard_coc"
 	item_state = "passcard_coc"
@@ -406,7 +406,7 @@
 /obj/item/clothing/accessory/badge/passcard/himeo
 	name = "himean passcard"
 	desc = "A passcard issued to a citizen of the planet Himeo."
-	desc_fluff = "Himean passcards are descended from a series of modifications made to the original design, meant to show the user had membership in a worker's syndicate without arousing suspicion from \
+	desc_extended = "Himean passcards are descended from a series of modifications made to the original design, meant to show the user had membership in a worker's syndicate without arousing suspicion from \
 	overseers with paper union cards. These 'defaced' Solarian passcards often find their way into planetary museums, or private collections."
 	icon_state = "passcard_himeo"
 	item_state = "passcard_himeo"
@@ -414,7 +414,7 @@
 /obj/item/clothing/accessory/badge/passcard/gad
 	name = "gadpathurian passcard"
 	desc = "A passcard issued to an active member of a Gadpathurian cadre."
-	desc_fluff = "While identification tabs remain the de facto proof of a Gadpathurian's pride to their cadre and nation, more recent innovations in identification-locked facilities and equipment have demanded \
+	desc_extended = "While identification tabs remain the de facto proof of a Gadpathurian's pride to their cadre and nation, more recent innovations in identification-locked facilities and equipment have demanded \
 	a temporary solution to the low-technology tabs until widespread reform can be made to their manufacturing. As such, Gadpathurian passcards are developed from the ground-up, and are notorious for including \
 	hostile electronics that overheat Solarian examination equipment and can be easily destroyed in the event of capture."
 	icon_state = "passcard_gad"
@@ -423,7 +423,7 @@
 /obj/item/clothing/accessory/badge/passcard/vysoka
 	name = "vysokan passcard"
 	desc = "A passcard issued to a citizen of the planet Vysoka."
-	desc_fluff = "Vysokan passcards often include metals and plastics derived from the place of origin for their recipient, and may make small aesthetic changes to reflect family traditions. They are often \
+	desc_extended = "Vysokan passcards often include metals and plastics derived from the place of origin for their recipient, and may make small aesthetic changes to reflect family traditions. They are often \
 	objects of incredible sentimental value to their bearer."
 	icon_state = "passcard_vysoka"
 	item_state = "passcard_vysoka"
@@ -431,14 +431,14 @@
 /obj/item/clothing/accessory/badge/passcard/assu
 	name = "assunzionii passcard"
 	desc = "A passcard issued to a citizen of the planet Assunzione."
-	desc_fluff = "Assunzionii passcards, while unable to provide the same light as a warding sphere, are known for having light-absorbing compounds in their assembly, and thus glow in the dark for easy reading."
+	desc_extended = "Assunzionii passcards, while unable to provide the same light as a warding sphere, are known for having light-absorbing compounds in their assembly, and thus glow in the dark for easy reading."
 	icon_state = "passcard_assu"
 	item_state = "passcard_assu"
 
 /obj/item/clothing/accessory/badge/passcard/scarab
 	name = "scarab passblade"
 	desc = "A dagger issued as a writ of passage to Scarabs abroad."
-	desc_fluff = "By Scarab traditions, one should show their weapon to non-Scarabs upon first meeting. This dagger, sheathed in hakhma chitin, is often given to noncombatants, the Released, or the young, so they \
+	desc_extended = "By Scarab traditions, one should show their weapon to non-Scarabs upon first meeting. This dagger, sheathed in hakhma chitin, is often given to noncombatants, the Released, or the young, so they \
 	may meet with outsiders with at least a blade between them. Despite this, the blade is sealed tightly within the scabbard."
 	icon_state = "passcard_scarab"
 	item_state = "passcard_scarab"
@@ -451,7 +451,7 @@
 /obj/item/clothing/accessory/badge/passcard/burzsia
 	name = "burzsian passcard"
 	desc = "A passcard issued to Burzsian Hephaestus employees and- owned IPCs- working abroad."
-	desc_fluff = "Despite protest from the Himean representatives in government, Hephaestus Industries- citing their 'Home is where the Hephaestus is' initiative- is permitted to issue up to five thousand \
+	desc_extended = "Despite protest from the Himean representatives in government, Hephaestus Industries- citing their 'Home is where the Hephaestus is' initiative- is permitted to issue up to five thousand \
 	sponsored passcards to participating employees on a yearly basis, both to remind them of their home and to save on imported labor costs."
 	icon_state = "passcard_burs"
 	item_state = "passcard_burs"
@@ -459,7 +459,7 @@
 /obj/item/clothing/accessory/badge/passcard/konyang
 	name = "konyanger passcard"
 	desc = "A passcard issued to residents of the planet Konyang."
-	desc_fluff = "The 'homeworld' of the human positronic intelligence, life on Konyang is a tightly-knit tapestry of organic-synthetic relations. The planet's unique conditions are reflected by a small piece of preserved moss stored in the card's plastic casing."
+	desc_extended = "The 'homeworld' of the human positronic intelligence, life on Konyang is a tightly-knit tapestry of organic-synthetic relations. The planet's unique conditions are reflected by a small piece of preserved moss stored in the card's plastic casing."
 	icon_state = "passcard_konyang"
 	item_state = "passcard_konyang"
 
@@ -467,7 +467,7 @@
 /obj/item/clothing/accessory/badge/passcard/workvisa
 	name = "republic of biesel work visa"
 	desc = "A work visa issued to those who work in the Republic of Biesel, but who do not have a Biesellite citizenship."
-	desc_fluff = "A work visa is required in the Republic of Biesel for those who do not have a Biesellite citizenship and who intend to hold legal employment. Those who most commonly lack a Biesellite citizenship \
+	desc_extended = "A work visa is required in the Republic of Biesel for those who do not have a Biesellite citizenship and who intend to hold legal employment. Those who most commonly lack a Biesellite citizenship \
 	are those from the Alliance of Sovereign Solarian Nations, as the ASSN does not permit dual citizenships in combination with a Biesellite citizenship. Other individuals that may have a Republic of Biesel work \
 	visa are those who intend to become citizens but have not yet resided for two years in order to apply for citizenship, or those who have not yet applied for a citizenship."
 	icon_state = "workvisa"

code/modules/clothing/under/accessories/holster.dm

@@ -197,7 +197,7 @@
 /obj/item/clothing/accessory/holster/utility/custodial
 	name = "custodial holster"
 	desc = "A custodial holster."
-	desc_fluff = "In a universe where various utility firearms and tools have become more common for diverse applications, it is important that there are ways to store them where \
+	desc_extended = "In a universe where various utility firearms and tools have become more common for diverse applications, it is important that there are ways to store them where \
 		they are kept safe from wear and tear as well as from misuse. Thus as an alternative to regular firearm holsters, specialized utility firearm and tool holsters exist, which \
 		allow non-standard firearms to be stored inside, whilst at the same time keeping individuals from storing actual firearms in one."
 	allowed_items = list(

code/modules/clothing/under/accessories/shirts.dm

@@ -6,7 +6,7 @@
 /obj/item/clothing/accessory/sweater
 	name = "sweater"
 	desc = "A warm, knit sweater."
-	desc_fluff = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
+	desc_extended = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
 	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
 	icon_state = "sweater"
 	item_state = "sweater"
@@ -87,7 +87,7 @@
 /obj/item/clothing/accessory/sweater_vest
 	name = "sweater vest"
 	desc = "A warm, knit sweater vest."
-	desc_fluff = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
+	desc_extended = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
 	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
 	icon_state = "sweater_vest"
 	item_state = "sweater_vest"
@@ -97,7 +97,7 @@
 /obj/item/clothing/accessory/argyle_sweater_vest
 	name = "argyle sweater vest"
 	desc = "A warm, knit sweater vest with an argyle pattern."
-	desc_fluff = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
+	desc_extended = "Commonly made out of cotton or wool, but sometimes polyester or acrylic as well."
 	icon = 'icons/contained_items/clothing/topwear/sweaters.dmi'
 	icon_state = "argyle_sweater_vest"
 	item_state = "argyle_sweater_vest"

code/modules/clothing/under/accessories/xeno/diona.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/accessory/badge/passcard/sol_diona
 	name = "Dionae Passcard"
 	desc = "A passcard issued to Dionae citizens of the Alliance of Sovereign Solarian Nations who have cleared their assigned contract. "
-	desc_fluff = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \
+	desc_extended = "A passcard is a modern evolution of the state-issued identification card, with all the functionality of a driver's license, birth certificate, passport, or other document, \
 	updated as necessary or able by a central government. The concept was pioneered in the early days of the Sol Alliance, and continues in most human stellar nations to this day, owing to the availability \
 	and price of consumer plastics and self-powered microholograms."
 	icon_state = "passcard_sol_dionae"

code/modules/clothing/under/accessories/xeno/skrell.dm

@@ -2,7 +2,7 @@
 /obj/item/clothing/accessory/poncho/shouldercape/cloak
 	name = "Ox cloak"
 	desc = "A plain cloak that denotes the wearer as being an Ox-class worker."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
 	icon = 'icons/obj/contained_items/skrell/nralakk_cloaks.dmi'
 	icon_override = 'icons/obj/contained_items/skrell/nralakk_cloaks.dmi'
 	item_state = "ox_cloak"
@@ -13,19 +13,19 @@
 /obj/item/clothing/accessory/poncho/shouldercape/cloak/ix
 	name = "Ix cloak"
 	desc = "An average cloak that denotes the wearer as being an Ix-class worker."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. "
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. "
 	item_state = "ix_cloak"
 
 /obj/item/clothing/accessory/poncho/shouldercape/cloak/oqi
 	name = "Oqi cloak"
 	desc = "A fashionable cloak that denotes the wearer as being an Oqi-class worker."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation."
 	item_state = "oqi_cloak"
 
 /obj/item/clothing/accessory/poncho/shouldercape/cloak/iqi
 	name = "Iqi cloak"
 	desc = "A very fashionable cloak that denotes the wearer as being an Iqi-class worker."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise."
 	item_state = "iqi_cloak"
 
 // Ponchos
@@ -61,7 +61,7 @@
 /obj/item/clothing/accessory/poncho/shouldercape/nationcapes
 	name = "\improper Nralakk cape"
 	desc = "A cape that has the Nralakk flag on the back."
-	desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the inner systems."
+	desc_extended = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the inner systems."
 	icon = 'icons/obj/contained_items/skrell/nationcapes.dmi'
 	icon_override = 'icons/obj/contained_items/skrell/nationcapes.dmi'
 	item_state = "jargcape"
@@ -72,27 +72,27 @@
 /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/traverse
 	name = "\improper Traverse cape"
 	desc = "A cape that has the Free Traverse flag on the back."
-	desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the Traverse. As the Free Traverse Flag is linked to the lyukal and general Traverse independence movements, it is not recommended to wear this flag openly in Federation space."
+	desc_extended = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Nralakk Federation - specifically, the Traverse. As the Free Traverse Flag is linked to the lyukal and general Traverse independence movements, it is not recommended to wear this flag openly in Federation space."
 	item_state = "travcape"
 	icon_state = "travcape"
 
 /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/sol
 	name = "\improper Sol cape"
 	desc = "A cape that has the Solarian Alliance flag on the back."
-	desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Sol Alliance. Unlike similar capes, it is generally acceptable to Fed-aligned Skrell to wear this due to the Sol Alliance's relationship with the Federation."
+	desc_extended = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Sol Alliance. Unlike similar capes, it is generally acceptable to Fed-aligned Skrell to wear this due to the Sol Alliance's relationship with the Federation."
 	item_state = "solcape"
 	icon_state = "solcape"
 
 /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/coc
 	name = "\improper CoC cape"
 	desc = "A cape that has the Coalition of Colonies flag on the back."
-	desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Coalition of Colonies. Due to the poor relationship between the Coalition of Colonies and the Nralakk Federation, Fed-aligned Skrell do not approve of this cape."
+	desc_extended = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Coalition of Colonies. Due to the poor relationship between the Coalition of Colonies and the Nralakk Federation, Fed-aligned Skrell do not approve of this cape."
 	item_state = "coccape"
 	icon_state = "coccape"
 
 /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/biesel
 	name = "\improper Biesel cape"
 	desc = "A cape that has the Republic of Biesel flag on the back."
-	desc_fluff = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Republic of Biesel. Due to the mix of both pro-Fed and anti-Fed Skrell in the Republic, this cape usually does not warrant strong emotions until the wearer's political leanings are known."
+	desc_extended = "A relatively new addition to Skrell fashion, these cloaks are meant to identify the origin of the wearer. Since first contact, it has been a popular way for Skrell to distinguish themselves from Skrell from other regions of the Orion Spur, and has become a popular way to denote political ties or support. This cape signifies that the wearer comes from the Republic of Biesel. Due to the mix of both pro-Fed and anti-Fed Skrell in the Republic, this cape usually does not warrant strong emotions until the wearer's political leanings are known."
 	item_state = "biescape"
 	icon_state = "biescape"

code/modules/clothing/under/accessories/xeno/tajara.dm

@@ -5,7 +5,7 @@
 	icon_state = "furscarf_brown"
 	item_state = "furscarf_brown"
 	contained_sprite = TRUE
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old. Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old. Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -63,7 +63,7 @@
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "taj_commoncloak"
 	item_state = "taj_commoncloak"
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \
 	to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -83,7 +83,7 @@
 	desc = "Originally used by the Amohdan swordsmen before the First Revolution, this cloak is now commonly worn by the island population."
 	icon_state = "amohda_cloak"
 	item_state = "amohda_cloak"
-	desc_fluff = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
+	desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \
 	single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \
 	of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \
 	bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \
@@ -100,7 +100,7 @@
 	desc = "An Adhomian cloak with an asymmetric design. The symbol of the New Kingdom of Adhomai is at its back."
 	icon_state = "royalist_cloak"
 	item_state = "royalist_cloak"
-	desc_fluff = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
+	desc_extended = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
 	part of the Adhomian way of life. While the government makes no effort in enforcing this separation, there is a great societal expectation that each Tajara will attempt to stay in \
 	their customary roles related to their ethnicity."
 
@@ -123,7 +123,7 @@
 	icon_state = "wrap_male"
 	item_state = "wrap_male"
 	contained_sprite = TRUE
-	desc_fluff = "Marriage wraps are the symbol of the union of a Tajaran couple in the tradition known as S'rendal'Mati. At the noon, during the marriage celebration, the bride \
+	desc_extended = "Marriage wraps are the symbol of the union of a Tajaran couple in the tradition known as S'rendal'Mati. At the noon, during the marriage celebration, the bride \
 	and groom meet at the main altar of the church, a present priest recites the holy vows and with the wedding wrist wraps, one blue for the bride and one golden for the groom, ties \
 	their hands together ending the ceremony. From then on celebration begins, feats of strength, endurance and agility are a common sight and many use wedding days to secure their own \
 	future brides and grooms, the bride and groom are required to stay tied together by these wrist wraps until the suns set and celebrations end, solidifying their marriage. The next \
@@ -142,7 +142,7 @@
 	icon_state = "pelt"
 	item_state = "pelt"
 	contained_sprite = TRUE
-	desc_fluff = "Tajara under the worship of Ma'ta'ke have a less celebratory and less ritualistic wedding ceremony, instead having a simple meeting between families with a \
+	desc_extended = "Tajara under the worship of Ma'ta'ke have a less celebratory and less ritualistic wedding ceremony, instead having a simple meeting between families with a \
 	clergyman to proclaim the lovers \"Zrrazhil Ekrratul\" (Continuation of the families), named for the simple notion of propagating the blood of the families involved."
 
 /obj/item/clothing/accessory/badge/hadii_card
@@ -152,7 +152,7 @@
 	overlay_state = "hadii-id"
 	slot_flags = SLOT_TIE
 	badge_string = "Honorary Member of Party of the Free Tajara under the Leadership of Hadii"
-	desc_fluff = "The Party of the Free Tajara under the Leadership of Hadii is the only and ruling party in the PRA, with its leader always being the elected president. \
+	desc_extended = "The Party of the Free Tajara under the Leadership of Hadii is the only and ruling party in the PRA, with its leader always being the elected president. \
 	They follow Hadiism as their main ideology, with the objective of securing the tajaran freedom and place in the galactic community. Membership of the Hadiist Party is not open. \
 	For anyone to become a member, they must be approved by a committee that will consider their qualifications and past. Goverment officials can grant honorary memberships, this is \
 	seen as nothing but a honor and does not grant any status or position that a regular Party member would have."
@@ -168,7 +168,7 @@
 	desc = "A pin worn by supporters of the Democratic People's Republic of Adhomai and the ideals of almariism."
 	icon_state = "dpra-badge"
 	overlay_state = "dpra-badge"
-	desc_fluff = "The government of the DPRA seeks to dismantle the ethnic caste system present in Tajaran society. Instead of creating policies and using the force of the state \
+	desc_extended = "The government of the DPRA seeks to dismantle the ethnic caste system present in Tajaran society. Instead of creating policies and using the force of the state \
 	to do so, they believe that this goal can be reached by giving the necessary opportunities and freedom from external influences to the Tajara species. Local autonomy and regional \
 	cultures are protected by the authorities. Traditional Zhan communities, rock nomads and Amohdan lodges are allowed to thrive in the territories of the Democratic People's Republic. \
 	This ideology is known as Al'mariism, as it seeks to preserve the initial ideals of the first revolution."
@@ -184,7 +184,7 @@
 	desc = "A badge worn by the supporters of the New Kingdom of Adhomai and its royalist ideals."
 	icon_state = "nka-badge"
 	overlay_state = "nka-badge"
-	desc_fluff = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
+	desc_extended = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
 	part of the Adhomian way of life. While the government makes no effort in enforcing this separation, there is a great societal expectation that each Tajara will attempt to stay in \
 	their customary roles related to their ethnicity."
 	slot_flags = SLOT_TIE
@@ -200,7 +200,7 @@
 	icon_state = "hadii-pin"
 	item_state = "hadii-pin"
 	overlay_state = "hadii-pin"
-	desc_fluff = "The Party of the Free Tajara under the Leadership of Hadii is the only and ruling party in the PRA, with its leader always being the elected president. \
+	desc_extended = "The Party of the Free Tajara under the Leadership of Hadii is the only and ruling party in the PRA, with its leader always being the elected president. \
 	They follow Hadiism as their main ideology, with the objective of securing the Tajaran freedom and place in the galactic community. Membership of the Hadiist Party is not open. \
 	For anyone to become a member, they must be approved by a committee that will consider their qualifications and past. Goverment officials can grant honorary memberships, this is \
 	seen as nothing but a honor and does not grant any status or position that a regular Party member would have."
@@ -215,7 +215,7 @@
 	icon_state = "pin-ala"
 	item_state = "pin-ala"
 	overlay_state = "pin-ala"
-	desc_fluff = "The government of the DPRA seeks to dismantle the ethnic caste system present in Tajaran society. Instead of creating policies and using the force of the state \
+	desc_extended = "The government of the DPRA seeks to dismantle the ethnic caste system present in Tajaran society. Instead of creating policies and using the force of the state \
 	to do so, they believe that this goal can be reached by giving the necessary opportunities and freedom from external influences to the Tajara species. Local autonomy and regional \
 	cultures are protected by the authorities. Traditional Zhan communities, rock nomads and Amohdan lodges are allowed to thrive in the territories of the Democratic People's Republic. \
 	This ideology is known as Al'mariism, as it seeks to preserve the initial ideals of the first revolution."
@@ -230,7 +230,7 @@
 	icon_state = "pin-nka"
 	item_state = "pin-nka"
 	overlay_state = "pin-nka"
-	desc_fluff = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
+	desc_extended = "The New Kingdom of Adhomai culture is characterized as traditional; instead of trying to change the Tajaran caste system, those divisions are seen as a natural \
 	part of the Adhomian way of life. While the government makes no effort in enforcing this separation, there is a great societal expectation that each Tajara will attempt to stay in \
 	their customary roles related to their ethnicity."
 
@@ -300,7 +300,7 @@
 	icon_state = "council_badge"
 	item_state = "council_badge"
 	overlay_state = "council_badge"
-	desc_fluff = "The Free Tajaran Council is the largest Tajaran community in Himeo; its origin can be traced back to the First Revolution. Born in the city of Shungsta during the war, \
+	desc_extended = "The Free Tajaran Council is the largest Tajaran community in Himeo; its origin can be traced back to the First Revolution. Born in the city of Shungsta during the war, \
 	the Tajaran Free Council was a political movement that advocated for the total abolishment of authoritarian governments in favor of independent democratic councils. "
 	flippable = TRUE
 
@@ -312,7 +312,7 @@
 	desc = "A hand carved wooden charm of tajaran origin."
 	icon_state = "wooden_talisman"
 	item_state = "wooden_talisman"
-	desc_fluff = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off raskara and other evils. \
+	desc_extended = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off raskara and other evils. \
 	Hand-carved tajani charms are held in special regards, often being thought of as being particularly fortunate."
 	w_class = ITEMSIZE_TINY
 	flags = NOBLUDGEON
@@ -367,7 +367,7 @@
 /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell
 	name = "silver seashell charm"
 	desc = "A necklace made of soft rope with a silver charm attached in the shape of a seashell."
-	desc_fluff = "Followers of Ma'ta'ke who reverers the amohdan goddess Minharzka can sometimes be found wearing silvery seashell charms. \
+	desc_extended = "Followers of Ma'ta'ke who reverers the amohdan goddess Minharzka can sometimes be found wearing silvery seashell charms. \
 	Her tears having filled the oceans and risen to become the rain in the sky and it is thought that her mood is what controls the treacherous adhomian seas. \
 	Minharzka's name is often invoked and offerings left at her altars for those hoping for safe travels, impressive cargo hauls or for the weather to change \
 	and her fanatics are well known across tajaran history as being fearless and dangerous sailors and warriors of the sea."
@@ -375,7 +375,7 @@
 /obj/item/clothing/accessory/tajaran/charm/tajani
 	name = "wooden tajani charm"
 	desc = "A hand carved charm of one of the mythical tajani."
-	desc_fluff = "Tajani, also known as 'short people' in basic, are good-willed tiny elder Tajara who serve as guardians of nature and homes. \
+	desc_extended = "Tajani, also known as 'short people' in basic, are good-willed tiny elder Tajara who serve as guardians of nature and homes. \
 	Hand carved charms of them is considered a symbol of luck and as such many superstitious tajara keeps one around."
 
 /obj/item/clothing/accessory/tajaran/tanker_pin
@@ -385,7 +385,7 @@
 	icon_state = "tanker_pin"
 	item_state = "tanker_pin"
 	overlay_state = "tanker_pin"
-	desc_fluff = "Lead by the famously merciful Commander Kahan Hro'rammhad, the Hro'rammhad Tank Corps has the distinction of being the most powerful and accomplished armored unit in the history \
+	desc_extended = "Lead by the famously merciful Commander Kahan Hro'rammhad, the Hro'rammhad Tank Corps has the distinction of being the most powerful and accomplished armored unit in the history \
 	of Adhomai. These elite Armored Kazarrhaldiye Tajara are used primarily in offensive operations to break through opposing lines and encircle their positions. Their tanks have exceptionally \
 	wide tracks which allow them to more easily tread across snowy terrains. Veterans of the Hro'rammhad Tank Corps are known for their golden pins depicting the sun-god S'rendarr which they wear on their uniforms."
 	flippable = TRUE
@@ -399,7 +399,7 @@
 	icon_state = "zbrojny_badge"
 	item_state = "zbrojny_badge"
 	overlay_state = "zbrojny_badge"
-	desc_fluff = "Seeking to replicate the success of the Liberation Army guerrillas, the Zbrojny is a partisan force created after the Armistice. The Zbrojny is made up of loyal Hadiist \
+	desc_extended = "Seeking to replicate the success of the Liberation Army guerrillas, the Zbrojny is a partisan force created after the Armistice. The Zbrojny is made up of loyal Hadiist \
 	volunteers from the civilian population. Trained by the People's Strategic Intelligence Service in guerilla tactics, they are meant to act behind enemy lines in occupied territory. \
 	Unlike all branches of the Grand People's Army, the Partisans are under the direct control of the secret service."
 	flippable = TRUE
@@ -415,7 +415,7 @@
 	icon_state = "abparty_pin"
 	item_state = "abparty_pin"
 	overlay_state = "abparty_pin"
-	desc_fluff = "The Adhomian Blue party is formed by farmers and students. Instead of worrying about the Armistice or the composition of the government, their main goal is to preserve the environment of \
+	desc_extended = "The Adhomian Blue party is formed by farmers and students. Instead of worrying about the Armistice or the composition of the government, their main goal is to preserve the environment of \
 	Adhomai. Industrialization and armed conflict are considered a major threat to the nature and beauty of the planet. Members of this organization are also vehemently opposed to the presence \
 	of NanoTrasen. The organization is currently divided between environmentalists and Al'mariist ruralists."
 	flippable = TRUE
@@ -429,7 +429,7 @@
 	icon_state = "fonparty_pin"
 	item_state = "fonparty_pin"
 	overlay_state = "fonparty_pin"
-	desc_fluff = "The Followers of Nated is an organization formed by fanatical supporters of Nated who claim he is a divine avatar of the Suns or Mata'ke. They support a dictatorship under the guidance of Halkiikijr \
+	desc_extended = "The Followers of Nated is an organization formed by fanatical supporters of Nated who claim he is a divine avatar of the Suns or Mata'ke. They support a dictatorship under the guidance of Halkiikijr \
 	Nated'Hakhan, stripping away any semblance of democracy from the Democratic People's Republic. Members of this party oppose any form of peace or negotiation with the other Tajaran factions, \
 	or diplomacy with alien powers. They are known for hosting the most radical elements of DPRA's political scenario."
 	flippable = TRUE
@@ -443,7 +443,7 @@
 	icon_state = "ftpparty_pin"
 	item_state = "ftpparty_pin"
 	overlay_state = "ftpparty_pin"
-	desc_fluff = "The Free Tajaran People's Party encompasses most of the military and authoritarian elements. They seek to weaken the autonomy of governors in favor of a strong central government, overseen by \
+	desc_extended = "The Free Tajaran People's Party encompasses most of the military and authoritarian elements. They seek to weaken the autonomy of governors in favor of a strong central government, overseen by \
 	the supreme commander. Members of this organization hold the most nationalist and xenophobic views; defending the return of the war against other Adhomian nations and isolation before the \
 	galactic community."
 	flippable = TRUE
@@ -457,7 +457,7 @@
 	icon_state = "nawparty_pin"
 	item_state = "nawparty_pin"
 	overlay_state = "nawparty_pin"
-	desc_fluff = "The National Adhomai Worker's Party is composed of urban workers and intellectuals. They aim to increase the autonomy of the states, placing less importance on the decisions made by the national \
+	desc_extended = "The National Adhomai Worker's Party is composed of urban workers and intellectuals. They aim to increase the autonomy of the states, placing less importance on the decisions made by the national \
 	assemblies. Members of its organization hold far more moderate views; seeking to honor the Armistice of Shastar while recognizing that maintaining a healthy and independent relationship \
 	with other foreign powers is needed."
 	flippable = TRUE
@@ -471,7 +471,7 @@
 	icon_state = "aflparty_pin"
 	item_state = "aflparty_pin"
 	overlay_state = "aflparty_pin"
-	desc_fluff = "The Amohdan Free Lodge was represented by Amohdan nationals. They pushed for the independence of Amohda as its own state, usually siding with other parties that may help them in reaching their \
+	desc_extended = "The Amohdan Free Lodge was represented by Amohdan nationals. They pushed for the independence of Amohda as its own state, usually siding with other parties that may help them in reaching their \
 	goals. However, they were divided between two different sides; one that saw democracy as the best option for the island, while others believed that restoring the monarchy would have been \
 	better. This organization was the main supporter of the ceasefire with the New Kingdom of Adhomai. This Party was banned after the Amohdan uprising of 2462."
 	flippable = TRUE

code/modules/clothing/under/accessories/xeno/unathi.dm

@@ -55,7 +55,7 @@
 	name = "Th'akhist maxtlatl"
 	desc = "A traditional garment worn by Th'akh shamans. Popular adornments include dried and pressed grass and \
 	flowers, in addition to colorful stones placed into and hanging off of the mantle."
-	desc_fluff = "The term \" maxtlatl\" was given by humanity upon seeing this due to its resemblance to ancient \
+	desc_extended = "The term \" maxtlatl\" was given by humanity upon seeing this due to its resemblance to ancient \
 	human cultures. However, it is more appropriately called a zlukti, or 'spirit garb'. Each adornment, whether \
 	feathers, stones, or metals, is made by another shaman who has passed away: the more colorful the attire, the \
 	older it is."
@@ -69,7 +69,7 @@
 	name = "desert hide mantle"
 	desc = "The cured hide and skin of a large beast, tapered off with a colorful collar. This one is a popular \
 	trophy among Wastelanders: someone's been hunting!"
-	desc_fluff = "With the expansion of the Touched Lands, the normal beasts that prowl and stalk the dunes have \
+	desc_extended = "With the expansion of the Touched Lands, the normal beasts that prowl and stalk the dunes have \
 	proliferated at unprecedented rates. Those stranded outside of the greenery of the Izweski take up arms to cull \
 	the herdes of klazd, and their skins make valuable mantles to protect wearers from the sun."
 	icon = 'icons/obj/unathi_items.dmi'
@@ -84,7 +84,7 @@
 	name = "forest hide mantle"
 	desc = "The cured hide and skin of a large beast, tapered off with a colorful collar. These are seen exclusively \
 	by warriors, nobles, and those with credits to spare."
-	desc_fluff = "After the Contact War, the prized horns of the tul quickly vanished from the market. Nobles and \
+	desc_extended = "After the Contact War, the prized horns of the tul quickly vanished from the market. Nobles and \
 	wealthy guildsmen were swift to monopolize and purchase all the remaining cloaks; a peasant seen with one of \
 	these is likely enough a death sentence."
 	worn_overlay = "forest"
@@ -93,7 +93,7 @@
 	name = "mountain hide mantle"
 	desc = "The cured hide and skin of a large beast, tapered off with a colorful collar. Mountainous arbek, massive \
 	snakes longer than a bus, have a long enough hide for multiple mantles."
-	desc_fluff = "Hunting an arbek is no easy task. Brave Zo'saa looking to prove themselves in battle and be \
+	desc_extended = "Hunting an arbek is no easy task. Brave Zo'saa looking to prove themselves in battle and be \
 	promoted to Saa rarely understand the gravity of these trials. Serpents large enough to swallow Unathi whole, \
 	they can live up to half a millenia- should enough foolish adventurers try to slay it, that is."
 	worn_overlay = "mountain"
@@ -101,7 +101,7 @@
 /obj/item/clothing/accessory/poncho/rockstone
 	name = "rockstone cape"
 	desc = "A cape seen exclusively on nobility. The chain is adorned with precious, multi-color stones, hence its name."
-	desc_fluff = "A simple drape over the shoulder is done easily; the distinguishing part between the commoners and \
+	desc_extended = "A simple drape over the shoulder is done easily; the distinguishing part between the commoners and \
 	nobility is the sheer elegance of the rockstone cape. Vibrant stones adorn the heavy collar, and the cape itself \
 	is embroidered with gold."
 	icon = 'icons/obj/unathi_items.dmi'

code/modules/clothing/under/jobs/civilian.dm

@@ -205,7 +205,7 @@
 /obj/item/clothing/under/rank/bridge_crew/sancolette
 	name = "bridge crew's uniform"
 	desc = "A bridge staff uniform in SCC colors but Colettish style, consisting of trousers and meant to be paired with a jacket. Fancy!"
-	desc_fluff = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
+	desc_extended = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
 	uniforms of the Civil Guard are one of the more striking uniforms found in the local military forces of the Alliance, and are often copied by both corporate and civil actors."
 	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_sancol.dmi'
 	icon_state = "bridge_crew_sancol"
@@ -215,7 +215,7 @@
 /obj/item/clothing/under/rank/bridge_crew/sancolette/alt
 	name = "bridge crew's uniform"
 	desc = "A bridge staff uniform in SCC colors but Colettish style, consisting of navy trousers and meant to be paired with a jacket. Fancy!"
-	desc_fluff = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
+	desc_extended = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
 	uniforms of the Civil Guard are one of the more striking uniforms found in the local military forces of the Alliance, and are often copied by both corporate and civil actors."
 	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_sancol.dmi'
 	icon_state = "bridge_crew_sancol_alt"

code/modules/clothing/under/jobs/security.dm

@@ -65,7 +65,7 @@
 
 /obj/item/clothing/under/rank/security/pmc/epmc // Note: Item Icon placeholder
 	name = "EPMC security uniform"
-	desc_fluff = "The EPMC is a subsidiary of the PMCG."
+	desc_extended = "The EPMC is a subsidiary of the PMCG."
 	icon_state = "epmc"
 	item_state = "epmc"
 

code/modules/clothing/under/miscellaneous.dm

@@ -80,7 +80,7 @@
 /obj/item/clothing/under/rank/scc
 	name = "Stellar Corporate Conglomerate agent uniform"
 	desc = "A formal blue uniform worn by agents of the Stellar Corporate Conglomerate."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon = 'icons/clothing/under/uniforms/scc.dmi'
 	icon_state = "scc_agent"
 	item_state = "scc_agent"

code/modules/clothing/under/shorts.dm

@@ -36,7 +36,7 @@
 /obj/item/clothing/under/shorts/scc
 	name = "Stellar Corporate Conglomerate shorts"
 	desc = "Shorts displaying the wearer's pride in their assigned corporate entity."
-	desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
+	desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "sccshorts"
 	item_state = "sccshorts"
 

code/modules/clothing/under/skirts.dm

@@ -3,7 +3,7 @@
 /obj/item/clothing/under/skirt
 	name = "casual skirt"
 	desc = "A short, colorful skirt."
-	desc_fluff = "Not to be mistaken with the similarly named cut of steak."
+	desc_extended = "Not to be mistaken with the similarly named cut of steak."
 	icon = 'icons/obj/clothing/skirts.dmi'
 	icon_state = "skirt_casual"
 	item_state = "skirt_casual"
@@ -14,7 +14,7 @@
 /obj/item/clothing/under/skirt/puffy
 	name = "puffy skirt"
 	desc = "A short, puffy skirt."
-	desc_fluff = "When you've got too much air in your head and need to put it somewhere else."
+	desc_extended = "When you've got too much air in your head and need to put it somewhere else."
 	icon_state = "skirt_puffy"
 	item_state = "skirt_puffy"
 	worn_state = "skirt_puffy"
@@ -22,7 +22,7 @@
 /obj/item/clothing/under/skirt/long
 	name = "long skirt"
 	desc = "A long, modest skirt."
-	desc_fluff = "Long enough to do a curtsy, if you're into that sort of thing."
+	desc_extended = "Long enough to do a curtsy, if you're into that sort of thing."
 	icon_state = "skirt_long"
 	item_state = "skirt_long"
 	worn_state = "skirt_long"
@@ -30,7 +30,7 @@
 /obj/item/clothing/under/skirt/high
 	name = "high skirt"
 	desc = "A modest skirt going up to the waist."
-	desc_fluff = "For when covering your legs isn't enough."
+	desc_extended = "For when covering your legs isn't enough."
 	icon_state = "skirt_high"
 	item_state = "skirt_high"
 	worn_state = "skirt_high"
@@ -38,7 +38,7 @@
 /obj/item/clothing/under/skirt/pencil
 	name = "pencil skirt"
 	desc = "A professional-looking pencil skirt."
-	desc_fluff = "Revel in how professional you are. Realize that you'll never pick up anything from the floor without compromising yourself."
+	desc_extended = "Revel in how professional you are. Realize that you'll never pick up anything from the floor without compromising yourself."
 	icon_state = "skirt_pencil"
 	item_state = "skirt_pencil"
 	worn_state = "skirt_pencil"
@@ -46,7 +46,7 @@
 /obj/item/clothing/under/skirt/swept
 	name = "swept skirt"
 	desc = "A skirt that is swept to one side."
-	desc_fluff = "When you want a little more skirt, but not too much."
+	desc_extended = "When you want a little more skirt, but not too much."
 	icon_state = "skirt_swept"
 	item_state = "skirt_swept"
 	worn_state = "skirt_swept"
@@ -54,7 +54,7 @@
 /obj/item/clothing/under/skirt/plaid
 	name = "plaid skirt"
 	desc = "A preppy plaid skirt."
-	desc_fluff = "Stick it to gender stereotypes and be the lumberjack you've always been! Avoid doing physical labor anyway on account of the skirt being several lengths too short!"
+	desc_extended = "Stick it to gender stereotypes and be the lumberjack you've always been! Avoid doing physical labor anyway on account of the skirt being several lengths too short!"
 	icon_state = "skirt_plaid"
 	item_state = "skirt_plaid"
 	worn_state = "skirt_plaid"
@@ -62,7 +62,7 @@
 /obj/item/clothing/under/skirt/pleated
 	name = "pleated skirt"
 	desc = "A sharp-looking knife-pleated skirt."
-	desc_fluff = "Would go great with a sailor uniform."
+	desc_extended = "Would go great with a sailor uniform."
 	icon_state = "skirt_pleated"
 	item_state = "skirt_pleated"
 	worn_state = "skirt_pleated"
@@ -70,7 +70,7 @@
 /obj/item/clothing/under/skirt/skater
 	name = "skater skirt"
 	desc = "A plush skater skirt."
-	desc_fluff = "Be it ice skating, skateboarding or rollerskating : You should probably wear shorts under these."
+	desc_extended = "Be it ice skating, skateboarding or rollerskating : You should probably wear shorts under these."
 	icon_state = "skirt_skater"
 	item_state = "skirt_skater"
 	worn_state = "skirt_skater"
@@ -78,7 +78,7 @@
 /obj/item/clothing/under/skirt/tube
 	name = "tube skirt"
 	desc = "A long tube skirt."
-	desc_fluff = "A pencil skirt. But longer."
+	desc_extended = "A pencil skirt. But longer."
 	icon_state = "skirt_tube"
 	item_state = "skirt_tube"
 	worn_state = "skirt_tube"
@@ -86,7 +86,7 @@
 /obj/item/clothing/under/skirt/straightlong
 	name = "straight long skirt"
 	desc = "A skirt that goes all the way down to the ankles."
-	desc_fluff = "Enough fabric for two skirts, and then some."
+	desc_extended = "Enough fabric for two skirts, and then some."
 	icon_state = "skirt_straightlong"
 	item_state = "skirt_straightlong"
 	worn_state = "skirt_straightlong"
@@ -102,7 +102,7 @@
 /obj/item/clothing/under/skirt/jumper
 	name = "jumper skirt"
 	desc = "A short skirt with two large shoulder straps."
-	desc_fluff = "Too tall or too short? Too bad. These shoulder straps can't be adjusted."
+	desc_extended = "Too tall or too short? Too bad. These shoulder straps can't be adjusted."
 	icon_state = "skirt_jumper"
 	worn_state = "skirt_jumper"
 	item_state = "skirt_jumper"
@@ -110,7 +110,7 @@
 /obj/item/clothing/under/skirt/jumper_highcut
 	name = "jumper dress"
 	desc = "A garment with open sides that seems to be a cross between a dress and an apron."
-	desc_fluff = "You could achieve the same effect with two aprons, we're pretty sure."
+	desc_extended = "You could achieve the same effect with two aprons, we're pretty sure."
 	icon_state = "skirt_jumper_highcut"
 	worn_state = "skirt_jumper_highcut"
 	item_state = "skirt_jumper_highcut"

code/modules/clothing/under/xenos/skrell.dm

@@ -54,7 +54,7 @@
 /obj/item/clothing/under/skrell/nralakk
 	name = "Ox research uniform"
 	desc = "A plain, utilitarian jumpsuit that signifies the wearer as a Tertiary Numerical working in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
 	icon = 'icons/obj/contained_items/skrell/nralakk_uniforms.dmi'
 	sprite_sheets = list(
 		BODYTYPE_VAURCA_BULWARK = 'icons/obj/contained_items/vaurca/bulwark/nralakk_uniforms.dmi'
@@ -90,7 +90,7 @@
 /obj/item/clothing/under/skrell/nralakk/ix
 	name = "Ix research uniform"
 	desc = "A plain jumpsuit that signifies the wearer as a low-scoring Secondary Numerical working in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. "
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. "
 	item_state = "ix_sci"
 	icon_state = "ix_sci"
 
@@ -122,7 +122,7 @@
 /obj/item/clothing/under/skrell/nralakk/oqi
 	name = "Oqi research uniform"
 	desc = "A more fashionable jumpsuit that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation."
 	item_state = "oqi_sci"
 	icon_state = "oqi_sci"
 
@@ -154,7 +154,7 @@
 /obj/item/clothing/under/skrell/nralakk/iqi
 	name = "Iqi research uniform"
 	desc = "A very fashionable jumpsuit that signifies the wearer as a high-scoring Primary Numerical in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise."
 	item_state = "iqi_sci"
 	icon_state = "iqi_sci"
 
@@ -186,7 +186,7 @@
 /obj/item/clothing/suit/storage/toggle/skrell
 	name = "Ox research jacket"
 	desc = "A plain, utilitarian jacket that signifies the wearer as a Tertiary Numerical in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ox are those who are within the Tertiary Numerical band, and are provided with the bare essentials for adequate clothes. Tertiary Numericals are typically criminals, or Skrell who otherwise do not conform to the standards of Nralakk Society."
 	icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi'
 	item_state = "ox_sci_jacket"
 	icon_state = "ox_sci_jacket"
@@ -220,7 +220,7 @@
 /obj/item/clothing/suit/storage/toggle/skrell/ix
 	name = "Ix research jacket"
 	desc = "A plain jacket that signifies the wearer as a low-scoring Secondary Numerical in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. "
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Ix are those who are low-scoring Secondary Numericals with their clothes typically being plain, yet still considered pleasant to wear and be seen in. Secondary Numericals are the majority population in the Nralakk Federation, with Ix being those who are in the lower end of the band. "
 	item_state = "ix_sci_jacket"
 	icon_state = "ix_sci_jacket"
 
@@ -252,7 +252,7 @@
 /obj/item/clothing/suit/storage/toggle/skrell/oqi
 	name = "Oqi research jacket"
 	desc = "A more fashionable jacket that signifies the wearer as either a high-scoring Secondary Numerical or low-scoring Primary Numerical in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Oqi are high-scoring Secondary Numericals or low-scoring Primary Numericals, with their workwear generally having more accessories that help them work in their specific industry. Skrell who are Oqi are typically more fashion-conscious, making it not uncommon to see these uniforms altered slightly to account for the latest fashion trends in the Nralakk Federation."
 	item_state = "oqi_sci_jacket"
 	icon_state = "oqi_sci_jacket"
 
@@ -284,7 +284,7 @@
 /obj/item/clothing/suit/storage/toggle/skrell/iqi
 	name = "Iqi research jacket"
 	desc = "A very fashionable jacket that signifies the wearer as a high-scoring Primary Numerical in a scientific field."
-	desc_fluff = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise."
+	desc_extended = "The Nralakk Federation ranks its workers based on their social credit score, and provides workwear based on said score: Iqi are high-scoring Primary Numericals, and as such their workwear is of the highest quality afforded by the Federation. These clothes are typically made of sturdier materials and are more comfortable to wear. Primary Numericals are typically seen as the trend-setters in Federation society, and Skrell who are ranked at Iqi are known to influence fashion through how they accessorise."
 	item_state = "iqi_sci_jacket"
 	icon_state = "iqi_sci_jacket"
 
@@ -339,7 +339,7 @@
 /obj/item/clothing/suit/storage/toggle/skrell/starcoat
 	name = "star coat"
 	desc = "A very fashionable coat, that traps moisture and provides good insulation. Starry patterns have been woven into its fabric."
-	desc_fluff = "The patterns typically represent the constellations visible from the home system of the wearer. Coats like this one are usually very personal and custom made."
+	desc_extended = "The patterns typically represent the constellations visible from the home system of the wearer. Coats like this one are usually very personal and custom made."
 	icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi'
 	item_state = "starcoat"
 	icon_state = "starcoat"

code/modules/clothing/under/xenos/tajara.dm

@@ -5,7 +5,7 @@
 	icon_state = "taj_labor"
 	item_state = "taj_labor"
 	contained_sprite = TRUE
-	desc_fluff = "Having direct and friendly contact with humanity, The People's Republic of Adhomai has been the most influenced by the spacer fashion. The most known \
+	desc_extended = "Having direct and friendly contact with humanity, The People's Republic of Adhomai has been the most influenced by the spacer fashion. The most known \
 	being the \"assistant jumpsuits\" which directly inspired the design of factory overalls, the plight and low pay of the assistants being close to the hearts of Tajara Hadiist \
 	workers and their Republic."
 	no_overheat = TRUE
@@ -15,7 +15,7 @@
 	desc = "Worn by princess, barons and lords of Adhomai, now in stores near you!"
 	icon_state = "male_taj_fancy"
 	item_state = "male_taj_fancy"
-	desc_fluff = "While money and riches are at an all time low, the New Kingdom is symbolized by one thing, hope. While the often attacked, poor and shaggy nation is compared to \
+	desc_extended = "While money and riches are at an all time low, the New Kingdom is symbolized by one thing, hope. While the often attacked, poor and shaggy nation is compared to \
 	the others in quite a poor state, it holds a \"stiff upper muzzle\" attitude, not letting their enemies get under their skin. Unlike the PRA if someone can afford it, they flaunt it, \
 	nobles and peasants live in the same streets, drink the same water and eat the same food and thus even wear the same clothes. On the streets they look very similar to PRA Tajara, \
 	overcoats, white shirts, pants although often in poorer state. However jewelry, tail adornments and veils are in rich abundance, often showing off small and intricate details of \
@@ -32,7 +32,7 @@
 	desc = "Simple linen garments worn by Mata'ke priests."
 	icon_state = "matakeuniform"
 	item_state = "matakeuniform"
-	desc_fluff = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
+	desc_extended = "The priesthood of Mata'ke is comprised of only men and strangely enough, hunters. Like their patron, all priests of Mata'ke must prove themselves capable, \
 	practical, strong and masters of Adhomai wilderness. Every clan and temple of Mata'ke has a different way of testing its applicants and these tests are always kept as a strict \
 	secret, the only thing known is that the majority of applicants never return. After they're accepted, priests of Mata'ke dress in furs and carry silver \
 	weapons, usually daggers for ease of transport and to simulate Mata'ke's sword. There is a remarkably low amount of Njarir'Akhran in the Mata'ke priesthood."
@@ -42,7 +42,7 @@
 	desc = "A military uniform used by the forces of the People's Republic of Adhomai orbital fleet."
 	icon_state = "cosmonaut"
 	item_state = "cosmonaut"
-	desc_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
+	desc_extended = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
 	protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
 	contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
 	ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
@@ -57,7 +57,7 @@
 	desc = "A military uniform used by Party Commissars attached to kosmostrelki units."
 	icon_state = "space_commissar"
 	item_state = "space_commissar"
-	desc_fluff = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
+	desc_extended = "Party Commissars are high ranking members of the Party of the Free Tajara under the Leadership of Hadii attached to army units, who ensures that soldiers and \
 	their commanders follow the principles of Hadiism. Their duties are not only limited to enforcing the republican ideals among the troops and reporting possible subversive elements, \
 	they are expected to display bravery in combat and lead by example."
 	starting_accessories = (/obj/item/clothing/accessory/holster/hip)
@@ -79,7 +79,7 @@
 	desc = "A simple and robust overall used by Adhomian urban workers."
 	icon_state = "mechanic"
 	item_state = "mechanic"
-	desc_fluff = "The quality of life for an urban dweller in Nal'tor, or any other major city, can vary considerably according to the Tajara's occupation, education and standing \
+	desc_extended = "The quality of life for an urban dweller in Nal'tor, or any other major city, can vary considerably according to the Tajara's occupation, education and standing \
 	with the Party. The average worker that labours in the industrial suburbs, can expect an honest living to be made, and a modest lifestyle to be led. The majority of the city labourers \
 	work in government run factories and spaceports, with stable but strict work hours and schedule the Hadii regime boasts of its fairness to the worker."
 
@@ -89,7 +89,7 @@
 	icon = 'icons/obj/tajara_items.dmi'
 	icon_state = "raakti_shariim_uniform"
 	item_state = "raakti_shariim_uniform"
-	desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \
+	desc_extended = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \
 		peacekeeping force, working closely with both the Royal Constabulary and the Royal Ministry of Intelligence to \
 		seek out internal threats to the Kingdom such as spies, terrorists, and other domestic enemies to the crown. \
 		The Raakti Shariim's uniforms incorporate a dark, navy blue paired with a lilac accent and pale-gold twin-sun \
@@ -103,7 +103,7 @@
 	item_state = "taj_dress_white"
 	contained_sprite = TRUE
 	no_overheat = TRUE
-	desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
+	desc_extended = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \
 	synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \
 	suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters usually shatter against how effective and cheap it is to \
 	make the human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \
@@ -155,7 +155,7 @@
 	item_state = "summer-pants"
 	contained_sprite = TRUE
 	starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt)
-	desc_fluff = "Having direct and friendly contact with humanity, The People's Republic of Adhomai has been the most influenced by the spacer fashion. The most known \
+	desc_extended = "Having direct and friendly contact with humanity, The People's Republic of Adhomai has been the most influenced by the spacer fashion. The most known \
 	being the \"assistant jumpsuits\" which directly inspired the design of factory overalls, the plight and low pay of the assistants being close to the hearts of Tajara Hadiist \
 	workers and their Republic."
 

code/modules/clothing/under/xenos/unathi.dm

@@ -73,7 +73,7 @@
 	name = "himation cloak"
 	desc = "The himation is a staple of Unathi fashion. Whether a commoner in practical clothes or a noble looking \
 	for leisure wear, the himation has remained stylish for centuries."
-	desc_fluff = "The himation while unwrapped is usually a three meter around cloth. Unathi start by putting the \
+	desc_extended = "The himation while unwrapped is usually a three meter around cloth. Unathi start by putting the \
 	front around their waist, bring it over their right shoulder, and then form a sash-like loop by bringing it over \
 	their right again. A belt ties it off and drapes a skirt down over their thighs to complete the look. Fashionable \
 	for simple noble wear (the cloth can be embroidered), and practical for labor!"

code/modules/clothing/wrists/watches.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/wrists/watch
 	name = "watch"
 	desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in black plastic."
-	desc_fluff = "For those who want too much time on their wrists instead."
+	desc_extended = "For those who want too much time on their wrists instead."
 	icon_state = "watch"
 	item_state = "watch"
 	sprite_sheets = list(
@@ -12,31 +12,31 @@
 
 /obj/item/clothing/wrists/watch/silver
 	desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in silver."
-	desc_fluff = "To unleash the telemarketer in you!"
+	desc_extended = "To unleash the telemarketer in you!"
 	icon_state = "watch_silver"
 	item_state = "watch_silver"
 
 /obj/item/clothing/wrists/watch/gold
 	desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in <b>REAL</b> faux gold."
-	desc_fluff = "Be the jerk-ass pawn shop owner you'll never be."
+	desc_extended = "Be the jerk-ass pawn shop owner you'll never be."
 	icon_state = "watch_gold"
 	item_state = "watch_gold"
 
 /obj/item/clothing/wrists/watch/holo 
 	desc = "It's a GaussIo ZeitMeister with a holographic screen."
-	desc_fluff = "The latest Elyran technology!"
+	desc_extended = "The latest Elyran technology!"
 	icon_state = "watch_holo"
 	item_state = "watch_holo"
 
 /obj/item/clothing/wrists/watch/leather
 	desc = "It's a GaussIo ZeitMeister, a finely tuned wristwatch encased in leather."
-	desc_fluff = "Made from real synth leather."
+	desc_extended = "Made from real synth leather."
 	icon_state = "watch_leather"
 	item_state = "watch_leather"
 
 /obj/item/clothing/wrists/watch/spy
 	desc = "It's a GENUINE Spy-Tech Invisi-watch! <b>WARNING</b> : Does not actually make you invisible."
-	desc_fluff = "Makes you want to wear a balaclava and smoke a cigarette."
+	desc_extended = "Makes you want to wear a balaclava and smoke a cigarette."
 	icon_state = "watch_spy"
 	item_state = "watch_silver"
 

code/modules/clothing/wrists/xeno/unathi.dm

@@ -17,7 +17,7 @@
 	name = "Th'akhist wristguards"
 	desc = "A traditional garment worn by Th'akh shamans. Popular adornments include dried and pressed grass and \
 	feathers, as well as precious metals and colorful stones in the cuff itself."
-	desc_fluff = "Wristguards as a part of the maxtatl did not become prevalent until much later in Th'akh \
+	desc_extended = "Wristguards as a part of the maxtatl did not become prevalent until much later in Th'akh \
 	tradition. As time passed and garb was passed down from shaman to shaman, attire became cluttered with \
 	adornments. Bracers were designed as a method of adding more charms to remember previous shamans that \
 	predate the latest to pass away."

code/modules/library/lib_items.dm

@@ -191,7 +191,7 @@
 		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
 		)
 	icon_state = "book"
-	desc_cult = "This can be reforged to become a cult tome."
+	desc_antag = "As a Cultist, this item can be reforged to become a cult tome."
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEMSIZE_NORMAL		 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)

code/modules/martial_arts/tajara.dm

@@ -99,7 +99,7 @@
 	name = "baghrar manual"
 	desc = "A manual designated to teach the user about the tajaran martial art of Baghrar."
 	martial_art = /datum/martial_art/baghrar
-	desc_fluff = "An ancient martial art from Adhomai primarily used for sport and contests of strength. The fighting style consists of attacks against the opponent from the waist \
+	desc_extended = "An ancient martial art from Adhomai primarily used for sport and contests of strength. The fighting style consists of attacks against the opponent from the waist \
 	up. The form of the attacks are primarily swiping motions which take advantage of a Tajara's claws to rake an opponents torso or head. Other moves include punching for friendlier \
 	matches or stabbing forward with the claws in typical matches. Modern Baghrariri, or people who fight in the Baghrar style for sport, usually fight with implements that cover and \
 	support their claws to avoid serious bodily damage. Modern Baghrar matches are decided upon with a point scoring system over three 10 minute rounds of fighting, but historical \

code/modules/mob/living/silicon/robot/items/inductive_charger.dm

@@ -1,7 +1,7 @@
 /obj/item/inductive_charger
 	name = "inductive charger"
 	desc = "A phoron-enhanced induction charger hooked up to its attached stationbound's internal cell."
-	desc_fluff = "Harnessing the energy potential found in phoron structures, NanoTrasen engineers have created a portable device capable of highly efficient wireless charging. The expense and limit of energy output of using this method of charging prevents it from being used on a large scale, being far outclassed by Phoron-Supermatter charging systems."
+	desc_extended = "Harnessing the energy potential found in phoron structures, NanoTrasen engineers have created a portable device capable of highly efficient wireless charging. The expense and limit of energy output of using this method of charging prevents it from being used on a large scale, being far outclassed by Phoron-Supermatter charging systems."
 	desc_info = "Click on an adjacent object that contains or is a power cell to attempt to find and charge it. After a successful charge, the inductive charger recharge in a few minutes. The amount transfered can be adjusted by alt clicking it."
 	icon = 'icons/obj/contained_items/tools/inductive_charger.dmi'
 	icon_state = "inductive_charger"

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -8,7 +8,7 @@
 /mob/living/simple_animal/hostile/giant_spider
 	name = "greimorian warrior"
 	desc = "A deep purple carapace covers this vicious Greimorian warrior."
-	desc_fluff = "Greimorians are a species of arthropods whose evolutionary traits have made them an extremely dangerous invasive species.  \
+	desc_extended = "Greimorians are a species of arthropods whose evolutionary traits have made them an extremely dangerous invasive species.  \
 	They originate from the Badlands planet Greima, once covered in crystalized phoron. A decaying orbit led to its combustion from proximity to its sun, and its dominant inhabitants \
 	managed to survive in orbit. Countless years later, they prove to be a menace across the galaxy, having carried themselves within the hulls of Human vessels to spread wildly."
 	icon = 'icons/mob/npc/greimorian.dmi'

code/modules/mob/living/simple_animal/hostile/icarus_drone.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/hostile/icarus_drone
 	name = "combat drone"
 	desc = "An automated combat drone armed with state of the art weaponry and shielding. This one has the markings of a drone carrier on the side."
-	desc_fluff = "Produced by NanoTrasen, these combat drones are often carried and deployed by NDV Drone Carriers to protect local assets."
+	desc_extended = "Produced by NanoTrasen, these combat drones are often carried and deployed by NDV Drone Carriers to protect local assets."
 	icon_state = "drone3"
 	icon_living = "drone3"
 	icon_dead = "drone_dead"

code/modules/mob/living/simple_animal/hostile/pra.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/hostile/republicon
 	name = "republican defensive robot"
 	desc = "An outdated defense drone commonly used by People's Republic of Adhomai Orbital Fleet."
-	desc_fluff = "Most heavy and medium Republican ships carry a detachment of very outdated combat robots brought from Solarian military surplus, they are usually armed with \
+	desc_extended = "Most heavy and medium Republican ships carry a detachment of very outdated combat robots brought from Solarian military surplus, they are usually armed with \
 	blades,	ballistic rifles or rockets. Those machines are usually deployed in rare cases of boarding operations. They possess a rudimentary artificial intelligence and targeting system, \
 	being only capable of perfoming simple tasks outside of attacking. The People's Republic is unable to manufacture this kind of synthetics, but their fleet technicians can \
 	easily repair and reprogram them."

code/modules/mob/living/simple_animal/hostile/space_fauna.dm

@@ -3,7 +3,7 @@
 /mob/living/simple_animal/hostile/carp
 	name = "space carp"
 	desc = "A ferocious, fang-bearing creature that resembles a fish."
-	desc_fluff = "This specimen is a native to the Romanovich Cloud, and possesses a shimmering appearance to its scales. Much like other Cloud-faring creatures, this primarily thrives off of a \
+	desc_extended = "This specimen is a native to the Romanovich Cloud, and possesses a shimmering appearance to its scales. Much like other Cloud-faring creatures, this primarily thrives off of a \
 	diet consisting of raw ores and rock."
 	icon_state = "carp"
 	icon_living = "carp"
@@ -255,7 +255,7 @@
 /mob/living/simple_animal/hostile/gnat
 	name = "gnat"
 	desc = "A small, obnoxious looking specimen. This is a renowned wire-chewing menace in the Romanovich Cloud, similarly insufferable as an Earth insect."
-	desc_fluff = "This specimen is a native to the Romanovich Cloud, and possesses a shimmering appearance to its scales. Much like other Cloud-faring creatures, this primarily thrives off of a \
+	desc_extended = "This specimen is a native to the Romanovich Cloud, and possesses a shimmering appearance to its scales. Much like other Cloud-faring creatures, this primarily thrives off of a \
 	diet consisting of raw ores and rock."
 	icon_state = "gnat"
 	icon_living = "gnat"

code/modules/mob/living/simple_animal/hostile/spider_queen.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/hostile/spider_queen
 	name = "colossal greimorian"
 	desc = "A monstrous six-legged Greimorian."
-	desc_fluff = "Greimorians are a species of arthropods whose evolutionary traits have made them an extremely dangerous invasive species.  \
+	desc_extended = "Greimorians are a species of arthropods whose evolutionary traits have made them an extremely dangerous invasive species.  \
 	They originate from the Badlands planet Greima, once covered in crystalized phoron. A decaying orbit led to its combustion from proximity to its sun, and its dominant inhabitants \
 	managed to survive in orbit. Countless years later, they prove to be a menace across the galaxy, having carried themselves within the hulls of Human vessels to spread wildly."
 	icon = 'icons/mob/npc/spider_queen.dmi'

code/modules/modular_computers/computers/subtypes/dev_wristbound.dm

@@ -2,7 +2,7 @@
 	name = "wristbound computer"
 	lexical_name = "wristbound"
 	desc = "A portable wristbound device for your needs on the go. Quite comfortable."
-	desc_fluff = "A NanoTrasen design, this wristbound computer allows the user to quickly and safely access critical info, without taking their hands out of the equation."
+	desc_extended = "A NanoTrasen design, this wristbound computer allows the user to quickly and safely access critical info, without taking their hands out of the equation."
 	icon = 'icons/obj/modular_wristbound.dmi'
 	icon_state = "wristbound"
 	icon_state_unpowered = "wristbound"

code/modules/projectiles/guns/bang/pistol.dm

@@ -10,7 +10,7 @@
 /obj/item/gun/bang/sec
 	name = "\improper .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
-	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
+	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
 	icon = 'icons/obj/guns/secgun.dmi'
 	icon_state = "secgun"
 	item_state = "secgun"
@@ -23,7 +23,7 @@
 /obj/item/gun/bang/sec/wood
 	name = "custom .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
-	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
+	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
 	icon = 'icons/obj/guns/secgun_wood.dmi'
 	icon_state = "secgunwood"
 	item_state = "secgunwood"

code/modules/projectiles/guns/energy/crank.dm

@@ -25,7 +25,7 @@
 	knife_x_offset = 23
 	knife_y_offset = 13
 
-	desc_fluff = "The Tui'ad \"Icelance\" laser rifle is an energy weapon of Tajaran design. Clumsy overheating handguns and rifles that slowly fire long bolts of \
+	desc_extended = "The Tui'ad \"Icelance\" laser rifle is an energy weapon of Tajaran design. Clumsy overheating handguns and rifles that slowly fire long bolts of \
 	concentrated energy are used by high ranking soldiers or special operatives of the Republican army, but their durability is dubious in comparison to the mass-produced, \
 	single shot or bolt action rifles that the majority of Tajaran soldiers use."
 

code/modules/projectiles/guns/energy/cult.dm

@@ -2,7 +2,7 @@
 	name = "bloodpike"
 	desc = "A ranged weapon of demonic origin, surely. It menaces with crimson spikes."
 	desc_info = null
-	desc_fluff = null
+	desc_extended = null
 	desc_antag = "This weapon can be recharged by clicking on blood or remains with it, remains recharge more than simple blood."
 	icon = 'icons/obj/guns/bloodpike.dmi'
 	icon_state = "bloodpike"

code/modules/projectiles/guns/energy/disruptor.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/energy/disruptorpistol
 	name = "disruptor pistol"
 	desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal."
-	desc_fluff = "Developed and produced by NanoTrasen for its internal security division, the NT DP-7 is a state of the art blaster pistol capable of firing reduced-power bolts which disrupt the central nervous system, inducing a stunning effect on the victim. It is also capable of firing full-power blaster bolts."
+	desc_extended = "Developed and produced by NanoTrasen for its internal security division, the NT DP-7 is a state of the art blaster pistol capable of firing reduced-power bolts which disrupt the central nervous system, inducing a stunning effect on the victim. It is also capable of firing full-power blaster bolts."
 	icon = 'icons/obj/guns/disruptorpistol/disruptorpistols.dmi'
 	icon_state = "disruptorpistol"
 	item_state = "disruptorpistol"

code/modules/projectiles/guns/energy/laser.dm

@@ -81,7 +81,7 @@ obj/item/gun/energy/retro
 /obj/item/gun/energy/lasercannon
 	name = "laser cannon"
 	desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon."
-	desc_fluff = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
+	desc_extended = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
 	icon = 'icons/obj/guns/lasercannon.dmi'
 	icon_state = "lasercannon100"
 	item_state = "lasercannon100"
@@ -112,7 +112,7 @@ obj/item/gun/energy/retro
 /obj/item/gun/energy/xray
 	name = "xray laser gun"
 	desc = "A NanoTrasen designed high-power laser sidearm capable of expelling concentrated xray blasts."
-	desc_fluff = "The NT XG-1 is a laser sidearm developed and produced by NanoTrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms."
+	desc_extended = "The NT XG-1 is a laser sidearm developed and produced by NanoTrasen. A recent invention, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover. It is compact with relatively high capacity to other sidearms."
 	icon = 'icons/obj/guns/xray.dmi'
 	icon_state = "xray"
 	item_state = "xray"
@@ -179,7 +179,7 @@ obj/item/gun/energy/retro
 /obj/item/gun/energy/laser/shotgun
 	name = "laser shotgun"
 	desc = "A NanoTrasen designed laser weapon, designed to split a single amplified beam four times."
-	desc_fluff = "The NT QB-2 is a laser weapon developed and produced by NanoTrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
+	desc_extended = "The NT QB-2 is a laser weapon developed and produced by NanoTrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
 	icon = 'icons/obj/guns/lasershotgun.dmi'
 	icon_state = "lasershotgun"
 	item_state = "lasershotgun"

code/modules/projectiles/guns/energy/nuclear.dm

@@ -4,7 +4,7 @@
 	desc_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
 	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To switch between stun and lethal, click the weapon \
 	in your hand.  To recharge this weapon, use a weapon recharger."
-	desc_fluff = "The NT EC-4 is an energy carbine developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
+	desc_extended = "The NT EC-4 is an energy carbine developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
 	icon = 'icons/obj/guns/ecarbine.dmi'
 	icon_state = "energystun"
 	item_state = "energystun"
@@ -127,7 +127,7 @@
 /obj/item/gun/energy/pistol
 	name = "energy pistol"
 	desc = "A NanoTrasen energy-based pistol gun with two settings: Stun and kill."
-	desc_fluff = "The NT EP-3 is an energy sidearm developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
+	desc_extended = "The NT EP-3 is an energy sidearm developed and produced by NanoTrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
 	icon = 'icons/obj/guns/epistol.dmi'
 	icon_state = "epistolstun100"
 	item_state = "epistolstun100"
@@ -154,7 +154,7 @@
 /obj/item/gun/energy/pistol/hegemony
 	name = "hegemony energy pistol"
 	desc = "An upgraded variant of the standard energy pistol with two settings: Incapacitate and Smite."
-	desc_fluff = "This is the Zkrehk-Guild Beamgun, an energy-based sidearm designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy."
+	desc_extended = "This is the Zkrehk-Guild Beamgun, an energy-based sidearm designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy."
 	icon = 'icons/obj/guns/hegemony_pistol.dmi'
 	icon_state = "hegemony_pistol"
 	item_state = "hegemony_pistol"
@@ -180,7 +180,7 @@
 /obj/item/gun/energy/repeater
 	name = "energy repeater"
 	desc = "A Stellar Corporate Conglomerate created energy repeater, extremely lightweight. It has three settings: Single, Three-Burst, and Full-Auto."
-	desc_fluff = "The SCC-ER1 was designed to be a reliable yet concealable firearm, capable of defending SCC assets and agents from various attackers."
+	desc_extended = "The SCC-ER1 was designed to be a reliable yet concealable firearm, capable of defending SCC assets and agents from various attackers."
 	icon = 'icons/obj/guns/erepeater.dmi'
 	icon_state = "energysmg100"
 	item_state = "energysmg100"
@@ -248,7 +248,7 @@
 /obj/item/gun/energy/gun/qukala
 	name = "tqi-qop rifle"
 	desc = "The Tqi-Qop Rifle is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell."
-	desc_fluff = ""
+	desc_extended = ""
 	icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
 	icon_state = "qukalagun"
 	item_state = "qukalagun"

code/modules/projectiles/guns/energy/rifle.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/energy/rifle
 	name = "energy rifle"
 	desc = "A NanoTrasen designed energy-based rifle with two settings: Stun and Kill."
-	desc_fluff = "The NT ER-2 is an energy rifle developed and produced by NanoTrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
+	desc_extended = "The NT ER-2 is an energy rifle developed and produced by NanoTrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
 	icon = 'icons/obj/guns/erifle.dmi'
 	icon_state = "eriflestun"
 	item_state = "eriflestun"
@@ -40,7 +40,7 @@
 /obj/item/gun/energy/rifle/laser
 	name = "laser rifle"
 	desc = "A NanoTrasen designed laser weapon, designed to kill with concentrated energy blasts."
-	desc_fluff = "The NT LR-6 is a laser rifle developed and produced by NanoTrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry."
+	desc_extended = "The NT LR-6 is a laser rifle developed and produced by NanoTrasen. Designed to kill with concentrated energy blasts focused through a crystal lens. It is considered to be the template of other standard laser weaponry."
 	icon = 'icons/obj/guns/laserrifle.dmi'
 	icon_state = "laserrifle"
 	item_state = "laserrifle"
@@ -68,7 +68,7 @@
 /obj/item/gun/energy/rifle/laser/noctiluca
 	name = "combat laser rifle"
 	desc = "The Noctiluca XM/24 is a brand new model of laser rifle, developed entirely by Kumar Arms, a Zavodskoi Interstellar subsidiary. Easy to handle for users with minimal training, reliable and with a reasonable form factor, it is poised to become the new standard for laser weaponry."
-	desc_fluff = "The Noctiluca XM/24 was unveiled at the tail end of 2463 in the SCC Future Firearms contest and was released by Zavodskoi in June 2464 after achieving a stunning victory over the other competitors. Zavodskoi installations are prioritized for acquisition of this new rifle, with along the SCCV Horizon. The Noctiluca's specialty lies in its revolutionary dual-function laser diffuser, which is able to modulate the laser into either a standard beam or an armor-piercing super-concentrated beam."
+	desc_extended = "The Noctiluca XM/24 was unveiled at the tail end of 2463 in the SCC Future Firearms contest and was released by Zavodskoi in June 2464 after achieving a stunning victory over the other competitors. Zavodskoi installations are prioritized for acquisition of this new rifle, with along the SCCV Horizon. The Noctiluca's specialty lies in its revolutionary dual-function laser diffuser, which is able to modulate the laser into either a standard beam or an armor-piercing super-concentrated beam."
 	desc_info = "This is an energy weapon.  To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \
 	then click where you want to fire.  Most energy weapons can fire through windows harmlessly.  To recharge this weapon, use a weapon recharger. \
 	The Noctiluca comes with a standard firing mode that is slightly worse in damage than the normal laser rifle, but has more armor penetration. Additionally, \
@@ -92,7 +92,7 @@
 /obj/item/gun/energy/rifle/laser/heavy
 	name = "laser cannon"
 	desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon."
-	desc_fluff = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
+	desc_extended = "The NT LC-4 is a laser cannon developed and produced by NanoTrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
 	icon = 'icons/obj/guns/lasercannon.dmi'
 	icon_state = "lasercannon100"
 	item_state = "lasercannon100"
@@ -118,7 +118,7 @@
 /obj/item/gun/energy/rifle/laser/xray
 	name = "xray laser rifle"
 	desc = "A NanoTrasen designed high-power laser rifle capable of expelling concentrated xray blasts."
-	desc_fluff = "The NT XR-1 is a laser firearm developed and produced by NanoTrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity."
+	desc_extended = "The NT XR-1 is a laser firearm developed and produced by NanoTrasen. A recent innovation, used for specialist operations, it is presently being produced and sold in limited capacity over the galaxy. Designed for precision strikes, releasing concentrated xray blasts that are capable of hitting targets behind cover, all the while having a large ammo capacity."
 	icon = 'icons/obj/guns/xrifle.dmi'
 	icon_state = "xrifle"
 	item_state = "xrifle"
@@ -234,7 +234,7 @@
 /obj/item/gun/energy/rifle/laser/qukala
 	name = "geop cannon"
 	desc = "An advanced weapon of Skrell design, this Geop Cannon uses a tiny warp accelerator to super heat particles."
-	desc_fluff = ""
+	desc_extended = ""
 	icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
 	icon_state = "qukala_heavy"
 	item_state = "qukala_heavy"

code/modules/projectiles/guns/energy/stun.dm

@@ -21,7 +21,7 @@
 /obj/item/gun/energy/stunrevolver
 	name = "stun revolver"
 	desc = "A Hephaestus designed high-tech revolver that fires rechargable stun bolts."
-	desc_fluff = "The ST-30 is a highly advanced sidearm produced by Hephaestus Industries. It is designed for self-defense in a less-than-lethal manner. While the weapon design itself is not groundbreaking, it fires high velocity energy bolts with rechargable cartridges, possessing unusual high stopping power."
+	desc_extended = "The ST-30 is a highly advanced sidearm produced by Hephaestus Industries. It is designed for self-defense in a less-than-lethal manner. While the weapon design itself is not groundbreaking, it fires high velocity energy bolts with rechargable cartridges, possessing unusual high stopping power."
 	icon = 'icons/obj/guns/stunrevolver.dmi'
 	icon_state = "stunrevolver"
 	item_state = "stunrevolver"

code/modules/projectiles/guns/launcher/harpoon.dm

@@ -16,7 +16,7 @@
 	fire_sound_text = "a metallic thunk"
 	recoil = 1
 
-	desc_fluff = "Adapted from fishing tools, Frozen Sea Harpoon Guns were found to be useful weapons in the hands of the Royal Navy and Army. Their ammunition can be equipped \
+	desc_extended = "Adapted from fishing tools, Frozen Sea Harpoon Guns were found to be useful weapons in the hands of the Royal Navy and Army. Their ammunition can be equipped \
 	with all shorts of implements, such as explosives and even grappling hooks. Large guns are usually mounted on warships, serving as a complement to their traditional cannons. \
 	While smaller version are carried by sailors and fishermen."
 

code/modules/projectiles/guns/projectile/automatic.dm

@@ -47,7 +47,7 @@
 /obj/item/gun/projectile/automatic/c20r
 	name = "submachine gun"
 	desc = "A conventional bullpup submachine gun with an extendable stock. Loads from 9mm magazines."
-	desc_fluff = "The Colettish Armaments Model 25 SMG is a typical product of the San Colette Interstellar Armaments Company (CAISC). Rejected by the Solarian military due to competition with the Zavodskoi M470-L, the CA-M25 was repurposed \
+	desc_extended = "The Colettish Armaments Model 25 SMG is a typical product of the San Colette Interstellar Armaments Company (CAISC). Rejected by the Solarian military due to competition with the Zavodskoi M470-L, the CA-M25 was repurposed \
 	into the Colettish Armaments Model 25 Export (CA-25E) and has found reasonable success in mercenary groups across the Orion Spur. Recently many have found their ways into the hands of violent non-state actors in the Corporate Reconstruction Zone, where \
 	they contribute to the further destabilization of the region. Curiously, these models typically have a filed-off serial number or no serial number at all."
 	icon = 'icons/obj/guns/c20r.dmi'
@@ -150,7 +150,7 @@
 /obj/item/gun/projectile/automatic/rifle/sts35
 	name = "assault rifle"
 	desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked."
-	desc_fluff = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across \
+	desc_extended = "The STS35 is a durable, reliable and cheap to buy fully automatic assault rifle with many licensed manufacturers across \
 	the galaxy. It comes in different versions and calibres, this one uses 7.62 rounds. The manufacturer markings have been filed off."
 	can_bayonet = TRUE
 	knife_x_offset = 23
@@ -166,7 +166,7 @@
 	Key changes include significant shortening of the barrel and the addition of an improvised vertical foregrip, \
 	condensing heavy firepower into a relatively small and maneuverable package intended for close-in \
 	fighting aboard ships and space stations. Affectionately referred to as the \"Shorty\" in some circles. Uses 7.62mm rounds."
-	desc_fluff = "The STS35 is a durable, reliable, and cheap fully-automatic assault rifle with many licensed manufacturers across \
+	desc_extended = "The STS35 is a durable, reliable, and cheap fully-automatic assault rifle with many licensed manufacturers across \
 	the galaxy. It comes in many different versions and calibres; this one uses 7.62mm rounds. This example has been heavily modified and is illegal in some jurisdictions. \
 	Much of the barrel has been lopped off to decrease overall length, while a pistol grip from another STS35 has been clamped on below what remains of the handguard \
 	to improve handling. The fire control group has been altered as well, sacrificing the burst-fire function in favor of a smoother trigger pull. Born from \
@@ -195,7 +195,7 @@
 	name = "ballistic carbine"
 	desc = "A durable, rugged looking semi-automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds and does not accept large \
 	capacity magazines. It is unmarked."
-	desc_fluff = "The ST24 is often considered the little brother of its larger and fully automatic counterpart, the STS35. It is a \
+	desc_extended = "The ST24 is often considered the little brother of its larger and fully automatic counterpart, the STS35. It is a \
 	reliable and cheap to buy carbine with many licensed manufacturers across the galaxy. It comes in different versions and calibres, \
 	some even boasting select fire functionality. This one uses 5.56 rounds and is semi-automatic. The manufacturer markings have been filed off."
 	icon = 'icons/obj/guns/bcarbine.dmi'
@@ -218,7 +218,7 @@
 /obj/item/gun/projectile/automatic/rifle/carbine/civcarbine
 	name = "bullpup carbine"
 	desc = "A variant of the ZI Bulldog assault carbine, the ZI Terrier is a slimmer and lighter version, chambered in the same 5.56 caliber but only capable of accepting smaller magazines. It lacks the integral grenade launcher and the burst fire of the Bulldog."
-	desc_fluff = "It makes you feel like a corporate goon when you hold it."
+	desc_extended = "It makes you feel like a corporate goon when you hold it."
 	icon = 'icons/obj/guns/civcarbine.dmi'
 	magazine_type = /obj/item/ammo_magazine/a556/carbine/polymer
 	allowed_magazines = list(/obj/item/ammo_magazine/a556/carbine, /obj/item/ammo_magazine/a556/carbine/polymer)
@@ -256,7 +256,7 @@
 /obj/item/gun/projectile/automatic/rifle/z8
 	name = "bullpup assault carbine"
 	desc = "The ZI Bulldog bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle. Uses 5.56mm rounds."
-	desc_fluff = "It makes you feel like a corporate commando when you hold it."
+	desc_extended = "It makes you feel like a corporate commando when you hold it."
 	icon = 'icons/obj/guns/carbine.dmi'
 	icon_state = "carbine"
 	item_state = "carbine"
@@ -328,7 +328,7 @@
 /obj/item/gun/projectile/automatic/rifle/jingya
 	name = "burst rifle"
 	desc = "The Jingya A-1 is the first of a new line of NanoTrasen rifles, developed in cooperation with Zavodskoi Interstellar's Kumar Arms subsidiary. They are made to be sleek, easy to use by users with minimal training and cheap to mass produce while still being reliable."
-	desc_fluff = "The Jingya A-1 won a hard-fought victory in the ballistic side of the SCC Future Firearms contest hosted in 2463, which was also its first unveiling: this rifle is made to function where laser weaponry may be either too risky or not functional for the engagement at hand. It is slated to be deployed for trial usage by a select few special TCFL regiments in Mictlan."
+	desc_extended = "The Jingya A-1 won a hard-fought victory in the ballistic side of the SCC Future Firearms contest hosted in 2463, which was also its first unveiling: this rifle is made to function where laser weaponry may be either too risky or not functional for the engagement at hand. It is slated to be deployed for trial usage by a select few special TCFL regiments in Mictlan."
 	icon = 'icons/obj/guns/crew_rifle.dmi'
 	icon_state = "arifle"
 	item_state = "arifle"
@@ -359,7 +359,7 @@
 /obj/item/gun/projectile/automatic/rifle/l6_saw
 	name = "light machine gun"
 	desc = "A squad machine gun with a clunky, outdated loading mechanism. Loads from 7.62mm ammunition boxes. Gentlemen, lock and load."
-	desc_fluff = "Created by the San Colette Interstellar Armaments Company (CAISC) explicitly for export, the Colettish Armaments Model 75 Export machine gun is a cheap yet outdated method of providing large amounts of firepower to a squad. \
+	desc_extended = "Created by the San Colette Interstellar Armaments Company (CAISC) explicitly for export, the Colettish Armaments Model 75 Export machine gun is a cheap yet outdated method of providing large amounts of firepower to a squad. \
 	The CA-75E is not used by San Colette’s Civil Guard and is typically sold to mercenary groups or other Solarian systems. Since the Solarian Collapse more and more CA-75Es have found themselves in the hands of pirates and rebels in the Corporate Reconstruction Zone, and captured models curiously often have no serial number."
 	icon = 'icons/obj/guns/l6.dmi'
 	icon_state = "l6closed100"
@@ -439,7 +439,7 @@
 	item_state = "tsarrayut"
 	contained_sprite = TRUE
 
-	desc_fluff = "People's Republic military hardware is the most advanced among the Tajaran nations. Laser weapons, alongside simple ballistic guns, are used by high ranking soldiers or \
+	desc_extended = "People's Republic military hardware is the most advanced among the Tajaran nations. Laser weapons, alongside simple ballistic guns, are used by high ranking soldiers or \
 	special operatives. The majority of military is still equipped with simple bolt action rifles, that are being slowly replaced by the Tsarrayut'yan rifle; a select-fire, crew-served \
 	automatic rifle. Regardless of advances in the small arms field, artillery is the Republican army's main weapon and pride."
 

code/modules/projectiles/guns/projectile/cannon.dm

@@ -18,7 +18,7 @@
 
 	is_wieldable = TRUE
 
-	desc_fluff = "The adhomian hand cannon was created due the shortage of weapons that happened in the New Kingdom of Adhomai during the second civil war. Old naval culverins \
+	desc_extended = "The adhomian hand cannon was created due the shortage of weapons that happened in the New Kingdom of Adhomai during the second civil war. Old naval culverins \
 	found in museums and forgotten warehouses were adapted into portable weapons, combining modern and ancient tajaran technology. This weapon is usually found in the hands of the \
 	sailors and marines of the Royal Navy."
 
@@ -50,7 +50,7 @@
 
 	is_wieldable = TRUE
 
-	desc_fluff = "The People's Republic of Adhomai is the first Adhomian faction able to master the nuclear fission. Atomic weapons were used before in the tajaran civil war, \
+	desc_extended = "The People's Republic of Adhomai is the first Adhomian faction able to master the nuclear fission. Atomic weapons were used before in the tajaran civil war, \
 	causing the annihilation of the military base of Quizosa. The nuclear launcher was created by republican scientists as way to deploy this destructive force while on the field."
 
 /obj/item/gun/projectile/nuke/update_icon()

code/modules/projectiles/guns/projectile/musket.dm

@@ -2,7 +2,7 @@
 	name = "adhomian musket"
 	desc = "A rustic firearm, used by Tajaran soldiers during the adhomian gunpowder age"
 
-	desc_fluff = "The Gunpowder Age was marked by the slow replacement of traditional Adhomian battle tactics and weapons, that included melee weapons and crossbows, in favor of \
+	desc_extended = "The Gunpowder Age was marked by the slow replacement of traditional Adhomian battle tactics and weapons, that included melee weapons and crossbows, in favor of \
 	cannons and primitive firing lines. The Kingdoms of Amohda, Nal'tor and Das'nrra were the first countries to make use of this new technology."
 
 	icon = 'icons/obj/guns/musket.dmi'

code/modules/projectiles/guns/projectile/pistol.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/colt
 	name = ".45 combat pistol"
 	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette.  Uses .45 rounds."
-	desc_fluff = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
+	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
 	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
 	magazine_type = /obj/item/ammo_magazine/c45m
 	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
@@ -45,8 +45,8 @@
 
 /obj/item/gun/projectile/colt/super
 	name = "ornamental .45 combat pistol"
-	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette.  Uses .45 rounds. This example sports a short slide, wood-paneled grips, and few signs of use, likely belonging to someone of higher stature."
+	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette. Uses .45 rounds. This example sports a short slide, wood-paneled grips, and few signs of use, likely belonging to someone of higher stature."
-	desc_fluff = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
+	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
 	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
 	magazine_type = /obj/item/ammo_magazine/c45m/stendo
 	icon = 'icons/obj/guns/coltsuper.dmi'
@@ -63,7 +63,7 @@
 /obj/item/gun/projectile/automatic/lebman
 	name = "automatic .45 combat pistol"
 	desc = "A robust metal-framed semi-automatic pistol produced in the system of San Colette.  Uses .45 rounds. This example has been modified to allow fully-automatic fire, and sports a prominent vertical grip and muzzle compensator to aid in control."
-	desc_fluff = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
+	desc_extended = "The Pattern 5 Pistol is the standard-issue sidearm for the Civil Guard, San Colette’s local military force. Loosely based on the standard 9mm pistol of the Solarian Army, the P5 fires a larger .45 round intended for use against heavier targets. \
 	The P5 is produced by the San Colette Interstellar Armaments Company (CAISC) and is often found abroad due to its rugged construction."
 	magazine_type = /obj/item/ammo_magazine/c45m/lebman
 	icon = 'icons/obj/guns/coltauto.dmi'
@@ -90,7 +90,7 @@
 /obj/item/gun/projectile/sec
 	name = "\improper .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
-	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
+	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
 	icon = 'icons/obj/guns/secgun.dmi'
 	icon_state = "secgun"
 	item_state = "secgun"
@@ -120,7 +120,7 @@
 /obj/item/gun/projectile/sec/wood
 	name = "custom .45 pistol"
 	desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
-	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
+	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
 	icon = 'icons/obj/guns/secgun_wood.dmi'
 	icon_state = "secgunwood"
 	item_state = "secgunwood"
@@ -135,7 +135,7 @@
 /obj/item/gun/projectile/automatic/x9
 	name = "automatic .45 pistol"
 	desc = "A NanoTrasen-designed sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups. Uses .45 rounds."
-	desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
+	desc_extended = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security \
 	forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. \
 	A trademark of NanoTrasen security forces. This one has been modified for fully-automatic fire from the factory and sports a collapsible shoulder stock for better control. It uses .45 rounds."
 	icon = 'icons/obj/guns/x9.dmi'
@@ -211,7 +211,7 @@
 	magazine_type = /obj/item/ammo_magazine/c45m
 	allowed_magazines = list(/obj/item/ammo_magazine/c45m)
 
-	desc_fluff = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a silencer integrated as part of its barrel. Carried by \
+	desc_extended = "Created as a disposable and concealable weapon, the Mrrazhakulii suppressed pistol is a firearm with a silencer integrated as part of its barrel. Carried by \
 	guerrilla forces and spies, those guns are used in assassination and subterfuge operations. Due to using cheap and available materials, such as recycled iron and tires, countless of \
 	those pistols were distributed among cells and ALA soldiers."
 
@@ -250,7 +250,7 @@
 	icon = 'icons/obj/guns/adhomian_heavy_pistol.dmi'
 	icon_state = "adhomian_heavy_pistol"
 	item_state = "adhomian_heavy_pistol"
-	desc_fluff = "Given to Republican Commissars and high ranking Party members, the Nal'tor Model Pistol is notable for its large caliber. Unlike the Adar'Mazy pistol, only a \
+	desc_extended = "Given to Republican Commissars and high ranking Party members, the Nal'tor Model Pistol is notable for its large caliber. Unlike the Adar'Mazy pistol, only a \
 	single factory in Nal'tor is allowed to fabricate it, with its design being kept as a state secret. Because of its rarity and status, the Adhomai Heavy Pistol was a sought after \
 	war trophy by royalist and rebels forces."
 
@@ -282,7 +282,7 @@
 /obj/item/gun/projectile/pistol
 	name = "9mm pistol"
 	desc = "A compact 9mm handgun, extremely popular all throughout human space."
-	desc_fluff = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
+	desc_extended = "The Zavodskoi Interstellar Moonlight 9mm can be found in the hands of just about anyone imaginable - special operatives, common criminals, police officers, the average Joe - on account of the time-tested design, low price point, reliability, and ease of concealment. Having a threaded barrel helps, too, and it isn't uncommon to see the Moonlight as a prop in spy films, suppressed."
 	icon = 'icons/obj/guns/pistol.dmi'
 	icon_state = "pistol"
 	item_state = "pistol"
@@ -304,7 +304,7 @@
 
 /obj/item/gun/projectile/pistol/detective
 	desc = "A compact NanoTrasen designed sidearm, popular with law enforcement personnel for concealed carry purposes. It has a faux wooden grip. Uses 9mm rounds."
-	desc_fluff = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
+	desc_extended = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
 	name = "compact 9mm pistol"
 	magazine_type = /obj/item/ammo_magazine/mc9mm
 	icon = 'icons/obj/guns/detgun.dmi'
@@ -455,7 +455,7 @@
 	icon_state = "adhomian_pistol"
 	item_state = "adhomian_pistol"
 	can_silence = FALSE
-	desc_fluff = "A mass produced pistol issued to People's Republic officers, government officials and low-ranking Party members. Known for their simple, cheap and reliable \
+	desc_extended = "A mass produced pistol issued to People's Republic officers, government officials and low-ranking Party members. Known for their simple, cheap and reliable \
 	design, this weapon is produced by nearly all weapon factories in the Republic. The Adar'Mazy is also found in the hands of Adhomai Liberation Army soldiers and commanders."
 
 /obj/item/gun/projectile/pistol/adhomai/update_icon()
@@ -469,7 +469,7 @@
 	name = "super-heavy pistol"
 	desc = "A big, bulky and extremely powerful pistol, intended to pierce even your strongest enemy. You should wield this thing with two hands, if you want your wrists to stay intact."
 	desc_info = "You should not shoot this pistol unwielded, if you are not a Unathi or a G2. It will fly out of your hand and almost certainly break the hand you are using. Even as a Unathi or G2, the accuracy will suffer, if shot unwielded."
-	desc_fluff = "The Kumar Arms 2557 is a newly designed type of \"super-heavy\" pistol. \
+	desc_extended = "The Kumar Arms 2557 is a newly designed type of \"super-heavy\" pistol. \
 	It features a light-weight polymer pistol grip, a bulky plasteel frame and an extra long barrel. \
 	It is chambered in the newly developed .599 Kumar Super rifle cartridge. Despite designed for rifle use, the newly developed propellants allows this cartridge for use in the Kumar Arms 2557, upping the stopping power significantly. \
 	Kumar Arms guarantees your enemy's armor penetrated or your money back. It features a revolving bolt system with an electromagnetic striker, allowing for hammerless actuation. It has a revolutinary blowback system to ensure accuracy at the cost of fire rate."

code/modules/projectiles/guns/projectile/revolver.dm

@@ -222,7 +222,7 @@
 	ammo_type = /obj/item/ammo_casing/c38
 	magazine_type = null
 
-	desc_fluff = "A simple and reliable double action revolver, favored by the nobility, officers and law enforcement. The design is known for having an outdated reloading \
+	desc_extended = "A simple and reliable double action revolver, favored by the nobility, officers and law enforcement. The design is known for having an outdated reloading \
 	mechanism, with the need to manually eject each of the used cartridges, and reload one cartridge at a time through a loading gate. However, their cheap manufacturing cost has \
 	allowed countless copies to flood the Kingdom's markets."
 

code/modules/projectiles/guns/projectile/sniper.dm

@@ -177,7 +177,7 @@
 	icon_state = "dragunov"
 	item_state = "dragunov"
 
-	desc_fluff = "The Ho'taki Marksman Rifle was created by the Shastar Technical University, created through the reverse engineering of captured Tsarrayut'yan rifle. \
+	desc_extended = "The Ho'taki Marksman Rifle was created by the Shastar Technical University, created through the reverse engineering of captured Tsarrayut'yan rifle. \
 	The rifle is commonly issued to the feared Das'nrra Marksmen."
 
 	w_class = ITEMSIZE_LARGE

code/modules/reagents/reagent_containers/borghydro.dm

@@ -3,7 +3,7 @@
 	desc = "An advanced chemical synthesizer and injection system, designed for heavy-duty medical equipment."
 	desc_info = "Stationbound synthesizers produce specific reagents dependent on the selected module, which you can select by using it. \
 	The reagents recharge automatically at the cost of energy.<br> Alt Click the synthesizer to change the transfer amount."
-	desc_fluff = null
+	desc_extended = null
 	icon = 'icons/obj/syringe.dmi'
 	icon_state = "medical_synth"
 	item_state = "hypo"

code/modules/reagents/reagent_containers/food/cans.dm

@@ -414,7 +414,7 @@
 	desc = "A can of fermented fatshouters milk, imported from Adhomai."
 	icon_state = "milk_can"
 	center_of_mass = list("x"=16, "y"=10)
-	desc_fluff = "Fermend fatshouters milk is a drink that originated among the nomadic populations of Rhazar'Hrujmagh, and it has spread to the rest of Adhomai."
+	desc_extended = "Fermend fatshouters milk is a drink that originated among the nomadic populations of Rhazar'Hrujmagh, and it has spread to the rest of Adhomai."
 
 	reagents_to_add = list(/decl/reagent/drink/milk/adhomai/fermented = 30)
 
@@ -443,7 +443,7 @@
 /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda
 	name = "Hro'zamal Soda"
 	desc = "A can of Hro'zamal Soda. Made with Hro'zamal Ras'Nifs powder and canned in the People's Republic of Adhomai."
-	desc_fluff = "Hro'zamal Soda is a soft drink made from the seed's powder of a plant native to Hro'zamal, the sole Hadiist colony. While initially consumed as a herbal tea by the \
+	desc_extended = "Hro'zamal Soda is a soft drink made from the seed's powder of a plant native to Hro'zamal, the sole Hadiist colony. While initially consumed as a herbal tea by the \
 	colonists, it was introduced to Adhomai by the Army Expeditionary Force and transformed into a carbonated drink. The beverage is popular with factory workers and university \
 	students because of its stimulant effect."
 	icon_state = "hrozamal_soda_can"
@@ -461,7 +461,7 @@
 /obj/item/reagent_containers/food/drinks/cans/peach_soda
 	name = "Xanu Rush!"
 	desc = "Made from the NEW Xanu Prime peaches."
-	desc_fluff = "The rehabilitating environment of Xanu has allowed for small-scale agriculture to bloom. Xanu Rush! Is the number one Coalition soda, despite its dull taste."
+	desc_extended = "The rehabilitating environment of Xanu has allowed for small-scale agriculture to bloom. Xanu Rush! Is the number one Coalition soda, despite its dull taste."
 	icon_state = "xanu_rush"
 	center_of_mass = list("x"=16, "y"=10)
 	reagents_to_add = list(/decl/reagent/drink/peach_soda = 30)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -278,7 +278,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 /obj/item/reagent_containers/food/drinks/waterbottle
 	name = "bottled water"
 	desc = "A fresh bottle of water from the finest bottling plants on Silversun."
-	desc_fluff = "Previously introduced to the vending machines by Skrellian request, this water used to come straight from the Martian poles. Ever since the Martian catastrophe, however, an Idris subsidiary has since stepped in to fill the gap in the market \
+	desc_extended = "Previously introduced to the vending machines by Skrellian request, this water used to come straight from the Martian poles. Ever since the Martian catastrophe, however, an Idris subsidiary has since stepped in to fill the gap in the market \
 	and 'Martian Water' has become a prized collector's item."
 	icon_state = "waterbottle"
 	flags = 0 //starts closed
@@ -391,7 +391,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
 	name = "mutthir carton"
 	icon_state = "mutthir"
 	desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
-	desc_fluff = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
+	desc_extended = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
 	The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \
 	were quick to adopt the drink to their diet."