cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Devour Fixes Pt. 5 (#4782)

Browse Source 
Fixes #4780.
Fixes an issue where SA adult slimes were improperly considered organic mobs.
Fixes an issue where viscerators, malf drones, and spiderbots were not considered synthetic mobs.
This commit is contained in:
Lohikar
2018-05-22 01:20:57 +03:00
committed by Erki
parent 2f175e8a72
commit bf2f6fb28d
5 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_helpers.dm
+9 -5
View File
@@ -1040,19 +1040,23 @@ proc/is_blind(A)
// It's not worth adding a proc for every single one of these types.
/mob/living/simple_animal/find_type()
. = ..()
if (is_type_in_typecache(src, global.mtl_synthetic))
if (is_type_in_typecache(src, SSmob.mtl_synthetic))
. |= TYPE_SYNTHETIC
if (is_type_in_typecache(src, global.mtl_weird))
if (is_type_in_typecache(src, SSmob.mtl_weird))
. |= TYPE_WEIRD
// If it's not TYPE_SYNTHETIC or TYPE_WEIRD, we can assume it's TYPE_ORGANIC.
if (!(. & (TYPE_SYNTHETIC|TYPE_WEIRD)))
if (is_type_in_typecache(src, SSmob.mtl_incorporeal))
. |= TYPE_INCORPOREAL
// If it's not TYPE_SYNTHETIC, TYPE_WEIRD or TYPE_INCORPOREAL, we can assume it's TYPE_ORGANIC.
if (!(. & (TYPE_SYNTHETIC|TYPE_WEIRD|TYPE_INCORPOREAL)))
. |= TYPE_ORGANIC
if (is_type_in_typecache(src, global.mtl_humanoid))
if (is_type_in_typecache(src, SSmob.mtl_humanoid))
. |= TYPE_HUMANOID
/mob/living/proc/get_vessel(create = FALSE)
if (!create)
return