-
Notifications
You must be signed in to change notification settings - Fork 232
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Three player rendering fixes (#4068)
* Resize human_face.dmi from 32x48 to 32x32 * Fix spin dancing breaking the dancer's transform (shrinking giants) * Fix layer issue with Floran / Pod People hair * dumbass * fix integration test runtime * Fix bad crop which was breaking long hairstyles * midway * Improve bad icon check and resize some moth icons * remove testing check * Documentation * Turn off delayed height filters in the preferences window * wow I can't read
- Loading branch information
Showing
14 changed files
with
111 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
monkestation/code/modules/mob/living/living_update_icons.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/** | ||
* Used to restore the mob's transform when it is in an undefined state | ||
* If the mob's transform is not messed up just use update_transform() | ||
*/ | ||
/mob/living/proc/rebuild_transform() | ||
var/matrix/ntransform = matrix() | ||
|
||
/** | ||
* pixel x/y/w/z all discard values after the decimal separator. | ||
* That, coupled with the rendered interpolation, may make the | ||
* icons look awfuller than they already are, or not, whatever. | ||
* The solution to this nit is translating the missing decimals. | ||
* also flooring increases the distance from 0 for negative numbers. | ||
*/ | ||
var/abs_pixel_y_offset = 0 | ||
|
||
if(lying_angle && rotate_on_lying) | ||
ntransform.Turn(lying_angle) | ||
|
||
if(current_size != RESIZE_DEFAULT_SIZE) | ||
ntransform.Scale(current_size) | ||
|
||
//Update final_pixel_y so our mob doesn't go out of the southern bounds of the tile when standing | ||
if(!lying_angle || !rotate_on_lying) //But not if the mob has been rotated. | ||
//Make sure the body position y offset is also updated | ||
body_position_pixel_y_offset = get_pixel_y_offset_standing(current_size) | ||
abs_pixel_y_offset = abs(body_position_pixel_y_offset) | ||
var/new_translate = (abs_pixel_y_offset - round(abs_pixel_y_offset)) * SIGN(body_position_pixel_y_offset) | ||
if(new_translate) | ||
ntransform.Translate(0, new_translate) | ||
|
||
//Update the height of the maptext according to the size of the mob so they don't overlap. | ||
var/old_maptext_offset = body_maptext_height_offset | ||
body_maptext_height_offset = initial(maptext_height) * (current_size - 1) * 0.5 | ||
maptext_height += body_maptext_height_offset - old_maptext_offset | ||
|
||
var/pixel_y = base_pixel_y + body_position_pixel_y_offset | ||
|
||
SEND_SIGNAL(src, COMSIG_PAUSE_FLOATING_ANIM, 0.3 SECONDS) | ||
animate(src, transform = ntransform, time = 0, pixel_y = pixel_y, dir = dir, easing = NONE) | ||
SEND_SIGNAL(src, COMSIG_LIVING_POST_UPDATE_TRANSFORM, TRUE, lying_angle, TRUE) |
32 changes: 32 additions & 0 deletions
32
monkestation/code/modules/surgery/organs/external/_external_organs.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/datum/bodypart_overlay/mutant/pod_hair/get_overlay(layer, obj/item/bodypart/limb) | ||
layer = -HAIR_LAYER | ||
var/mutable_appearance/MA = mutable_appearance(layer = layer) | ||
for(var/image_layer in list(-BODY_ADJ_LAYER, -BODY_FRONT_LAYER)) | ||
var/mutable_appearance/returned = get_image(image_layer, limb) | ||
color_image(returned, image_layer, limb) | ||
MA.overlays += returned | ||
return MA | ||
|
||
/datum/bodypart_overlay/mutant/pod_hair/get_image(image_layer, obj/item/bodypart/limb) | ||
if(!sprite_datum) | ||
CRASH("Trying to call get_image() on [type] while it didn't have a sprite_datum. This shouldn't happen, report it as soon as possible.") | ||
|
||
var/list/icon_state_builder = list() | ||
icon_state_builder += "m" //Male is default because sprite accessories are so ancient they predate the concept of not hardcoding gender | ||
icon_state_builder += feature_key | ||
icon_state_builder += get_base_icon_state() | ||
icon_state_builder += mutant_bodyparts_layertext(image_layer) | ||
|
||
var/icon = sprite_datum.icon | ||
var/finished_icon_state = icon_state_builder.Join("_") | ||
|
||
if(image_layer == -BODY_ADJ_LAYER && istype(limb, /obj/item/bodypart/head/floran)) | ||
icon = 'monkestation/icons/mob/species/floran/floran_hair.dmi' | ||
finished_icon_state = get_base_icon_state() | ||
|
||
var/mutable_appearance/appearance = mutable_appearance(icon, finished_icon_state, layer = -HAIR_LAYER) | ||
|
||
if(sprite_datum.center) | ||
center_image(appearance, sprite_datum.dimension_x, sprite_datum.dimension_y) | ||
|
||
return appearance |
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+729 Bytes
(210%)
monkestation/icons/mob/species/tundramoths/moth_antennae.dmi
Binary file not shown.
Binary file modified
BIN
+541 Bytes
(200%)
monkestation/icons/mob/species/tundramoths/moth_markings.dmi
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters