Misc fixes (#1370)

changes:

bugfix: "Fixed formatting of forms when held up to a security camera."
spellcheck: "Fixed grammar error in IA and CE's headsets."
Fixes #1196.
Fixes #1358.
Fixes #1376.
Fixes #1347.
Replaces some BYOND text macros with spans.

Issues:

M'sai's preview image does not work (missing image).
This commit is contained in:
Lohikar
2017-01-03 01:54:30 +02:00
committed by skull132
parent 33c44ad093
commit cef746cd6d
22 changed files with 73 additions and 63 deletions
@@ -170,7 +170,7 @@
/obj/item/device/radio/headset/heads/ce
name = "chief engineer's headset"
desc = "The headset of the guy who is in charge of morons"
desc = "The headset of the guy who is in charge of morons."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/ce
@@ -211,7 +211,7 @@
ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/ia
name = "internal affair's headset"
name = "internal affairs headset"
desc = "The headset of your worst enemy."
icon_state = "com_headset"
item_state = "headset"
@@ -59,7 +59,7 @@
var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
if(!E)
return
usr << "\red Your eyes burn with the intense light of the flash!."
usr << span("alert", "Your eyes burn with the intense light of the flash!.")
E.damage += rand(10, 11)
if(E.damage > 12)
M.eye_blurry += rand(3,6)
@@ -33,13 +33,13 @@
active= !active
if(active)
playsound(user, 'sound/weapons/chainsawhit.ogg', 50, 1)
user << "\blue \The [src] rumbles to life."
user << span("notice", "\The [src] rumbles to life.")
force = 35
hitsound = 'sound/weapons/chainsawhit.ogg'
icon_state = "chainswordon"
slot_flags = null
else
user << "\blue \The [src] slowly powers down."
user << span("notice", "\The [src] slowly powers down.")
force = initial(force)
hitsound = initial(hitsound)
icon_state = initial(icon_state)
@@ -58,13 +58,13 @@ var/list/tape_roll_applications = list()
/obj/item/taperoll/attack_self(mob/user as mob)
if(icon_state == "[icon_base]_start")
start = get_turf(src)
usr << "\blue You place the first end of the [src]."
usr << span("notice", "You place the first end of the [src].")
icon_state = "[icon_base]_stop"
else
icon_state = "[icon_base]_start"
end = get_turf(src)
if(start.y != end.y && start.x != end.x || start.z != end.z)
usr << "\blue [src] can only be laid horizontally or vertically."
usr << span("notice", "[src] can only be laid horizontally or vertically.")
return
var/turf/cur = start
@@ -93,7 +93,7 @@ var/list/tape_roll_applications = list()
break
cur = get_step_towards(cur,end)
if (!can_place)
usr << "\blue You can't run \the [src] through that!"
usr << span("notice", "You can't run \the [src] through that!")
return
cur = start
@@ -106,7 +106,7 @@ var/list/tape_roll_applications = list()
var/obj/item/tape/P = new tape_type(cur)
P.icon_state = "[P.icon_base]_[dir]"
cur = get_step_towards(cur,end)
usr << "\blue You finish placing the [src]." //Git Test
usr << span("notice", "You finish placing the [src].") //Git Test
/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
if(!proximity)
@@ -118,7 +118,7 @@ var/list/tape_roll_applications = list()
P.loc = locate(T.x,T.y,T.z)
P.icon_state = "[src.icon_base]_door"
P.layer = 3.2
user << "\blue You finish placing the [src]."
user << span("notice", "You finish placing the [src].")
if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor))
var/turf/F = A
@@ -157,7 +157,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/attack_hand(mob/user as mob)
if (user.a_intent == I_HELP && src.allowed(user))
user.show_viewers("\blue [user] lifts [src], allowing passage.")
user.show_viewers(span("notice", "[user] lifts [src], allowing passage."))
crumple()
lifted = 1
spawn(200)
@@ -171,7 +171,7 @@ var/list/tape_roll_applications = list()
if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
user << "You can't break the [src] with that!"
return
user.show_viewers("\blue [user] breaks the [src]!")
user.show_viewers(span("notice", "[user] breaks the [src]!"))
var/dir[2]
var/icon_dir = src.icon_state
+2 -2
View File
@@ -16,9 +16,9 @@
var/mob/living/carbon/human/H = user
var/obj/item/organ/O = H.internal_organs_by_name[pick("eyes","appendix","kidneys","liver", "heart", "lungs", "brain")]
if(O == null)
user << "\blue You can't make any sense of the arcane glyphs. . . maybe you should try again."
user << span("notice", "You can't make any sense of the arcane glyphs. . . maybe you should try again.")
else
user << "\red As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!"
user << span("alert", "As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!")
user.visible_message("<span class='danger'>A flash of smoke pours out of [user]'s orifices!</span>")
playsound(user, 'sound/magic/lightningshock.ogg', 40, 1)
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()