cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

oversights with borg sprite refactor (#6638)

Browse Source
This commit is contained in:
kcin2001
2023-07-22 08:27:38 +02:00
committed by GitHub
parent 87824ead92
commit 6b5b341a49
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+1
View File
@@ -538,6 +538,7 @@
var/choice = tgui_input_list(M, "Choose your drink!", "Drink Choice", options)
if(src && choice && !M.stat && in_range(M,src))
icontype = options[choice]
selected_icon = module_sprites[icontype][SKIN_ICON_STATE] //CHOMPEdit - sprite selection refactor
var/active_sound = 'sound/effects/bubbles.ogg'
playsound(src.loc, "[active_sound]", 100, 0, 4)
to_chat(M, "<span class='filter_notice'>Your Tank now displays [choice]. Drink up and enjoy!</span>")
code/modules/mob/living/silicon/robot/robot.dm
+20 -4
View File
@@ -266,8 +266,16 @@
icontype = "Custom"
else
icontype = module_sprites[1]
selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
icon_state = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit Start- Spriteselector
icon_state = module_sprites[icontype][SKIN_ICON_STATE]
if (isnull(module_sprites[icontype][SKIN_OFFSET]))
pixel_x = 0
old_x = 0
default_pixel_x = 0
else
pixel_x = module_sprites[icontype][SKIN_OFFSET]
old_x = module_sprites[icontype][SKIN_OFFSET]
default_pixel_x = module_sprites[icontype][SKIN_OFFSET]//CHOMPEdit End
updateicon()
return module_sprites
@@ -1078,8 +1086,16 @@
else
transform_with_anim() //VOREStation edit end: sprite animation
selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
icon_state = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit Start - Spriteselector
icon_state = module_sprites[icontype][SKIN_ICON_STATE]
if (isnull(module_sprites[icontype][SKIN_OFFSET]))
pixel_x = 0
old_x = 0
default_pixel_x = 0
else
pixel_x = module_sprites[icontype][SKIN_OFFSET]
old_x = module_sprites[icontype][SKIN_OFFSET]
default_pixel_x = module_sprites[icontype][SKIN_OFFSET]//CHOMPEdit End
updateicon()
if (module_sprites.len > 1 && triesleft >= 1 && client)
modular_chomp/code/modules/mob/living/silicon/robot/robot_vr.dm
-8
View File
@@ -73,14 +73,6 @@
/mob/living/silicon/robot/proc/vr_sprite_check()
icon = module_sprites[icontype][SKIN_ICON]
if (isnull(module_sprites[icontype][SKIN_OFFSET]))
pixel_x = 0
old_x = 0
default_pixel_x = 0
else
pixel_x = module_sprites[icontype][SKIN_OFFSET]
old_x = module_sprites[icontype][SKIN_OFFSET]
default_pixel_x = module_sprites[icontype][SKIN_OFFSET]
if (isnull(module_sprites[icontype][SKIN_HEIGHT]))
vis_height = 32