diff --git a/code/game/dna.dm b/code/game/dna.dm index 70e8e8a6baf..73b8de76a74 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -198,9 +198,17 @@ if (!output) output = "5" return output -/proc/isblockon(hnumber, bnumber) +/proc/isblockon(hnumber, bnumber , var/UI = 0) + var/temp2 temp2 = hex2num(hnumber) + + if(UI) + if(temp2 >= 2050) + return 1 + else + return 0 + if (bnumber == HULKBLOCK || bnumber == TELEBLOCK) if (temp2 >= 3500 + BLOCKADD) return 1 @@ -211,6 +219,8 @@ return 1 else return 0 + + if (temp2 >= 2050 + BLOCKADD) return 1 else @@ -275,7 +285,7 @@ /////////////////////////// DNA HELPER-PROCS /////////////////////////// DNA MISC-PROCS -/proc/updateappearance(mob/M as mob,structure) +/proc/updateappearance(mob/M as mob , structure) if(istype(M, /mob/living/carbon/human)) M.dna.check_integrity() var/mob/living/carbon/human/H = M @@ -290,7 +300,7 @@ H.g_eyes = hex2num(getblock(structure,9,3)) H.b_eyes = hex2num(getblock(structure,10,3)) - if (isblockon(getblock(structure, 11,3),11)) + if (isblockon(getblock(structure, 11,3),11 , 1)) H.gender = FEMALE else H.gender = MALE diff --git a/code/modules/mob/living/silicon/robot/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/robot_upgrades.dm index ad15c948af9..5b8217cd07a 100644 --- a/code/modules/mob/living/silicon/robot/robot_upgrades.dm +++ b/code/modules/mob/living/silicon/robot/robot_upgrades.dm @@ -65,6 +65,10 @@ if(ghost.corpse == R && ghost.client) ghost.client.mob = ghost.corpse + if(R.health < 0) + usr << "You have to repair the borg before using this module!" + return 0 + R.stat = 0 return 1