From cadf8714d89ffdd88feff38d2fdcf8f33a4e3e1e Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 9 Dec 2023 08:32:46 +1100 Subject: [PATCH] Post-rebase updates. --- code/_onclick/hud/screen/_screen.dm | 1 + code/modules/mob/mob_defines.dm | 2 +- mods/species/ascent/mobs/nymph/nymph_ui.dm | 1 - mods/species/vox/datum/species.dm | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/_onclick/hud/screen/_screen.dm b/code/_onclick/hud/screen/_screen.dm index e5892ebac8c4..de322da1cf57 100644 --- a/code/_onclick/hud/screen/_screen.dm +++ b/code/_onclick/hud/screen/_screen.dm @@ -11,6 +11,7 @@ appearance_flags = NO_CLIENT_COLOR abstract_type = /obj/screen is_spawnable_type = FALSE + simulated = FALSE /// The mob that owns this screen object, if any. var/weakref/owner_ref diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 06023cdf1c00..a23c167a1422 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -48,6 +48,7 @@ var/obj/screen/bodytemp/bodytemp var/obj/screen/health_warning/healths var/obj/screen/throw_toggle/throw_icon + var/obj/screen/maneuver/maneuver_icon var/obj/screen/food/nutrition_icon var/obj/screen/drink/hydration_icon var/obj/screen/pressure/pressure @@ -57,7 +58,6 @@ var/obj/screen/gun/radio/radio_use_icon var/obj/screen/gun/move/gun_move_icon var/obj/screen/gun/mode/gun_setting_icon - var/obj/screen/ability_master/ability_master /*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob. diff --git a/mods/species/ascent/mobs/nymph/nymph_ui.dm b/mods/species/ascent/mobs/nymph/nymph_ui.dm index e1d20543a062..7de72b0a1d46 100644 --- a/mods/species/ascent/mobs/nymph/nymph_ui.dm +++ b/mods/species/ascent/mobs/nymph/nymph_ui.dm @@ -38,7 +38,6 @@ var/ui_style = get_ui_style() var/ui_color = get_ui_color() var/ui_alpha = get_ui_alpha() - held = new( null, mymob, ui_style, ui_color, ui_alpha) molt = new( null, mymob, ui_style, ui_color, ui_alpha) food = new /obj/screen/food( null, mymob, ui_style, ui_color, ui_alpha) drink = new /obj/screen/drink( null, mymob, ui_style, ui_color, ui_alpha) diff --git a/mods/species/vox/datum/species.dm b/mods/species/vox/datum/species.dm index 6272b7eb104f..ffc0cac10662 100644 --- a/mods/species/vox/datum/species.dm +++ b/mods/species/vox/datum/species.dm @@ -23,7 +23,6 @@ name = SPECIES_VOX name_plural = SPECIES_VOX base_prosthetics_model = /decl/bodytype/prosthetic/vox/crap - secret_codex_info = "Oh no, a shitbird." default_emotes = list( /decl/emote/audible/vox_shriek