diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index 33bbabd21a..ac2f1e088a 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -50,7 +50,7 @@ STOP_PROCESSING(SSobj, src) /datum/component/mood/proc/print_mood(mob/user) - var/msg = "*---------*\nYour current mood\n" + var/msg = "
Your current mood\n" msg += "My mental status: " //Long term switch(sanity) if(SANITY_GREAT to INFINITY) @@ -94,6 +94,7 @@ msg += event.description else msg += "I don't have much of a reaction to anything right now.\n" + msg += "
" to_chat(user || parent, msg) ///Called after moodevent/s have been added/removed. diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 8e5719500e..02864b4ccd 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -145,7 +145,7 @@ GENETICS SCANNER mob_status = "Deceased" oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss - var/msg = "*---------*\nAnalyzing results for [M]:\n\tOverall status: [mob_status]" + var/msg = "
Analyzing results for [M]:\n\tOverall status: [mob_status]" // Damage descriptions if(brute_loss > 10) @@ -169,9 +169,6 @@ GENETICS SCANNER if(advanced && H.has_dna()) msg += "\n\tGenetic Stability: [H.dna.stability]%." - to_chat(user, msg) - msg = "" - // Body part damage report var/list/dmgreport = list() if(iscarbon(M) && mode == 1) @@ -196,8 +193,9 @@ GENETICS SCANNER [(org.brute_dam > 0) ? "[org.brute_dam]" : "0"]\ [(org.burn_dam > 0) ? "[org.burn_dam]" : "0"]" dmgreport += "" - to_chat(user, dmgreport.Join()) + msg += "\n[dmgreport.Join()]" + msg += "\n" //Organ damages report var/heart_ded = FALSE @@ -451,14 +449,14 @@ GENETICS SCANNER if(cyberimp_detect) msg += "Detected cybernetic modifications:\n" msg += "[cyberimp_detect]\n" - msg += "*---------*" + msg += "
" to_chat(user, msg) SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, FALSE) /proc/chemscan(mob/living/user, mob/living/M) if(istype(M)) if(M.reagents) - var/msg = "*---------*\n" + var/msg = "
" if(M.reagents.reagent_list.len) var/list/datum/reagent/reagents = list() for(var/datum/reagent/R in M.reagents.reagent_list) @@ -496,7 +494,7 @@ GENETICS SCANNER if(95 to INFINITY) msg += "Subject contains a extremely dangerous amount of toxic isomers.\n" - msg += "*---------*" + msg += "
" to_chat(user, msg) /obj/item/healthanalyzer/verb/toggle_mode() @@ -823,8 +821,7 @@ GENETICS SCANNER slime_scan(T, user) /proc/slime_scan(mob/living/simple_animal/slime/T, mob/living/user) - to_chat(user, "========================") - to_chat(user, "Slime scan results:") + to_chat(user, "
Slime scan results:") to_chat(user, "[T.colour] [T.is_adult ? "adult" : "baby"] slime") to_chat(user, "Nutrition: [T.nutrition]/[T.get_max_nutrition()]") if (T.nutrition < T.get_starve_nutrition()) @@ -852,7 +849,7 @@ GENETICS SCANNER if(T.effectmod) to_chat(user, "Core mutation in progress: [T.effectmod]") to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]") - to_chat(user, "========================") + to_chat(user, "
") /obj/item/nanite_scanner diff --git a/code/modules/antagonists/clockcult/clock_mobs.dm b/code/modules/antagonists/clockcult/clock_mobs.dm index 2f00fd4e4a..d7770ad3a9 100644 --- a/code/modules/antagonists/clockcult/clock_mobs.dm +++ b/code/modules/antagonists/clockcult/clock_mobs.dm @@ -43,7 +43,7 @@ /mob/living/simple_animal/hostile/clockwork/examine(mob/user) var/t_He = p_they(TRUE) var/t_s = p_s() - var/msg = "*---------*\nThis is [icon2html(src, user)] \a [src]!\n" + var/msg = "
This is [icon2html(src, user)] \a [src]!\n" msg += "[desc]\n" if(health < maxHealth) msg += "" @@ -55,7 +55,7 @@ var/addendum = examine_info() if(addendum) msg += "[addendum]\n" - msg += "*---------*" + msg += "
" return list(msg) diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index ac1e5630da..3b57701aaf 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -63,7 +63,7 @@ /mob/living/carbon/true_devil/examine(mob/user) - . = list("*---------*\nThis is [icon2html(src, user)] [src]!") + . = list("
This is [icon2html(src, user)] [src]!") //Left hand items for(var/obj/item/I in held_items) @@ -81,7 +81,7 @@ . += "You can see hellfire inside its gaping wounds." else if(health < (maxHealth/2)) . += "You can see hellfire inside its wounds." - . += "*---------*" + . += "
" /mob/living/carbon/true_devil/IsAdvancedToolUser() return 1 diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 65d942ca2b..888e084a55 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -66,7 +66,7 @@ /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/plant_analyzer)) - var/msg = "*---------*\n This is \a [src].\n" + var/msg = "
This is [icon2html(src, user)] \a [src].\n" if(seed) msg += seed.get_analyzer_text() var/reag_txt = "" @@ -78,7 +78,7 @@ if(reag_txt) msg += reag_txt - msg += "
*---------*" + msg += "
" to_chat(user, msg) else if(seed) diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index f4859ffb1e..fc57d03637 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -36,10 +36,10 @@ /obj/item/grown/attackby(obj/item/O, mob/user, params) ..() if (istype(O, /obj/item/plant_analyzer)) - var/msg = "*---------*\n This is \a [src]\n" + var/msg = "
This is [icon2html(src, user)] \a [src]\n" if(seed) msg += seed.get_analyzer_text() - msg += "" + msg += "
" to_chat(usr, msg) return diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index fa7decc437..c197b57935 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -548,28 +548,29 @@ else if(istype(O, /obj/item/plant_analyzer)) var/obj/item/plant_analyzer/P_analyzer = O + var/msg = "
" if(myseed) if(P_analyzer.scan_mode == PLANT_SCANMODE_STATS) - to_chat(user, "*** [myseed.plantname] ***" ) - to_chat(user, "- Plant Age: [age]") + msg += "*** [myseed.plantname] ***" + msg += "\n- Plant Age: [age]" var/list/text_string = myseed.get_analyzer_text() if(text_string) - to_chat(user, text_string) - to_chat(user, "*---------*") + msg += "\n[text_string]" if(myseed.reagents_add && P_analyzer.scan_mode == PLANT_SCANMODE_CHEMICALS) - to_chat(user, "- Plant Reagents -") - to_chat(user, "*---------*") + msg += "\n- Plant Reagents -" + msg += "\n*---------*" for(var/datum/plant_gene/reagent/G in myseed.genes) - to_chat(user, "- [G.get_name()] -") - to_chat(user, "*---------*") + msg += "\n- [G.get_name()] -" + msg += "\n*---------*" else - to_chat(user, "No plant found.") - to_chat(user, "- Weed level: [weedlevel] / 10") - to_chat(user, "- Pest level: [pestlevel] / 10") - to_chat(user, "- Toxicity level: [toxic] / 100") - to_chat(user, "- Water level: [waterlevel] / [maxwater]") - to_chat(user, "- Nutrition level: [reagents.total_volume] / [maxnutri]") - to_chat(user, "") + msg += "No plant found." + msg += "\n- Weed level: [weedlevel] / 10" + msg += "\n- Pest level: [pestlevel] / 10" + msg += "\n- Toxicity level: [toxic] / 100" + msg += "\n- Water level: [waterlevel] / [maxwater]" + msg += "\n- Nutrition level: [reagents.total_volume] / [maxnutri]" + msg += "
" + to_chat(user, msg) return else if(istype(O, /obj/item/cultivator)) diff --git a/code/modules/hydroponics/sample.dm b/code/modules/hydroponics/sample.dm index 7fb92e8fcd..a924c02d94 100644 --- a/code/modules/hydroponics/sample.dm +++ b/code/modules/hydroponics/sample.dm @@ -13,7 +13,7 @@ add_overlay(filling) /obj/item/seeds/sample/get_analyzer_text() - return " The DNA of this sample is damaged beyond recovery, it can't support life on its own.\n*---------*" + return " The DNA of this sample is damaged beyond recovery, it can't support life on its own." /obj/item/seeds/sample/alienweed name = "alien weed sample" diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 577635cd1c..f351ab1f05 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -417,8 +417,7 @@ if(istype(traits, /datum/plant_gene/trait/plant_type)) continue all_traits += " [traits.get_name()]" - text += "- Plant Traits:[all_traits]\n" - text += "*---------*" + text += "- Plant Traits:[all_traits ? all_traits : " None"]" return text /obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) //in case seeds have some special interaction with special chems @@ -426,21 +425,21 @@ /obj/item/seeds/attackby(obj/item/O, mob/user, params) if (istype(O, /obj/item/plant_analyzer)) - to_chat(user, "*---------*\n This is \a [src].") + var/msg = "
This is [icon2html(src, user)] \a [src]." var/text var/obj/item/plant_analyzer/P_analyzer = O if(P_analyzer.scan_mode == PLANT_SCANMODE_STATS) text = get_analyzer_text() if(text) - to_chat(user, "[text]") + msg += "\n[text]" if(reagents_add && P_analyzer.scan_mode == PLANT_SCANMODE_CHEMICALS) - to_chat(user, "- Plant Reagents -") - to_chat(user, "*---------*") + msg += "\n- Plant Reagents -" + msg += "\n*---------*" for(var/datum/plant_gene/reagent/G in genes) - to_chat(user, "- [G.get_name()] -") - to_chat(user, "*---------*") - - + msg += "\n- [G.get_name()] -" + msg += "\n*---------*" + msg += "
" + to_chat(user, msg) return if(istype(O, /obj/item/pen)) diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index af15936d29..7ecbbdf444 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -583,12 +583,10 @@ switch(type_to_use) if("repair") - to_chat(world,"Integrity: [obj_integrity] / [max_integrity]") if(obj_integrity < max_integrity) obj_integrity = min(obj_integrity + 20,max_integrity) - to_chat(world,"Integrity: [obj_integrity] / [max_integrity]") to_chat(user,"You fix the dents and scratches of the assembly.") - to_chat(world,user) + to_chat(user, "Integrity: [obj_integrity] / [max_integrity]") return TRUE else diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 46ba9a5eb0..8e20df04b8 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -346,18 +346,23 @@ return var/embeds = FALSE + var/output = null for(var/X in bodyparts) var/obj/item/bodypart/LB = X for(var/obj/item/I in LB.embedded_objects) if(!embeds) embeds = TRUE // this way, we only visibly try to examine ourselves if we have something embedded, otherwise we'll still hug ourselves :) - visible_message("[src] examines [p_them()]self.", \ - "You check yourself for shrapnel.") + visible_message("[src] examines [p_them()]self.", "") + output += "You check yourself for shrapnel." if(I.isEmbedHarmless()) - to_chat(src, "\t There is \a [I] stuck to your [LB.name]!") + output += "\n\t There is \a [I] stuck to your [LB.name]!" else - to_chat(src, "\t There is \a [I] embedded in your [LB.name]!") + output += "\n\t There is \a [I] embedded in your [LB.name]!" + + if(output) + output += "" + to_chat(src, output) return embeds diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 5eabae16f7..8a321fa9d1 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -6,7 +6,7 @@ var/t_has = p_have() var/t_is = p_are() - . = list("*---------*\nThis is [icon2html(src, user)] \a [src]!") + . = list("
This is [icon2html(src, user)] \a [src]!") if (handcuffed) . += "[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!" @@ -153,7 +153,7 @@ if(MOOD_LEVEL_HAPPY4 to INFINITY) . += "[t_He] look[p_s()] ecstatic." SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) - . += "*---------*" + . += "
" /mob/living/carbon/examine_more(mob/user) if(!all_scars) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d9b74bc8c2..9e042828d4 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -13,7 +13,7 @@ if(HAS_TRAIT(L, TRAIT_PROSOPAGNOSIA)) obscure_name = TRUE - . = list("*---------*\nThis is [!obscure_name ? name : "Unknown"]!") + . = list("
This is [!obscure_name ? name : "Unknown"]!") var/vampDesc = ReturnVampExamine(user) // Vamps recognize the names of other vamps. var/vassDesc = ReturnVassalExamine(user) // Vassals recognize each other's marks. @@ -25,8 +25,6 @@ var/list/obscured = check_obscured_slots() var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) - //Skyrat changes - edited that to only show the extra species tidbit if it's unknown or he's got a custom species - //and also underwear slots :) if(skipface || get_visible_name() == "Unknown") . += "You can't make out what species they are." else @@ -491,7 +489,7 @@ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) //This also handles flavor texts now - . += "*---------*" + . += "
" /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects! var/list/dat = list() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index df8271a05b..786e640710 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -588,9 +588,9 @@ to_chat(src, "You succesfuly remove the durathread strand.") remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND) return - var/to_send = "" - visible_message("[src] examines [p_them()]self.", \ - "You check yourself for injuries.") + var/to_send = "
" + visible_message("[src] examines [p_them()]self.", "") + to_send += "You check yourself for injuries.\n" var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) for(var/X in bodyparts) @@ -649,13 +649,13 @@ msg = "\t Your [LB.name] is suffering [W.a_or_from] [lowertext(W.name)]!" if(WOUND_SEVERITY_CRITICAL) msg = "\t Your [LB.name] is suffering [W.a_or_from] [lowertext(W.name)]!!" - to_chat(src, msg) + to_send += "\n[msg]" for(var/obj/item/I in LB.embedded_objects) if(I.isEmbedHarmless()) - to_chat(src, "\t There is \a [I] stuck to your [LB.name]!") + to_send += "\n\t There is \a [I] stuck to your [LB.name]!" else - to_chat(src, "\t There is \a [I] embedded in your [LB.name]!") + to_send += "\n\t There is \a [I] embedded in your [LB.name]!" for(var/t in missing) to_send += "Your [parse_zone(t)] is missing!\n" @@ -678,7 +678,7 @@ bleed_text += " [BP.name]," bleed_text += " and [bleeding_limbs[num_bleeds].name]" bleed_text += "!" - to_chat(src, bleed_text) + to_send += "\n[bleed_text]" if(getStaminaLoss()) if(getStaminaLoss() > 30) to_send += "You're completely exhausted.\n" @@ -759,7 +759,7 @@ //Put the items in that list into a string of text for(var/B in broken) broken_message += B - to_chat(src, " Your [broken_message] [broken_plural ? "are" : "is"] non-functional!") + to_send += "\n Your [broken_message] [broken_plural ? "are" : "is"] non-functional!" if(damaged.len) if(damaged.len > 1) damaged.Insert(damaged.len, "and ") @@ -770,11 +770,12 @@ damaged_plural = TRUE for(var/D in damaged) damaged_message += D - to_chat(src, "Your [damaged_message] [damaged_plural ? "are" : "is"] hurt.") + to_send += "\nYour [damaged_message] [damaged_plural ? "are" : "is"] hurt." if(roundstart_quirks.len) to_send += "You have these quirks: [get_trait_string()].\n" + to_send += "
" to_chat(src, to_send) else if(wear_suit) @@ -788,8 +789,8 @@ if(stat == DEAD || stat == UNCONSCIOUS) return - visible_message("[src] examines [p_them()]self.", \ - "You check yourself for injuries.") + visible_message("[src] examines [p_them()]self.", "") + var/output = "
You check yourself for injuries." var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) @@ -845,7 +846,7 @@ isdisabled += " but otherwise " else isdisabled += " and " - to_chat(src, "\t Your [LB.name][isdisabled][self_aware ? " has " : " is "][status].") + output += "\n\t Your [LB.name][isdisabled][self_aware ? " has " : " is "][status]." for(var/thing in LB.wounds) var/datum/wound/W = thing @@ -859,14 +860,15 @@ msg = "\t Your [LB.name] is suffering [W.a_or_from] [lowertext(W.name)]!" if(WOUND_SEVERITY_CRITICAL) msg = "\t Your [LB.name] is suffering [W.a_or_from] [lowertext(W.name)]!!" - to_chat(src, msg) + output += "\n[msg]" for(var/obj/item/I in LB.embedded_objects) if(I.isEmbedHarmless()) - to_chat(src, "\t There is \a [I] stuck to your [LB.name]!") + output += "\n\t There is \a [I] stuck to your [LB.name]!" else - to_chat(src, "\t There is \a [I] embedded in your [LB.name]!") - + output += "\n\t There is \a [I] embedded in your [LB.name]!" + output += "
" + to_chat(src, output) /mob/living/carbon/human/damage_clothes(damage_amount, damage_type = BRUTE, damage_flag = 0, def_zone) if(damage_type != BRUTE && damage_type != BURN) diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index ebf76eeafa..baac494612 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -7,8 +7,7 @@ return var/list/print_msg = list() - print_msg += "*---------*" - print_msg += "As you snap back to consciousness, you recall people messing with your stuff..." + print_msg += "
As you snap back to consciousness, you recall people messing with your stuff..." afk_thefts = reverseRange(afk_thefts) @@ -28,7 +27,7 @@ if(LAZYLEN(afk_thefts) >= AFK_THEFT_MAX_MESSAGES) print_msg += "There may have been more, but that's all you can remember..." - print_msg += "*---------*" + print_msg += "
" to_chat(src, print_msg.Join("\n")) LAZYNULL(afk_thefts) diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 4cf9b81592..7a5482536a 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -1,5 +1,5 @@ /mob/living/silicon/ai/examine(mob/user) - . = list("*---------*\nThis is [icon2html(src, user)] [src]!") + . = list("
This is [icon2html(src, user)] [src]!") if (stat == DEAD) . += "It appears to be powered-down." else @@ -17,6 +17,6 @@ . += "The wireless networking light is blinking." else if (!shunted && !client) . += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem..." - . += "*---------*" + . += "
" . += ..() diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 45a3d15635..66e1e3fa8d 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -1,5 +1,5 @@ /mob/living/silicon/robot/examine(mob/user) - . = list("*---------*\nThis is [icon2html(src, user)] \a [src], a [src.module.name] unit!") + . = list("
This is [icon2html(src, user)] \a [src], a [src.module.name] unit!") if(desc) . += "[desc]" @@ -51,6 +51,6 @@ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .) - . += "*---------*" + . += "
" . += ..() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 7b1e2dcaba..143d62c785 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -83,13 +83,13 @@ /mob/living/simple_animal/hostile/construct/examine(mob/user) var/t_He = p_they(TRUE) var/t_s = p_s() - . = list("*---------*\nThis is [icon2html(src, user)] \a [src]!\n[desc]") + . = list("
This is [icon2html(src, user)] \a [src]!\n[desc]") if(health < maxHealth) if(health >= maxHealth/2) . += "[t_He] look[t_s] slightly dented." else . += "[t_He] look[t_s] severely dented!" - . += "*---------*" + . += "
" /mob/living/simple_animal/hostile/construct/attack_animal(mob/living/simple_animal/M) if(isconstruct(M)) //is it a construct? diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index ecd5db3ccf..bab02499fb 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -172,7 +172,7 @@ /mob/living/simple_animal/drone/examine(mob/user) - . = list("*---------*\nThis is [icon2html(src, user)] \a [src]!") + . = list("
This is [icon2html(src, user)] \a [src]!") //Hands for(var/obj/item/I in held_items) @@ -208,7 +208,7 @@ . += "A message repeatedly flashes on its display: \"REBOOT -- REQUIRED\"." else . += "A message repeatedly flashes on its display: \"ERROR -- OFFLINE\"." - . += "*---------*" + . += "
" /mob/living/simple_animal/drone/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) //Secbots won't hunt maintenance drones. diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm index a079507a63..709e3b1a62 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm @@ -18,14 +18,14 @@ /mob/living/simple_animal/hostile/guardian/dextrous/examine(mob/user) if(dextrous) - . = list("*---------*\nThis is [icon2html(src)] \a [src]!\n[desc]") + . = list("
This is [icon2html(src)] \a [src]!\n[desc]") for(var/obj/item/I in held_items) if(!(I.item_flags & ABSTRACT)) . += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))]." if(internal_storage && !(internal_storage.item_flags & ABSTRACT)) . += "It is holding [internal_storage.get_examine_string(user)] in its internal storage." - . += "*---------*" + . += "
" else return ..() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 68de074e07..c08154a55c 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -421,7 +421,7 @@ return /mob/living/simple_animal/slime/examine(mob/user) - . = list("*---------*\nThis is [icon2html(src, user)] \a [src]!") + . = list("
This is [icon2html(src, user)] \a [src]!") if (src.stat == DEAD) . += "It is limp and unresponsive." else @@ -446,7 +446,7 @@ if(10) . += "It is radiating with massive levels of electrical activity!" - . += "*---------*" + . += "
" /mob/living/simple_animal/slime/proc/discipline_slime(mob/user) if(stat) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 6bf82bd92b..5eb47bdd21 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -197,6 +197,13 @@ h1.alert, h2.alert {color: #000000;} } .icon {height: 1em; width: auto;} +.infobox { + border: 1px ridge #383243; + background: rgba(40, 40, 60, 0.5); + margin: 2px 8px; + padding: 8px 12px; + max-width: 550px; +} .memo {color: #638500; text-align: center;} .memoedit {text-align: center; font-size: 2;} diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index f558fc6264..459b26b7e0 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -30,6 +30,7 @@ export const MESSAGE_TYPE_DEADCHAT = 'deadchat'; export const MESSAGE_TYPE_OOC = 'ooc'; export const MESSAGE_TYPE_ADMINPM = 'adminpm'; export const MESSAGE_TYPE_COMBAT = 'combat'; +export const MESSAGE_TYPE_LEWD = 'lewd'; export const MESSAGE_TYPE_ADMINCHAT = 'adminchat'; export const MESSAGE_TYPE_MODCHAT = 'modchat'; export const MESSAGE_TYPE_EVENTCHAT = 'eventchat'; @@ -64,7 +65,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_INFO, name: 'Info', description: 'Non-urgent messages from the game and items', - selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain', + selector: '.notice:not(.pm), .adminnotice, .infobox, .info, .sinister, .cult, .infoplain', }, { type: MESSAGE_TYPE_WARNING, @@ -109,7 +110,7 @@ export const MESSAGE_TYPES = [ selector: '.danger', }, { - type: 'lovetype', + type: MESSAGE_TYPE_LEWD, name: 'Lewd messages', description: 'You came!', selector: '.userlove, .love', diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index c244ae2d7f..ddabd04220 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -993,6 +993,14 @@ em { width: auto; } +.infobox { + border: 1px ridge #383243; + background: rgba(40, 40, 60, 0.5); + margin: 2px 8px; + padding: 8px 12px; + max-width: 550px; +} + .memo { color: #638500; text-align: center; diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 599f45c3c0..6bca699d4b 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -1032,6 +1032,14 @@ h1.alert, h2.alert { width: auto; } +.infobox { + border: 1px ridge #383243; + background: rgba(40, 40, 60, 0.5); + margin: 2px 8px; + padding: 8px 12px; + max-width: 550px; +} + .memo { color: #638500; text-align: center;