diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index a714371d4b7..52f7a32a771 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -2506,7 +2506,7 @@ "gD" = ( /turf/open/chasm{ color = "#000000"; - desc = "Leave this place, insect."; + desc = "Leave this place, insect."; name = "Abyss" }, /area/awaymission/cabin/caves/mountain) @@ -2562,7 +2562,7 @@ /area/awaymission/cabin/caves/mountain) "gI" = ( /obj/structure/signpost/salvation{ - desc = "Come closer, insect."; + desc = "Come closer, insect."; icon = 'icons/mob/nest.dmi'; icon_state = "nether"; max_integrity = 99999; @@ -2995,7 +2995,7 @@ "hJ" = ( /obj/item/storage/book/bible{ deity_name = "Netherworld"; - desc = "Suffering and pain waits for you.
Death will not be your end for, with every step you take, your soul moves closer to me.
Your darkest fears will soon be realized.
There is nowhere to run, for I am everywhere. "; + desc = "Suffering and pain waits for you.
Death will not be your end for, with every step you take, your soul moves closer to me.
Your darkest fears will soon be realized.
There is nowhere to run, for I am everywhere. "; icon_state = "tome"; name = "Void Tome" }, diff --git a/code/datums/components/fantasy/_fantasy.dm b/code/datums/components/fantasy/_fantasy.dm index 457313471e6..86e016784ad 100644 --- a/code/datums/components/fantasy/_fantasy.dm +++ b/code/datums/components/fantasy/_fantasy.dm @@ -73,7 +73,7 @@ alignment |= AFFIX_GOOD if(quality <= 0) alignment |= AFFIX_EVIL - + var/usedSlots = NONE for(var/i in 1 to max(1, abs(quality))) // We want at least 1 affix applied var/datum/fantasy_affix/affix = pickweight(affixListing) @@ -88,7 +88,7 @@ /datum/component/fantasy/proc/modify() var/obj/item/master = parent - + master.force = max(0, master.force + quality) master.throwforce = max(0, master.throwforce + quality) master.armor = master.armor?.modifyAllRatings(quality) @@ -103,7 +103,7 @@ if(canFail && prob((quality - 9)*10)) var/turf/place = get_turf(parent) - place.visible_message("[parent] violently glows blue for a while, then evaporates.") + place.visible_message("[parent] violently glows blue for a while, then evaporates.") master.burn() return else if(announce) @@ -135,6 +135,6 @@ effect_description = "shimmering golden glow" else span = "" - effect_description = "mottled black glow" + effect_description = "mottled black glow" location.visible_message("[span][originalName] is covered by a [effect_description] and then transforms into [parent]!") diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 1e8578056f1..a6dd90b968d 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -448,7 +448,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) updateUsrDialog() break if(!jobdatum) - to_chat(usr, "No log exists for this job.") + to_chat(usr, "No log exists for this job.") updateUsrDialog() return if(inserted_modify_id.registered_account) @@ -463,7 +463,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id.assignment = "Unassigned" playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) else - to_chat(usr, "You are not authorized to demote this position.") + to_chat(usr, "You are not authorized to demote this position.") if ("reg") if (authenticated) var/t2 = inserted_modify_id @@ -473,7 +473,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id.registered_name = newName playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) else - to_chat(usr, "Invalid name entered.") + to_chat(usr, "Invalid name entered.") updateUsrDialog() return if ("mode") diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 6b90eafb68a..638cbc03815 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -15,15 +15,15 @@ if(stat & (NOPOWER|BROKEN|MAINT)) return if(!current) - to_chat(user, "You haven't selected anything to transmit laws to!") + to_chat(user, "You haven't selected anything to transmit laws to!") return if(!can_upload_to(current)) - to_chat(user, "Upload failed! Check to make sure [current.name] is functioning properly.") + to_chat(user, "Upload failed! Check to make sure [current.name] is functioning properly.") current = null return var/turf/currentloc = get_turf(current) if(currentloc && user.z != currentloc.z) - to_chat(user, "Upload failed! Unable to establish a connection to [current.name]. You're too far away!") + to_chat(user, "Upload failed! Unable to establish a connection to [current.name]. You're too far away!") current = null return M.install(current.laws, user) @@ -44,7 +44,7 @@ current = select_active_ai(user) if (!current) - to_chat(user, "No active AIs detected!") + to_chat(user, "No active AIs detected!") else to_chat(user, "[current.name] selected for law changes.") @@ -65,7 +65,7 @@ current = select_active_free_borg(user) if(!current) - to_chat(user, "No active unslaved cyborgs detected!") + to_chat(user, "No active unslaved cyborgs detected.") else to_chat(user, "[current.name] selected for law changes.") diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 4960e3ba409..f6776aa33a0 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -124,7 +124,7 @@ //Just build whatever it is new buildpath(loc) else - src.visible_message(" Something went very wrong and there isnt enough instabitaluri anymore!") + src.visible_message("Something went very wrong, there isn't enough instabitaluri anymore!") busy = FALSE flick("limbgrower_unfill",src) icon_state = "limbgrower_idleoff" diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 084406220d3..18d0dd054d6 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -166,13 +166,13 @@ var/obj/item/multitool/M = W if(panel_open) M.buffer = src - to_chat(user, "You download the data to the [W.name]'s buffer.") + to_chat(user, "You download the data to the [W.name]'s buffer.") else if(M.buffer && istype(M.buffer, /obj/machinery/teleport/station) && M.buffer != src) if(linked_stations.len < efficiency) linked_stations.Add(M.buffer) M.buffer = null - to_chat(user, "You upload the data from the [W.name]'s buffer.") + to_chat(user, "You upload the data from the [W.name]'s buffer.") else to_chat(user, "This station can't hold more information, try to use better parts.") return @@ -186,7 +186,7 @@ else if(W.tool_behaviour == TOOL_WIRECUTTER) if(panel_open) link_console_and_hub() - to_chat(user, "You reconnect the station to nearby machinery.") + to_chat(user, "You reconnect the station to nearby machinery.") return else return ..() diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 63aeffd43c8..88dd20dad9a 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -54,7 +54,7 @@ AI MODULES if(mylaw != "") tot_laws++ if(tot_laws > CONFIG_GET(number/silicon_max_law_amount) && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset - to_chat(user, "Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.") + to_chat(user, "Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.") message_admins("[ADMIN_LOOKUPFLW(user)] tried to upload laws to [law_datum.owner ? ADMIN_LOOKUPFLW(law_datum.owner) : "an AI core"] that would exceed the law cap.") overflow = TRUE diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index eb947c1d084..7039bed6ba6 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -74,7 +74,7 @@ if(-INFINITY to RAD_LEVEL_NORMAL) . += "Ambient radiation level count reports that all is well." if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE) - . += "Ambient radiation levels slightly above average." + . += "Ambient radiation levels slightly above average." if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH) . += "Ambient radiation levels above average." if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH) diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index fba198bf552..05bbc67d130 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -147,7 +147,7 @@ /obj/item/book/granter/spell/onlearned(mob/user) ..() if(oneuse) - user.visible_message("[src] glows dark for a second!") + user.visible_message("[src] glows dark for a second!") /obj/item/book/granter/spell/fireball spell = /obj/effect/proc_holder/spell/aimed/fireball @@ -180,7 +180,7 @@ /obj/item/book/granter/spell/smoke/recoil(mob/user) ..() - to_chat(user,"Your stomach rumbles...") + to_chat(user,"Your stomach rumbles...") if(user.nutrition) user.set_nutrition(200) if(user.nutrition <= 0) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 0f0edab575c..0233d90395a 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -406,7 +406,7 @@ else if(href_list["Master"]) forced_ai = select_active_ai(usr) if(!forced_ai) - to_chat(usr, "No active AIs detected.") + to_chat(usr, "No active AIs detected.") else if(href_list["Law"]) lawsync = !lawsync diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 3194f98f79a..5a7cc0704f2 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -57,7 +57,7 @@ if(!user.transferItemToLoc(F, src)) return fireaxe = F - to_chat(user, "You place the [F.name] back in the [name].") + to_chat(user, "You place the [F.name] back in the [name].") update_icon() return else if(!broken) @@ -112,7 +112,7 @@ if(fireaxe) user.put_in_hands(fireaxe) fireaxe = null - to_chat(user, "You take the fire axe from the [name].") + to_chat(user, "You take the fire axe from the [name].") src.add_fingerprint(user) update_icon() return @@ -166,10 +166,10 @@ add_overlay("glass_raised") /obj/structure/fireaxecabinet/proc/toggle_lock(mob/user) - to_chat(user, "Resetting circuitry...") + to_chat(user, "Resetting circuitry...") playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE) if(do_after(user, 20, target = src)) - to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.") + to_chat(user, "You [locked ? "disable" : "re-enable"] the locking modules.") locked = !locked update_icon() diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index e482f0c6115..5478fb639f7 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -113,7 +113,7 @@ else //caused by emp/remote signal M.log_message("was [targeted? "flashed(targeted)" : "flashed(AOE)"]",LOG_ATTACK) if(generic_message && M != user) - to_chat(M, "[src] emits a blinding light!") + to_chat(M, "[src] emits a blinding light!") if(targeted) if(M.flash_act(1, 1)) if(M.confused < power) @@ -121,14 +121,14 @@ M.confused += min(power, diff) if(user) terrible_conversion_proc(M, user) - visible_message("[user] blinds [M] with the flash!") + visible_message("[user] blinds [M] with the flash!") to_chat(user, "You blind [M] with the flash!") to_chat(M, "[user] blinds you with the flash!") else to_chat(M, "You are blinded by [src]!") M.Paralyze(rand(80,120)) else if(user) - visible_message("[user] fails to blind [M] with the flash!") + visible_message("[user] fails to blind [M] with the flash!") to_chat(user, "You fail to blind [M] with the flash!") to_chat(M, "[user] fails to blind you with the flash!") else @@ -152,10 +152,10 @@ var/diff = 5 * CONFUSION_STACK_MAX_MULTIPLIER - M.confused R.confused += min(5, diff) R.flash_act(affect_silicon = 1) - user.visible_message("[user] overloads [R]'s sensors with the flash!", "You overload [R]'s sensors with the flash!") + user.visible_message("[user] overloads [R]'s sensors with the flash!", "You overload [R]'s sensors with the flash!") return TRUE - user.visible_message("[user] fails to blind [M] with the flash!", "You fail to blind [M] with the flash!") + user.visible_message("[user] fails to blind [M] with the flash!", "You fail to blind [M] with the flash!") /obj/item/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(holder) @@ -266,14 +266,14 @@ else //caused by emp/remote signal M.log_message("was [targeted? "hypno-flashed(targeted)" : "hypno-flashed(AOE)"]",LOG_ATTACK) if(generic_message && M != user) - to_chat(M, "[src] emits a soothing light...") + to_chat(M, "[src] emits a soothing light...") if(targeted) if(M.flash_act(1, 1)) var/hypnosis = FALSE if(M.hypnosis_vulnerable()) hypnosis = TRUE if(user) - user.visible_message("[user] blinds [M] with the flash!", "You hypno-flash [M]!") + user.visible_message("[user] blinds [M] with the flash!", "You hypno-flash [M]!") if(!hypnosis) to_chat(M, "The light makes you feel oddly relaxed...") @@ -285,7 +285,7 @@ M.apply_status_effect(/datum/status_effect/trance, 200, TRUE) else if(user) - user.visible_message("[user] fails to blind [M] with the flash!", "You fail to hypno-flash [M]!") + user.visible_message("[user] fails to blind [M] with the flash!", "You fail to hypno-flash [M]!") else to_chat(M, "[src] fails to blind you!") diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index ac3e4cc3331..6ae06346636 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -94,7 +94,7 @@ to_chat(user, "You need a better grip to do that!") return var/mob/living/pushed_mob = user.pulling - visible_message("[user] stuffs [pushed_mob] into [src]!") + visible_message("[user] stuffs [pushed_mob] into [src]!") pushed_mob.forceMove(src) user.stop_pulling() return diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 0021738beaf..a41e7a4aa16 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -297,11 +297,6 @@ em {font-style: normal; font-weight: bold;} h1.alert, h2.alert {color: #000000;} .emote { font-style: italic;} -.selecteddna {color: #ffffff; background-color: #001B1B} - -.attack {color: #e01c1c;} -.disarm {color: #b42525;} -.passive {color: #a00f0f;} .userdanger {color: #c51e1e; font-weight: bold; font-size: 185%;} .danger {color: #c51e1e;} @@ -324,9 +319,8 @@ h1.alert, h2.alert {color: #000000;} .red {color: #FF0000} .blue {color: #215cff} .nicegreen {color: #059223;} -.shadowling {color: #8e8a99;} -.cult {color: #aa1c1c;} +.cult {color: #aa1c1c;} .cultitalic {color: #aa1c1c; font-style: italic;} .cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;} .cultboldtalic {color: #aa1c1c; font-weight: bold; font-size: 185%;} @@ -346,37 +340,15 @@ h1.alert, h2.alert {color: #000000;} .revenminor {color: #823abb} .revenwarning {color: #760fbb; font-style: italic;} .revendanger {color: #760fbb; font-weight: bold; font-size: 185%;} -.umbra {color: #7c00e6;} -.umbra_emphasis {color: #7c00e6; font-weight: bold; font-style: italic;} -.umbra_large {color: #7c00e6; font-size: 185%; font-weight: bold; font-style: italic;} .deconversion_message {color: #a947ff; font-size: 185%; font-style: italic;} -.nezbere_large {color: #42474D; font-size: 185%; font-weight: bold; font-style: italic;} -.nezbere {color: #42474D; font-weight: bold; font-style: italic;} -.nezbere_small {color: #42474D;} -.sevtug_large {color: #AF0AAF; font-size: 185%; font-weight: bold; font-style: italic;} -.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;} -.sevtug_small {color: #AF0AAF;} -.inathneq_large {color: #1E8CE1; font-size: 185%; font-weight: bold; font-style: italic;} -.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;} -.inathneq_small {color: #1E8CE1;} -.nzcrentr_large {color: #DAAA18; font-size: 185%; font-weight: bold; font-style: italic;} -.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;} -.nzcrentr_small {color: #DAAA18;} -.neovgre_large {color: #6E001A; font-size: 185%; font-weight: bold; font-style: italic;} -.neovgre {color: #6E001A; font-weight: bold; font-style: italic;} -.neovgre_small {color: #6E001A;} - -.newscaster {color: #c05d5d;} .ghostalert {color: #6600ff; font-style: italic; font-weight: bold;} .alien {color: #855d85;} .noticealien {color: #059223;} .alertalien {color: #059223; font-weight: bold;} .changeling {color: #059223; font-style: italic;} -.alertsyndie {color: #FF0000; font-size: 24px; font-weight: bold;} -.assimilator {color: #059223; font-size: 125%; font-weight: bold;} .alertsyndie {color: #FF0000; font-size: 185%; font-weight: bold;} .spider {color: #8800ff; font-weight: bold; font-size: 185%;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css index 4dfa086d7f2..13819e94f16 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput_white.css +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -294,11 +294,6 @@ em {font-style: normal; font-weight: bold;} h1.alert, h2.alert {color: #000000;} .emote { font-style: italic;} -.selecteddna {color: #ffffff; background-color: #001B1B} - -.attack {color: #ff0000;} -.disarm {color: #990000;} -.passive {color: #660000;} .userdanger {color: #ff0000; font-weight: bold; font-size: 185%;} .danger {color: #ff0000;} @@ -321,9 +316,8 @@ h1.alert, h2.alert {color: #000000;} .red {color: #FF0000} .blue {color: #0000FF} .nicegreen {color: #14a833;} -.shadowling {color: #3b2769;} -.cult {color: #960000;} +.cult {color: #960000;} .cultitalic {color: #960000; font-style: italic;} .cultbold {color: #960000; font-style: italic; font-weight: bold;} .cultboldtalic {color: #960000; font-weight: bold; font-size: 185%;} @@ -343,36 +337,9 @@ h1.alert, h2.alert {color: #000000;} .revenminor {color: #823abb} .revenwarning {color: #760fbb; font-style: italic;} .revendanger {color: #760fbb; font-weight: bold; font-size: 185%;} -.umbra {color: #5000A0;} -.umbra_emphasis {color: #5000A0; font-weight: bold; font-style: italic;} -.umbra_large {color: #5000A0; font-size: 185%; font-weight: bold; font-style: italic;} .deconversion_message {color: #5000A0; font-size: 185%; font-style: italic;} -.brass {color: #BE8700;} -.heavy_brass {color: #BE8700; font-weight: bold; font-style: italic;} -.large_brass {color: #BE8700; font-size: 185%;} -.big_brass {color: #BE8700; font-size: 185%; font-weight: bold; font-style: italic;} -.ratvar {color: #BE8700; font-size: 370%; font-weight: bold; font-style: italic;} -.alloy {color: #42474D;} -.heavy_alloy {color: #42474D; font-weight: bold; font-style: italic;} -.nezbere_large {color: #42474D; font-size: 185%; font-weight: bold; font-style: italic;} -.nezbere {color: #42474D; font-weight: bold; font-style: italic;} -.nezbere_small {color: #42474D;} -.sevtug_large {color: #AF0AAF; font-size: 185%; font-weight: bold; font-style: italic;} -.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;} -.sevtug_small {color: #AF0AAF;} -.inathneq_large {color: #1E8CE1; font-size: 185%; font-weight: bold; font-style: italic;} -.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;} -.inathneq_small {color: #1E8CE1;} -.nzcrentr_large {color: #DAAA18; font-size: 185%; font-weight: bold; font-style: italic;} -.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;} -.nzcrentr_small {color: #DAAA18;} -.neovgre_large {color: #6E001A; font-size: 185%; font-weight: bold; font-style: italic;} -.neovgre {color: #6E001A; font-weight: bold; font-style: italic;} -.neovgre_small {color: #6E001A;} - -.newscaster {color: #800000;} .ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;} .alien {color: #543354;} @@ -435,4 +402,4 @@ h1.alert, h2.alert {color: #000000;} /* HELPER CLASSES */ .text-normal {font-weight: normal; font-style: normal;} -.hidden {display: none; visibility: hidden;} \ No newline at end of file +.hidden {display: none; visibility: hidden;} 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 0b5646fa132..9e00cca5347 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -71,11 +71,11 @@ var/hacked = FALSE //If we have laws to destroy the station var/flavortext = \ "\nDO NOT INTERFERE WITH THE ROUND AS A DRONE OR YOU WILL BE DRONE BANNED\n"+\ - "Drones are a ghost role that are allowed to fix the station and build things. Interfering with the round as a drone is against the rules.\n"+\ - "Actions that constitute interference include, but are not limited to:\n"+\ - " - Interacting with round critical objects (IDs, weapons, contraband, powersinks, bombs, etc.)\n"+\ - " - Interacting with living beings (communication, attacking, healing, etc.)\n"+\ - " - Interacting with non-living beings (dragging bodies, looting bodies, etc.)\n"+\ + "Drones are a ghost role that are allowed to fix the station and build things. Interfering with the round as a drone is against the rules.\n"+\ + "Actions that constitute interference include, but are not limited to:\n"+\ + " - Interacting with round critical objects (IDs, weapons, contraband, powersinks, bombs, etc.)\n"+\ + " - Interacting with living beings (communication, attacking, healing, etc.)\n"+\ + " - Interacting with non-living beings (dragging bodies, looting bodies, etc.)\n"+\ "These rules are at admin discretion and will be heavily enforced.\n"+\ "If you do not have the regular drone laws, follow your laws to the best of your ability." diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 33420bc78cc..7e87edb1ae6 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -117,10 +117,10 @@ "3. Your goals are to actively build, maintain, repair, improve, and provide power to the best of your abilities within the facility that housed your activation." flavortext = \ "\nDO NOT WILLINGLY LEAVE KOSMICHESKAYA STANTSIYA 13 (THE DERELICT)\n"+\ - "Derelict drones are a ghost role that is allowed to roam freely on KS13, with the main goal of repairing and improving it.\n"+\ - "Do not interfere with the round going on outside KS13.\n"+\ - "Actions that constitute interference include, but are not limited to:\n"+\ - " - Going to the main station in search of materials.\n"+\ - " - Interacting with non-drone players outside KS13, dead or alive.\n"+\ + "Derelict drones are a ghost role that is allowed to roam freely on KS13, with the main goal of repairing and improving it.\n"+\ + "Do not interfere with the round going on outside KS13.\n"+\ + "Actions that constitute interference include, but are not limited to:\n"+\ + " - Going to the main station in search of materials.\n"+\ + " - Interacting with non-drone players outside KS13, dead or alive.\n"+\ "These rules are at admin discretion and will be heavily enforced.\n"+\ - "If you do not have the regular drone laws, follow your laws to the best of your ability." \ No newline at end of file + "If you do not have the regular drone laws, follow your laws to the best of your ability." diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 7ffb15743da..7c50efd5b5a 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -80,7 +80,7 @@ return if(!interface_control) - to_chat(usr, "ERROR: Request timed out. Check wire contacts.") + to_chat(usr, "ERROR: Request timed out. Check wire contacts.") return if(href_list["close"]) diff --git a/code/modules/spells/spell_types/charge.dm b/code/modules/spells/spell_types/charge.dm index 238fd084000..62e8543393d 100644 --- a/code/modules/spells/spell_types/charge.dm +++ b/code/modules/spells/spell_types/charge.dm @@ -97,7 +97,7 @@ if(!charged_item) to_chat(L, "You feel magical power surging through your hands, but the feeling rapidly fades...") else if(burnt_out) - to_chat(L, "[charged_item] doesn't seem to be reacting to the spell...") + to_chat(L, "[charged_item] doesn't seem to be reacting to the spell!") else playsound(get_turf(L), 'sound/magic/charge.ogg', 50, TRUE) to_chat(L, "[charged_item] suddenly feels very warm!") diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm index f9a5ef386dc..b9c509643bd 100644 --- a/code/modules/spells/spell_types/lichdom.dm +++ b/code/modules/spells/spell_types/lichdom.dm @@ -26,10 +26,10 @@ if(iscarbon(M)) hand_items = list(M.get_active_held_item(),M.get_inactive_held_item()) if(!hand_items.len) - to_chat(M, "You must hold an item you wish to make your phylactery...") + to_chat(M, "You must hold an item you wish to make your phylactery!") return if(!M.mind.hasSoul) - to_chat(user, "You do not possess a soul.") + to_chat(user, "You do not possess a soul!") return var/obj/item/marked_item diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index 3cc8e90064a..7d936306597 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -36,9 +36,9 @@ if(!marked_item) if(hand_items) - message = "You aren't holding anything that can be marked for recall." + message = "You aren't holding anything that can be marked for recall!" else - message = "You must hold the desired item in your hands to mark it for recall." + message = "You must hold the desired item in your hands to mark it for recall!" else if(marked_item && marked_item in hand_items) //unlinking item to the spell message = "You remove the mark on [marked_item] to use elsewhere." @@ -73,7 +73,7 @@ if(issilicon(M)) //Items in silicons warp the whole silicon M.loc.visible_message("[M] suddenly disappears!") M.forceMove(L.loc) - M.loc.visible_message("[M] suddenly appears!") + M.loc.visible_message("[M] suddenly appears!") item_to_retrieve = null break M.dropItemToGround(item_to_retrieve) @@ -107,10 +107,10 @@ item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly disappears!") if(!L.put_in_hands(item_to_retrieve)) item_to_retrieve.forceMove(L.drop_location()) - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears!") + item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears!") playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, TRUE) else - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears in [L]'s hand!") + item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears in [L]'s hand!") playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, TRUE) diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 06239e705c7..f7433e09c28 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -35,7 +35,7 @@ /datum/action/item_action/hands_free/activate_pill/Trigger() if(!..()) return FALSE - to_chat(owner, "You grit your teeth and burst the implanted [target.name]!") + to_chat(owner, "You grit your teeth and burst the implanted [target.name]!") log_combat(owner, null, "swallowed an implanted pill", target) if(target.reagents.total_volume) target.reagents.reaction(owner, INGEST) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 97a5ea9f7e4..79155c39a8c 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -59,11 +59,6 @@ em {font-style: normal; font-weight: bold;} h1.alert, h2.alert {color: #000000;} .emote { font-style: italic;} -.selecteddna {color: #ffffff; background-color: #001B1B} - -.attack {color: #ff0000;} -.disarm {color: #990000;} -.passive {color: #660000;} .userdanger {color: #ff0000; font-weight: bold; font-size: 3;} .danger {color: #ff0000;} @@ -83,7 +78,6 @@ h1.alert, h2.alert {color: #000000;} .suicide {color: #ff5050; font-style: italic;} .green {color: #03ff39;} .nicegreen {color: #14a833;} -.shadowling {color: #3b2769;} .cult {color: #960000;} .cultlarge {color: #960000; font-weight: bold; font-size: 3;} .narsie {color: #960000; font-weight: bold; font-size: 15;} @@ -100,37 +94,15 @@ h1.alert, h2.alert {color: #000000;} .revenminor {color: #823abb} .revenwarning {color: #760fbb; font-style: italic;} .revendanger {color: #760fbb; font-weight: bold; font-size: 3;} -.umbra {color: #5000A0;} -.umbra_emphasis {color: #5000A0; font-weight: bold; font-style: italic;} -.umbra_large {color: #5000A0; font-size: 3; font-weight: bold; font-style: italic;} .deconversion_message {color: #5000A0; font-size: 3; font-style: italic;} -.nezbere_large {color: #42474D; font-size: 3; font-weight: bold; font-style: italic;} -.nezbere {color: #42474D; font-weight: bold; font-style: italic;} -.nezbere_small {color: #42474D;} -.sevtug_large {color: #AF0AAF; font-size: 3; font-weight: bold; font-style: italic;} -.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;} -.sevtug_small {color: #AF0AAF;} -.inathneq_large {color: #1E8CE1; font-size: 3; font-weight: bold; font-style: italic;} -.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;} -.inathneq_small {color: #1E8CE1;} -.nzcrentr_large {color: #DAAA18; font-size: 3; font-weight: bold; font-style: italic;} -.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;} -.nzcrentr_small {color: #DAAA18;} -.neovgre_large {color: #6E001A; font-size: 3; font-weight: bold; font-style: italic;} -.neovgre {color: #6E001A; font-weight: bold; font-style: italic;} -.neovgre_small {color: #6E001A;} - -.newscaster {color: #800000;} .ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;} .alien {color: #543354;} .noticealien {color: #00c000;} .alertalien {color: #00c000; font-weight: bold;} .changeling {color: #800080; font-style: italic;} -.assimilator {color: #800080; font-size: 2 ; font-weight: bold;} -.bigassimilator {color: #800080; font-size: 4 ; font-weight: bold;} .spider {color: #4d004d;}