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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3

Browse Source 
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
This commit is contained in:
Datraen
2016-05-19 16:30:42 -04:00
parent ce6b574d67 861dc04e89
commit bb7713b2a8
200 changed files with 10329 additions and 8330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_macros.dm
View File

@@ -7,6 +7,8 @@
#define isanimal(A) istype(A, /mob/living/simple_animal)
#define isairlock(A) istype(A, /obj/machinery/door/airlock)
#define isbrain(A) istype(A, /mob/living/carbon/brain)
#define iscarbon(A) istype(A, /mob/living/carbon)