shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update species.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-14 09:23:24 -05:00
committed by GitHub
parent 49ffb814d5
commit 1fcfa019f3
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/carbon/human/species.dm
View File

@@ -66,12 +66,6 @@
var/obj/item/organ/lungs/mutantlungs = null
var/breathid = "o2"
<<<<<<< HEAD
//Flight and floating
var/override_float = 0
=======
>>>>>>> 8d647ff... Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes (#30570)
var/obj/item/organ/brain/mutant_brain = /obj/item/organ/brain
var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
@@ -1767,4 +1761,4 @@
#undef COLD_DAMAGE_LEVEL_1
#undef COLD_DAMAGE_LEVEL_2
#undef COLD_DAMAGE_LEVEL_3
#undef COLD_DAMAGE_LEVEL_3