cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow explicit path checks

Browse Source
This commit is contained in:
Kashargul
2024-12-06 00:57:08 +01:00
committed by GitHub
parent 592c313c83
commit f7a221698c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/inventory.dm
+8 -5
View File
@@ -136,15 +136,18 @@
return 0
// This one takes an object's type instead of an instance, as above.
/mob/living/silicon/robot/proc/has_active_type(var/type_to_compare)
/mob/living/silicon/robot/proc/has_active_type(var/type_to_compare, var/explicit = FALSE)
var/list/active_modules = list(module_state_1, module_state_2, module_state_3)
if(is_type_in_modules(type_to_compare, active_modules))
if(is_type_in_modules(type_to_compare, active_modules, explicit))
return TRUE
return FALSE
/mob/living/silicon/robot/proc/is_type_in_modules(var/type, var/list/modules)
for(var/module in modules)
if(istype(module, type))
/mob/living/silicon/robot/proc/is_type_in_modules(var/type, var/list/modules, var/explicit = FALSE)
for(var/atom/module in modules)
if(explicit && isatom(module))
if(module.type == type)
return TRUE
else if(istype(module, type))
return TRUE
return FALSE
code/modules/mob/living/silicon/robot/robot.dm
+2
View File
@@ -343,6 +343,8 @@
if(module)
var/list/module_sprites = SSrobot_sprites.get_module_sprites(module, src)
if(module_sprites.len == 1 || !client)
if(!module_sprites.len)
return
sprite_datum = module_sprites[1]
sprite_datum.do_equipment_glamour(module)
return