Merge pull request #12035 from AnturK/resizefix

Fixes Larva/Silicon resizing
This commit is contained in:
Razharas
2015-09-30 23:09:18 +03:00
4 changed files with 16 additions and 2 deletions
@@ -22,6 +22,7 @@
icon_state = "larva[state]"
/mob/living/carbon/alien/larva/update_transform() //All this is handled in update_icons()
..()
return update_icons()
/mob/living/carbon/alien/larva/update_inv_handcuffed()
@@ -204,4 +204,5 @@
canmove = 0
else
canmove = 1
update_transform()
return canmove
@@ -1155,4 +1155,4 @@
if(2) //New Module
connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.</span><br>"
if(3) //New Name
connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].</span><br>"
connected_ai << "<br><br><span class='notice'>NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].</span><br>"
+13 -1
View File
@@ -448,4 +448,16 @@
/mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
if(affect_silicon)
return ..()
return ..()
/mob/living/silicon/update_transform()
var/matrix/ntransform = matrix(transform) //aka transform.Copy()
var/changed = 0
if(resize != RESIZE_DEFAULT_SIZE)
changed++
ntransform.Scale(resize)
resize = RESIZE_DEFAULT_SIZE
if(changed)
animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT)
return ..()