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 #1119 from SkyMarshal/BugFixes

Browse Source 
Bug fixes
This commit is contained in:
Erthilo
2012-05-20 14:42:30 -07:00
parent 8d4d9fd20a 58570a0f65
commit eb599dd33a
20 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm
View File

@@ -37,6 +37,7 @@
updateappearance(O,O.dna.uni_identity)
O.loc = loc
O.viruses = viruses
O.s_tone = s_tone
viruses = list()
for(var/datum/disease/D in O.viruses)
D.affected_mob = O
@@ -47,6 +48,10 @@
client.mob = O
if(mind)
mind.transfer_to(O)
del(O.stand_icon) //Force it to update.
del(O.lying_icon)
O.update_body()
O.update_face()
spawn(1)

14
code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
View File

@@ -303,7 +303,12 @@
if ( istype(wear_suit, /obj/item/clothing/suit/bio_suit) || istype(wear_suit, /obj/item/clothing/suit/bomb_suit) || istype(wear_suit, /obj/item/clothing/suit/space) )
tail_shown = 0
if(tail_shown)
overlays += image("icon" = icon('tajaran.dmi', "tail_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
var/icon/tail_icon = image("icon" = icon('tajaran.dmi', "tail_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
if (s_tone >= 0)
tail_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
else
tail_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
overlays += tail_icon
if (lying)
if (face_lying)
@@ -339,7 +344,12 @@
var/datum/organ/external/head = organs["head"]
if(!head.destroyed)
//if not wearing anything on the head, show the ears
overlays += image("icon" = icon('tajaran.dmi', "ears_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
var/icon/ears_icon = image("icon" = icon('tajaran.dmi', "ears_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
if (s_tone >= 0)
ears_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
else
ears_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
overlays += ears_icon
// Belt
if (belt)