From 5a6025587b36a63f1d7e422b310285d98a2e72da Mon Sep 17 00:00:00 2001 From: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Wed, 31 Jul 2024 21:32:43 -0600 Subject: [PATCH] fixes our shit whoops fucking comas --- _maps/map_files/BoxStation/BoxStation.dmm | 4 ++-- _maps/map_files/LimaStation/LimaStation.dmm | 12 ++++++------ _maps/map_files/biodome/biodome.dmm | 14 +++++++------- _maps/map_files/moonstation/moonstation.dmm | 14 +++++++------- .../alternative_job_titles/code/alt_job_titles.dm | 2 +- .../code/modules/changeling_zombies/infection.dm | 2 +- .../code/modules/security/secmed/security_medic.dm | 1 - .../code/modules/wizard_dize/wizard_dice_object.dm | 4 ++-- 8 files changed, 26 insertions(+), 27 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index bf7615507c2b9..b7c6e3212ca14 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -27451,7 +27451,7 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/engine_smes) "ceo" = ( -/obj/machinery/keycard_auth/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/machinery/computer/station_alert{ dir = 4 }, @@ -61168,7 +61168,7 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/gravity_generator) "wIx" = ( -/obj/machinery/keycard_auth/directional/west, +/obj/machinery/keycard_auth/wall_mounted/directional/west, /obj/machinery/pdapainter/supply, /obj/machinery/computer/security/telescreen/cargo/directional/north, /obj/machinery/camera/directional/west{ diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 5dd373b0d729c..18c3690f7193f 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -5317,7 +5317,7 @@ "chZ" = ( /obj/machinery/pdapainter, /obj/structure/cable, -/obj/machinery/keycard_auth/directional/east, +/obj/machinery/keycard_auth/wall_mounted/directional/east, /obj/item/stamp/head/hop{ pixel_x = 7; pixel_y = 10 @@ -10228,7 +10228,7 @@ /obj/item/radio/intercom/directional/south{ pixel_y = -40 }, -/obj/machinery/keycard_auth/directional/south{ +/obj/machinery/keycard_auth/wall_mounted/directional/south{ pixel_y = -24 }, /obj/effect/turf_decal/siding/wood{ @@ -13650,7 +13650,7 @@ pixel_y = 35; req_access = list("hos") }, -/obj/machinery/keycard_auth/directional/north{ +/obj/machinery/keycard_auth/wall_mounted/directional/north{ pixel_x = 6; pixel_y = 24 }, @@ -20641,7 +20641,7 @@ /obj/machinery/modular_computer/preset/research{ dir = 8 }, -/obj/machinery/keycard_auth/directional/east, +/obj/machinery/keycard_auth/wall_mounted/directional/east, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) @@ -41245,7 +41245,7 @@ /obj/machinery/modular_computer/preset/engineering{ dir = 1 }, -/obj/machinery/keycard_auth/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/end, /turf/open/floor/iron/dark, /area/station/command/bridge) @@ -52772,7 +52772,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "tEk" = ( -/obj/machinery/keycard_auth/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/machinery/light/directional/south, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/qm) diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index be8ab3526edd5..a035c3332bac0 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -1352,7 +1352,7 @@ /obj/machinery/computer/communications{ dir = 4 }, -/obj/machinery/keycard_auth/directional/west{ +/obj/machinery/keycard_auth/wall_mounted/directional/west{ pixel_x = -32; pixel_y = 6 }, @@ -1399,7 +1399,7 @@ pixel_y = 9 }, /obj/item/pen, -/obj/machinery/keycard_auth/directional/west{ +/obj/machinery/keycard_auth/wall_mounted/directional/west{ pixel_y = -9 }, /turf/open/floor/wood, @@ -7199,7 +7199,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "cyC" = ( -/obj/machinery/keycard_auth/directional/north, +/obj/machinery/keycard_auth/wall_mounted/directional/north, /obj/machinery/newscaster/directional/west, /obj/machinery/computer/security/qm{ dir = 4 @@ -42165,7 +42165,7 @@ /obj/item/computer_disk/engineering, /obj/item/computer_disk/engineering, /obj/item/computer_disk/engineering, -/obj/machinery/keycard_auth/directional/east, +/obj/machinery/keycard_auth/wall_mounted/directional/east, /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) @@ -54266,7 +54266,7 @@ pixel_x = 32; pixel_y = 4 }, -/obj/machinery/keycard_auth/directional/east{ +/obj/machinery/keycard_auth/wall_mounted/directional/east{ pixel_x = 33; pixel_y = -6 }, @@ -66043,7 +66043,7 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, -/obj/machinery/keycard_auth/directional/east{ +/obj/machinery/keycard_auth/wall_mounted/directional/east{ pixel_x = 37; pixel_y = -8 }, @@ -67516,7 +67516,7 @@ "xsl" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/keycard_auth/directional/west, +/obj/machinery/keycard_auth/wall_mounted/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 9f3fd7dd3fe75..3f3fb5b76ef17 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -998,7 +998,7 @@ /obj/machinery/computer/communications{ dir = 4 }, -/obj/machinery/keycard_auth/directional/west, +/obj/machinery/keycard_auth/wall_mounted/directional/west, /obj/machinery/button/door/directional/west{ id = "captain_privacy"; name = "Captain's Privacy Shutters"; @@ -20064,7 +20064,7 @@ /area/station/engineering/rbmk2) "fBj" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/obj/machinery/keycard_auth/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) @@ -39611,7 +39611,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/keycard_auth/directional/north, +/obj/machinery/keycard_auth/wall_mounted/directional/north, /obj/machinery/button/door/directional/north{ id = "cmo_officer_shutters"; name = "Privacy Shutters Control"; @@ -56341,7 +56341,7 @@ "pJo" = ( /obj/structure/table/wood, /obj/machinery/fax/auto_name, -/obj/machinery/keycard_auth/directional/west, +/obj/machinery/keycard_auth/wall_mounted/directional/west, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/hop) "pJW" = ( @@ -56774,7 +56774,7 @@ /area/moonstation/surface) "pPT" = ( /obj/machinery/light/warm/directional/east, -/obj/machinery/keycard_auth/directional/east, +/obj/machinery/keycard_auth/wall_mounted/directional/east, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, @@ -76678,7 +76678,7 @@ /turf/open/floor/iron/checker, /area/station/security/evidence) "vrN" = ( -/obj/machinery/keycard_auth/directional/south, +/obj/machinery/keycard_auth/wall_mounted/directional/south, /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/command/meeting_room) @@ -81400,7 +81400,7 @@ /turf/open/floor/grass, /area/station/service/hydroponics/garden) "wMc" = ( -/obj/machinery/keycard_auth/directional/west, +/obj/machinery/keycard_auth/wall_mounted/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, diff --git a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm index 7707f15cc09e2..49e4751e49829 100644 --- a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm +++ b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm @@ -221,7 +221,7 @@ "Culinary Artist", "Sous-Chef", "Junior Chef", - "Tavern Chef",, + "Tavern Chef", "Confectionist", "Pastry Chef", ) diff --git a/modular_zubbers/code/modules/changeling_zombies/infection.dm b/modular_zubbers/code/modules/changeling_zombies/infection.dm index b02e22ac3e1a9..546fce8c603a3 100644 --- a/modular_zubbers/code/modules/changeling_zombies/infection.dm +++ b/modular_zubbers/code/modules/changeling_zombies/infection.dm @@ -255,7 +255,7 @@ GLOBAL_VAR_INIT(changeling_zombies_detected,FALSE) podspawn(list( "target" = chosen_turf, "path" = /obj/structure/closet/supplypod/centcompod, - "style" = STYLE_CENTCOM, + "style" = /datum/pod_style/centcom, "spawn" = /obj/structure/closet/crate/medical/changeling_zombie_cure, "damage" = 50, "explosionSize" = list(0, 1, 2, 3), diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm index 14b7a2e30725a..b4c1c728dd1db 100644 --- a/modular_zubbers/code/modules/security/secmed/security_medic.dm +++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm @@ -100,7 +100,6 @@ icon = 'modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi' icon_state = "hud" worn_icon_state = "healthhud" - hud_types = list(DATA_HUD_MEDICAL_ADVANCED) clothing_traits = list(TRAIT_MEDICAL_HUD) /obj/item/clothing/glasses/hud/secmed/equipped(mob/living/carbon/human/user, slot) diff --git a/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm b/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm index fc3a41b54be58..a8b180d3bbb8e 100644 --- a/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm +++ b/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm @@ -178,7 +178,7 @@ podspawn(list( "target" = get_turf(target), "path" = /obj/structure/closet/supplypod/centcompod, - "style" = STYLE_CENTCOM, + "style" = /datum/pod_style/centcom, "spawn" = /obj/item/toy/plush/lizard_plushie, "damage" = 50, "explosionSize" = list(0, 0, 2, 4), @@ -196,4 +196,4 @@ - smite_rng_seed++ \ No newline at end of file + smite_rng_seed++