From 513f59ea9272b67c3e3cc547b853e840251ff58c Mon Sep 17 00:00:00 2001 From: Screemonster Date: Sun, 6 Oct 2019 20:14:26 +0100 Subject: [PATCH] chimera examinetext --- .../mob/living/carbon/human/examine.dm | 1 + .../mob/living/carbon/human/examine_vr.dm | 37 ++++++++++++++++++ code/modules/reagents/Chemistry-Recipes_vr.dm | 1 + icons/mob/chimerahud.dmi | Bin 0 -> 830 bytes 4 files changed, 39 insertions(+) create mode 100644 icons/mob/chimerahud.dmi diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 8c687e8de6..dad9e0f41d 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -295,6 +295,7 @@ msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code msg += attempt_vr(src,"examine_nif",args) //VOREStation Code + msg += attempt_vr(src,"examine_chimera",args) //VOREStation Code if(mSmallsize in mutations) msg += "[T.He] [T.is] very short!
" diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index fd6a426447..8f12f28d1f 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -155,3 +155,40 @@ /mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H) if(nif && nif.examine_msg) //If you have one set, anyway. return "[nif.examine_msg]\n" + +/mob/living/carbon/human/proc/examine_chimera(mob/living/carbon/human/H) + var/t_He = "It" //capitalised for use at the start of each line. + var/t_his = "its" + var/t_His = "Its" + var/t_appear = "appears" + var/t_has = "has" + switch(identifying_gender) //Gender is their "real" gender. Identifying_gender is their "chosen" gender. + if(MALE) + t_He = "He" + t_His = "His" + t_his = "his" + if(FEMALE) + t_He = "She" + t_His = "Her" + t_his = "her" + if(PLURAL) + t_He = "They" + t_His = "Their" + t_his = "their" + t_appear = "appear" + t_has = "have" + if(NEUTER) + t_He = "It" + t_His = "Its" + t_his = "its" + if(HERM) + t_He = "Shi" + t_His = "Hir" + t_his = "hir" + if(revive_ready == REVIVING_NOW || revive_ready == REVIVING_DONE) + if(stat == DEAD) + return "[t_His] body is twitching subtly.\n" + else + return "[t_He] [t_appear] to be in some sort of torpor.\n" + if(feral) + return "[t_He] [t_has] a crazed, wild look in [t_his] eyes!\n" \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index ac8fa9a7f2..c6d948ac35 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -59,6 +59,7 @@ if(H.stat == DEAD && (/mob/living/carbon/human/proc/reconstitute_form in H.verbs)) //no magical regen for non-regenners, and can't force the reaction on live ones if(H.hasnutriment()) // make sure it actually has the conditions to revive if(H.revive_ready >= 1) // if it's not reviving, start doing so + H.revive_ready = REVIVING_READY // overrides the normal cooldown H.visible_message("[H] shudders briefly, then relaxes, faint movements stirring within.") H.chimera_regenerate() else if (/mob/living/carbon/human/proc/hatch in H.verbs)// already reviving, check if they're ready to hatch diff --git a/icons/mob/chimerahud.dmi b/icons/mob/chimerahud.dmi new file mode 100644 index 0000000000000000000000000000000000000000..890ee10cebef394b2a914049d3a79312360bf49c GIT binary patch literal 830 zcmV-E1Ht@>P)9*3KQ_WNL$Fj{#9Cgn97CBZFpw-UkyTm$%rn5i zz%%YN?*IS*0d!JMQvg8b*k%9#0FZiASad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1 zxSMjGG_((;}xx>)a)%B-DMDd{06UK2Im`8q*Q{WW&nFSlmqcIb6z69X3<5>s3 zOvX-=3!iEJIi~~9IIwjWH=4;#m&uv*9swuC69+cV8Z(;3EsHTODF8TWo*IPj-RKu@ zoLQD7`3(Rk&2uaGSb1H|x~?Cq&#j=uN%PdeTIbn@8*tuRn;MikX`UK{Z{rE}uFML` zoHS1#Blg?ITR6pUe#<=QfYXuZHUeL7miczQU9Z`V1UT*a*;WpG=Ch5AIMIWjccXc} zt?oG9{Ax4V~^fklZ&i#gXPRFOA$Y}eS~O|`Dy)z#J2^}7<0c*x5IK>nA&CGs;1 zG+%)HFFT%ffb&H;|I2}A9N>IW&i|r#;sEE1a{d?1wE>zhQ2rOq69X_`p!_eIXI4<0 zFHrs$%@YGKU!eRinkNQezJU2(jy!!#(R=~(zwCK#qoMg?K>1(f!B1KRnlA>F|3xA% zbvra)3@HCci#gXPp1l71qymfWy66C|e@d^v5W2d$y1FU|{yqP0{qQb{hcvRFUH)(3 zK!^Na-+@&AukAod{;%smY5uQnp!0u&6&&+_bpxIMs~hP2U->a2o&T$E1Ulyb23wi- z`M*gsB6{TiR{iwLVy@pOjutWhH~fP>zHnOB|1xP@zw5v06W4kt0AK