Skip to content
This repository has been archived by the owner on Mar 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #30918 from Spookerton/spkrtn/fix/geckon't
Browse files Browse the repository at this point in the history
fix immense robot lizards
  • Loading branch information
Spookerton committed Jul 3, 2021
2 parents 2f34105 + 6a3430e commit c4816d8
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -201,23 +201,25 @@ Please contact me on #coderbus IRC. ~Carn x


/mob/living/carbon/human/proc/get_scale()
var/h_mul = LAZYACCESS(descriptors, "height")
if (h_mul)
var/height_modifier = 0
var/height_descriptor = LAZYACCESS(descriptors, "height")
if (height_descriptor)
var/datum/mob_descriptor/height/H = species.descriptors["height"]
if (H)
var/list/scale_effect = H.scale_effect[species.name]
if (scale_effect)
h_mul = 0.01 * scale_effect[h_mul]
var/b_mul = LAZYACCESS(descriptors, "build")
if (b_mul)
if (length(scale_effect))
height_modifier = 0.01 * scale_effect[height_descriptor]
var/build_modifier = 0
var/build_descriptor = LAZYACCESS(descriptors, "build")
if (build_descriptor)
var/datum/mob_descriptor/build/B = species.descriptors["build"]
if (B)
var/list/scale_effect = B.scale_effect[species.name]
if (scale_effect)
b_mul = 0.01 * scale_effect[b_mul]
if (length(scale_effect))
build_modifier = 0.01 * scale_effect[build_descriptor]
return list(
(1 + b_mul) * size_multiplier,
(1 + h_mul) * size_multiplier
(1 + build_modifier) * size_multiplier,
(1 + height_modifier) * size_multiplier
)

var/global/list/damage_icon_parts = list()
Expand Down

0 comments on commit c4816d8

Please sign in to comment.