cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix runtimes and donking!

Browse Source
This commit is contained in:
Kashargul
2024-01-18 00:18:14 +01:00
committed by GitHub
parent 53aeaa2e89
commit 05dceb78f7
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/robot.dm
+6 -4
View File
@@ -240,7 +240,8 @@ var/obj/screen/robot_inventory
var/display_rows = -round(-(r.module.modules.len) / 8)
r.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
r.client.screen += r.robot_modules_background
if(r.client)
r.client.screen += r.robot_modules_background
var/x = -4 //Start at CENTER-4,SOUTH+1
var/y = 1
@@ -258,7 +259,7 @@ var/obj/screen/robot_inventory
r.module.modules.Remove(r.module.emag)
for(var/atom/movable/A in r.module.modules)
if( (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
//Module is not currently active
r.client.screen += A
if(x < 0)
@@ -276,11 +277,12 @@ var/obj/screen/robot_inventory
//Modules display is hidden
//r.client.screen -= robot_inventory //"store" icon
for(var/atom/A in r.module.modules)
if( (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
//Module is not currently active
r.client.screen -= A
r.shown_robot_modules = 0
r.client.screen -= r.robot_modules_background
if(r.client)
r.client.screen -= r.robot_modules_background
/mob/living/silicon/robot/update_hud()
if(modtype)
code/modules/projectiles/guns/toy.dm
+2 -1
View File
@@ -221,6 +221,7 @@
icon = 'icons/obj/gun_toy.dmi'
icon_state = "smg"
caliber = "foam"
manual_chamber = FALSE
load_method = SINGLE_CASING
max_shells = 15
var/cleanup = 0
@@ -318,4 +319,4 @@
item_state = "retro"
/obj/item/weapon/gun/energy/lasertag/omni
projectile_type = /obj/item/projectile/beam/lasertag/omni
projectile_type = /obj/item/projectile/beam/lasertag/omni