mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
Merge pull request #15519 from KillianKirilenko/kk-mini2
Scaling Center Up-port
This commit is contained in:
@@ -1247,6 +1247,8 @@
|
||||
maxHealth = species.total_health
|
||||
hunger_rate = species.hunger_factor //VOREStation Add
|
||||
|
||||
center_offset = species.center_offset
|
||||
|
||||
if(LAZYLEN(descriptors))
|
||||
descriptors = null
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
var/micro_size_mod = 0 // How different is our size for interactions that involve us being small?
|
||||
var/macro_size_mod = 0 // How different is our size for interactions that involve us being big?
|
||||
var/digestion_nutrition_modifier = 1
|
||||
var/center_offset = 0.5
|
||||
var/can_climb = FALSE
|
||||
var/climbing_delay = 1.5 // We climb with a quarter delay
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
female_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg','sound/effects/mob_effects/tesharicoughb.ogg')
|
||||
male_sneeze_sound = 'sound/effects/mob_effects/tesharisneeze.ogg'
|
||||
female_sneeze_sound = 'sound/effects/mob_effects/tesharisneeze.ogg'
|
||||
center_offset = 0
|
||||
|
||||
blood_color = "#D514F7"
|
||||
flesh_color = "#5F7BB0"
|
||||
|
||||
@@ -117,7 +117,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
||||
//Do any species specific layering updates, such as when hiding.
|
||||
update_icon_special()
|
||||
|
||||
/mob/living/carbon/human/update_transform()
|
||||
/mob/living/carbon/human/update_transform(var/instant = FALSE)
|
||||
/* VOREStation Edit START
|
||||
// First, get the correct size.
|
||||
var/desired_scale_x = icon_scale_x
|
||||
@@ -136,6 +136,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
||||
var/desired_scale_y = size_multiplier * icon_scale_y
|
||||
desired_scale_x *= species.icon_scale_x
|
||||
desired_scale_y *= species.icon_scale_y
|
||||
var/cent_offset = species.center_offset
|
||||
if(fuzzy || offset_override || dir == EAST || dir == WEST)
|
||||
cent_offset = 0
|
||||
vis_height = species.icon_height
|
||||
appearance_flags |= PIXEL_SCALE
|
||||
if(fuzzy)
|
||||
@@ -165,15 +168,19 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
||||
else
|
||||
M.Translate(1,-6)
|
||||
M.Scale(desired_scale_y, desired_scale_x)
|
||||
M.Translate(cent_offset * desired_scale_x, (vis_height/2)*(desired_scale_y-1))
|
||||
layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters
|
||||
else
|
||||
M.Scale(desired_scale_x, desired_scale_y)//VOREStation Edit
|
||||
M.Translate(0, (vis_height/2)*(desired_scale_y-1)) //VOREStation edit
|
||||
M.Translate(cent_offset * desired_scale_x, (vis_height/2)*(desired_scale_y-1))
|
||||
if(tail_style?.can_loaf) // VOREStation Edit: Taur Loafing
|
||||
update_tail_showing() // VOREStation Edit: Taur Loafing
|
||||
layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters
|
||||
|
||||
animate(src, transform = M, time = anim_time)
|
||||
if(instant)
|
||||
transform = M
|
||||
else
|
||||
animate(src, transform = M, time = anim_time)
|
||||
update_icon_special() //May contain transform-altering things
|
||||
|
||||
//DAMAGE OVERLAYS
|
||||
|
||||
@@ -1010,15 +1010,18 @@
|
||||
if(!isnull(M.icon_scale_y_percent))
|
||||
. *= M.icon_scale_y_percent
|
||||
|
||||
/mob/living/update_transform()
|
||||
/mob/living/update_transform(var/instant = FALSE)
|
||||
// First, get the correct size.
|
||||
var/desired_scale_x = size_multiplier * icon_scale_x //VOREStation edit
|
||||
var/desired_scale_y = size_multiplier * icon_scale_y //VOREStation edit
|
||||
var/cent_offset = center_offset
|
||||
|
||||
// Now for the regular stuff.
|
||||
if(fuzzy || offset_override || dir == EAST || dir == WEST)
|
||||
cent_offset = 0
|
||||
var/matrix/M = matrix()
|
||||
M.Scale(desired_scale_x, desired_scale_y)
|
||||
M.Translate(0, (vis_height/2)*(desired_scale_y-1)) //VOREStation edit
|
||||
M.Translate(cent_offset * desired_scale_x, (vis_height/2)*(desired_scale_y-1))
|
||||
src.transform = M //VOREStation edit
|
||||
handle_status_indicators()
|
||||
|
||||
@@ -1301,3 +1304,8 @@
|
||||
icon = 'icons/mob/screen/midnight.dmi'
|
||||
icon_state = "character"
|
||||
screen_loc = ui_smallquad
|
||||
|
||||
/mob/living/set_dir(var/new_dir)
|
||||
. = ..()
|
||||
if(size_multiplier != 1 || icon_scale_x != 1 && center_offset > 0)
|
||||
update_transform(TRUE)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
verbs |= /mob/living/proc/lick
|
||||
verbs |= /mob/living/proc/smell
|
||||
verbs |= /mob/living/proc/switch_scaling
|
||||
verbs |= /mob/living/proc/center_offset
|
||||
|
||||
if(!no_vore)
|
||||
verbs |= /mob/living/proc/vorebelly_printout
|
||||
|
||||
Reference in New Issue
Block a user