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 7de9222d9e0..c07e7088f9e 100644
Binary files a/icons/mob/human_races/r_diona.dmi and b/icons/mob/human_races/r_diona.dmi differ