diff --git a/code/WorkInProgress/carn/debug_locnull.dm b/code/WorkInProgress/carn/debug_locnull.dm new file mode 100644 index 0000000000..5d6a378a76 --- /dev/null +++ b/code/WorkInProgress/carn/debug_locnull.dm @@ -0,0 +1,7 @@ +/client/verb/find_atoms_in_null() + if(!holder) return + var/msg + for(var/atom/A) + if(A.loc == null) + msg += "\ref[A] [A.type] - [A]\n" + world.log << msg \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm index 431ca42069..78b705871f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm @@ -6,7 +6,7 @@ var/obj/screen/using var/obj/screen/inventory/inv_box - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "act_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_alien.dmi' @@ -16,7 +16,7 @@ src.adding += using action_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "mov_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_alien.dmi' @@ -26,7 +26,7 @@ src.adding += using move_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "drop" using.icon = 'icons/mob/screen1_alien.dmi' using.icon_state = "act_drop" @@ -34,11 +34,9 @@ using.layer = 19 src.adding += using - - //equippable shit //suit - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "o_clothing" inv_box.dir = SOUTH inv_box.icon = 'icons/mob/screen1_alien.dmi' @@ -48,7 +46,7 @@ inv_box.layer = 19 src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "r_hand" inv_box.dir = WEST inv_box.icon = 'icons/mob/screen1_alien.dmi' @@ -61,7 +59,7 @@ inv_box.slot_id = slot_r_hand src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "l_hand" inv_box.dir = EAST inv_box.icon = 'icons/mob/screen1_alien.dmi' @@ -74,7 +72,7 @@ src.l_hand_hud_object = inv_box src.adding += inv_box - using = new /obj/screen/inventory( src ) + using = new /obj/screen/inventory() using.name = "hand" using.dir = SOUTH using.icon = 'icons/mob/screen1_alien.dmi' @@ -83,7 +81,7 @@ using.layer = 19 src.adding += using - using = new /obj/screen/inventory( src ) + using = new /obj/screen/inventory() using.name = "hand" using.dir = SOUTH using.icon = 'icons/mob/screen1_alien.dmi' @@ -93,7 +91,7 @@ src.adding += using //pocket 1 - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "storage1" inv_box.icon = 'icons/mob/screen1_alien.dmi' inv_box.icon_state = "pocket" @@ -103,7 +101,7 @@ src.adding += inv_box //pocket 2 - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "storage2" inv_box.icon = 'icons/mob/screen1_alien.dmi' inv_box.icon_state = "pocket" @@ -113,7 +111,7 @@ src.adding += inv_box //head - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "head" inv_box.icon = 'icons/mob/screen1_alien.dmi' inv_box.icon_state = "hair" @@ -124,7 +122,7 @@ //end of equippable shit /* - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "resist" using.icon = 'icons/mob/screen1_alien.dmi' using.icon_state = "act_resist" @@ -133,78 +131,57 @@ src.adding += using */ - mymob.throw_icon = new /obj/screen(null) + mymob.throw_icon = new /obj/screen() mymob.throw_icon.icon = 'icons/mob/screen1_alien.dmi' mymob.throw_icon.icon_state = "act_throw_off" mymob.throw_icon.name = "throw" mymob.throw_icon.screen_loc = ui_drop_throw - mymob.oxygen = new /obj/screen( null ) + mymob.oxygen = new /obj/screen() mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi' mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_alien_oxygen - mymob.toxin = new /obj/screen( null ) + mymob.toxin = new /obj/screen() mymob.toxin.icon = 'icons/mob/screen1_alien.dmi' mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_alien_toxin - mymob.fire = new /obj/screen( null ) + mymob.fire = new /obj/screen() mymob.fire.icon = 'icons/mob/screen1_alien.dmi' mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_alien_fire - mymob.healths = new /obj/screen( null ) + mymob.healths = new /obj/screen() mymob.healths.icon = 'icons/mob/screen1_alien.dmi' mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_alien_health - mymob.pullin = new /obj/screen( null ) + mymob.pullin = new /obj/screen() mymob.pullin.icon = 'icons/mob/screen1_alien.dmi' mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_pull_resist - mymob.blind = new /obj/screen( null ) + mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " mymob.blind.screen_loc = "1,1" mymob.blind.layer = 0 - mymob.flash = new /obj/screen( null ) + 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.layer = 17 - /* - mymob.hands = new /obj/screen( null ) - mymob.hands.icon = 'icons/mob/screen1_alien.dmi' - mymob.hands.icon_state = "hand" - mymob.hands.name = "hand" - mymob.hands.screen_loc = ui_hand - mymob.hands.dir = NORTH - - mymob.sleep = new /obj/screen( null ) - mymob.sleep.icon = 'icons/mob/screen1_alien.dmi' - mymob.sleep.icon_state = "sleep0" - mymob.sleep.name = "sleep" - mymob.sleep.screen_loc = ui_sleep - - mymob.rest = new /obj/screen( null ) - mymob.rest.icon = 'icons/mob/screen1_alien.dmi' - mymob.rest.icon_state = "rest0" - mymob.rest.name = "rest" - mymob.rest.screen_loc = ui_rest - */ - - mymob.zone_sel = new /obj/screen/zone_sel( null ) + mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = 'icons/mob/screen1_alien.dmi' mymob.zone_sel.overlays = null mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") diff --git a/code/modules/mob/living/carbon/alien/larva/hud.dm b/code/modules/mob/living/carbon/alien/larva/hud.dm index 5e3bbcce0b..c26a603546 100644 --- a/code/modules/mob/living/carbon/alien/larva/hud.dm +++ b/code/modules/mob/living/carbon/alien/larva/hud.dm @@ -1,13 +1,12 @@ - /datum/hud/proc/larva_hud() - src.adding = list( ) - src.other = list( ) + src.adding = list() + src.other = list() var/obj/screen/using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "act_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_alien.dmi' @@ -17,7 +16,7 @@ src.adding += using action_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "mov_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_alien.dmi' @@ -27,53 +26,53 @@ src.adding += using move_intent = using - mymob.oxygen = new /obj/screen( null ) + mymob.oxygen = new /obj/screen() mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi' mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_alien_oxygen - mymob.toxin = new /obj/screen( null ) + mymob.toxin = new /obj/screen() mymob.toxin.icon = 'icons/mob/screen1_alien.dmi' mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_alien_toxin - mymob.fire = new /obj/screen( null ) + mymob.fire = new /obj/screen() mymob.fire.icon = 'icons/mob/screen1_alien.dmi' mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_alien_fire - mymob.healths = new /obj/screen( null ) + mymob.healths = new /obj/screen() mymob.healths.icon = 'icons/mob/screen1_alien.dmi' mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_alien_health - mymob.pullin = new /obj/screen( null ) + mymob.pullin = new /obj/screen() mymob.pullin.icon = 'icons/mob/screen1_alien.dmi' mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_pull_resist - mymob.blind = new /obj/screen( null ) + mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " mymob.blind.screen_loc = "1,1" mymob.blind.layer = 0 - mymob.flash = new /obj/screen( null ) + 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.layer = 17 - mymob.zone_sel = new /obj/screen/zone_sel( null ) + mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.overlays = null mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting)) diff --git a/code/modules/mob/living/carbon/brain/hud.dm b/code/modules/mob/living/carbon/brain/hud.dm index 2798e2059c..b9f455b53e 100644 --- a/code/modules/mob/living/carbon/brain/hud.dm +++ b/code/modules/mob/living/carbon/brain/hud.dm @@ -2,7 +2,7 @@ //ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout. - mymob.blind = new /obj/screen( null ) + mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index 13a28fc055..f527383dcb 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/code/modules/mob/living/carbon/human/hud.dm @@ -1,13 +1,13 @@ /datum/hud/proc/human_hud(var/ui_style='icons/mob/screen1_old.dmi') - src.adding = list( ) - src.other = list( ) - src.hotkeybuttons = list( ) //These can be disabled for hotkey usersx + src.adding = list() + src.other = list() + src.hotkeybuttons = list() //These can be disabled for hotkey usersx var/obj/screen/using var/obj/screen/inventory/inv_box - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "act_intent" using.dir = SOUTHWEST using.icon = ui_style @@ -17,7 +17,7 @@ src.adding += using action_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "mov_intent" using.dir = SOUTHWEST using.icon = ui_style @@ -27,7 +27,7 @@ src.adding += using move_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "drop" using.icon = ui_style using.icon_state = "act_drop" @@ -35,7 +35,7 @@ using.layer = 19 src.hotkeybuttons += using - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "i_clothing" inv_box.dir = SOUTH inv_box.icon = ui_style @@ -45,7 +45,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "o_clothing" inv_box.dir = SOUTH inv_box.icon = ui_style @@ -55,7 +55,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "r_hand" inv_box.dir = WEST inv_box.icon = ui_style @@ -68,7 +68,7 @@ src.r_hand_hud_object = inv_box src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "l_hand" inv_box.dir = EAST inv_box.icon = ui_style @@ -81,7 +81,7 @@ src.l_hand_hud_object = inv_box src.adding += inv_box - using = new /obj/screen/inventory( src ) + using = new /obj/screen/inventory() using.name = "hand" using.dir = SOUTH using.icon = ui_style @@ -90,7 +90,7 @@ using.layer = 19 src.adding += using - using = new /obj/screen/inventory( src ) + using = new /obj/screen/inventory() using.name = "hand" using.dir = SOUTH using.icon = ui_style @@ -99,7 +99,7 @@ using.layer = 19 src.adding += using - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "id" inv_box.dir = NORTH inv_box.icon = ui_style @@ -109,7 +109,7 @@ inv_box.layer = 19 src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "mask" inv_box.dir = NORTH inv_box.icon = ui_style @@ -119,7 +119,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "back" inv_box.dir = NORTH inv_box.icon = ui_style @@ -129,7 +129,7 @@ inv_box.layer = 19 src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "storage1" inv_box.icon = ui_style inv_box.icon_state = "pocket" @@ -138,7 +138,7 @@ inv_box.layer = 19 src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "storage2" inv_box.icon = ui_style inv_box.icon_state = "pocket" @@ -147,7 +147,7 @@ inv_box.layer = 19 src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "suit storage" inv_box.icon = ui_style inv_box.dir = 8 //The sprite at dir=8 has the background whereas the others don't. @@ -157,7 +157,7 @@ inv_box.layer = 19 src.adding += inv_box - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "resist" using.icon = ui_style using.icon_state = "act_resist" @@ -165,7 +165,7 @@ using.layer = 19 src.hotkeybuttons += using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "other" using.icon = ui_style using.icon_state = "other" @@ -173,7 +173,7 @@ using.layer = 20 src.adding += using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "equip" using.icon = ui_style using.icon_state = "act_equip" @@ -181,7 +181,7 @@ using.layer = 20 src.adding += using - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "gloves" inv_box.icon = ui_style inv_box.icon_state = "gloves" @@ -190,7 +190,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "eyes" inv_box.icon = ui_style inv_box.icon_state = "glasses" @@ -199,7 +199,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "ears" inv_box.icon = ui_style inv_box.icon_state = "ears" @@ -208,7 +208,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "head" inv_box.icon = ui_style inv_box.icon_state = "hair" @@ -217,7 +217,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "shoes" inv_box.icon = ui_style inv_box.icon_state = "shoes" @@ -226,7 +226,7 @@ inv_box.layer = 19 src.other += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "belt" inv_box.icon = ui_style inv_box.icon_state = "belt" @@ -235,69 +235,69 @@ inv_box.layer = 19 src.adding += inv_box - mymob.throw_icon = new /obj/screen(null) + mymob.throw_icon = new /obj/screen() mymob.throw_icon.icon = ui_style mymob.throw_icon.icon_state = "act_throw_off" mymob.throw_icon.name = "throw" mymob.throw_icon.screen_loc = ui_drop_throw src.hotkeybuttons += mymob.throw_icon - mymob.oxygen = new /obj/screen( null ) + mymob.oxygen = new /obj/screen() mymob.oxygen.icon = ui_style mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen - mymob.pressure = new /obj/screen( null ) + mymob.pressure = new /obj/screen() mymob.pressure.icon = ui_style mymob.pressure.icon_state = "pressure0" mymob.pressure.name = "pressure" mymob.pressure.screen_loc = ui_pressure - mymob.toxin = new /obj/screen( null ) + mymob.toxin = new /obj/screen() mymob.toxin.icon = ui_style mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_toxin - mymob.internals = new /obj/screen( null ) + mymob.internals = new /obj/screen() mymob.internals.icon = ui_style mymob.internals.icon_state = "internal0" mymob.internals.name = "internal" mymob.internals.screen_loc = ui_internal - mymob.fire = new /obj/screen( null ) + mymob.fire = new /obj/screen() mymob.fire.icon = ui_style mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire - mymob.bodytemp = new /obj/screen( null ) + mymob.bodytemp = new /obj/screen() mymob.bodytemp.icon = ui_style mymob.bodytemp.icon_state = "temp1" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp - mymob.healths = new /obj/screen( null ) + mymob.healths = new /obj/screen() mymob.healths.icon = ui_style mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_health - mymob.nutrition_icon = new /obj/screen( null ) + mymob.nutrition_icon = new /obj/screen() mymob.nutrition_icon.icon = ui_style mymob.nutrition_icon.icon_state = "nutrition0" mymob.nutrition_icon.name = "nutrition" mymob.nutrition_icon.screen_loc = ui_nutrition - mymob.pullin = new /obj/screen( null ) + mymob.pullin = new /obj/screen() mymob.pullin.icon = ui_style mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_pull_resist src.hotkeybuttons += mymob.pullin - mymob.blind = new /obj/screen( null ) + mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " @@ -305,7 +305,7 @@ mymob.blind.mouse_opacity = 0 mymob.blind.layer = 0 - mymob.damageoverlay = new /obj/screen( null ) + mymob.damageoverlay = new /obj/screen() mymob.damageoverlay.icon = 'icons/mob/screen1_full.dmi' mymob.damageoverlay.icon_state = "oxydamageoverlay0" mymob.damageoverlay.name = "dmg" @@ -313,27 +313,24 @@ mymob.damageoverlay.mouse_opacity = 0 mymob.damageoverlay.layer = 17 - mymob.flash = new /obj/screen( null ) + mymob.flash = new /obj/screen() 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.layer = 17 - mymob.zone_sel = new /obj/screen/zone_sel( null ) + mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = ui_style mymob.zone_sel.overlays = null mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") mymob.client.screen = null - //, mymob.i_select, mymob.m_select mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.pressure, mymob.toxin, mymob.bodytemp, mymob.internals, mymob.fire, mymob.healths, mymob.nutrition_icon, mymob.pullin, mymob.blind, mymob.flash, mymob.damageoverlay) //, mymob.hands, mymob.rest, mymob.sleep) //, mymob.mach ) mymob.client.screen += src.adding + src.hotkeybuttons inventory_shown = 0; - //if(istype(mymob,/mob/living/carbon/monkey)) mymob.client.screen += src.mon_blo - return diff --git a/code/modules/mob/living/carbon/metroid/hud.dm b/code/modules/mob/living/carbon/metroid/hud.dm index 026ae2f9f8..908703c12b 100644 --- a/code/modules/mob/living/carbon/metroid/hud.dm +++ b/code/modules/mob/living/carbon/metroid/hud.dm @@ -1,6 +1,4 @@ /mob/living/carbon/metroid/proc/regular_hud_updates() - if(client) - for(var/hud in client.screen) - del(hud) + return diff --git a/code/modules/mob/living/carbon/monkey/hud.dm b/code/modules/mob/living/carbon/monkey/hud.dm index cf9b23431c..8ab65850b0 100644 --- a/code/modules/mob/living/carbon/monkey/hud.dm +++ b/code/modules/mob/living/carbon/monkey/hud.dm @@ -1,12 +1,12 @@ /datum/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi') - src.adding = list( ) - src.other = list( ) + src.adding = list() + src.other = list() var/obj/screen/using var/obj/screen/inventory/inv_box - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "act_intent" using.dir = SOUTHWEST using.icon = ui_style @@ -16,7 +16,7 @@ src.adding += using action_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "mov_intent" using.dir = SOUTHWEST using.icon = ui_style @@ -26,7 +26,7 @@ src.adding += using move_intent = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "drop" using.icon = ui_style using.icon_state = "act_drop" @@ -34,7 +34,7 @@ using.layer = 19 src.adding += using - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "r_hand" inv_box.dir = WEST inv_box.icon = ui_style @@ -47,7 +47,7 @@ src.r_hand_hud_object = inv_box src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "l_hand" inv_box.dir = EAST inv_box.icon = ui_style @@ -60,7 +60,7 @@ src.l_hand_hud_object = inv_box src.adding += inv_box - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "hand" using.dir = SOUTH using.icon = ui_style @@ -69,7 +69,7 @@ using.layer = 19 src.adding += using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "hand" using.dir = SOUTH using.icon = ui_style @@ -78,7 +78,7 @@ using.layer = 19 src.adding += using - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "mask" inv_box.dir = NORTH inv_box.icon = ui_style @@ -88,7 +88,7 @@ inv_box.layer = 19 src.adding += inv_box - inv_box = new /obj/screen/inventory( src ) + inv_box = new /obj/screen/inventory() inv_box.name = "back" inv_box.dir = NORTHEAST inv_box.icon = ui_style @@ -98,75 +98,75 @@ inv_box.layer = 19 src.adding += inv_box - mymob.throw_icon = new /obj/screen(null) + mymob.throw_icon = new /obj/screen() mymob.throw_icon.icon = ui_style mymob.throw_icon.icon_state = "act_throw_off" mymob.throw_icon.name = "throw" mymob.throw_icon.screen_loc = ui_drop_throw - mymob.oxygen = new /obj/screen( null ) + mymob.oxygen = new /obj/screen() mymob.oxygen.icon = ui_style mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen - mymob.pressure = new /obj/screen( null ) + mymob.pressure = new /obj/screen() mymob.pressure.icon = ui_style mymob.pressure.icon_state = "pressure0" mymob.pressure.name = "pressure" mymob.pressure.screen_loc = ui_pressure - mymob.toxin = new /obj/screen( null ) + mymob.toxin = new /obj/screen() mymob.toxin.icon = ui_style mymob.toxin.icon_state = "tox0" mymob.toxin.name = "toxin" mymob.toxin.screen_loc = ui_toxin - mymob.internals = new /obj/screen( null ) + mymob.internals = new /obj/screen() mymob.internals.icon = ui_style mymob.internals.icon_state = "internal0" mymob.internals.name = "internal" mymob.internals.screen_loc = ui_internal - mymob.fire = new /obj/screen( null ) + mymob.fire = new /obj/screen() mymob.fire.icon = ui_style mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire - mymob.bodytemp = new /obj/screen( null ) + mymob.bodytemp = new /obj/screen() mymob.bodytemp.icon = ui_style mymob.bodytemp.icon_state = "temp1" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp - mymob.healths = new /obj/screen( null ) + mymob.healths = new /obj/screen() mymob.healths.icon = ui_style mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_health - mymob.pullin = new /obj/screen( null ) + mymob.pullin = new /obj/screen() mymob.pullin.icon = ui_style mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_pull_resist - mymob.blind = new /obj/screen( null ) + mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " mymob.blind.screen_loc = "1,1" mymob.blind.layer = 0 - mymob.flash = new /obj/screen( null ) + mymob.flash = new /obj/screen() 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.layer = 17 - mymob.zone_sel = new /obj/screen/zone_sel( null ) + mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = ui_style mymob.zone_sel.overlays = null mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm index 4640065a65..b5b6808bac 100644 --- a/code/modules/mob/living/silicon/ai/login.dm +++ b/code/modules/mob/living/silicon/ai/login.dm @@ -5,22 +5,21 @@ blood.override = 1 client.images += blood regenerate_icons() - flash = new /obj/screen( null ) + flash = new /obj/screen() flash.icon_state = "blank" flash.name = "flash" flash.screen_loc = "1,1 to 15,15" flash.layer = 17 - blind = new /obj/screen( null ) + blind = new /obj/screen() blind.icon_state = "black" blind.name = " " blind.screen_loc = "1,1 to 15,15" blind.layer = 0 - client.screen += list( blind, flash ) + client.screen.Add( blind, flash ) if(stat != DEAD) for(var/obj/machinery/ai_status_display/O in machines) //change status - if(O) - O.mode = 1 - O.emotion = "Neutral" + O.mode = 1 + O.emotion = "Neutral" src.view_core() return \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/hud.dm b/code/modules/mob/living/silicon/robot/hud.dm index 5f6af26a55..88ef557705 100644 --- a/code/modules/mob/living/silicon/robot/hud.dm +++ b/code/modules/mob/living/silicon/robot/hud.dm @@ -1,14 +1,14 @@ /datum/hud/proc/robot_hud() - src.adding = list( ) - src.other = list( ) + src.adding = list() + src.other = list() var/obj/screen/using //Radio - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "radio" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_robot.dmi' @@ -19,7 +19,7 @@ //Module select - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "module1" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_robot.dmi' @@ -29,7 +29,7 @@ src.adding += using mymob:inv1 = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "module2" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_robot.dmi' @@ -39,7 +39,7 @@ src.adding += using mymob:inv2 = using - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "module3" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_robot.dmi' @@ -52,7 +52,7 @@ //End of module select //Intent - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "act_intent" using.dir = SOUTHWEST using.icon = 'icons/mob/screen1_robot.dmi' @@ -63,28 +63,28 @@ action_intent = using //Cell - mymob:cells = new /obj/screen( null ) + mymob:cells = new /obj/screen() mymob:cells.icon = 'icons/mob/screen1_robot.dmi' mymob:cells.icon_state = "charge-empty" mymob:cells.name = "cell" mymob:cells.screen_loc = ui_toxin //Health - mymob.healths = new /obj/screen( null ) + mymob.healths = new /obj/screen() mymob.healths.icon = 'icons/mob/screen1_robot.dmi' mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_borg_health //Installed Module - mymob.hands = new /obj/screen( null ) + mymob.hands = new /obj/screen() mymob.hands.icon = 'icons/mob/screen1_robot.dmi' mymob.hands.icon_state = "nomod" mymob.hands.name = "module" mymob.hands.screen_loc = ui_borg_module //Module Panel - using = new /obj/screen( src ) + using = new /obj/screen() using.name = "panel" using.icon = 'icons/mob/screen1_robot.dmi' using.icon_state = "panel" @@ -93,52 +93,52 @@ src.adding += using //Store - mymob.throw_icon = new /obj/screen(null) + mymob.throw_icon = new /obj/screen() mymob.throw_icon.icon = 'icons/mob/screen1_robot.dmi' mymob.throw_icon.icon_state = "store" mymob.throw_icon.name = "store" mymob.throw_icon.screen_loc = ui_borg_store //Temp - mymob.bodytemp = new /obj/screen( null ) + mymob.bodytemp = new /obj/screen() mymob.bodytemp.icon_state = "temp0" mymob.bodytemp.name = "body temperature" mymob.bodytemp.screen_loc = ui_temp - mymob.oxygen = new /obj/screen( null ) + mymob.oxygen = new /obj/screen() mymob.oxygen.icon = 'icons/mob/screen1_robot.dmi' mymob.oxygen.icon_state = "oxy0" mymob.oxygen.name = "oxygen" mymob.oxygen.screen_loc = ui_oxygen - mymob.fire = new /obj/screen( null ) + mymob.fire = new /obj/screen() mymob.fire.icon = 'icons/mob/screen1_robot.dmi' mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire - mymob.pullin = new /obj/screen( null ) + mymob.pullin = new /obj/screen() mymob.pullin.icon = 'icons/mob/screen1_robot.dmi' mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_borg_pull - mymob.blind = new /obj/screen( null ) + mymob.blind = new /obj/screen() mymob.blind.icon = 'icons/mob/screen1_full.dmi' mymob.blind.icon_state = "blackimageoverlay" mymob.blind.name = " " mymob.blind.screen_loc = "1,1" mymob.blind.layer = 0 - mymob.flash = new /obj/screen( null ) + 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.layer = 17 - mymob.zone_sel = new /obj/screen/zone_sel( null ) + mymob.zone_sel = new /obj/screen/zone_sel() mymob.zone_sel.icon = 'icons/mob/screen1_robot.dmi' mymob.zone_sel.overlays = null mymob.zone_sel.overlays += image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 566d2621b6..16daad2847 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -351,10 +351,7 @@ var/list/slot_equipment_priority = list( \ if(!client) log_game("[usr.key] AM failed due to disconnect.") return - for(var/obj/screen/t in usr.client.screen) - if (t.loc == null) - //t = null - del(t) + client.screen.Cut() if(!client) log_game("[usr.key] AM failed due to disconnect.") return