diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm index d84a34e89f0..63549e5b1aa 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm @@ -56,7 +56,7 @@ if (mutantrace) switch(mutantrace) - if("lizard","golem","metroid") + if("golem","metroid") overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]") if(face_standing) del(face_standing) @@ -66,6 +66,16 @@ del(stand_icon) if(lying_icon) del(lying_icon) + if("lizard") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]") + if(face_standing) + del(face_standing) + if(face_lying) + del(face_lying) + if(stand_icon) + del(stand_icon) + if(lying_icon) + del(lying_icon) if("plant") if(stat != 2) //if not dead, that is overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]") diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dmi b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dmi index e818779c206..5cb5c4b5c03 100644 Binary files a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dmi and b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dmi differ diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran_face.dmi b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran_face.dmi index 9e066874506..9835ba87647 100644 Binary files a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran_face.dmi and b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran_face.dmi differ diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index edd9aba5eab..840a5cbb826 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -191,4 +191,20 @@ I kind of like the right click only--the window version can get a little confusi src << "\green This vent is not connected to anything." else src << "\green You must be standing on or beside an open air vent to enter it." + return + +/mob/living/carbon/alien/humanoid/verb/regurgitate() + set name = "Regurgitate" + set desc = "Empties the contents of your stomach" + set category = "Alien" + + if(powerc()) + if(stomach_contents.len) + for(var/mob/M in src) + if(M in stomach_contents) + stomach_contents.Remove(M) + M.loc = loc + Paralyse(4) + for(var/mob/O in viewers(src, null)) + O.show_message(text("\green [src] hurls out the contents of their stomach!"), 1) return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 1358df19aa1..1f6ae9bead7 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -183,19 +183,3 @@ alien_invis = 0.0 src << "\green You are no longer invisible." return - -/mob/living/carbon/alien/humanoid/hunter/verb/regurgitate() - set name = "Regurgitate" - set desc = "Empties the contents of your stomach" - set category = "Alien" - - if(powerc()) - if(stomach_contents.len) - for(var/mob/M in src) - if(M in stomach_contents) - stomach_contents.Remove(M) - M.loc = loc - Paralyse(10) - for(var/mob/O in viewers(src, null)) - O.show_message(text("\green [src] hurls out the contents of their stomach!"), 1) - return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 061d15d1223..1daeb625c4e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -873,7 +873,7 @@ fat = "fat" if (mutations & HULK) - overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat]_[gender][!lying ? "_s" : "_l"]") if (mutations & COLD_RESISTANCE) overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!lying ? "_s" : "_l"]") @@ -886,7 +886,7 @@ if (mutantrace) switch(mutantrace) - if("lizard","golem","metroid") + if("golem","metroid") overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]") if(face_standing) del(face_standing) @@ -896,6 +896,16 @@ del(stand_icon) if(lying_icon) del(lying_icon) + if("lizard") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]") + if(face_standing) + del(face_standing) + if(face_lying) + del(face_lying) + if(stand_icon) + del(stand_icon) + if(lying_icon) + del(lying_icon) if("plant") if(stat != 2) //if not dead, that is overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]") diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi index 524093c8bc9..aca76b630a1 100644 Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