From 12055144e477731e77263f154e82a9b095ccf680 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 16:09:16 -0500 Subject: [PATCH] fix it --- code/_onclick/hud/screen_objects.dm | 34 +++++++++--------- code/game/turfs/closed.dm | 2 +- .../images/{blank.png => blank.dmi} | Bin 3 files changed, 18 insertions(+), 18 deletions(-) rename config/title_screens/images/{blank.png => blank.dmi} (100%) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 3cd0d5bdbd..0da04de7d3 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -91,9 +91,9 @@ screen_loc = ui_language_menu /obj/screen/language_menu/Click() - var/mob/M = usr - var/datum/language_holder/H = M.get_language_holder() - H.open_language_menu(usr) + var/mob/M = usr + var/datum/language_holder/H = M.get_language_holder() + H.open_language_menu(usr) /obj/screen/inventory var/slot_id // The indentifier for the slot. It has nothing to do with ID cards. @@ -133,8 +133,8 @@ icon_state = icon_empty /obj/screen/inventory/hand - var/mutable_appearance/handcuff_overlay - var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked") + var/mutable_appearance/handcuff_overlay + var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked") var/held_index = 0 /obj/screen/inventory/hand/update_icon() @@ -142,7 +142,7 @@ if(!handcuff_overlay) var/state = (!(held_index % 2)) ? "markus" : "gabrielle" - handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state) + handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state) cut_overlays() @@ -157,7 +157,7 @@ add_overlay(blocked_overlay) if(held_index == hud.mymob.active_hand_index) - add_overlay("hand_active") + add_overlay("hand_active") /obj/screen/inventory/hand/Click(location, control, params) @@ -439,7 +439,7 @@ /obj/screen/zone_sel/update_icon(mob/user) cut_overlays() - add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[selecting]")) + add_overlay(mutable_appearance('icons/mob/screen_gen.dmi', "[selecting]")) user.zone_selected = selecting /obj/screen/zone_sel/alien @@ -447,7 +447,7 @@ /obj/screen/zone_sel/alien/update_icon(mob/user) cut_overlays() - add_overlay(mutable_appearance('icons/mob/screen_alien.dmi', "[selecting]")) + add_overlay(mutable_appearance('icons/mob/screen_alien.dmi', "[selecting]")) user.zone_selected = selecting /obj/screen/zone_sel/robot @@ -531,25 +531,25 @@ screen_loc = ui_health mouse_opacity = 0 -/obj/screen/healths/construct - icon = 'icons/mob/screen_construct.dmi' - icon_state = "artificer_health0" - screen_loc = ui_construct_health - mouse_opacity = 0 - +/obj/screen/healths/construct + icon = 'icons/mob/screen_construct.dmi' + icon_state = "artificer_health0" + screen_loc = ui_construct_health + mouse_opacity = 0 + /obj/screen/healthdoll name = "health doll" screen_loc = ui_healthdoll /obj/screen/splash - icon = 'config/title_screens/images/blank.png' + icon = 'config/title_screens/images/blank.dmi' icon_state = "" screen_loc = "1,1" layer = SPLASHSCREEN_LAYER plane = SPLASHSCREEN_PLANE var/client/holder -/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE +/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE holder = C if(!visible) diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index a459ac5903..ac0add9746 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -29,7 +29,7 @@ /turf/closed/indestructible/splashscreen name = "Space Station 13" - icon = 'config/title_screens/images/blank.png' + icon = 'config/title_screens/images/blank.dmi' icon_state = "" layer = FLY_LAYER diff --git a/config/title_screens/images/blank.png b/config/title_screens/images/blank.dmi similarity index 100% rename from config/title_screens/images/blank.png rename to config/title_screens/images/blank.dmi