From bd946b0ab1124696f70cee1784275587e923e470 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 28 Jan 2014 16:33:02 -0500 Subject: [PATCH] Fixes for new species --- code/WorkInProgress/ZomgPonies/karma.dm | 10 ++++++---- code/modules/client/client procs.dm | 13 +++++++++---- code/modules/mob/living/carbon/human/human.dm | 4 ++++ code/modules/mob/living/carbon/species.dm | 1 + code/modules/mob/new_player/new_player.dm | 2 ++ icons/mob/human_races/r_diona.dmi | Bin 2536 -> 2730 bytes 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/code/WorkInProgress/ZomgPonies/karma.dm b/code/WorkInProgress/ZomgPonies/karma.dm index 0212fc5067e..562139e92be 100644 --- a/code/WorkInProgress/ZomgPonies/karma.dm +++ b/code/WorkInProgress/ZomgPonies/karma.dm @@ -147,10 +147,12 @@ You've gained [totalkarma] total karma in your time here.
"} Unlock Nanotrasen Representative -- 15KP
Unlock Customs Officer -- 30KP
Unlock BlueShield -- 30KP
- Unlock Kidan -- 30KP
- Unlock Grey -- 30KP
- Unlock Vox -- 45KP
- Unlock Slime People -- 45KP
+
+ Unlock Machine People -- 15KP
+ Unlock Kidan -- 30KP
+ Unlock Grey -- 30KP
+ Unlock Vox -- 45KP
+ Unlock Slime People -- 45KP
PLEASE NOTE THAT PEOPLE WHO TRY TO GAME THE KARMA SYSTEM WILL END UP ON THE WALL OF SHAME. THIS INCLUDES BUT IS NOT LIMITED TO TRADES, OOC KARMA BEGGING, CODE EXPLOITS, ETC. "} diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index e0518fd2fd4..db856725acf 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -73,21 +73,26 @@ else src.DB_job_unlock("Blueshield",30) if("5") - if(karma <30) + if(karma <15) usr << "You do not have enough karma!" else - src.DB_species_unlock("Kidan",30) + src.DB_species_unlock("Machine",15) if("6") if(karma <30) usr << "You do not have enough karma!" else - src.DB_species_unlock("Grey",30) + src.DB_species_unlock("Kidan",30) if("7") + if(karma <30) + usr << "You do not have enough karma!" + else + src.DB_species_unlock("Grey",30) + if("8") if(karma <45) usr << "You do not have enough karma!" else src.DB_species_unlock("Vox",45) - if("8") + if("9") if(karma <45) usr << "You do not have enough karma!" else diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3e5b39b7fa7..00b1a4c3955 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -51,6 +51,10 @@ dna.mutantrace = "slime" ..() +/mob/living/carbon/human/machine/New() + species = new /datum/species/machine(src) + ..() + /mob/living/carbon/human/grey/New() set_species("Grey") mutations.Add(M_REMOTE_TALK) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index ab5fe842ace..8a37621e321 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -257,6 +257,7 @@ name = "Machine" icobase = 'icons/mob/human_races/r_machine.dmi' deform = 'icons/mob/human_races/r_machine.dmi' + path = /mob/living/carbon/human/machine language = "Tradeband" max_hurt_damage = 3 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 0d8c8d65c2e..ceabbc244e8 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -392,6 +392,8 @@ new_character = new /mob/living/carbon/human/kidan(loc) if("Grey") new_character = new /mob/living/carbon/human/grey(loc) + if("Machine") + new_character = new /mob/living/carbon/human/machine(loc) if("Human") new_character = new /mob/living/carbon/human/human(loc) // new_character.set_species(client.prefs.species) diff --git a/icons/mob/human_races/r_diona.dmi b/icons/mob/human_races/r_diona.dmi index 7de9222d9e046740bbbcb7626271d621f0da62d5..c07e7088f9eac2fda3802174ed8459b3b2116ecc 100644 GIT binary patch delta 2691 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 delta 2495 zcmV;w2|)I$73dQsiBL{Q4GJ0x0000DNk~Le0002s0002s2m=5B04?*H(*OVfGm#}C zD$(qnz`(!&W;3GLH5(fnzP`RZ9ssQ1z|#N#00DGTPE!Ct=GbNc0063yZYF=p(7b{% z*s)C=3uLvWZ(pY!I+bXl2ad4u1SG4#)d)55JIQ9(V za5x+ehr{7;I2;a#!{Im-@BaE~F9PLRfg35JV`=Rj&ou3Z z-heefTJY23SRo&bHPR`rW3Vt-*g9#g5?mo{B$w$qT0|@KlZMa5x+ehr{7;I2;a#!{K-V#CLyXwklHZ z1+gO1@&~wG_^rP5Zad;VL}zmY_PyWN3*o9LuSeAQ!<5?S=5K=&T+`(Tq z!LF|-{!ioYXnQio{}LW><}X9j4ORJ?@)LB#|0(*D>}KaY)K8OaTE@sf$~SI9^VJ2x;YcEa~XeK zgb1)x9RG8Iw>g8+_6~=`;cz${4u`|xa5x+ehvWHx;ovOgXQT3mMwy)wX$lIM{9Q*K zT5Mggqp7vyt1Vb-piC5xrD*()W+JETj87Zzt=&8Cg4qUJ*}X$Iy5!(Nn}oan?->>8npe3Rs* zL2@un%Ga5MN6B7DOG;xa{oy1&W#mX>9v1Y$vO4Moy?Gw3!wutf7u&$?BWidnLw-#JfL1=8cJ+T% zKeW^fRe;QqI~gF(vf&d0GUTAFs?)CEi+uSXc|U=)Svk_anisA9OLPNv!WnftjscbJGN)6TuiI`)`xB?S zlR#+gqiTVSbJjR%Ge+Bt`L?Yfzvh37M8pO0;pYkOIanAU*H7gO{_eDBS(TQ*QRiLU~=9`K% zhC~DEaWUalHt>o`K2v_lmsA}5t_?Y1$eB~ak(`E#H7OQG`cGPlNPF&n@e_YgkS;ZD zK{DY>{zeOQU`S+Fz4qNUFq4m?Mj#u5a9m{<&y64(i1pIDa_zs$-)MmW+Cp$*MY1u5 z<}goW7e;R4wx_OFzB6hXR_n5H>G~j~3-{dYCE6WS@+Bn{!{;iXD1qF{HkT`^WJ@Yg*OP4e&cNQ~De6wIQ8&%qcSuc+dd4NzdL_Yy6%H_g3jN`zuRH@ z{fd3uiP96T`)=RsLtD%5HD0uW+sN7qoQFMnaJazHxOFHorsU}+S{m5XOnrW$eIGp< z+&=AVZ^v$C6{j0$O+?+m*~J_?#y8{k_?K+w|BAIsC??i9K5$+d#%=oZuRg;5n3L2n zexL2`HvHk{{aa)ImY)CR