diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index f53267a862e..fbb265bf8bc 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -7,7 +7,7 @@ var/obj/screen/using var/obj/screen/inventory/inv_box - + using = new /obj/screen() using.name = "act_intent" using.dir = SOUTHWEST @@ -16,7 +16,7 @@ using.screen_loc = ui_acti using.layer = 20 src.adding += using - action_intent = using + action_intent = using using = new /obj/screen() using.name = "mov_intent" @@ -26,8 +26,8 @@ using.screen_loc = ui_movi using.layer = 20 src.adding += using - move_intent = using - + move_intent = using + if(istype(mymob, /mob/living/carbon/alien/humanoid/hunter)) mymob.leap_icon = new /obj/screen() mymob.leap_icon.icon = 'icons/mob/screen1_alien.dmi' @@ -35,7 +35,7 @@ mymob.leap_icon.icon_state = "leap_off" mymob.leap_icon.screen_loc = ui_alien_storage_r src.adding += mymob.leap_icon - + //equippable shit inv_box = new /obj/screen/inventory() inv_box.name = "r_hand" @@ -90,7 +90,7 @@ using.screen_loc = ui_pull_resist using.layer = 19 src.adding += using - + using = new /obj/screen() using.name = "drop" using.icon = 'icons/mob/screen1_alien.dmi' @@ -133,8 +133,8 @@ nightvisionicon.icon = 'icons/mob/screen1_alien.dmi' nightvisionicon.icon_state = "nightvision1" nightvisionicon.name = "night vision" - nightvisionicon.screen_loc = ui_alien_nightvision - + nightvisionicon.screen_loc = ui_alien_nightvision + mymob.pullin = new /obj/screen() mymob.pullin.icon = 'icons/mob/screen1_alien.dmi' mymob.pullin.icon_state = "pull0" @@ -151,14 +151,14 @@ mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " - mymob.blind.screen_loc = "1,1" + mymob.blind.screen_loc = "CENTER-7,CENTER-7" mymob.blind.layer = 0 mymob.flash = new /obj/screen() mymob.flash.icon = 'icons/mob/screen1_alien.dmi' mymob.flash.icon_state = "blank" mymob.flash.name = "flash" - mymob.flash.screen_loc = "1,1 to 15,15" + mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH" mymob.flash.layer = 17 mymob.zone_sel = new /obj/screen/zone_sel() diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index 51d3275d3af..15e6de47546 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -49,12 +49,12 @@ mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_alien_health - + nightvisionicon = new /obj/screen() nightvisionicon.icon = 'icons/mob/screen1_alien.dmi' nightvisionicon.icon_state = "nightvision1" nightvisionicon.name = "night vision" - nightvisionicon.screen_loc = ui_alien_nightvision + nightvisionicon.screen_loc = ui_alien_nightvision mymob.pullin = new /obj/screen() mymob.pullin.icon = 'icons/mob/screen1_alien.dmi' @@ -66,14 +66,14 @@ mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " - mymob.blind.screen_loc = "1,1" + mymob.blind.screen_loc = "CENTER-7,CENTER-7" mymob.blind.layer = 0 mymob.flash = new /obj/screen() mymob.flash.icon = 'icons/mob/screen1_alien.dmi' mymob.flash.icon_state = "blank" mymob.flash.name = "flash" - mymob.flash.screen_loc = "1,1 to 15,15" + mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH" mymob.flash.layer = 17 mymob.zone_sel = new /obj/screen/zone_sel() diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 21bbd27bcb9..a0430b09569 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -35,32 +35,32 @@ var/datum/global_hud/global_hud = new() //that nasty looking dither you get when you're short-sighted vimpaired = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen) O = vimpaired[1] - O.screen_loc = "1,1 to 5,15" + O.screen_loc = "WEST,SOUTH to CENTER-3,NORTH" O = vimpaired[2] - O.screen_loc = "5,1 to 10,5" + O.screen_loc = "WEST,SOUTH to EAST,CENTER-3" O = vimpaired[3] - O.screen_loc = "6,11 to 10,15" + O.screen_loc = "CENTER+3,SOUTH to EAST,NORTH" O = vimpaired[4] - O.screen_loc = "11,1 to 15,15" + O.screen_loc = "WEST,CENTER+3 to EAST,NORTH" //welding mask overlay black/dither darkMask = newlist(/obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen) O = darkMask[1] - O.screen_loc = "3,3 to 5,13" + O.screen_loc = "CENTER-5,CENTER-5 to CENTER-3,CENTER+5" O = darkMask[2] - O.screen_loc = "5,3 to 10,5" + O.screen_loc = "CENTER-5,CENTER-5 to CENTER+5,CENTER-3" O = darkMask[3] - O.screen_loc = "6,11 to 10,13" + O.screen_loc = "CENTER+3,CENTER-5 to CENTER+5,CENTER+5" O = darkMask[4] - O.screen_loc = "11,3 to 13,13" + O.screen_loc = "CENTER-5,CENTER+3 to CENTER+5,CENTER+5" O = darkMask[5] - O.screen_loc = "1,1 to 15,2" + O.screen_loc = "WEST,SOUTH to CENTER-5,NORTH" O = darkMask[6] - O.screen_loc = "1,3 to 2,15" + O.screen_loc = "WEST,SOUTH to EAST,CENTER-5" O = darkMask[7] - O.screen_loc = "14,3 to 15,15" + O.screen_loc = "CENTER+5,SOUTH to EAST,NORTH" O = darkMask[8] - O.screen_loc = "3,14 to 13,15" + O.screen_loc = "WEST,CENTER+5 to EAST,NORTH" for(i = 1, i <= 4, i++) O = vimpaired[i] diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 619b9efef62..6b034990bd3 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -433,7 +433,7 @@ mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = "blind" - mymob.blind.screen_loc = "1,1" + mymob.blind.screen_loc = "CENTER-7,CENTER-7" mymob.blind.mouse_opacity = 0 mymob.blind.layer = 0 @@ -441,7 +441,7 @@ mymob.damageoverlay.icon = 'icons/mob/screen1_full.dmi' mymob.damageoverlay.icon_state = "oxydamageoverlay0" mymob.damageoverlay.name = "dmg" - mymob.damageoverlay.screen_loc = "1,1" + mymob.damageoverlay.screen_loc = "CENTER-7,CENTER-7" mymob.damageoverlay.mouse_opacity = 0 mymob.damageoverlay.layer = 18.1 //The black screen overlay sets layer to 18 to display it, this one has to be just on top. @@ -449,7 +449,7 @@ mymob.flash.icon = ui_style mymob.flash.icon_state = "blank" mymob.flash.name = "flash" - mymob.flash.screen_loc = "1,1 to 15,15" + mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH" mymob.flash.layer = 17 mymob.pain = new /obj/screen( null ) diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index 48ad188f531..4d995b9e660 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -244,7 +244,7 @@ mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = "blind" - mymob.blind.screen_loc = "1,1" + mymob.blind.screen_loc = "CENTER-7,CENTER-7" mymob.blind.mouse_opacity = 0 mymob.blind.layer = 0 @@ -252,7 +252,7 @@ mymob.damageoverlay.icon = 'icons/mob/screen1_full.dmi' mymob.damageoverlay.icon_state = "oxydamageoverlay0" mymob.damageoverlay.name = "dmg" - mymob.damageoverlay.screen_loc = "1,1" + mymob.damageoverlay.screen_loc = "CENTER-7,CENTER-7" mymob.damageoverlay.mouse_opacity = 0 mymob.damageoverlay.layer = 18.1 //The black screen overlay sets layer to 18 to display it, this one has to be just on top. @@ -260,7 +260,7 @@ mymob.flash.icon = ui_style mymob.flash.icon_state = "blank" mymob.flash.name = "flash" - mymob.flash.screen_loc = "1,1 to 15,15" + mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH" mymob.flash.layer = 17 mymob.pain = new /obj/screen( null ) diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm index fb2f7e8a27f..33270c0d521 100644 --- a/code/_onclick/hud/other_mobs.dm +++ b/code/_onclick/hud/other_mobs.dm @@ -45,7 +45,7 @@ mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " - mymob.blind.screen_loc = "1,1" + mymob.blind.screen_loc = "CENTER-7,CENTER-7" mymob.blind.layer = 0 diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index e91cfb50f78..6ecc8c87c72 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -128,14 +128,14 @@ mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " - mymob.blind.screen_loc = "1,1" + mymob.blind.screen_loc = "CENTER-7,CENTER-7" mymob.blind.layer = 0 mymob.flash = new /obj/screen() mymob.flash.icon = 'icons/mob/screen1_robot.dmi' mymob.flash.icon_state = "blank" mymob.flash.name = "flash" - mymob.flash.screen_loc = "1,1 to 15,15" + mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH" mymob.flash.layer = 17 mymob.zone_sel = new /obj/screen/zone_sel() diff --git a/code/game/gamemodes/vampire/hud.dm b/code/game/gamemodes/vampire/hud.dm index 75973e38beb..06e956413ac 100644 --- a/code/game/gamemodes/vampire/hud.dm +++ b/code/game/gamemodes/vampire/hud.dm @@ -3,7 +3,7 @@ vampire_blood_display = new /obj/screen() vampire_blood_display.name = "Vampire Blood" vampire_blood_display.icon_state = "dark128" - vampire_blood_display.screen_loc = "14:28,9:15" + vampire_blood_display.screen_loc = "EAST-1:28,CENTER+1:15" vampire_blood_display.layer = 20 mymob.client.screen += list(vampire_blood_display) \ No newline at end of file