cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Testing branching again

Browse Source
This commit is contained in:
Perakp
2013-10-27 10:37:29 +02:00
parent 1389603afb
commit cec73fb2af
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+5 -1
View File
@@ -34,6 +34,10 @@
proj.silenced = silenced
return
proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
user << "<span class='warning'>*click*</span>"
return
emp_act(severity)
for(var/obj/O in contents)
@@ -78,7 +82,7 @@
if(!special_check(user))
return
if(!load_into_chamber())
user << "<span class='warning'>*click*</span>"
shoot_with_empty_chamber(user)
return
if(!in_chamber)
code/modules/projectiles/guns/energy/special.dm
+5
View File
@@ -64,6 +64,11 @@ obj/item/weapon/gun/energy/staff
update_icon()
return
shoot_with_empty_chamber(mob/living/user as mob|obj)
user << "<span class='warning'>The [name] whizzles quietly.<span>"
return
/obj/item/weapon/gun/energy/staff/animate
name = "staff of animation"
desc = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines."