Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into handle_blood

_maps/RandomZLevels/away_mission/jungleresort.dmm

@@ -2040,7 +2040,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/power/rtg,
 /turf/open/floor/plating,
 /area/awaymission/jungleresort)
 "CA" = (
@@ -3720,7 +3720,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/power/rtg,
 /turf/open/floor/plating,
 /area/awaymission/jungleresort)
 "Yb" = (

_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm

@@ -815,16 +815,16 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 351.9
+	initial_temperature = 351.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "bX" = (
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 351.9
+	initial_temperature = 351.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "bY" = (
@@ -2263,8 +2263,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "eK" = (
@@ -2634,8 +2634,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/central)
 "fo" = (
@@ -2870,8 +2870,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/central)
 "fK" = (
@@ -3049,8 +3049,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "gg" = (
@@ -3197,8 +3197,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/crew_quarters)
 "gC" = (
@@ -3411,8 +3411,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/research)
 "he" = (
@@ -3422,8 +3422,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/crew_quarters)
 "hf" = (
@@ -3454,8 +3454,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/crew_quarters)
 "hi" = (
@@ -4789,8 +4789,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/gateway)
 "jM" = (
@@ -4823,8 +4823,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/research)
 "jR" = (
@@ -6606,8 +6606,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/gateway)
 "mJ" = (
@@ -8072,12 +8072,10 @@
 /obj/machinery/power/terminal{
 	dir = 1
 	},
-/obj/machinery/power/port_gen/pacman{
-	name = "P.A.C.M.A.N.-type portable generator"
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/rtg,
 /turf/open/floor/plating{
 	heat_capacity = 1e+006
 	},
@@ -8086,9 +8084,6 @@
 /obj/machinery/power/terminal{
 	dir = 1
 	},
-/obj/machinery/power/port_gen/pacman/super{
-	name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator"
-	},
 /obj/item/wrench,
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -8096,6 +8091,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/rtg,
 /turf/open/floor/plating{
 	heat_capacity = 1e+006
 	},
@@ -8104,12 +8100,10 @@
 /obj/machinery/power/terminal{
 	dir = 1
 	},
-/obj/machinery/power/port_gen/pacman{
-	name = "P.A.C.M.A.N.-type portable generator"
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/rtg,
 /turf/open/floor/plating{
 	heat_capacity = 1e+006
 	},
@@ -8356,8 +8350,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "pv" = (
@@ -8367,8 +8361,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "pw" = (
@@ -8379,8 +8373,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/engineering)
 "px" = (
@@ -8670,8 +8664,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "qb" = (
@@ -8902,8 +8896,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "qA" = (
@@ -8913,8 +8907,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "qB" = (
@@ -8924,8 +8918,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "qC" = (
@@ -11106,8 +11100,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/crew_quarters)
 "uc" = (
@@ -11752,8 +11746,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "vm" = (
@@ -11978,8 +11972,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/research)
 "vI" = (
@@ -12264,8 +12258,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/mining)
 "wk" = (
@@ -13483,8 +13477,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/mining)
 "yh" = (
@@ -13492,8 +13486,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yi" = (
@@ -13501,8 +13495,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yj" = (
@@ -13512,8 +13506,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yk" = (
@@ -13522,8 +13516,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yl" = (
@@ -13533,8 +13527,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "ym" = (
@@ -13543,8 +13537,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yn" = (
@@ -13552,8 +13546,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yo" = (
@@ -13562,8 +13556,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yp" = (
@@ -13572,8 +13566,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yq" = (
@@ -13581,8 +13575,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yr" = (
@@ -13590,8 +13584,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yt" = (
@@ -13600,8 +13594,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yu" = (
@@ -13610,8 +13604,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yw" = (
@@ -13620,8 +13614,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yz" = (
@@ -13629,8 +13623,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yA" = (
@@ -13639,8 +13633,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yB" = (
@@ -13648,8 +13642,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yC" = (
@@ -13658,8 +13652,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yD" = (
@@ -13669,8 +13663,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "yH" = (
@@ -13680,8 +13674,8 @@
 /turf/open/floor/plating/asteroid{
 	heat_capacity = 1e+006;
 	initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
-	name = "Cave Floor";
-	initial_temperature = 363.9
+	initial_temperature = 363.9;
+	name = "Cave Floor"
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "KE" = (

_maps/map_files/BoxStation/BoxStation.dmm

@@ -42889,7 +42889,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "cbr" = (

_maps/map_files/CogStation/CogStation.dmm

@@ -57320,7 +57320,7 @@
 	name = "Chief Engineer's RC";
 	pixel_y = -32
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel,
 /area/command/heads_quarters/ce)
 "csf" = (

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -2619,9 +2619,8 @@
 /turf/closed/wall/r_wall,
 /area/space/nearstation)
 "ajs" = (
-/obj/structure/table,
-/obj/item/storage/briefcase,
 /obj/effect/turf_decal/delivery,
+/obj/machinery/vending/kink,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "ajt" = (
@@ -2880,15 +2879,17 @@
 "ajR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/delivery,
-/obj/item/kirbyplants{
-	icon_state = "plant-21"
-	},
+/obj/structure/table,
+/obj/item/storage/briefcase,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "ajS" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/item/kirbyplants{
+	icon_state = "plant-21"
+	},
 /turf/open/floor/plasteel/cafeteria,
 /area/hallway/secondary/entry)
 "ajT" = (
@@ -75787,7 +75788,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "fLq" = (
@@ -96886,7 +96887,7 @@
 /obj/item/folder/red,
 /obj/item/toy/gun,
 /obj/item/clothing/head/beret/sec{
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0);
+	armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0);
 	desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
 	name = "replica officer's beret"
 	},
@@ -98957,7 +98958,7 @@
 	name = "Replica CentCom officer's jumpsuit"
 	},
 /obj/item/clothing/head/centhat{
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0);
+	armor = list("melee"=0,"bullet"=0,"laser"=0,"energy"=0,"bomb"=0,"bio"=0,"rad"=0);
 	desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
 	name = "Replica CentCom hat"
 	},
@@ -114141,6 +114142,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/machinery/vending/kink,
 /turf/open/floor/plasteel,
 /area/commons/fitness/recreation)
 "sVM" = (
@@ -119427,7 +119429,7 @@
 	},
 /obj/item/reagent_containers/food/drinks/beer{
 	desc = "Whatever it is, it reeks of foul, putrid froth.";
-	list_reagents = list("bacchus_blessing" = 15);
+	list_reagents = list("bacchus_blessing"=15);
 	name = "Delta-Down";
 	pixel_x = 5;
 	pixel_y = 5

_maps/map_files/FestiveBall/FestiveStation.dmm

@@ -5069,7 +5069,7 @@
 /area/command/heads_quarters/ce)
 "ane" = (
 /obj/structure/filingcabinet/chestdrawer,
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "anf" = (

_maps/map_files/KiloStation/KiloStation.dmm

@@ -13429,7 +13429,7 @@
 /obj/item/radio/intercom{
 	pixel_x = 28
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "awq" = (

_maps/map_files/LambdaStation/lambda.dmm

@@ -44859,7 +44859,7 @@
 /obj/item/gps/engineering{
 	gpstag = "CE0"
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "bUH" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -57489,7 +57489,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/ce)
 "ixH" = (

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -6363,7 +6363,7 @@
 	c_tag = "Chief Engineer's Office";
 	network = list("ss13","engine")
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 10
 	},
@@ -23914,7 +23914,7 @@
 	c_tag = "Library 2";
 	dir = 4
 	},
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/dark/side{
@@ -23925,6 +23925,9 @@
 /obj/structure/table/wood,
 /obj/item/folder,
 /obj/item/pen,
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/library)
 "aRV" = (
@@ -23996,6 +23999,9 @@
 /obj/machinery/newscaster{
 	pixel_x = 32
 	},
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 10
 	},
@@ -24955,6 +24961,9 @@
 /area/maintenance/port/aft)
 "aUj" = (
 /obj/machinery/photocopier,
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 10
 	},
@@ -26434,7 +26443,7 @@
 /turf/closed/wall,
 /area/service/library)
 "aXg" = (
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/dark/side{
@@ -26443,6 +26452,9 @@
 /area/service/library)
 "aXh" = (
 /obj/machinery/light,
+/obj/structure/sign/painting/library{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/dark,
 /area/service/library)
 "aXi" = (
@@ -26460,7 +26472,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "aXj" = (
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/dark,
@@ -26473,6 +26485,9 @@
 	c_tag = "Library 1";
 	dir = 8
 	},
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 10
 	},
@@ -35443,7 +35458,7 @@
 /obj/structure/table/wood,
 /obj/item/folder,
 /obj/item/pen,
-/obj/structure/sign/painting{
+/obj/structure/sign/painting/library{
 	pixel_x = -32
 	},
 /turf/open/floor/plasteel/dark,

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -42909,7 +42909,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel,
 /area/command/heads_quarters/ce)
 "bVE" = (

_maps/map_files/Snaxi/Snaxi.dmm

@@ -85,7 +85,7 @@
 /obj/machinery/keycard_auth{
 	pixel_y = -28
 	},
-/mob/living/simple_animal/parrot/Poly,
+/mob/living/simple_animal/parrot/Polly,
 /turf/open/floor/plasteel,
 /area/command/heads_quarters/ce)
 "aai" = (

code/controllers/subsystem/persistence/polly_parrot.dm

@@ -0,0 +1,11 @@
+/**
+ * Persists polly messages across rounds
+ */
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadPolly()
+
+/datum/controller/subsystem/persistence/proc/LoadPolly()
+	for(var/mob/living/simple_animal/parrot/Polly/P in GLOB.alive_mob_list)
+		twitterize(P.speech_buffer, "polytalk")
+		break //Who's been duping the bird?!

code/controllers/subsystem/persistence/poly_parrot.dm

@@ -1,11 +0,0 @@
-/**
- * Persists poly messages across rounds
- */
-/datum/controller/subsystem/persistence/LoadGamePersistence()
-	. = ..()
-	LoadPoly()
-
-/datum/controller/subsystem/persistence/proc/LoadPoly()
-	for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
-		twitterize(P.speech_buffer, "polytalk")
-		break //Who's been duping the bird?!

code/datums/components/identification.dm

@@ -61,7 +61,7 @@
 	if(identification_method_flags & ID_COMPONENT_EFFECT_NO_ACTIONS)
 		return COMPONENT_NO_GRANT_ACTIONS
 
-/datum/component/identification/proc/check_knowledge(mob/user)
+/datum/component/identification/proc/check_knowledge(datum/source, mob/user)
 	return ID_COMPONENT_KNOWLEDGE_NONE
 
 /datum/component/identification/proc/on_identify(mob/user)
@@ -83,7 +83,7 @@
   */
 /datum/component/identification/syndicate
 
-/datum/component/identification/syndicate/check_knowledge(mob/user)
+/datum/component/identification/syndicate/check_knowledge(datum/source, mob/user)
 	. = ..()
 	if(user?.mind?.has_antag_datum(/datum/antagonist/traitor))
 		. = max(., ID_COMPONENT_KNOWLEDGE_FULL)

code/datums/diseases/parrotpossession.dm

@@ -13,7 +13,7 @@
 	severity = DISEASE_SEVERITY_MEDIUM
 	infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC|MOB_MINERAL
 	bypasses_immunity = TRUE //2spook
-	var/mob/living/simple_animal/parrot/Poly/ghost/parrot
+	var/mob/living/simple_animal/parrot/Polly/ghost/parrot
 
 /datum/disease/parrot_possession/stage_act()
 	..()

code/modules/admin/chat_commands.dm

@@ -150,7 +150,7 @@ GLOBAL_LIST(round_end_notifiees)
 
 /datum/tgs_chat_command/wheelofsalt/Run(datum/tgs_chat_user/sender, params)
 	var/saltresult = "The wheel of salt [pick("clatters","screams","vibrates","clanks","resonates","groans","moans","squeaks","emits a[pick(" god-forsaken"," lewd"," creepy"," generic","n orgasmic"," demonic")] [pick("airhorn","bike horn","trumpet","clown","latex","vore","dog","laughing")] noise")] as it spins violently... And it seems the salt of the day is the "
-	var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin removal","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Poly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
+	var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin removal","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Polly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
 	var/saltsecondarysubject = "[pick("rework","changes","r34","ban","removal","addition","leak","proposal","fanart","introduction","tabling","ERP","bikeshedding","crossdressing","sprites","semen keg","argument","theft","nerf","screeching","salt","creampie","lewding","murder","kissing","marriage","replacement","fucking","ship","netflix adaptation","dance","remaster","system","voyeur","decoration","pre-order","bukkake","seduction","worship","gangbang","handholding")]"
 	if(prob(10))
 		saltresult += "@here for your salt, all day every day"
@@ -174,12 +174,12 @@ GLOBAL_LIST(round_end_notifiees)
 /datum/tgs_chat_command/despacito/Run()
 	return "https://www.youtube.com/watch?v=kJQP7kiw5Fk"
 
-/datum/tgs_chat_command/poly
-	name = "poly"
-	help_text = "The Lewder, more applicable Poly speak for Citadel Station 13."
+/datum/tgs_chat_command/polly
+	name = "polly"
+	help_text = "The Lewder, more applicable Polly speak for Citadel Station 13."
 	var/list/speech_buffer
 
-/datum/tgs_chat_command/poly/Run()
+/datum/tgs_chat_command/polly/Run()
 	LAZYINITLIST(speech_buffer) //I figure this is just safe to do for everything at this point
 	if(length(speech_buffer))	//Let's not look up the whole json EVERY TIME, just the first time.
 		return "[pick(speech_buffer)]"

code/modules/admin/topic.dm

@@ -489,8 +489,8 @@
 				M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob )
 			if("parrot")
 				M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob )
-			if("polyparrot")
-				M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob )
+			if("pollyparrot")
+				M.change_mob_type( /mob/living/simple_animal/parrot/Polly , null, null, delmob )
 			if("constructarmored")
 				M.change_mob_type( /mob/living/simple_animal/hostile/construct/armored , null, null, delmob )
 			if("constructbuilder")

code/modules/antagonists/bloodsucker/powers/mesmerize.dm

@@ -2,7 +2,7 @@
 //	* MEZMERIZE
 //		LOVE:		Target falls in love with you. Being harmed directly causes them harm if they see it?
 //		STAY:		Target will do everything they can to stand in the same place.
-//		FOLLOW:		Target follows you, spouting random phrases from their history (or maybe Poly's or NPC's vocab?)
+//		FOLLOW:		Target follows you, spouting random phrases from their history (or maybe Polly's or NPC's vocab?)
 //		ATTACK:		Target finds a nearby non-Bloodsucker victim to attack.
 
 /datum/action/bloodsucker/targeted/mesmerize

code/modules/awaymissions/super_secret_room.dm

@@ -45,9 +45,9 @@
 		if(9)
 			SpeakPeace(list("Alright maybe that's <b>too</b> boring.", "I can't keep manually typing these lines out though.", "It's hard to explain but the code structure I'm using is kind of terrible."))
 		if(10)
-			SpeakPeace(list("Oh I have an idea!", "Lets outsource this endless banter to Poly!", "Then you'll be able to keep listening to this without getting bored!"))
+			SpeakPeace(list("Oh I have an idea!", "Lets outsource this endless banter to Polly!", "Then you'll be able to keep listening to this without getting bored!"))
 			if(isnull(shenanigans) || !shenanigans.len)
-				shenanigans = list("Except the poly file is missing...")
+				shenanigans = list("Except the polly file is missing...")
 		if(11 to 14, 16 to 50, 52 to 99, 103 to 107, 109 to 203, 205 to 249, 252 to 665, 667 to 999, 1001 to 5642)
 			SpeakPeace(list(pick(shenanigans),pick(shenanigans),pick(shenanigans)))
 			if(times_spoken_to % 10 == 0)
@@ -55,7 +55,7 @@
 		if(15)
 			SpeakPeace(list("See? Isn't this fun?","Now you can mash this for hours without getting bored.","Anyway I'll leave you it."))
 		if(51)
-			SpeakPeace(list("The fun never ends around here.", "The Poly text files stores up to 500 statements.", "But you've probably heard a few repeats by now."))
+			SpeakPeace(list("The fun never ends around here.", "The Polly text files stores up to 500 statements.", "But you've probably heard a few repeats by now."))
 		if(100)
 			SpeakPeace(list("And that's a solid hundred.", "Good hustle I guess.", "You've probably heard a lot of repeats by now."))
 		if(101)

code/modules/cargo/packs/engineering.dm

@@ -49,7 +49,7 @@
 
 /datum/supply_pack/engineering/engihardsuit
 	name = "Engineering Hardsuit"
-	desc = "Poly 'Who stole all the hardsuits!' Well now you can get more hardsuits if needed! NOTE ONE HARDSUIT IS IN THIS CRATE, as well as one air tank and mask!"
+	desc = "Polly 'Who stole all the hardsuits!' Well now you can get more hardsuits if needed! NOTE ONE HARDSUIT IS IN THIS CRATE, as well as one air tank and mask!"
 	cost = 2250
 	access = ACCESS_ENGINE
 	contains = list(/obj/item/tank/internals/air,

code/modules/events/holiday/halloween.dm

@@ -15,9 +15,9 @@
 
 	for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_living_list)
 		Ian.place_on_head(new /obj/item/bedsheet(Ian))
-	for(var/mob/living/simple_animal/parrot/Poly/Poly in GLOB.mob_living_list)
-		new /mob/living/simple_animal/parrot/Poly/ghost(Poly.loc)
-		qdel(Poly)
+	for(var/mob/living/simple_animal/parrot/Polly/Polly in GLOB.mob_living_list)
+		new /mob/living/simple_animal/parrot/Polly/ghost(Polly.loc)
+		qdel(Polly)
 
 
 /datum/round_event/spooky/announce(fake)

code/modules/mob/living/silicon/ai/ai.dm

@@ -660,7 +660,7 @@
 			"goat" = 'icons/mob/animal.dmi',
 			"cat" = 'icons/mob/pets.dmi',
 			"cat2" = 'icons/mob/pets.dmi',
-			"poly" = 'icons/mob/animal.dmi',
+			"polly" = 'icons/mob/animal.dmi',
 			"pug" = 'icons/mob/pets.dmi',
 			"spider" = 'icons/mob/animal.dmi'
 			)
@@ -669,7 +669,7 @@
 			if(input)
 				qdel(holo_icon)
 				switch(input)
-					if("poly")
+					if("polly")
 						holo_icon = getHologramIcon(icon(icon_list[input],"parrot_fly"))
 					if("chicken")
 						holo_icon = getHologramIcon(icon(icon_list[input],"chicken_brown"))

code/modules/mob/living/simple_animal/bot/cleanbot.dm

@@ -19,6 +19,7 @@
 	path_image_color = "#993299"
 	weather_immunities = list("lava","ash")
 
+	var/base_icon = "cleanbot"
 	var/clean_time = 50 //How long do we take to clean?
 	var/upgrades = 0
 
@@ -126,13 +127,21 @@
 
 /mob/living/simple_animal/bot/cleanbot/turn_on()
 	..()
-	icon_state = "cleanbot[on]"
 	bot_core.updateUsrDialog()
+	update_icon()
 
 /mob/living/simple_animal/bot/cleanbot/turn_off()
 	..()
-	icon_state = "cleanbot[on]"
 	bot_core.updateUsrDialog()
+	update_icon()
+
+/mob/living/simple_animal/bot/cleanbot/update_icon_state()
+	. = ..()
+	switch(mode)
+		if(BOT_CLEANING)
+			icon_state = "[base_icon]-c"
+		else
+			icon_state = "[base_icon][on]"
 
 /mob/living/simple_animal/bot/cleanbot/bot_reset()
 	..()

code/modules/mob/living/simple_animal/parrot.dm

@@ -84,7 +84,7 @@
 	var/speech_shuffle_rate = 20
 	var/list/available_channels = list()
 
-	//Headset for Poly to yell at engineers :)
+	//Headset for Polly to yell at engineers :)
 	var/obj/item/radio/headset/ears = null
 	/// spawns with headset
 	var/spawns_with_headset = FALSE
@@ -349,7 +349,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 				parrot_state |= PARROT_FLEE
 			icon_state = icon_living
 			drop_held_item(0)
-	else if(istype(O, /obj/item/reagent_containers/food/snacks/cracker)) //Poly wants a cracker.
+	else if(istype(O, /obj/item/reagent_containers/food/snacks/cracker)) //Polly wants a cracker.
 		qdel(O)
 		if(health < maxHealth)
 			adjustBruteLoss(-10)
@@ -894,10 +894,10 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 /*
  * Sub-types
  */
-/mob/living/simple_animal/parrot/Poly
-	name = "Poly"
-	desc = "Poly the Parrot. An expert on quantum cracker theory."
-	speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
+/mob/living/simple_animal/parrot/Polly
+	name = "Polly"
+	desc = "Polly the Parrot. An expert on quantum cracker theory."
+	speak = list("Polly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
 	gold_core_spawnable = NO_SPAWN
 	speak_chance = 3
 	spawns_with_headset = TRUE
@@ -906,7 +906,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 	var/longest_survival = 0
 	var/longest_deathstreak = 0
 
-/mob/living/simple_animal/parrot/Poly/Initialize(mapload)
+/mob/living/simple_animal/parrot/Polly/Initialize(mapload)
 	ears = new /obj/item/radio/headset/headset_eng(src)
 	available_channels = list(":e")
 	Read_Memory()
@@ -929,30 +929,30 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 
 	. = ..()
 
-/mob/living/simple_animal/parrot/Poly/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+/mob/living/simple_animal/parrot/Polly/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
 	. = ..()
 	if(. && !client && prob(1) && prob(1) && CONFIG_GET(string/chat_squawk_tag)) //Only the one true bird may speak across dimensions.
 		send2chat("A stray squawk is heard... \"[message]\"", CONFIG_GET(string/chat_squawk_tag))
 
-/mob/living/simple_animal/parrot/Poly/BiologicalLife(delta_time, times_fired)
+/mob/living/simple_animal/parrot/Polly/BiologicalLife(delta_time, times_fired)
 	if(!(. = ..()))
 		return
 	if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
 		Write_Memory(FALSE)
 		memory_saved = TRUE
 
-/mob/living/simple_animal/parrot/Poly/death(gibbed)
+/mob/living/simple_animal/parrot/Polly/death(gibbed)
 	if(!memory_saved)
 		Write_Memory(TRUE)
 	if(rounds_survived == longest_survival || rounds_survived == longest_deathstreak || prob(0.666))
-		var/mob/living/simple_animal/parrot/Poly/ghost/G = new(loc)
+		var/mob/living/simple_animal/parrot/Polly/ghost/G = new(loc)
 		if(mind)
 			mind.transfer_to(G)
 		else
 			transfer_ckey(G)
 	..(gibbed)
 
-/mob/living/simple_animal/parrot/Poly/proc/Read_Memory()
+/mob/living/simple_animal/parrot/Polly/proc/Read_Memory()
 	var/saved_color
 	if(fexists("data/npc_saves/Poly.sav")) //legacy compatability to convert old format to new
 		var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
@@ -976,7 +976,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 	if(!isnull(saved_color))
 		add_atom_colour(json_decode(saved_color), FIXED_COLOUR_PRIORITY)
 
-/mob/living/simple_animal/parrot/Poly/proc/Write_Memory(dead)
+/mob/living/simple_animal/parrot/Polly/proc/Write_Memory(dead)
 	var/json_file = file("data/npc_saves/Poly.json")
 	var/list/file_data = list()
 	if(islist(speech_buffer))
@@ -1003,14 +1003,14 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))
 
-/mob/living/simple_animal/parrot/Poly/ratvar_act()
+/mob/living/simple_animal/parrot/Polly/ratvar_act()
 	playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 75, TRUE)
 	var/mob/living/simple_animal/parrot/clock_hawk/H = new(loc)
 	H.setDir(dir)
 	qdel(src)
 
-/mob/living/simple_animal/parrot/Poly/ghost
-	name = "The Ghost of Poly"
+/mob/living/simple_animal/parrot/Polly/ghost
+	name = "The Ghost of Polly"
 	desc = "Doomed to squawk the Earth."
 	color = "#FFFFFF"
 	alpha = 77
@@ -1019,16 +1019,16 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 	incorporeal_move = INCORPOREAL_MOVE_BASIC
 	butcher_results = list(/obj/item/ectoplasm = 1)
 
-/mob/living/simple_animal/parrot/Poly/ghost/Initialize(mapload)
+/mob/living/simple_animal/parrot/Polly/ghost/Initialize(mapload)
 	memory_saved = TRUE //At this point nothing is saved
 	. = ..()
 
-/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_speech()
+/mob/living/simple_animal/parrot/Polly/ghost/handle_automated_speech()
 	if(ismob(loc))
 		return
 	..()
 
-/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_movement()
+/mob/living/simple_animal/parrot/Polly/ghost/handle_automated_movement()
 	if(isliving(parrot_interest))
 		if(!ishuman(parrot_interest))
 			parrot_interest = null
@@ -1037,7 +1037,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
 			Possess(parrot_interest)
 	..()
 
-/mob/living/simple_animal/parrot/Poly/ghost/proc/Possess(mob/living/carbon/human/H)
+/mob/living/simple_animal/parrot/Polly/ghost/proc/Possess(mob/living/carbon/human/H)
 	if(!ishuman(H))
 		return
 	var/datum/disease/parrot_possession/P = new

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

@@ -225,7 +225,7 @@
 						length += emote_see.len
 					var/randomValue = rand(1,length)
 					if(randomValue <= speak.len)
-						say(pick(speak), forced = "poly")
+						say(pick(speak), forced = "polly")
 					else
 						randomValue -= speak.len
 						if(emote_see && randomValue <= emote_see.len)
@@ -233,7 +233,7 @@
 						else
 							emote("me [pick(emote_hear)]", 2)
 				else
-					say(pick(speak), forced = "poly")
+					say(pick(speak), forced = "polly")
 			else
 				if(!(emote_hear && emote_hear.len) && (emote_see && emote_see.len))
 					emote("me", EMOTE_VISIBLE, pick(emote_see))

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

@@ -603,14 +603,14 @@
 	return ..()
 
 /datum/status_effect/stabilized/darkpurple/tick()
-	var/obj/item/I = owner.get_active_held_item()
-	var/obj/item/reagent_containers/food/snacks/F = I
-	if(istype(F))
-		if(F.cooked_type)
+	var/obj/item/item = owner.get_active_held_item()
+	if(item)
+		var/obj/item/reagent_containers/food/snacks/F = item
+		if(istype(F) && F.cooked_type)
 			to_chat(owner, "<span class='warning'>[linked_extract] flares up brightly, and your hands alone are enough cook [F]!</span>")
 			F.microwave_act()
-	else
-		I.attackby(fire, owner)
+		else
+			item.attackby(fire, owner)
 	return ..()
 
 /datum/status_effect/stabilized/darkpurple/on_remove()

code/modules/wiremod/preset/speech_relay.dm

@@ -1,7 +1,7 @@
 /**
  * # Speech Relay preset
  *
- * Acts like poly. Says whatever it hears.
+ * Acts like polly. Says whatever it hears.
  */
 /obj/item/integrated_circuit/loaded/speech_relay
 

config/entries/logging.txt

@@ -68,7 +68,7 @@ LOG_ECON
 LOG_WORLD_TOPIC
 
 ## enables use of the proc twitterize() that lets you take a large list of strings and turn it into a JSON file of tweet sized strings.
-## As an example of how this could be """useful""" look towards Poly (https://twitter.com/Poly_the_Parrot)
+## As an example of how this could be """useful""" look towards Polly (https://twitter.com/Poly_the_Parrot)
 # LOG_TWITTER
 
 ## Enable logging pictures

html/changelogs/AutoChangeLog-pr-15690.yml

@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes: 
-  - balance: "quark matter is now worth 5% as much and gives 10% the research points"

html/changelogs/AutoChangeLog-pr-15707.yml

@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "makes brain trauma event respect canSpawnEvent conditions such as min players"

html/changelogs/AutoChangeLog-pr-15711.yml

@@ -0,0 +1,4 @@
+author: "Bhijn & Myr"
+delete-after: True
+changes: 
+  - tweak: "The typo in Polly's name has been fixed, severing the decade-old reference to a 2012-era TGstation coder. If you know, you know."

html/changelogs/AutoChangeLog-pr-15713.yml

@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - qol: "Two new Kinkmates have been added to Deltastation in the dorms and arrivals area."

html/changelogs/AutoChangeLog-pr-15714.yml

@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - qol: "Public library paintings have been added to Omegastation. You can now submit paintings that will appear in later rounds on that station."

html/changelogs/AutoChangeLog-pr-15716.yml

@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - bugfix: "Cleanbots will no longer go invisible when they get turned on or off."

html/changelogs/archive/2022-07.yml

@@ -34,3 +34,23 @@
   - rscadd: Added new Alina sprites
   SandPoot:
   - bugfix: The tweak tag for changelogs should now work.
+2022-07-20:
+  Putnam3145:
+  - balance: quark matter is now worth 5% as much and gives 10% the research points
+  timothyteakettle:
+  - bugfix: makes brain trauma event respect canSpawnEvent conditions such as min
+      players
+2022-07-21:
+  SandPoot:
+  - bugfix: If you have a dark purple stabilized extract and are holding nothing in
+      your hand, no longer attempts to heat nothing, which caused immense amounts
+      of runtimes.
+  - bugfix: The syndicate has fixed the radiation health analyzer allowing you to
+      check on the ui again.
+2022-07-23:
+  TripleShades:
+  - rscdel: Snow Cabin turbine
+  - tweak: Snow Cabin, Jungle Resort, and Plasma Outpost gateways now use RTGs for
+      power generation
+  - balance: Snow Cabin SMES unit is now non-magical
+  - bugfix: Snow Cabin gateway wiring now connected properly

strings/cas_white.txt

@@ -72,7 +72,7 @@ Supermatter undergarments.
 A permaban.
 Stealing all the miners' ore.
 Bluespace artillery.
-Poly reading porn over the radio again.
+Polly reading porn over the radio again.
 Mining the shaft.
 Grab intent.
 A blob zombie with an erection.

strings/phobia.json

@@ -250,6 +250,7 @@
 		"bird",
 		"beak",
 		"poly",
+		"polly",
 		"wing",
 		"claw",
 		"peck",

tgstation.dme

@@ -420,7 +420,7 @@
 #include "code\controllers\subsystem\persistence\_persistence.dm"
 #include "code\controllers\subsystem\persistence\cleanable_debris.dm"
 #include "code\controllers\subsystem\persistence\panic_bunker.dm"
-#include "code\controllers\subsystem\persistence\poly_parrot.dm"
+#include "code\controllers\subsystem\persistence\polly_parrot.dm"
 #include "code\controllers\subsystem\persistence\recent_votes_etc.dm"
 #include "code\controllers\subsystem\persistence\secret_satchels.dm"
 #include "code\controllers\subsystem\persistence\trophies.dm"