[MIRROR] fixes code that makes resting borgs show missing sprite error (#10735)

Co-authored-by: Asher 49 <asherdehanna@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-04-24 09:34:30 -07:00
committed by GitHub
parent 609437fc92
commit 9ab4e3681d
22 changed files with 41 additions and 4 deletions

View File

@@ -196,9 +196,15 @@ SUBSYSTEM_DEF(robot_sprites)
if(findtext(icon, regex("-disabler")))
RS.sprite_flags |= ROBOT_HAS_DISABLER_SPRITE
continue
if(findtext(icon, regex("-rest-eyes")))
RS.has_rest_eyes_sprites = TRUE
continue
if(findtext(icon, regex("-eyes")))
RS.has_eye_sprites = TRUE
continue
if(findtext(icon, regex("-rest-lights")))
RS.has_rest_lights_sprites = TRUE
continue
if(findtext(icon, regex("-lights")))
RS.has_eye_light_sprites = TRUE
continue

View File

@@ -17,6 +17,8 @@
var/has_vore_struggle_sprite = FALSE
var/max_belly_size = 1 //If larger bellies are made, set this to the value of the largest size
var/has_rest_sprites = FALSE
var/has_rest_eyes_sprites = FALSE
var/has_rest_lights_sprites = FALSE
var/list/rest_sprite_options
var/has_dead_sprite = FALSE
var/has_dead_sprite_overlay = FALSE
@@ -139,14 +141,18 @@
/datum/robot_sprite/proc/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
if(!(ourborg.resting && has_rest_sprites))
return "[sprite_icon_state]-eyes"
else if(ourborg.resting && has_rest_sprites)
else if(ourborg.resting && has_rest_eyes_sprites)
return "[get_rest_sprite(ourborg)]-eyes"
else
return
/datum/robot_sprite/proc/get_eye_light_overlay(var/mob/living/silicon/robot/ourborg)
if(!(ourborg.resting && has_rest_sprites))
return "[sprite_icon_state]-lights"
else if(ourborg.resting && has_rest_sprites)
else if(ourborg.resting && has_rest_lights_sprites)
return "[get_rest_sprite(ourborg)]-lights"
else
return
// This can not use the get_rest_sprite function as it could use belly overlays as decals
/datum/robot_sprite/proc/get_robotdecal_overlay(var/mob/living/silicon/robot/ourborg, var/type)

View File

@@ -322,6 +322,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
sprite_decals = list("breastplate", "loincloth","loinclothbreastplate","eyecover")
pixel_x = 0
icon_x = 32
@@ -338,8 +340,8 @@
icon_x = 64
pixel_x = -16
/datum/robot_sprite/dogborg/tall/service/dullahan/servicealt3
name = "Dullahan v4 matcha"
/datum/robot_sprite/dogborg/tall/service/dullahanv3/servicealt3
name = "Dullahan v3 matcha"
sprite_icon = 'icons/mob/robot/dullahan/v3/barista.dmi'
sprite_icon_state = "dullahanbarista"
sprite_decals = list("decals")

View File

@@ -230,6 +230,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
icon_x = 32
pixel_x = 0

View File

@@ -213,6 +213,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
rest_sprite_options = list("Default", "Sit")
sprite_decals = list("breastplate", "eyecover")
icon_x = 32

View File

@@ -149,6 +149,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
rest_sprite_options = list("Default", "Sit")
sprite_decals = list("breastplate","loincloth","eyecover")
icon_x = 32

View File

@@ -196,6 +196,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
sprite_decals = list("breastplate","loincloth","eyecover")
rest_sprite_options = list("Default", "sit")
icon_x = 32
@@ -221,6 +223,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
rest_sprite_options = list("Default", "Sit")
sprite_decals = list("breastplate","eyecover")
icon_x = 32

View File

@@ -219,6 +219,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
sprite_hud_icon_state = "sci-borg"
rest_sprite_options = list("Default", "Sit")
sprite_decals = list("breastplate","loincloth","eyecover")

View File

@@ -227,6 +227,8 @@
has_rest_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
rest_sprite_options = list("Default", "Sit")
icon_x = 32
pixel_x = 0

View File

@@ -75,6 +75,9 @@
sprite_icon_state = "dullahansyndi"
has_eye_light_sprites = TRUE
has_vore_belly_sprites = TRUE
has_vore_belly_resting_sprites = TRUE
has_rest_lights_sprites = TRUE
has_rest_eyes_sprites = TRUE
rest_sprite_options = list("Default", "Sit")
sprite_decals = list("breastplate","loincloth","eyecover")
icon_x = 32

View File

@@ -178,6 +178,12 @@
if(RS.has_glow_sprites)
if(check_state(RS,"-[rest_style]-glow"))
failed = TRUE
if(RS.has_rest_lights_sprites)
if(check_state(RS,"-[rest_style]-lights"))
failed = TRUE
if(RS.has_rest_eyes_sprites)
if(check_state(RS,"-[rest_style]-eyes"))
failed = TRUE
// death
if(RS.has_dead_sprite)
if(check_state(RS,"-wreck"))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB