cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into buttbots2

Browse Source 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
This commit is contained in:
Tastyfish
2016-03-31 13:28:05 -04:00
parent fb9c883b90 38692feb95
commit 6a8ea815b2
245 changed files with 6723 additions and 4456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/pda/ai.dm
View File

@@ -85,5 +85,13 @@
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
return
/obj/item/device/pda/ai/pai
ttone = "assist"
/obj/item/device/pda/pai
icon_state = "NONE"
detonate = 0
ttone = "assist"
/obj/item/device/pda/pai/can_use()
var/mob/living/silicon/pai/pAI = usr
if(!istype(pAI))
return 0
return ..() && !pAI.silence_time