cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Shadowlight213
2016-07-26 14:03:43 -07:00
parent 2d69b0ad19
commit 7f642978ef
3 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/hud/hud.dm
View File

@@ -120,10 +120,7 @@
if(!mymob.client) if(!mymob.client)
return 0 return 0
var/mob/screenmob = mymob var/mob/screenmob = viewmob || mymob
if(viewmob)
screenmob = viewmob
screenmob.client.screen = list() screenmob.client.screen = list()

8
code/_onclick/hud/human.dm
View File

@@ -325,9 +325,7 @@
return return
var/mob/living/carbon/human/H = mymob var/mob/living/carbon/human/H = mymob
var/mob/screenmob = H var/mob/screenmob = viewer || H
if(viewer)
screenmob = viewer
if(screenmob.hud_used.inventory_shown && screenmob.hud_used.hud_shown) if(screenmob.hud_used.inventory_shown && screenmob.hud_used.hud_shown)
if(H.shoes) if(H.shoes)
@@ -369,9 +367,7 @@
return return
var/mob/living/carbon/human/H = mymob var/mob/living/carbon/human/H = mymob
var/mob/screenmob = H var/mob/screenmob = viewer || H
if(viewer)
screenmob = viewer
if(screenmob.hud_used.hud_shown) if(screenmob.hud_used.hud_shown)
if(H.s_store) if(H.s_store)

39
code/_onclick/hud/robot.dm
View File

@@ -176,45 +176,40 @@
/datum/hud/proc/toggle_show_robot_modules() /datum/hud/proc/toggle_show_robot_modules()
if(!isrobot(mymob)) return if(!isrobot(mymob)) return
var/mob/living/silicon/robot/r = mymob var/mob/living/silicon/robot/R = mymob
r.shown_robot_modules = !r.shown_robot_modules R.shown_robot_modules = !R.shown_robot_modules
update_robot_modules_display() update_robot_modules_display()
/datum/hud/proc/update_robot_modules_display(mob/viewer) /datum/hud/proc/update_robot_modules_display(mob/viewer)
if(!isrobot(mymob)) return if(!isrobot(mymob)) return
var/mob/living/silicon/robot/r = mymob var/mob/living/silicon/robot/R = mymob
var/mob/screenmob = r var/mob/screenmob = viewer || R
if(viewer)
screenmob = viewer
if(!r.client) if(!R.module)
return return
if(!r.module) if(R.shown_robot_modules && screenmob.hud_used.hud_shown)
return
if(r.shown_robot_modules && screenmob.hud_used.hud_shown)
//Modules display is shown //Modules display is shown
screenmob.client.screen += module_store_icon //"store" icon screenmob.client.screen += module_store_icon //"store" icon
if(!r.module.modules) if(!R.module.modules)
usr << "<span class='danger'>Selected module has no modules to select</span>" usr << "<span class='danger'>Selected module has no modules to select</span>"
return return
if(!r.robot_modules_background) if(!R.robot_modules_background)
return return
var/display_rows = Ceiling(length(r.module.get_inactive_modules()) / 8) var/display_rows = Ceiling(length(R.module.get_inactive_modules()) / 8)
r.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7" R.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
screenmob.client.screen += r.robot_modules_background screenmob.client.screen += R.robot_modules_background
var/x = -4 //Start at CENTER-4,SOUTH+1 var/x = -4 //Start at CENTER-4,SOUTH+1
var/y = 1 var/y = 1
for(var/atom/movable/A in r.module.get_inactive_modules()) for(var/atom/movable/A in R.module.get_inactive_modules())
//Module is not currently active //Module is not currently active
screenmob.client.screen += A screenmob.client.screen += A
if(x < 0) if(x < 0)
@@ -232,11 +227,11 @@
//Modules display is hidden //Modules display is hidden
screenmob.client.screen -= module_store_icon //"store" icon screenmob.client.screen -= module_store_icon //"store" icon
for(var/atom/A in r.module.get_inactive_modules()) for(var/atom/A in R.module.get_inactive_modules())
//Module is not currently active //Module is not currently active
screenmob.client.screen -= A screenmob.client.screen -= A
r.shown_robot_modules = 0 R.shown_robot_modules = 0
screenmob.client.screen -= r.robot_modules_background screenmob.client.screen -= R.robot_modules_background
/mob/living/silicon/robot/create_mob_hud() /mob/living/silicon/robot/create_mob_hud()
if(client && !hud_used) if(client && !hud_used)
@@ -248,9 +243,7 @@
return return
var/mob/living/silicon/robot/R = mymob var/mob/living/silicon/robot/R = mymob
var/mob/screenmob = R var/mob/screenmob = viewer || R
if(viewer)
screenmob = viewer
if(screenmob.hud_used.hud_shown) if(screenmob.hud_used.hud_shown)
if(R.module_state_1) if(R.module_state_1)