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

made grenades great again

Browse Source
This commit is contained in:
Bobbahbrown
2018-09-18 12:30:58 -03:00
parent b7919009f4
commit c617a99bba
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/grenades/chem_grenade.dm
+7 -5
View File
@@ -29,18 +29,21 @@
display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state
..()
if(user.can_see_reagents())
var/count = 0
if(beakers.len)
to_chat(user, "<span class='notice'>You scan the grenade and detect the following reagents:</span>")
for(var/obj/item/reagent_containers/glass/G in beakers)
var/textcount = thtotext(++count)
for(var/datum/reagent/R in G.reagents.reagent_list)
to_chat(user, "<span class='notice'>[R.volume] units of [R.name] in the [textcount] beaker.</span>")
to_chat(user, "<span class='notice'>[R.volume] units of [R.name] in the [G.name].</span>")
if(beakers.len == 1)
to_chat(user, "<span class='notice'>You detect no second beaker in the grenade.</span>")
else
to_chat(user, "<span class='notice'>You scan the grenade, but detect nothing.</span>")
else if(stage != READY && beakers.len)
if(beakers.len == 2 && beakers[1].name == beakers[2].name)
to_chat(user, "<span class='notice'>You see two [beakers[1].name]s inside the grenade.</span>")
else
for(var/obj/item/reagent_containers/glass/G in beakers)
to_chat(user, "<span class='notice'>You see a [G.name] inside the grenade.</span>")
/obj/item/grenade/chem_grenade/attack_self(mob/user)
if(stage == READY && !active)
@@ -49,7 +52,6 @@
else
..()
/obj/item/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
if(stage == WIRED)