diff --git a/code/game/dna.dm b/code/game/dna.dm index 0ac3dad9ac..f5339294fa 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -361,28 +361,28 @@ if (!M) return //mutations /* - TK =(1<<0) - COLD_RESISTANCE =(1<<1) - XRAY =(1<<2) - HULK =(1<<3) - CLUMSY =(1<<4) - //FAT =(1<<5) - HUSK =(1<<6) - LASER =(1<<7) - HEAL =(1<<8) - mNobreath =(1<<9) - mRemote =(1<<10) - mRegen =(1<<11) - mRun =(1<<12) - mRemotetalk =(1<<13) - mMorph =(1<<14) - mBlend =(1<<15) + TK =(1<<0) 1 + COLD_RESISTANCE =(1<<1) 2 + XRAY =(1<<2) 4 + HULK =(1<<3) 8 + CLUMSY =(1<<4) 16 + //FAT =(1<<5) 32 + HUSK =(1<<6) 64 + LASER =(1<<7) 128 + HEAL =(1<<8) 256 + mNobreath =(1<<9) 512 + mRemote =(1<<10) 1024 + mRegen =(1<<11) 2048 + mRun =(1<<12) 4096 + mRemotetalk =(1<<13) 8192 + mMorph =(1<<14) 16384 + mBlend =(1<<15) 32768 mutations2: - mHallucination =(1<<0) - mFingerprints =(1<<1) - mShock =(1<<2) - mSmallsize =(1<<3) + mHallucination =(1<<0) 1 + mFingerprints =(1<<1) 2 + mShock =(1<<2) 4 + mSmallsize =(1<<3) 8 */ //disabilities diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 39ba8fc0b1..7cefc09859 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2806,6 +2806,9 @@ It can still be worn/put on as normal. var/list/mob/creatures = list() for(var/mob/living/carbon/h in world) + var/turf/temp_turf = get_turf(h) + if(temp_turf.z != 1 && temp_turf.z != 5) //Not on mining or the station. + continue creatures += h var/mob/target = input ("Who do you want to project your mind to ?") as mob in creatures diff --git a/html/changelog.html b/html/changelog.html index 55c829882d..c92a0151f6 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,7 @@ should be listed in the changelog upon commit though. Thanks. -->