cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofResearchAndPrototypes

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
This commit is contained in:
Kelenius
2015-05-25 20:35:46 +03:00
parent 5be2bd6a1b b934258adc
commit ea12fc664f
113 changed files with 2503 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/shards.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC || (H.species.siemens_coefficient<0.5)) //Thick skin.
if(H.species.siemens_coefficient<0.5) //Thick skin.
return
if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )