From 8d810079f8796d43c6d3c279b2f1560876cc361e Mon Sep 17 00:00:00 2001
From: ParadoxSpace <Takyahasu@gmail.com>
Date: Wed, 15 Jan 2020 16:56:45 -0700
Subject: [PATCH] Additional TCFL Loadout Bits (#8003)

The sexy, more fashionable red field beret alongside the blue, less sexy dress one.
Removes the armor from the field/sentinel berets, as I'm sure the PR wouldn't fly otherwise.
---
 .../preference_setup/loadout/loadout_head.dm  | 17 +++++---
 code/modules/clothing/head/misc.dm            |  5 +--
 html/changelogs/paradoxspace-oorah.yml        | 42 +++++++++++++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 html/changelogs/paradoxspace-oorah.yml

diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index a709c5ae88f..4732786a11e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -234,10 +234,17 @@
 	path = /obj/item/clothing/head/soft/iacberet
 	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
 
-/datum/gear/head/tcflberet
-	display_name = "Tau Ceti Foreign Legion dress beret"
-	path = /obj/item/clothing/head/legion_beret
-
 /datum/gear/head/circuitry
 	display_name = "headwear, circuitry (empty)"
-	path = /obj/item/clothing/head/circuitry
\ No newline at end of file
+	path = /obj/item/clothing/head/circuitry
+
+/datum/gear/head/tcfl
+	display_name = "tcfl hat selection"
+	path = /obj/item/clothing/head/legion_beret
+
+/datum/gear/head/tcfl/New()
+	..()
+	var/tcfl = list()
+	tcfl["tcfl beret, dress"] = /obj/item/clothing/head/legion_beret
+	tcfl["tcfl beret, field"] = /obj/item/clothing/head/legion
+	gear_tweaks += new/datum/gear_tweak/path(tcfl)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 70f249f78a2..306b3389909 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -489,14 +489,13 @@
 
 /obj/item/clothing/head/legion
 	name = "TCFL field beret"
-	desc = "A hardy, stark red field beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\". Offers some minor protection."
-	armor = list(melee = 20, bullet = 10, laser = 10, energy = 10, bomb = 10, bio = 0, rad = 0)
+	desc = "A hardy, stark red field beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\"."
 	icon_state = "legion_field_beret"
 	item_state = "legion_field_beret"
 
 /obj/item/clothing/head/legion/sentinel
 	name = "TCFL sentinel beret"
-	desc = "A hardy, stark purple sentinel beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\". Offers some minor protection."
+	desc = "A hardy, stark purple sentinel beret with a rubber insignia of a torch, surrounded by red stars and the letters \"TCFL\"."
 	icon_state = "legion_sentinel_beret"
 	item_state = "legion_sentinel_beret"
 
diff --git a/html/changelogs/paradoxspace-oorah.yml b/html/changelogs/paradoxspace-oorah.yml
new file mode 100644
index 00000000000..1353d93c781
--- /dev/null
+++ b/html/changelogs/paradoxspace-oorah.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: ParadoxSpace
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "You can now cop the TCFL field beret in the loadout."
+  - rscdel: "To ensure equivalent exchange, it doesn't have armor anymore."