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

Merge branch 'master' of github.com:Baystation12/Baystation12

Browse Source
This commit is contained in:
Erthilo
2012-06-25 01:20:08 +01:00
parent bb8f21a431 156f1349c2
commit 390782f544
8 changed files with 82 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/weapons.dm
+7
View File
@@ -95,6 +95,13 @@
/atom/proc/blob_act()
return
/atom/proc/acid_act(var/datum/reagent/R)
return 0
/*/obj/proc/acid_act(var/datum/reagent/R)
return 0
/mob/proc/acid_act(var/datum/reagent/R)
return 0*/
// bullet_act called when anything is hit buy a projectile (bullet, tazer shot, laser, etc.)
// flag is projectile type, can be:
//PROJECTILE_TASER = 1 taser gun