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

Misc fixes (#1370)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
+3 -2
View File
@@ -291,6 +291,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
// Actual whitelist checks are handled elsewhere, this is just for accessing the preview window.
var/choice = input("Which species would you like to look at?") as null|anything in playable_species
if(!choice) return
choice = html_decode(choice)
pref.species_preview = choice
SetSpecies(preference_mob())
pref.alternate_languages.Cut() // Reset their alternate languages. Todo: attempt to just fix it instead?
@@ -302,7 +303,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_NOACTION
var/prev_species = pref.species
pref.species = href_list["set_species"]
pref.species = html_decode(href_list["set_species"])
if(prev_species != pref.species)
mob_species = all_species[pref.species]
@@ -649,7 +650,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(restricted == 2)
dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>"
if(!restricted || check_rights(R_ADMIN, 0))
dat += "\[<a href='?src=\ref[src];set_species=[pref.species_preview]'>select</a>\]"
dat += "\[<a href='?src=\ref[src];set_species=[html_encode(pref.species_preview)]'>select</a>\]"
dat += "</center></body>"
user << browse(dat, "window=species;size=700x400")
code/modules/mob/living/silicon/ai/ai.dm
+9 -9
View File
@@ -467,7 +467,7 @@ var/list/ai_verbs_default = list(
if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name()))
ai_actual_track(target)
else
src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
src << "<span class='warning'>System error. Cannot locate [html_decode(href_list["trackname"])].</span>"
return
if (href_list["readcapturedpaper"]) //Yep stolen from admin faxes
var/entry = text2num(href_list["readcapturedpaper"])
@@ -476,7 +476,7 @@ var/list/ai_verbs_default = list(
src << "<span class='notice'>Unable to locate visual entry.</span>"
return
var/info = cameraRecords[entry]
src<< browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", html_encode(info[1]), html_encode(info[2])), text("window=[]", html_encode(info[1])))
src << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", info[1], info[2]), text("window=[]", html_encode(info[1])))
return
return
@@ -556,7 +556,7 @@ var/list/ai_verbs_default = list(
if(network in C.network)
eyeobj.setLoc(get_turf(C))
break
src << "\blue Switched to [network] camera network."
src << "<span class='notice'>Switched to [network] camera network.</span>"
//End of code by Mord_Sith
/mob/living/silicon/ai/proc/ai_statuschange()
@@ -666,19 +666,19 @@ var/list/ai_verbs_default = list(
else if(istype(W, /obj/item/weapon/wrench))
if(anchored)
user.visible_message("\blue \The [user] starts to unbolt \the [src] from the plating...")
user.visible_message("<span class='notice'>\The [user] starts to unbolt \the [src] from the plating...</span>")
if(!do_after(user,40))
user.visible_message("\blue \The [user] decides not to unbolt \the [src].")
user.visible_message("<span class='notice'>\The [user] decides not to unbolt \the [src].</span>")
return
user.visible_message("\blue \The [user] finishes unfastening \the [src]!")
user.visible_message("<span class='notice'>\The [user] finishes unfastening \the [src]!</span>")
anchored = 0
return
else
user.visible_message("\blue \The [user] starts to bolt \the [src] to the plating...")
user.visible_message("<span class='notice'>\The [user] starts to bolt \the [src] to the plating.</span>..")
if(!do_after(user,40))
user.visible_message("\blue \The [user] decides not to bolt \the [src].")
user.visible_message("<span class='notice'>\The [user] decides not to bolt \the [src].</span>")
return
user.visible_message("\blue \The [user] finishes fastening down \the [src]!")
user.visible_message("<span class='notice'>\The [user] finishes fastening down \the [src]!</span>")
anchored = 1
return
else
code/modules/mob/living/silicon/silicon.dm
+5 -5
View File
@@ -74,8 +74,8 @@
src.take_organ_damage(0,10,emp=1)
Stun(rand(1,5))
flick("noise", src:flash)
src << "\red <B>*BZZZT*</B>"
src << "\red Warning: Electromagnetic pulse detected."
src << "<span class='danger'>*BZZZT*</span>"
src << "<span class='warning'>Warning: Electromagnetic pulse detected.</span>"
..()
/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount)
@@ -90,9 +90,9 @@
shock_damage *= 0.75 //take reduced damage
take_overall_damage(0, shock_damage)
visible_message("\red [src] was shocked by \the [source]!", \
"\red <B>Energy pulse detected, system damaged!</B>", \
"\red You hear an electrical crack")
visible_message("<span class='warning'>[src] was shocked by \the [source]!</span>", \
"<span class='danger'>Energy pulse detected, system damaged!</span>", \
"<span class='warning'>You hear an electrical crack.</span>")
if(prob(20))
Stun(2)
return
code/modules/paperwork/paper.dm
+7 -3
View File
@@ -42,8 +42,12 @@
/obj/item/weapon/paper/proc/set_content(text,title)
if(title)
name = title
info = html_encode(text)
info = parsepencode(text)
if (text && length(text))
info = html_encode(text)
info = parsepencode(text)
else
info = ""
update_icon()
update_space(info)
updateinfolinks()
@@ -51,7 +55,7 @@
/obj/item/weapon/paper/update_icon()
if(icon_state == "paper_talisman")
return
else if(info)
else if (info && length(trim(info)))
icon_state = "paper_words"
else
icon_state = "paper"