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 remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
This commit is contained in:
PsiOmegaDelta
2015-09-11 08:38:28 +02:00
parent c7ae067701 c0546f01c4
commit f81ac77884
16 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/unsorted.dm
View File

@@ -613,7 +613,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
else return get_step(ref, base_dir)
/proc/do_mob(var/mob/user, var/mob/target, var/delay, var/numticks = 5, var/needhand = 1) //This is quite an ugly solution but i refuse to use the old request system.
/proc/do_mob(var/mob/user, var/mob/target, var/delay = 30, var/numticks = 5, var/needhand = 1) //This is quite an ugly solution but i refuse to use the old request system.
if(!user || !target) return 0
if(numticks == 0) return 0