From 777dd60375f9863e742d4b1003b7dc720ec71614 Mon Sep 17 00:00:00 2001 From: DrDuckedGoose Date: Tue, 3 Oct 2023 14:57:56 +1100 Subject: [PATCH] clean - 3 10 23 --- SQL/prefs_migration_2023-07-26.sql | 1 - code/datums/datacore.dm | 1 - code/game/turfs/closed/_closed.dm | 1 - code/modules/antagonists/heretic/rust_effect.dm | 1 + code/modules/mob/living/carbon/carbon.dm | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/SQL/prefs_migration_2023-07-26.sql b/SQL/prefs_migration_2023-07-26.sql index 2f7ab51b725dc..21b28e06a7077 100644 --- a/SQL/prefs_migration_2023-07-26.sql +++ b/SQL/prefs_migration_2023-07-26.sql @@ -74,7 +74,6 @@ ALTER TABLE `SS13_characters` ADD COLUMN IF NOT EXISTS `feature_mcolor` VARCHAR(64) COLLATE 'utf8mb4_general_ci' NULL AFTER `feature_lizard_tail`, ADD COLUMN IF NOT EXISTS `feature_human_tail` VARCHAR(64) COLLATE 'utf8mb4_general_ci' NULL AFTER `feature_mcolor`, ADD COLUMN IF NOT EXISTS `feature_human_ears` VARCHAR(64) COLLATE 'utf8mb4_general_ci' NULL AFTER `feature_human_tail`, - ADD COLUMN IF NOT EXISTS `feature_psyphoza_cap` VARCHAR(64) COLLATE 'utf8mb4_general_ci' NULL AFTER `feature_human_ears`, MODIFY COLUMN `helmet_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci' NULL, MODIFY COLUMN `preferred_ai_core_display` VARCHAR(64) COLLATE 'utf8mb4_general_ci' NULL, MODIFY COLUMN `preferred_security_department` VARCHAR(32) COLLATE 'utf8mb4_general_ci' NULL, diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 4f1aeee859dc5..4b4dee4d96047 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -377,6 +377,5 @@ security_records_out += list(crew_record) return security_records_out -// TODO tgui-prefs test this /datum/datacore/proc/get_id_photo(mob/living/carbon/human/human, show_directions = list(SOUTH)) return get_flat_existing_human_icon(human, show_directions) diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index a92ac940339bf..5213fa29a66d7 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -10,7 +10,6 @@ /turf/closed/Initialize(mapload) . = ..() - /turf/closed/AfterChange() . = ..() SSair.high_pressure_delta -= src diff --git a/code/modules/antagonists/heretic/rust_effect.dm b/code/modules/antagonists/heretic/rust_effect.dm index 7507730b0cc1f..8336868b3b811 100644 --- a/code/modules/antagonists/heretic/rust_effect.dm +++ b/code/modules/antagonists/heretic/rust_effect.dm @@ -4,6 +4,7 @@ icon_state = "small_rune_1" duration = 1 MINUTES layer = LOW_SIGIL_LAYER + plane = GAME_PLANE /obj/effect/temp_visual/glowing_rune/Initialize(mapload) . = ..() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fad919bd995ca..c53027269eecd 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -746,7 +746,6 @@ else set_stat(CONSCIOUS) cure_blind(UNCONSCIOUS_BLIND) - REMOVE_TRAIT(src, TRAIT_SIXTHSENSE, "near-death") update_mobility() update_damage_hud()