Merge branch 'master' into fix_adding_apc_every_area_almayer

cmss13-devs · Jul 17, 2023 · 3ae8bd2 · 3ae8bd2
2 parents 8135246 + 823c9ce
commit 3ae8bd2
Show file tree

Hide file tree

Showing 53 changed files with 46 additions and 6 deletions.
diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml
@@ -209,3 +209,14 @@
       so they can still be found correctly.
   theselfish:
   - rscadd: SOs may now get coats in their vendor.
+2023-07-17:
+  Puckaboo2:
+  - spellcheck: Some duplicate icon states have been differentiated to prevent future
+      missing icon state errors.
+  - imageadd: Added new icon states for chemical and virology dispensers.
+  - rscdel: Removed dozens of duplicate icon states from over 50 files to reduce bloat.
+  - rscdel: Removed duplicate empty icon states.
+  realforest2001:
+  - maptweak: Added Apollo Maintenance Controllers to the following locations.
+  - maptweak: Astronavigation, CIC Substation, Brig Substation, Req Aux Storage, Hangar
+      & OT & Engineering workshops, Reactor Core Room and Lifeboat Control Ring.
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
diff --git a/icons/mob/hud/alien_standard.dmi b/icons/mob/hud/alien_standard.dmi
diff --git a/icons/mob/hud/hud.dmi b/icons/mob/hud/hud.dmi
diff --git a/icons/mob/hud/human_bronze.dmi b/icons/mob/hud/human_bronze.dmi
diff --git a/icons/mob/hud/human_old.dmi b/icons/mob/hud/human_old.dmi
diff --git a/icons/mob/hud/human_orange.dmi b/icons/mob/hud/human_orange.dmi
diff --git a/icons/mob/hud/screen1.dmi b/icons/mob/hud/screen1.dmi
diff --git a/icons/mob/hud/screen1_robot.dmi b/icons/mob/hud/screen1_robot.dmi
diff --git a/icons/mob/hud/talk.dmi b/icons/mob/hud/talk.dmi
diff --git a/icons/mob/humans/green_armors.dmi b/icons/mob/humans/green_armors.dmi
diff --git a/icons/mob/humans/human.dmi b/icons/mob/humans/human.dmi
diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi
diff --git a/icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi b/icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi
diff --git a/icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi b/icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi
diff --git a/icons/mob/xenonids/lurker.dmi b/icons/mob/xenonids/lurker.dmi
diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi
diff --git a/icons/obj/items/black_goo_stuff.dmi b/icons/obj/items/black_goo_stuff.dmi
diff --git a/icons/obj/items/clothing/halloween_clothes.dmi b/icons/obj/items/clothing/halloween_clothes.dmi
diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi
diff --git a/icons/obj/items/hunter/pred_gear.dmi b/icons/obj/items/hunter/pred_gear.dmi
diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi
diff --git a/icons/obj/items/weapons/guns/attachments/rail.dmi b/icons/obj/items/weapons/guns/attachments/rail.dmi
diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi
diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi
diff --git a/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi b/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi
diff --git a/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi b/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi
diff --git a/icons/obj/structures/doors/mineral_doors.dmi b/icons/obj/structures/doors/mineral_doors.dmi
diff --git a/icons/obj/structures/doors/prison_FOP/prison_hatches.dmi b/icons/obj/structures/doors/prison_FOP/prison_hatches.dmi
diff --git a/icons/obj/structures/machinery/computer3.dmi b/icons/obj/structures/machinery/computer3.dmi
diff --git a/icons/obj/structures/machinery/cryogenics.dmi b/icons/obj/structures/machinery/cryogenics.dmi
diff --git a/icons/obj/structures/machinery/shuttle-parts.dmi b/icons/obj/structures/machinery/shuttle-parts.dmi
diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi
diff --git a/icons/obj/structures/props/dam.dmi b/icons/obj/structures/props/dam.dmi
diff --git a/icons/obj/structures/props/fence.dmi b/icons/obj/structures/props/fence.dmi
diff --git a/icons/obj/structures/stairs/perspective_stairs_ice.dmi b/icons/obj/structures/stairs/perspective_stairs_ice.dmi
diff --git a/icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi b/icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi
diff --git a/icons/old_stuff/Seasonal/xmas.dmi b/icons/old_stuff/Seasonal/xmas.dmi
diff --git a/icons/rebase_icons.dmi b/icons/rebase_icons.dmi
diff --git a/icons/turf/almayer.dmi b/icons/turf/almayer.dmi
diff --git a/icons/turf/area_strata.dmi b/icons/turf/area_strata.dmi
diff --git a/icons/turf/floors/asphalt.dmi b/icons/turf/floors/asphalt.dmi
diff --git a/icons/turf/floors/concrete.dmi b/icons/turf/floors/concrete.dmi
diff --git a/icons/turf/floors/floors.dmi b/icons/turf/floors/floors.dmi
diff --git a/icons/turf/walls/bunker.dmi b/icons/turf/walls/bunker.dmi
diff --git a/icons/turf/walls/dev/dev.dmi b/icons/turf/walls/dev/dev.dmi
diff --git a/icons/turf/walls/floodgate.dmi b/icons/turf/walls/floodgate.dmi
diff --git a/icons/turf/walls/kutjevo/kutjevo.dmi b/icons/turf/walls/kutjevo/kutjevo.dmi
diff --git a/icons/turf/walls/solaris/solaris.dmi b/icons/turf/walls/solaris/solaris.dmi
diff --git a/icons/turf/walls/solaris/solaris_old.dmi b/icons/turf/walls/solaris/solaris_old.dmi
diff --git a/icons/turf/walls/strata_outpost.dmi b/icons/turf/walls/strata_outpost.dmi
diff --git a/icons/turf/walls/windows.dmi b/icons/turf/walls/windows.dmi
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -2839,6 +2839,10 @@
 	pixel_y = 7
 	},
 /obj/effect/decal/cleanable/blood/oil,
