From 6d4131648c89d2d6a352ff5e9adb33e5b7f3dadd Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Sun, 6 Feb 2022 16:00:33 +0100
Subject: [PATCH 1/4] makes the hull shield make shielding over some floor
 types (#13105)

---
 code/modules/shieldgen/shield_gen_external.dm | 4 ++--
 html/changelogs/HullShield.yml                | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/HullShield.yml

diff --git a/code/modules/shieldgen/shield_gen_external.dm b/code/modules/shieldgen/shield_gen_external.dm
index 5541bed6543..e65a4e9aa9e 100644
--- a/code/modules/shieldgen/shield_gen_external.dm
+++ b/code/modules/shieldgen/shield_gen_external.dm
@@ -23,7 +23,7 @@
 		// Ignore station areas.
 		if (the_station_areas[T.loc])
 			continue
-		else if (istype(T, /turf/space) || istype(T, /turf/unsimulated/floor/asteroid) || isopenturf(T))
+		else if (istype(T, /turf/space) || istype(T, /turf/unsimulated/floor/asteroid) || isopenturf(T) || istype(T, /turf/simulated/floor/reinforced) || istype(T, /turf/simulated/floor/plating))
 			for (var/uu in RANGE_TURFS(1, T))
 				U = uu
 				if (T == U)
@@ -49,7 +49,7 @@
 				// Ignore station areas.
 				if (the_station_areas[T.loc])
 					continue
-				else if (istype(T, /turf/space) || istype(T, /turf/unsimulated/floor/asteroid) || isopenturf(T))
+				else if (istype(T, /turf/space) || istype(T, /turf/unsimulated/floor/asteroid) || isopenturf(T) || istype(T, /turf/simulated/floor/reinforced) || istype(T, /turf/simulated/floor/plating))
 					for (var/uu in RANGE_TURFS(1, T))
 						U = uu
 						if (T == U)
diff --git a/html/changelogs/HullShield.yml b/html/changelogs/HullShield.yml
new file mode 100644
index 00000000000..f4a9db917f5
--- /dev/null
+++ b/html/changelogs/HullShield.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - tweak: "The hull shield generator now also makes shields over some floor types if they're in space."

From eba7ce6d1eee98701685d405da166af903fd7105 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 6 Feb 2022 15:01:05 +0000
Subject: [PATCH 2/4] "[ci skip] Automatic Build - 2022.02.06.15.01.05"

---
 html/changelog.html                     | 19 ++++++++++
 html/changelogs/.all_changelog.yml      | 16 ++++++++
 html/changelogs/HullShield.yml          |  6 ---
 html/changelogs/Wezzy_RobotResprite.yml | 50 -------------------------
 4 files changed, 35 insertions(+), 56 deletions(-)
 delete mode 100644 html/changelogs/HullShield.yml
 delete mode 100644 html/changelogs/Wezzy_RobotResprite.yml

diff --git a/html/changelog.html b/html/changelog.html
index b3a73683384..fae132e124d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,25 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 February 2022</h2>
+			<h3 class="author">TheGreyWolf updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The hull shield generator now also makes shields over some floor types if they&#x27;re in space.</li>
+			</ul>
+			<h3 class="author">Wowzewow, Cdey updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Resprites most, if not all robots, including eyes.</li>
+				<li class="imageadd">All robots now have unique maintenance panels.</li>
+				<li class="imageadd">Janicarts look better by extension now.</li>
+				<li class="imagedel">Removed SD-MAD and Unbranded-MAD sprites.</li>
+				<li class="imageadd">Adds eight new robot sprites - The Sputnik, Arthrodroid, Wide, Cricket, Positron 03, Plantasonic, Coolermaster and Phage.</li>
+				<li class="tweak">Toileto-tron renamed to Kent, Arachnotron renamed to Spiderbot.</li>
+				<li class="bugfix">Fixed missing sprite for Mining Drones.</li>
+				<li class="bugfix">Fixed robot eyes going over tables.</li>
+				<li class="refactor">Refactors Cyborg sprites to work better.</li>
+				<li class="bugfix">Fixes sprite interaction between mobility module and eyes.</li>
+			</ul>
+
 			<h2 class="date">04 February 2022</h2>
 			<h3 class="author">BLUNTFORCE420 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dc2e534e541..c3548c1374d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -22513,3 +22513,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   xxxxyobdab:
   - rscadd: All hatchet and scythe type tools can destroy bushes.
   - rscadd: Biogenerators can make plant bags for 500 points.
+2022-02-06:
+  TheGreyWolf:
+  - tweak: The hull shield generator now also makes shields over some floor types
+      if they&#x27;re in space.
+  Wowzewow, Cdey:
+  - imageadd: Resprites most, if not all robots, including eyes.
+  - imageadd: All robots now have unique maintenance panels.
+  - imageadd: Janicarts look better by extension now.
+  - imagedel: Removed SD-MAD and Unbranded-MAD sprites.
+  - imageadd: Adds eight new robot sprites - The Sputnik, Arthrodroid, Wide, Cricket,
+      Positron 03, Plantasonic, Coolermaster and Phage.
+  - tweak: Toileto-tron renamed to Kent, Arachnotron renamed to Spiderbot.
+  - bugfix: Fixed missing sprite for Mining Drones.
+  - bugfix: Fixed robot eyes going over tables.
+  - refactor: Refactors Cyborg sprites to work better.
+  - bugfix: Fixes sprite interaction between mobility module and eyes.
diff --git a/html/changelogs/HullShield.yml b/html/changelogs/HullShield.yml
deleted file mode 100644
index f4a9db917f5..00000000000
--- a/html/changelogs/HullShield.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - tweak: "The hull shield generator now also makes shields over some floor types if they're in space."
diff --git a/html/changelogs/Wezzy_RobotResprite.yml b/html/changelogs/Wezzy_RobotResprite.yml
deleted file mode 100644
index 5a6abe38a26..00000000000
--- a/html/changelogs/Wezzy_RobotResprite.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-################################
-# 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: Wowzewow, Cdey
-
-# 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:
-  - imageadd: "Resprites most, if not all robots, including eyes."
-  - imageadd: "All robots now have unique maintenance panels."
-  - imageadd: "Janicarts look better by extension now."
-  - imagedel: "Removed SD-MAD and Unbranded-MAD sprites."
-  - imageadd: "Adds eight new robot sprites - The Sputnik, Arthrodroid, Wide, Cricket, Positron 03, Plantasonic, Coolermaster and Phage."
-  - tweak: "Toileto-tron renamed to Kent, Arachnotron renamed to Spiderbot."
-  - bugfix: "Fixed missing sprite for Mining Drones."
-  - bugfix : "Fixed robot eyes going over tables."
-  - refactor : "Refactors Cyborg sprites to work better."
-  - bugfix : "Fixes sprite interaction between mobility module and eyes."

From b035a0b8e4b46e28f0dd5f096305c29ad00ee357 Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Sun, 6 Feb 2022 16:01:27 +0100
Subject: [PATCH 3/4] fixes representative wrist and double radio keys (#13106)

Co-authored-by: TGW <mc-casper@hotmail.dk>
---
 code/game/jobs/job/outsider/representative.dm    | 3 +++
 code/game/objects/items/devices/radio/headset.dm | 6 ++++++
 html/changelogs/DiplomatFix.yml                  | 6 ++++++
 3 files changed, 15 insertions(+)
 create mode 100644 html/changelogs/DiplomatFix.yml

diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm
index 64a41d611b4..f3fb0efbd73 100644
--- a/code/game/jobs/job/outsider/representative.dm
+++ b/code/game/jobs/job/outsider/representative.dm
@@ -33,6 +33,9 @@
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 	headset = /obj/item/device/radio/headset/representative
 	bowman = /obj/item/device/radio/headset/representative/alt
+	double_headset = /obj/item/device/radio/headset/alt/double/command/representative
+	wrist_radio = /obj/item/device/radio/headset/wrist/command/representative
+
 	l_hand =  /obj/item/storage/briefcase
 	backpack_contents = list(
 		/obj/item/device/camera = 1,
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index a0eb75ccf8f..c983db83a8d 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -703,6 +703,12 @@
 	icon_state = "com_headset_alt"
 	item_state = "headset_alt"
 
+/obj/item/device/radio/headset/alt/double/command/representative
+	name = "soundproof representative headset"
+
+/obj/item/device/radio/headset/wrist/command/representative
+	name = "wristbound representative radio"
+
 /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
 	name = "\improper AI subspace transceiver"
 	desc = "Integrated AI radio transceiver."
diff --git a/html/changelogs/DiplomatFix.yml b/html/changelogs/DiplomatFix.yml
new file mode 100644
index 00000000000..6461d783ae6
--- /dev/null
+++ b/html/changelogs/DiplomatFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Consular, liaison and representative wrist & double radio now works properly instead of spawning without any radio keys."

From ea5f66fa4cb2e666d81925764cbcaf713e444b3a Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 6 Feb 2022 15:02:05 +0000
Subject: [PATCH 4/4] "[ci skip] Automatic Build - 2022.02.06.15.02.05"

---
 html/changelog.html                | 1 +
 html/changelogs/.all_changelog.yml | 2 ++
 html/changelogs/DiplomatFix.yml    | 6 ------
 3 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/DiplomatFix.yml

diff --git a/html/changelog.html b/html/changelog.html
index fae132e124d..877ce8b65aa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -39,6 +39,7 @@
 			<h3 class="author">TheGreyWolf updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">The hull shield generator now also makes shields over some floor types if they&#x27;re in space.</li>
+				<li class="bugfix">Consular, liaison and representative wrist &amp; double radio now works properly instead of spawning without any radio keys.</li>
 			</ul>
 			<h3 class="author">Wowzewow, Cdey updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c3548c1374d..fe03215dcab 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -22517,6 +22517,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   TheGreyWolf:
   - tweak: The hull shield generator now also makes shields over some floor types
       if they&#x27;re in space.
+  - bugfix: Consular, liaison and representative wrist &amp; double radio now works
+      properly instead of spawning without any radio keys.
   Wowzewow, Cdey:
   - imageadd: Resprites most, if not all robots, including eyes.
   - imageadd: All robots now have unique maintenance panels.
diff --git a/html/changelogs/DiplomatFix.yml b/html/changelogs/DiplomatFix.yml
deleted file mode 100644
index 6461d783ae6..00000000000
--- a/html/changelogs/DiplomatFix.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: TheGreyWolf
-
-delete-after: True
-
-changes:
-  - bugfix: "Consular, liaison and representative wrist & double radio now works properly instead of spawning without any radio keys."