shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ports "examine-code refactor"... part 1...

Browse Source
This commit is contained in:
Ghommie
2019-11-19 03:28:06 +01:00
parent d9b24b20d1
commit a52e292cc8
204 changed files with 739 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/grenades/chem_grenade.dm
+5 -5
View File
@@ -27,19 +27,19 @@
/obj/item/grenade/chem_grenade/examine(mob/user)
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>")
. += "<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>")
. += "<span class='notice'>[R.volume] units of [R.name] in the [textcount] beaker.</span>"
if(beakers.len == 1)
to_chat(user, "<span class='notice'>You detect no second beaker in the grenade.</span>")
. += "<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>")
. += "<span class='notice'>You scan the grenade, but detect nothing.</span>"
/obj/item/grenade/chem_grenade/attack_self(mob/user)
code/game/objects/items/grenades/ghettobomb.dm
+2 -2
View File
@@ -56,5 +56,5 @@
qdel(src)
/obj/item/grenade/iedcasing/examine(mob/user)
..()
to_chat(user, "You can't tell when it will explode!")
. = ..()
. += "You can't tell when it will explode!"
code/game/objects/items/grenades/grenade.dm
+3 -3
View File
@@ -47,12 +47,12 @@
/obj/item/grenade/examine(mob/user)
..()
. = ..()
if(display_timer)
if(det_time > 1)
to_chat(user, "The timer is set to [DisplayTimeText(det_time)].")
. += "The timer is set to [DisplayTimeText(det_time)]."
else
to_chat(user, "\The [src] is set for instant detonation.")
. += "\The [src] is set for instant detonation."
/obj/item/grenade/attack_self(mob/user)