+/obj/structure/machinery/computer/working_joe{
+	dir = 4;
+	pixel_x = -17
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "silver"
@@ -5322,7 +5326,13 @@
 "are" = (
 /obj/structure/machinery/computer/demo_sim{
 	dir = 4;
-	pixel_x = -16
+	pixel_x = -17;
+	pixel_y = 8
+	},
+/obj/structure/machinery/computer/working_joe{
+	dir = 4;
+	pixel_x = -17;
+	pixel_y = -8
 	},
 /turf/open/floor/almayer,
 /area/almayer/engineering/engineering_workshop/hangar)
@@ -9677,6 +9687,9 @@
 /area/almayer/shipboard/brig/main_office)
 "aEm" = (
 /obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/working_joe{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -10322,6 +10335,10 @@
 	},
 /area/almayer/living/numbertwobunks)
 "aHo" = (
+/obj/structure/machinery/computer/working_joe{
+	dir = 4;
+	pixel_x = -17
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "orange"
@@ -18126,7 +18143,7 @@
 /area/almayer/squads/bravo)
 "buQ" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/station_alert{
+/obj/structure/machinery/computer/working_joe{
 	dir = 8
 	},
 /turf/open/floor/almayer{
@@ -21033,11 +21050,11 @@
 	},
 /area/almayer/squads/req)
 "bIw" = (
-/obj/structure/machinery/prop/almayer/computer,
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/light{
 	dir = 1
 	},
+/obj/structure/machinery/computer/working_joe,
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "red"
@@ -38956,12 +38973,12 @@
 /area/almayer/medical/upper_medical)
 "hbZ" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/station_alert{
-	dir = 4
-	},
 /obj/structure/sign/safety/terminal{
 	pixel_x = -17
 	},
+/obj/structure/machinery/computer/working_joe{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "orange"
@@ -49767,6 +49784,9 @@
 "lXg" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/recharger,
+/obj/structure/machinery/computer/working_joe{
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -56194,6 +56214,10 @@
 	},
 /obj/effect/decal/cleanable/cobweb2/dynamic,
 /obj/item/packageWrap,
+/obj/structure/machinery/computer/working_joe{
+	dir = 8;
+	pixel_x = 17
+	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
@@ -76819,6 +76843,11 @@
 	},
 /obj/structure/surface/rack,
 /obj/effect/spawner/random/toolbox,
+/obj/structure/machinery/computer/working_joe{
+	dir = 4;
+	pixel_y = 14;
+	pixel_x = -17
+	},
 /turf/open/floor/almayer{
 	dir = 10;
 	icon_state = "orange"