cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10017 from Heroman3003/bubblefix

Browse Source 
Makes typing indicators scale again
This commit is contained in:
Novacat
2021-03-25 13:57:44 -04:00
committed by Chompstation Bot
parent ceb72dd0ec
commit 9143373aa3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/typing_indicator.dm
View File

@@ -1,18 +1,20 @@
/proc/generate_speech_bubble(var/bubble_loc, var/speech_state, var/set_layer = FLOAT_LAYER) /proc/generate_speech_bubble(var/bubble_loc, var/speech_state, var/set_layer = FLOAT_LAYER)
var/image/I = image('icons/mob/talk_vr.dmi', bubble_loc, speech_state, set_layer) //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons var/image/I = image('icons/mob/talk_vr.dmi', bubble_loc, speech_state, set_layer) //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
I.appearance_flags |= (KEEP_APART|RESET_COLOR|PIXEL_SCALE) I.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) //VOREStation Edit
/* //VOREStation Removal Start
if(istype(bubble_loc, /atom/movable)) if(istype(bubble_loc, /atom/movable))
var/atom/movable/AM = bubble_loc var/atom/movable/AM = bubble_loc
var/x_scale = AM.get_icon_scale_x() var/x_scale = AM.get_icon_scale_x()
if(abs(x_scale) < 2) // reset transform on bubbles, except for the Very Large if(abs(x_scale) < 2) // reset transform on bubbles, except for the Very Large
I.pixel_z = (AM.icon_expected_height * (x_scale-1)) I.pixel_z = (AM.icon_expected_height * (x_scale-1))
I.appearance_flags |= RESET_TRANSFORM I.appearance_flags |= RESET_TRANSFORM
*/ //VOREStation Removal Start
return I return I
/mob/proc/init_typing_indicator(var/set_state = "typing") /mob/proc/init_typing_indicator(var/set_state = "typing")
typing_indicator = new typing_indicator = new
typing_indicator.appearance = generate_speech_bubble(null, set_state) typing_indicator.appearance = generate_speech_bubble(null, set_state)
typing_indicator.appearance_flags |= (KEEP_APART|RESET_COLOR|RESET_TRANSFORM|PIXEL_SCALE) typing_indicator.appearance_flags |= (RESET_COLOR|PIXEL_SCALE) //VOREStation Edit
/mob/proc/set_typing_indicator(var/state) //Leaving this here for mobs. /mob/proc/set_typing_indicator(var/state) //Leaving this here for mobs.