cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom borg sprites (#15253)

Browse Source
This commit is contained in:
Wildkins
2022-12-08 11:11:55 -05:00
committed by GitHub
parent b606e55768
commit e01a0e48b8
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+16 -5
View File
@@ -287,8 +287,14 @@
if(custom_sprite)
var/datum/custom_synth/sprite = robot_custom_icons[name]
var/list/valid_states = icon_states(CUSTOM_ITEM_SYNTH)
if("[sprite.synthicon]-[mod_type]" in valid_states)
module_sprites["Custom"] = "[sprite.synthicon]-[mod_type]"
var/custom_iconpath = "[sprite.synthicon]-[mod_type]"
if(custom_iconpath in valid_states)
module_sprites["Custom"] = list(
ROBOT_CHASSIS = custom_iconpath,
ROBOT_EYES = custom_iconpath,
ROBOT_PANEL = custom_iconpath,
ROBOT_ICON = CUSTOM_ITEM_SYNTH
)
icon = CUSTOM_ITEM_SYNTH
icontype = "Custom"
else
@@ -378,7 +384,7 @@
custom_name = newname
updatename()
if(custom_sprite)
if(custom_sprite && module)
set_module_sprites(module.sprites) // custom synth icons
SSrecords.reset_manifest()
@@ -1084,8 +1090,11 @@
else
var/list/options = list()
for(var/i in module_sprites) // Gottverdamnt.
var/image/radial_button = image(icon = src.icon, icon_state = module_sprites[i][ROBOT_CHASSIS])
radial_button.overlays.Add(image(icon = src.icon, icon_state = "[module_sprites[i][ROBOT_EYES]]-eyes_help"))
var/icon/btn_icon = module_sprites[i][ROBOT_ICON]
if(!btn_icon)
btn_icon = initial(icon)
var/image/radial_button = image(btn_icon, icon_state = module_sprites[i][ROBOT_CHASSIS])
radial_button.overlays.Add(image(btn_icon, icon_state = "[module_sprites[i][ROBOT_EYES]]-eyes_help"))
options[i] = radial_button
icontype = show_radial_menu(src, src, options, radius = 42, tooltips = TRUE)
@@ -1093,6 +1102,8 @@
return
icon_state = module_sprites[icontype][ROBOT_CHASSIS]
if(!module_sprites[icontype][ROBOT_ICON])
icon = initial(icon)
icon_selected = TRUE
setup_icon_cache()
code/modules/mob/living/silicon/robot/robot_helpers.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/eye_layer = src.layer
if(lights_on && layer == MOB_LAYER) // in case you're hiding. so eyes don't go through tables.
eye_layer = EFFECTS_ABOVE_LIGHTING_LAYER //make them glow in the dark if the lamp is on
var/eyeprefix = custom_sprite ? module_sprites[icontype] : module_sprites[icontype][ROBOT_EYES]
var/eyeprefix = module_sprites[icontype][ROBOT_EYES]
if(speed == -2) // For combat drones with the mobility module.
cached_eye_overlays = list(
I_HELP = image(icon, "[eyeprefix]-roll-eyes_help", layer = eye_layer),