Merge pull request #12247 from CosmicScientist/ThreeGrammarFixes

Cigs, urinals, infrared lasers, oh my!
This commit is contained in:
Razharas
2015-10-10 03:29:42 +03:00
3 changed files with 3 additions and 3 deletions
@@ -378,7 +378,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
new /obj/effect/decal/cleanable/ash(location)
if(ismob(loc))
var/mob/living/M = loc
M << "<span class='notice'>Your [name] goes out, and you empty the ash.</span>"
M << "<span class='notice'>Your [name] goes out.</span>"
lit = 0
icon_state = icon_off
item_state = icon_off
+1 -1
View File
@@ -122,7 +122,7 @@
var/mob/living/GM = G.affecting
if(G.state >= GRAB_AGGRESSIVE)
if(GM.loc != get_turf(src))
user << "<span class='notice'>[GM.name] needs to on [src].</span>"
user << "<span class='notice'>[GM.name] needs to be on [src].</span>"
return
user.visible_message("<span class='danger'>[user] slams [GM] into [src]!</span>", "<span class='notice'>You slam [GM] into [src]!</span>")
GM.adjustBruteLoss(8)
+1 -1
View File
@@ -159,7 +159,7 @@
/***************************IBeam*********************************/
/obj/effect/beam/i_beam
name = "i beam"
name = "infrared beam"
icon = 'icons/obj/projectiles.dmi'
icon_state = "ibeam"
var/obj/effect/beam/i_beam/next = null