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

Merge github.com:Baystation12/Baystation12

Browse Source 
Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
This commit is contained in:
cib
2012-05-29 13:43:20 +02:00
parent 0799cddb4b 115e1205a0
commit 3a74270e29
119 changed files with 12083 additions and 10356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/projectile/change.dm
View File

@@ -48,6 +48,6 @@
M:Alienize()
if("human")
if (M.monkeyizing)
return
return
return