cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

added new assembled timer-igniter assembly and added that to default chem-grenades

Browse Source
This commit is contained in:
Ater Ignis
2012-11-01 17:49:21 +04:00
parent f4f3beeacb
commit e79df68ef3
3 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/grenade.dm
+8 -11
View File
@@ -16,11 +16,7 @@
if((CLUMSY in user.mutations) && prob(50))
user << "<span class='warning'>Huh? How does this thing work?</span>"
log_attack("<font color='red'>[user.name] ([user.ckey]) clumsily primed \a [src]</font>")
log_admin("ATTACK: [user] ([user.ckey]) clumsily primed \a [src]")
message_admins("ATTACK: [user] ([user.ckey]) clumsily primed \a [src]")
activate()
activate(user)
add_fingerprint(user)
spawn(5)
prime()
@@ -60,11 +56,7 @@
if(clown_check(user))
user << "<span class='warning'>You prime \the [name]! [det_time/10] seconds!</span>"
log_attack("<font color='red'>[user.name] ([user.ckey]) primed \a [src].</font>")
log_admin("ATTACK: [user] ([user.ckey]) primed \a [src].")
message_admins("ATTACK: [user] ([user.ckey]) primed \a [src].")
activate()
activate(user)
add_fingerprint(user)
if(iscarbon(user))
var/mob/living/carbon/C = user
@@ -72,10 +64,15 @@
return
/obj/item/weapon/grenade/proc/activate()
/obj/item/weapon/grenade/proc/activate(mob/user as mob)
if(active)
return
if(user)
log_attack("<font color='red'>[user.name] ([user.ckey]) primed \a [src]</font>")
log_admin("ATTACK: [user] ([user.ckey]) primed \a [src]")
message_admins("ATTACK: [user] ([user.ckey]) primed \a [src]")
icon_state = initial(icon_state) + "_active"
active = 1
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)