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

Improve extended examination text for many objects (#31381)

Browse Source 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
This commit is contained in:
Tad Hardesty
2017-10-10 01:06:46 -07:00
committed by CitadelStationBot
parent eb9737912c
commit 01ecdff51a
47 changed files with 143 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/inducer.dm
+16 -13
View File
@@ -48,15 +48,15 @@
/obj/item/inducer/proc/cantbeused(mob/user)
if(!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You don't have the dexterity to use \the [src]!</span>")
to_chat(user, "<span class='warning'>You don't have the dexterity to use [src]!</span>")
return TRUE
if(!cell)
to_chat(user, "<span class='warning'>\The [src] doesn't have a power cell installed!</span>")
to_chat(user, "<span class='warning'>[src] doesn't have a power cell installed!</span>")
return TRUE
if(!cell.charge)
to_chat(user, "<span class='warning'>\The [src]'s battery is dead!</span>")
to_chat(user, "<span class='warning'>[src]'s battery is dead!</span>")
return TRUE
return FALSE
@@ -79,12 +79,12 @@
if(!cell)
if(!user.transferItemToLoc(W, src))
return
to_chat(user, "<span class='notice'>You insert \the [W] into \the [src].</span>")
to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
cell = W
update_icon()
return
else
to_chat(user, "<span class='notice'>\The [src] already has \a [cell] installed!</span>")
to_chat(user, "<span class='notice'>[src] already has \a [cell] installed!</span>")
return
if(cantbeused(user))
@@ -110,15 +110,17 @@
if(istype(A, /obj))
O = A
if(C)
var/done_any = FALSE
if(C.charge >= C.maxcharge)
to_chat(user, "<span class='notice'>\The [A] is fully charged!</span>")
to_chat(user, "<span class='notice'>[A] is fully charged!</span>")
recharging = FALSE
return TRUE
user.visible_message("[user] starts recharging \the [A] with \the [src]","<span class='notice'>You start recharging [A] with \the [src]</span>")
user.visible_message("[user] starts recharging [A] with [src].","<span class='notice'>You start recharging [A] with [src].</span>")
while(C.charge < C.maxcharge)
if(E)
E.chambered = null // Prevents someone from firing continuously while recharging the gun.
if(do_after(user, 10, target = user) && cell.charge)
done_any = TRUE
induce(C, coefficient)
do_sparks(1, FALSE, A)
if(O)
@@ -127,7 +129,8 @@
break
if(E)
E.recharge_newshot() //We're done charging, so we'll let someone fire it now.
user.visible_message("[user] recharged \the [A]!","<span class='notice'>You recharged \the [A]!</span>")
if(done_any) // Only show a message if we succeeded at least once
user.visible_message("[user] recharged [A]!","<span class='notice'>You recharged [A]!</span>")
recharging = FALSE
return TRUE
recharging = FALSE
@@ -147,7 +150,7 @@
/obj/item/inducer/attack_self(mob/user)
if(opened && cell)
user.visible_message("[user] removes \the [cell] from \the [src]!","<span class='notice'>You remove \the [cell].</span>")
user.visible_message("[user] removes [cell] from [src]!","<span class='notice'>You remove [cell].</span>")
cell.update_icon()
user.put_in_hands(cell)
cell = null
@@ -157,11 +160,11 @@
/obj/item/inducer/examine(mob/living/M)
..()
if(cell)
to_chat(M, "<span class='notice'>It's display shows: [DisplayPower(cell.charge)]</span>")
to_chat(M, "<span class='notice'>Its display shows: [DisplayPower(cell.charge)].</span>")
else
to_chat(M,"<span class='notice'>It's display is dark.</span>")
to_chat(M,"<span class='notice'>Its display is dark.</span>")
if(opened)
to_chat(M,"<span class='notice'>It's battery compartment is open.</span>")
to_chat(M,"<span class='notice'>Its battery compartment is open.</span>")
/obj/item/inducer/update_icon()
cut_overlays()
@@ -174,7 +177,7 @@
/obj/item/inducer/sci
icon_state = "inducer-sci"
item_state = "inducer-sci"
desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than it's engineering counterpart."
desc = "A tool for inductively charging internal power cells. This one has a science color scheme, and is less potent than its engineering counterpart."
cell_type = null
powertransfer = 500
opened = TRUE