cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed a lot of commented out code from hud. Removed some unused variables.

Browse Source 
Trying to move everything into datum/hud, doing this will allow huds to be made more modular. Meaning more mobs can have huds with smaller and maintainable code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4773 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-09-29 08:48:19 +00:00
parent d4cf2c2040
commit 14c5bcf325
15 changed files with 69 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/hud.dm
+4 -47
View File
@@ -6,7 +6,7 @@
var/obj/screen/using
var/obj/screen/inventory/inv_box
using = new src.h_type( src )
using = new /obj/screen( src )
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 src.h_type( src )
using = new /obj/screen( src )
using.name = "mov_intent"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_alien.dmi'
@@ -26,50 +26,7 @@
src.adding += using
move_intent = using
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using
*/
/*
using = new src.h_type( src )
using.name = "arrowleft"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowright"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
using.layer = 19
src.adding += using
*/
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "drop"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "act_drop"
@@ -167,7 +124,7 @@
//end of equippable shit
/*
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "resist"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "act_resist"
code/modules/mob/living/carbon/alien/humanoid/life.dm
-3
View File
@@ -456,9 +456,6 @@
see_in_dark = 4
see_invisible = SEE_INVISIBLE_LEVEL_TWO
if (sleep) sleep.icon_state = text("sleep[]", sleeping)
if (rest) rest.icon_state = text("rest[]", resting)
if (healths)
if (stat != 2)
switch(health)
code/modules/mob/living/carbon/alien/larva/hud.dm
+2 -67
View File
@@ -7,7 +7,7 @@
var/obj/screen/using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "act_intent"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_alien.dmi'
@@ -17,7 +17,7 @@
src.adding += using
action_intent = using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "mov_intent"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_alien.dmi'
@@ -27,57 +27,6 @@
src.adding += using
move_intent = using
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
using.icon = 'icons/mob/screen1_alien.dmi'
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using
*/
/*
using = new src.h_type( src )
using.name = "arrowleft"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowright"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "resist"
using.icon = 'icons/mob/screen1_alien.dmi'
using.icon_state = "act_resist"
using.screen_loc = ui_resist
using.layer = 19
src.adding += using
*/
mymob.oxygen = new /obj/screen( null )
mymob.oxygen.icon = 'icons/mob/screen1_alien.dmi'
mymob.oxygen.icon_state = "oxy0"
@@ -124,20 +73,6 @@
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.layer = 17
/*
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.overlays = null
mymob.zone_sel.overlays += image("icon" = 'icons/mob/zone_sel.dmi', "icon_state" = text("[]", mymob.zone_sel.selecting))
code/modules/mob/living/carbon/alien/larva/life.dm
-3
View File
@@ -354,9 +354,6 @@
see_in_dark = 4
see_invisible = SEE_INVISIBLE_LEVEL_TWO
if (sleep) sleep.icon_state = text("sleep[]", sleeping)
if (rest) rest.icon_state = text("rest[]", resting)
if (healths)
if (stat != 2)
switch(health)
code/modules/mob/living/carbon/brain/life.dm
-3
View File
@@ -221,9 +221,6 @@
see_in_dark = 2
see_invisible = SEE_INVISIBLE_LIVING
if (sleep) sleep.icon_state = text("sleep[]", sleeping)
if (rest) rest.icon_state = text("rest[]", resting)
if (healths)
if (stat != 2)
switch(health)
code/modules/mob/living/carbon/human/hud.dm
+6 -278
View File
@@ -7,7 +7,7 @@
var/obj/screen/using
var/obj/screen/inventory/inv_box
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "act_intent"
using.dir = SOUTHWEST
using.icon = ui_style
@@ -17,7 +17,7 @@
src.adding += using
action_intent = using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "mov_intent"
using.dir = SOUTHWEST
using.icon = ui_style
@@ -27,48 +27,7 @@
src.adding += using
move_intent = using
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
using.icon = ui_style
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
using.icon = ui_style
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
using.icon = ui_style
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowleft"
using.icon = ui_style
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowright"
using.icon = ui_style
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
using.layer = 19
src.adding += using
*/
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "drop"
using.icon = ui_style
using.icon_state = "act_drop"
@@ -96,15 +55,6 @@
inv_box.layer = 19
src.other += inv_box
/* inv_box = new /obj/screen/inventory( src )
inv_box.name = "headset"
inv_box.dir = SOUTHEAST
inv_box.icon_state = "equip"
inv_box.screen_loc = ui_headset
inv_box.layer = 19
if(istype(mymob,/mob/living/carbon/monkey)) inv_box.overlays += blocked
src.other += inv_box*/
inv_box = new /obj/screen/inventory( src )
inv_box.name = "r_hand"
inv_box.dir = WEST
@@ -207,7 +157,7 @@
inv_box.layer = 19
src.adding += inv_box
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "resist"
using.icon = ui_style
using.icon_state = "act_resist"
@@ -215,7 +165,7 @@
using.layer = 19
src.hotkeybuttons += using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "other"
using.icon = ui_style
using.icon_state = "other"
@@ -223,7 +173,7 @@
using.layer = 20
src.adding += using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "equip"
using.icon = ui_style
using.icon_state = "act_equip"
@@ -231,22 +181,6 @@
using.layer = 20
src.adding += using
/*
using = new src.h_type( src )
using.name = "intent"
using.icon_state = "intent"
using.screen_loc = "15,15"
using.layer = 20
src.adding += using
using = new src.h_type( src )
using.name = "m_intent"
using.icon_state = "move"
using.screen_loc = "15,14"
using.layer = 20
src.adding += using
*/
inv_box = new /obj/screen/inventory( src )
inv_box.name = "gloves"
inv_box.icon = ui_style
@@ -301,59 +235,6 @@
inv_box.layer = 19
src.adding += inv_box
/*
using = new src.h_type( src )
using.name = "grab"
using.icon_state = "grab"
using.screen_loc = "12:-11,15"
using.layer = 19
src.intents += using
//ICONS
using = new src.h_type( src )
using.name = "hurt"
using.icon_state = "harm"
using.screen_loc = "15:-11,15"
using.layer = 19
src.intents += using
src.m_ints += using
using = new src.h_type( src )
using.name = "disarm"
using.icon_state = "disarm"
using.screen_loc = "14:-10,15"
using.layer = 19
src.intents += using
using = new src.h_type( src )
using.name = "help"
using.icon_state = "help"
using.screen_loc = "13:-10,15"
using.layer = 19
src.intents += using
src.m_ints += using
using = new src.h_type( src )
using.name = "face"
using.icon_state = "facing"
using.screen_loc = "15:-11,14"
using.layer = 19
src.mov_int += using
using = new src.h_type( src )
using.name = "walk"
using.icon_state = "walking"
using.screen_loc = "14:-11,14"
using.layer = 19
src.mov_int += using
using = new src.h_type( src )
using.name = "run"
using.icon_state = "running"
using.screen_loc = "13:-11,14"
using.layer = 19
src.mov_int += using
*/
mymob.throw_icon = new /obj/screen(null)
mymob.throw_icon.icon = ui_style
mymob.throw_icon.icon_state = "act_throw_off"
@@ -373,19 +254,6 @@
mymob.pressure.name = "pressure"
mymob.pressure.screen_loc = ui_pressure
/*
mymob.i_select = new /obj/screen( null )
mymob.i_select.icon_state = "selector"
mymob.i_select.name = "intent"
mymob.i_select.screen_loc = "16:-11,15"
mymob.m_select = new /obj/screen( null )
mymob.m_select.icon_state = "selector"
mymob.m_select.name = "moving"
mymob.m_select.screen_loc = "16:-11,14"
*/
mymob.toxin = new /obj/screen( null )
mymob.toxin.icon = ui_style
mymob.toxin.icon_state = "tox0"
@@ -452,115 +320,6 @@
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.layer = 17
/*
mymob.hands = new /obj/screen( null )
mymob.hands.icon = ui_style
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 = ui_style
mymob.sleep.icon_state = "sleep0"
mymob.sleep.name = "sleep"
mymob.sleep.screen_loc = ui_sleep
mymob.rest = new /obj/screen( null )
mymob.rest.icon = ui_style
mymob.rest.icon_state = "rest0"
mymob.rest.name = "rest"
mymob.rest.screen_loc = ui_rest
*/
/*/Monkey blockers
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_ears
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_belt
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_shoes
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_storage2
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_glasses
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_gloves
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_storage1
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_headset
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_oclothing
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_iclothing
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_id
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_head
using.layer = 20
src.mon_blo += using
//Monkey blockers
*/
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.icon = ui_style
mymob.zone_sel.overlays = null
@@ -577,37 +336,6 @@
return
/*
using = new src.h_type( src )
using.dir = WEST
using.screen_loc = "1,3 to 2,3"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = NORTHEAST
using.screen_loc = "3,3"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = NORTH
using.screen_loc = "3,2"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = SOUTHEAST
using.screen_loc = "3,1"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = SOUTHWEST
using.screen_loc = "1,1 to 2,2"
using.layer = 19
src.adding += using
*/
/mob/living/carbon/human/verb/toggle_hotkey_verbs()
set category = "OOC"
code/modules/mob/living/carbon/human/life.dm
-2
View File
@@ -1077,8 +1077,6 @@
else
see_invisible = SEE_INVISIBLE_LIVING
if(sleep && !hal_crit) sleep.icon_state = "sleep[sleeping]" //used?
if(healths)
switch(hal_screwyhud)
if(1) healths.icon_state = "health6"
code/modules/mob/living/carbon/metroid/hud.dm
-41
View File
@@ -4,44 +4,3 @@
for(var/hud in client.screen)
del(hud)
/*
/datum/hud/proc/metroid_hud()
src.adding = list( )
src.other = list( )
src.intents = list( )
src.mon_blo = list( )
src.m_ints = list( )
src.mov_int = list( )
src.vimpaired = list( )
src.darkMask = list( )
src.g_dither = new src.h_type( src )
src.g_dither.screen_loc = "WEST,SOUTH to EAST,NORTH"
src.g_dither.name = "Mask"
src.g_dither.icon_state = "dither12g"
src.g_dither.layer = 18
src.g_dither.mouse_opacity = 0
src.alien_view = new src.h_type(src)
src.alien_view.screen_loc = "WEST,SOUTH to EAST,NORTH"
src.alien_view.name = "Alien"
src.alien_view.icon_state = "alien"
src.alien_view.layer = 18
src.alien_view.mouse_opacity = 0
src.blurry = new src.h_type( src )
src.blurry.screen_loc = "WEST,SOUTH to EAST,NORTH"
src.blurry.name = "Blurry"
src.blurry.icon_state = "blurry"
src.blurry.layer = 17
src.blurry.mouse_opacity = 0
src.druggy = new src.h_type( src )
src.druggy.screen_loc = "WEST,SOUTH to EAST,NORTH"
src.druggy.name = "Druggy"
src.druggy.icon_state = "druggy"
src.druggy.layer = 17
src.druggy.mouse_opacity = 0
*/
code/modules/mob/living/carbon/monkey/hud.dm
+5 -372
View File
@@ -1,16 +1,12 @@
/datum/hud/proc/monkey_hud(var/ui_style='icons/mob/screen1_old.dmi')
//ui_style='icons/mob/screen1_old.dmi' //Overriding the parameter. Only this UI style is acceptable with the 'sleek' layout.
src.adding = list( )
src.other = list( )
//var/icon/blocked = icon(ui_style,"blocked")
var/obj/screen/using
var/obj/screen/inventory/inv_box
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "act_intent"
using.dir = SOUTHWEST
using.icon = ui_style
@@ -20,7 +16,7 @@
src.adding += using
action_intent = using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "mov_intent"
using.dir = SOUTHWEST
using.icon = ui_style
@@ -30,82 +26,13 @@
src.adding += using
move_intent = using
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
using.icon = ui_style
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
using.icon = ui_style
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
using.icon = ui_style
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowleft"
using.icon = ui_style
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowright"
using.icon = ui_style
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
using.layer = 19
src.adding += using*/
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "drop"
using.icon = ui_style
using.icon_state = "act_drop"
using.screen_loc = ui_drop_throw
using.layer = 19
src.adding += using
/*
using = new src.h_type( src )
using.name = "i_clothing"
using.dir = SOUTH
using.icon = ui_style
using.icon_state = "center"
using.screen_loc = ui_iclothing
using.layer = 19
using.overlays += blocked
src.adding += using
using = new src.h_type( src )
using.name = "o_clothing"
using.dir = SOUTH
using.icon = ui_style
using.icon_state = "equip"
using.screen_loc = ui_oclothing
using.layer = 19
using.overlays += blocked
src.adding += using
*/
/* using = new src.h_type( src )
using.name = "headset"
using.dir = SOUTHEAST
using.icon_state = "equip"
using.screen_loc = ui_headset
using.layer = 19
if(istype(mymob,/mob/living/carbon/monkey)) using.overlays += blocked
src.other += using*/
inv_box = new /obj/screen/inventory( src )
inv_box.name = "r_hand"
@@ -133,7 +60,7 @@
src.l_hand_hud_object = inv_box
src.adding += inv_box
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "hand"
using.dir = SOUTH
using.icon = ui_style
@@ -142,7 +69,7 @@
using.layer = 19
src.adding += using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "hand"
using.dir = SOUTH
using.icon = ui_style
@@ -150,17 +77,6 @@
using.screen_loc = ui_swaphand2
using.layer = 19
src.adding += using
/*
using = new src.h_type( src )
using.name = "id"
using.dir = SOUTHWEST
using.icon = ui_style
using.icon_state = "equip"
using.screen_loc = ui_id
using.layer = 19
using.overlays += blocked
src.adding += using
*/
inv_box = new /obj/screen/inventory( src )
inv_box.name = "mask"
@@ -181,147 +97,6 @@
inv_box.slot_id = slot_back
inv_box.layer = 19
src.adding += inv_box
/*
using = new src.h_type( src )
using.name = "storage1"
using.icon = ui_style
using.icon_state = "pocket"
using.screen_loc = ui_storage1
using.layer = 19
using.overlays += blocked
src.adding += using
using = new src.h_type( src )
using.name = "storage2"
using.icon = ui_style
using.icon_state = "pocket"
using.screen_loc = ui_storage2
using.layer = 19
using.overlays += blocked
src.adding += using
using = new src.h_type( src )
using.name = "resist"
using.icon = ui_style
using.icon_state = "act_resist"
using.screen_loc = ui_resist
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "other"
using.icon = ui_style
using.icon_state = "other"
using.screen_loc = ui_shoes
using.layer = 20
src.adding += using
using = new src.h_type( src )
using.name = "gloves"
using.icon = ui_style
using.icon_state = "gloves"
using.screen_loc = ui_gloves
using.layer = 19
using.overlays += blocked
src.other += using
using = new src.h_type( src )
using.name = "eyes"
using.icon = ui_style
using.icon_state = "glasses"
using.screen_loc = ui_glasses
using.layer = 19
using.overlays += blocked
src.other += using
using = new src.h_type( src )
using.name = "ears"
using.icon = ui_style
using.icon_state = "ears"
using.screen_loc = ui_ears
using.layer = 19
using.overlays += blocked
src.other += using
using = new src.h_type( src )
using.name = "head"
using.icon = ui_style
using.icon_state = "hair"
using.screen_loc = ui_head
using.layer = 19
using.overlays += blocked
src.adding += using
using = new src.h_type( src )
using.name = "shoes"
using.icon = ui_style
using.icon_state = "shoes"
using.screen_loc = ui_shoes
using.layer = 19
using.overlays += blocked
src.other += using
using = new src.h_type( src )
using.name = "belt"
using.icon = ui_style
using.icon_state = "belt"
using.screen_loc = ui_belt
using.layer = 19
using.overlays += blocked
src.adding += using
*/
/*
using = new src.h_type( src )
using.name = "grab"
using.icon_state = "grab"
using.screen_loc = "12:-11,15"
using.layer = 19
src.intents += using
//ICONS
using = new src.h_type( src )
using.name = "hurt"
using.icon_state = "harm"
using.screen_loc = "15:-11,15"
using.layer = 19
src.intents += using
src.m_ints += using
using = new src.h_type( src )
using.name = "disarm"
using.icon_state = "disarm"
using.screen_loc = "14:-10,15"
using.layer = 19
src.intents += using
using = new src.h_type( src )
using.name = "help"
using.icon_state = "help"
using.screen_loc = "13:-10,15"
using.layer = 19
src.intents += using
src.m_ints += using
using = new src.h_type( src )
using.name = "face"
using.icon_state = "facing"
using.screen_loc = "15:-11,14"
using.layer = 19
src.mov_int += using
using = new src.h_type( src )
using.name = "walk"
using.icon_state = "walking"
using.screen_loc = "14:-11,14"
using.layer = 19
src.mov_int += using
using = new src.h_type( src )
using.name = "run"
using.icon_state = "running"
using.screen_loc = "13:-11,14"
using.layer = 19
src.mov_int += using
*/
mymob.throw_icon = new /obj/screen(null)
mymob.throw_icon.icon = ui_style
@@ -391,114 +166,6 @@
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.layer = 17
/*
mymob.hands = new /obj/screen( null )
mymob.hands.icon = ui_style
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 = ui_style
mymob.sleep.icon_state = "sleep0"
mymob.sleep.name = "sleep"
mymob.sleep.screen_loc = ui_sleep
mymob.rest = new /obj/screen( null )
mymob.rest.icon = ui_style
mymob.rest.icon_state = "rest0"
mymob.rest.name = "rest"
mymob.rest.screen_loc = ui_rest*/
/*/Monkey blockers
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_ears
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_belt
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_shoes
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_storage2
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_glasses
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_gloves
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_storage1
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_headset
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_oclothing
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_iclothing
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_id
using.layer = 20
src.mon_blo += using
using = new src.h_type( src )
using.name = "blocked"
using.icon_state = "blocked"
using.screen_loc = ui_head
using.layer = 20
src.mon_blo += using
//Monkey blockers
*/
mymob.zone_sel = new /obj/screen/zone_sel( null )
mymob.zone_sel.icon = ui_style
mymob.zone_sel.overlays = null
@@ -506,42 +173,8 @@
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.pullin, mymob.blind, mymob.flash) //, mymob.hands, mymob.rest, mymob.sleep, mymob.mach )
mymob.client.screen += src.adding + src.other
//if(istype(mymob,/mob/living/carbon/monkey)) mymob.client.screen += src.mon_blo
return
/*
using = new src.h_type( src )
using.dir = WEST
using.screen_loc = "1,3 to 2,3"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = NORTHEAST
using.screen_loc = "3,3"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = NORTH
using.screen_loc = "3,2"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = SOUTHEAST
using.screen_loc = "3,1"
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.dir = SOUTHWEST
using.screen_loc = "1,1 to 2,2"
using.layer = 19
src.adding += using
*/
code/modules/mob/living/carbon/monkey/life.dm
-3
View File
@@ -463,9 +463,6 @@
see_in_dark = 2
see_invisible = SEE_INVISIBLE_LIVING
if (sleep) sleep.icon_state = text("sleep[]", sleeping)
if (rest) rest.icon_state = text("rest[]", resting)
if (healths)
if (stat != 2)
switch(health)
code/modules/mob/living/silicon/robot/hud.dm
+6 -67
View File
@@ -8,7 +8,7 @@
//Radio
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "radio"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
@@ -17,34 +17,9 @@
using.layer = 20
src.adding += using
//Generic overlays
/*
using = new src.h_type(src) //Right hud bar
using.dir = SOUTH
using.icon = 'icons/mob/screen1_robot.dmi'
using.screen_loc = "EAST+1,SOUTH to EAST+1,NORTH"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Lower hud bar
using.dir = EAST
using.icon = 'icons/mob/screen1_robot.dmi'
using.screen_loc = "WEST,SOUTH-1 to EAST,SOUTH-1"
using.layer = 19
src.adding += using
using = new src.h_type(src) //Corner Button
using.dir = NORTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
using.screen_loc = "EAST+1,SOUTH-1"
using.layer = 19
src.adding += using*/
//Module select
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "module1"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
@@ -54,7 +29,7 @@
src.adding += using
mymob:inv1 = using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "module2"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
@@ -64,7 +39,7 @@
src.adding += using
mymob:inv2 = using
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "module3"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
@@ -77,7 +52,7 @@
//End of module select
//Intent
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "act_intent"
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
@@ -86,25 +61,6 @@
using.layer = 20
src.adding += using
action_intent = using
/*
using = new src.h_type( src )
using.name = "arrowleft"
using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "s_arrow"
using.dir = WEST
using.screen_loc = ui_iarrowleft
using.layer = 19
src.adding += using
using = new src.h_type( src )
using.name = "arrowright"
using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "s_arrow"
using.dir = EAST
using.screen_loc = ui_iarrowright
using.layer = 19
src.adding += using*/
//End of Intent
//Cell
mymob:cells = new /obj/screen( null )
@@ -128,7 +84,7 @@
mymob.hands.screen_loc = ui_borg_module
//Module Panel
using = new src.h_type( src )
using = new /obj/screen( src )
using.name = "panel"
using.icon = 'icons/mob/screen1_robot.dmi'
using.icon_state = "panel"
@@ -162,8 +118,6 @@
mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_fire
mymob.pullin = new /obj/screen( null )
mymob.pullin.icon = 'icons/mob/screen1_robot.dmi'
mymob.pullin.icon_state = "pull0"
@@ -184,21 +138,6 @@
mymob.flash.screen_loc = "1,1 to 15,15"
mymob.flash.layer = 17
/*
mymob.sleep = new /obj/screen( null )
mymob.sleep.icon = 'icons/mob/screen1_robot.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_robot.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.icon = 'icons/mob/screen1_robot.dmi'
mymob.zone_sel.overlays = null
code/modules/mob/living/silicon/robot/life.dm
-3
View File
@@ -164,9 +164,6 @@
var/obj/item/borg/sight/hud/hud = (locate(/obj/item/borg/sight/hud) in src)
if(hud && hud.hud) hud.hud.process_hud(src)
if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
if (src.healths)
if (src.stat != 2)
switch(health)
code/modules/mob/mob_defines.dm
-3
View File
@@ -14,9 +14,6 @@
var/obj/screen/flash = null
var/obj/screen/blind = null
var/obj/screen/hands = null
var/obj/screen/mach = null
var/obj/screen/sleep = null
var/obj/screen/rest = null
var/obj/screen/pullin = null
var/obj/screen/internals = null
var/obj/screen/oxygen = null