cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Runtime

Browse Source
This commit is contained in:
clusterfack
2015-10-06 12:34:55 -05:00
parent 833217ecba
commit 59c35f4f6d
5 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/_defines.dm
View File

@@ -47,7 +47,7 @@
#define ui_inv3 "CENTER:16,SOUTH:5" //borgs
#define ui_borg_module "CENTER+1:16,SOUTH:5" //borgs
#define ui_borg_store "CENTER+2:16,SOUTH:5" //borgs
#define ui_borg_sight "CENTER-3:16, SOUTH:5" //borgs
#define ui_borg_sight "CENTER-3:16,SOUTH:5" //borgs
#define ui_monkey_uniform "WEST+2:14,SOUTH:5"//monkey
#define ui_monkey_hat "WEST+3:14,SOUTH:5" //monkey

9
code/_onclick/hud/mommi.dm
View File

@@ -30,7 +30,7 @@
src.adding += using // Place using in our adding list
M.inv_tool = using // Save this using as our MoMMI's inv_sight
using = getFromPool(/obj/screen/sight)
using = getFromPool(/obj/screen)
using.name = INV_SLOT_SIGHT
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'
@@ -39,6 +39,7 @@
using.layer = 20
src.adding += using
M.sensor = using
// End of module select
// Head
inv_box = getFromPool(/obj/screen/inventory)
@@ -48,7 +49,7 @@
inv_box.screen_loc = ui_monkey_mask
inv_box.slot_id = slot_head
inv_box.layer = 19
src.adding += ui_inv1
src.adding += inv_box
// Intent
@@ -161,6 +162,4 @@
mymob.client.reset_screen()
// Add everything to their screen
mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.fire, mymob.hands, mymob.healths, mymob:cells, mymob.pullin, mymob.blind, mymob.flash) //, mymob.rest, mymob.sleep, mymob.mach )
mymob.client.screen += src.adding + src.other
return
mymob.client.screen += src.adding + src.other

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

@@ -20,7 +20,7 @@
//Module select
using = getFromPool(/obj/screen/sight)
using = getFromPool(/obj/screen)
using.name = INV_SLOT_SIGHT
using.dir = SOUTHWEST
using.icon = 'icons/mob/screen1_robot.dmi'

20
code/_onclick/hud/screen_objects.dm
View File

@@ -445,8 +445,13 @@
usr:toggle_module(INV_SLOT_TOOL)
if(INV_SLOT_SIGHT)
if(istype(usr, /mob/living/silicon/robot/mommi))
usr:toggle_module(INV_SLOT_SIGHT)
if(isrobot(usr))
var/mob/living/silicon/robot/person = usr
person.sensor_mode()
if(person.sensor_mode == 0)
icon_state = "sight"
else
icon_state = "sight+a"
if("module1")
if(istype(usr, /mob/living/silicon/robot))
@@ -784,17 +789,6 @@
usr.delayNextAttack(6)
return 1
/obj/screen/sight
name = "sight"
/obj/screen/sight/Click()
var/mob/living/silicon/robot/person = usr
person.sensor_mode()
if(person.sensor_mode == 0)
icon_state = "sight"
else
icon_state = "sight+a"
client/proc/reset_screen()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\client/proc/reset_screen() called tick#: [world.time]")
for(var/obj/screen/objects in src.screen)