cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00: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

29
code/game/objects/items/weapons/grenades/chem_grenade.dm
View File

@@ -69,17 +69,14 @@
path = 1
if(beakers.len)
user << "\blue You lock the assembly."
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3)
name = "grenade"
icon_state = initial(icon_state) +"_locked"
stage = 2
else
// user << "\red You need to add at least one beaker before locking the assembly."
user << "\blue You lock the empty assembly."
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3)
name = "fake grenade"
icon_state = initial(icon_state) +"_locked"
stage = 2
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3)
icon_state = initial(icon_state) +"_locked"
stage = 2
else if(stage == 2)
if(active && prob(95))
user << "\red You trigger the assembly!"
@@ -114,8 +111,9 @@
if(detonator)
usr << "With attached [detonator.name]"
activate()
activate(mob/user as mob)
if(active) return
if(detonator)
if(!isigniter(detonator.a_left))
detonator.a_left.activate()
@@ -126,6 +124,11 @@
if(active)
icon_state = initial(icon_state) + "_active"
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]")
return
proc/primed(var/primed = 1)
@@ -195,9 +198,11 @@
B2.reagents.add_reagent("foaming_agent", 10)
B2.reagents.add_reagent("pacid", 10)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
icon_state = "grenade"
icon_state = initial(icon_state) +"_locked"
/obj/item/weapon/grenade/chem_grenade/incendiary
name = "Incendiary Grenade"
@@ -214,9 +219,11 @@
B2.reagents.add_reagent("plasma", 25)
B2.reagents.add_reagent("sacid", 25)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
icon_state = "grenade"
icon_state = initial(icon_state) +"_locked"
/obj/item/weapon/grenade/chem_grenade/cleaner
name = "Cleaner Grenade"
@@ -233,6 +240,8 @@
B2.reagents.add_reagent("water", 40)
B2.reagents.add_reagent("cleaner", 10)
detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
beakers += B1
beakers += B2
icon_state = "grenade"
icon_state = initial(icon_state) +"_locked"

19
code/game/objects/items/weapons/grenades/grenade.dm
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)