diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm
index b02cb604054..30f43569fa4 100644
--- a/code/game/jobs/job/outsider/representative.dm
+++ b/code/game/jobs/job/outsider/representative.dm
@@ -32,6 +32,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 a46c2905811..9b738734045 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/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/changelog.html b/html/changelog.html
index b3a73683384..877ce8b65aa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -35,6 +35,26 @@
-->
+
06 February 2022
+
TheGreyWolf updated:
+
+ - The hull shield generator now also makes shields over some floor types if they're in space.
+ - Consular, liaison and representative wrist & double radio now works properly instead of spawning without any radio keys.
+
+
Wowzewow, Cdey updated:
+
+ - Resprites most, if not all robots, including eyes.
+ - All robots now have unique maintenance panels.
+ - Janicarts look better by extension now.
+ - Removed SD-MAD and Unbranded-MAD sprites.
+ - Adds eight new robot sprites - The Sputnik, Arthrodroid, Wide, Cricket, Positron 03, Plantasonic, Coolermaster and Phage.
+ - Toileto-tron renamed to Kent, Arachnotron renamed to Spiderbot.
+ - Fixed missing sprite for Mining Drones.
+ - Fixed robot eyes going over tables.
+ - Refactors Cyborg sprites to work better.
+ - Fixes sprite interaction between mobility module and eyes.
+
+
04 February 2022
BLUNTFORCE420 updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dc2e534e541..fe03215dcab 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -22513,3 +22513,21 @@ 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're in space.
+ - bugfix: Consular, liaison and representative wrist & 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.
+ - 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/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."