cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2755 from VOREStation/polaris-sync-2018-01-10

Browse Source 
Polaris Sync 2018 01 10
This commit is contained in:
Arokha Sieyes
2018-01-16 02:46:25 -05:00
committed by GitHub
parent 8c6da18e19 5d5f052eb7
commit 0a037f0fe0
15 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/organs/organ.dm
View File

@@ -108,7 +108,7 @@ var/list/organ_cache = list()
if(preserved)
return
//Process infections
if ((robotic >= ORGAN_ROBOT) || (owner && owner.species && (owner.species.flags & IS_PLANT)))
if(robotic >= ORGAN_ROBOT || (owner && owner.species && (owner.species.flags & IS_PLANT || (owner.species.flags & NO_INFECT))))
germ_level = 0
return

2
code/modules/organs/organ_external.dm
View File

@@ -605,7 +605,7 @@ Note that amputating the affected organ does in fact remove the infection from t
*/
/obj/item/organ/external/proc/update_germs()
if(robotic >= ORGAN_ROBOT || (owner.species && owner.species.flags & IS_PLANT)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
if(robotic >= ORGAN_ROBOT || (owner.species && (owner.species.flags & IS_PLANT || (owner.species.flags & NO_INFECT)))) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
germ_level = 0
return