From 47b71270a96e9fe92e67f5d4d8cdd6957d197f7c Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sun, 16 Mar 2025 16:01:30 +0100 Subject: [PATCH] fix some issues (#17362) * fix some issues * . --- code/game/gamemodes/technomancer/spells/insert/mend_organs.dm | 2 +- code/game/machinery/frame.dm | 2 +- code/modules/power/supermatter/supermatter.dm | 3 --- maps/groundbase/groundbase_telecomms.dm | 3 +-- maps/stellar_delight/stellar_delight_defines.dm | 2 +- maps/stellar_delight/stellar_delight_shuttle_defs.dm | 2 +- maps/stellar_delight/stellar_delight_telecomms.dm | 4 ++-- maps/tether/tether_defines.dm | 2 +- maps/tether/tether_telecomms.dm | 3 +-- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm b/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm index c3d8467ee8..a9de50dff0 100644 --- a/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm +++ b/code/game/gamemodes/technomancer/spells/insert/mend_organs.dm @@ -43,7 +43,7 @@ for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones var/obj/item/organ/external/affected = E - if((affected.damage < affected.min_broken_damage * config.organ_health_multiplier) && (affected.status & ORGAN_BROKEN)) + if((affected.damage < affected.min_broken_damage * CONFIG_GET(number/organ_health_multiplier)) && (affected.status & ORGAN_BROKEN)) affected.status &= ~ORGAN_BROKEN for(var/datum/wound/W in affected.wounds) // Fix IB diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index 0aeff00218..9d68cd33bc 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -270,7 +270,7 @@ req_component_names[ct] = initial(ct.name) /obj/structure/frame/Initialize(mapload, var/dir, var/building = 0, var/datum/frame/frame_types/type, mob/user as mob) - ..() + . = ..() if(building) frame_type = type state = FRAME_PLACED diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 0f1d5fbb47..792c74ad27 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -110,10 +110,7 @@ var/datum/looping_sound/supermatter/soundloop /obj/machinery/power/supermatter/Initialize(mapload) - . = ..() uid = gl_uid++ - -/obj/machinery/power/supermatter/Initialize(mapload) soundloop = new(list(src), TRUE) return ..() diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 22c4a7a111..54afd42bb1 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -1,7 +1,6 @@ // #### Relays #### // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. -/obj/machinery/telecomms/relay/preset/station/Initialize(mapload) - . = ..() +/obj/machinery/telecomms/relay/preset/station id = "groundbase Relay" autolinkers = list("groundbase_relay") diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm index fb812f6ad5..e158dfcb4f 100644 --- a/maps/stellar_delight/stellar_delight_defines.dm +++ b/maps/stellar_delight/stellar_delight_defines.dm @@ -388,4 +388,4 @@ SSatc.msg(message) /obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() - return list(Z_NAME_SPACE_ROCKS) + return list(GLOB.map_templates_loaded[Z_NAME_SPACE_ROCKS]) diff --git a/maps/stellar_delight/stellar_delight_shuttle_defs.dm b/maps/stellar_delight/stellar_delight_shuttle_defs.dm index 6830f246b8..7e55444eb5 100644 --- a/maps/stellar_delight/stellar_delight_shuttle_defs.dm +++ b/maps/stellar_delight/stellar_delight_shuttle_defs.dm @@ -169,4 +169,4 @@ SSatc.msg(message) /obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() - return list(Z_NAME_SPACE_ROCKS) + return list(GLOB.map_templates_loaded[Z_NAME_SPACE_ROCKS]) diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index 32cb112503..c1b3a09e2d 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -1,10 +1,10 @@ // #### Relays #### // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. -/obj/machinery/telecomms/relay/preset/station/Initialize(mapload) - . = ..() +/obj/machinery/telecomms/relay/preset/station id = "SD Relay" autolinkers = list("sd_relay") + /datum/map/sd/default_internal_channels() return list( num2text(PUB_FREQ) = list(), diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index b38a365df3..5432590070 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -287,7 +287,7 @@ announce_atc(AM,going = TRUE) /obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() - return list(Z_LEVEL_TETHER_SPACE_LOW) + return list(GLOB.map_templates_loaded[Z_LEVEL_TETHER_SPACE_LOW]) /obj/effect/overmap/visitable/sector/virgo3b/announce_atc(var/atom/movable/AM, var/going = FALSE) if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob)) diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index c94131a8cc..7df1fb3108 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -1,7 +1,6 @@ // #### Relays #### // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. -/obj/machinery/telecomms/relay/preset/station/Initialize(mapload) - . = ..() +/obj/machinery/telecomms/relay/preset/station id = "Tether Relay" autolinkers = list("tether_relay")