From fe3bf24784de16d92020dd23cc97c6e69895443f Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:24:02 +0100 Subject: [PATCH] Changes more 's into span_defines, fixes more lists, de-hardcodes a lil bit of code and removes useless defines (#1930) * spans and lists * bap * some more fixes * unknown --- ModularTegustation/tegu_cloning/machine.dm | 2 +- .../tegu_security_code/detective_vendor.dm | 108 +++++++------- code/__DEFINES/~lobotomy_defines/adventure.dm | 12 +- .../objects/items/ego_weapons/_ego_weapon.dm | 30 ++-- code/game/objects/items/ego_weapons/_lists.dm | 38 ++--- code/game/objects/items/ego_weapons/aleph.dm | 56 ++++---- code/game/objects/items/ego_weapons/he.dm | 76 +++++----- code/game/objects/items/ego_weapons/joke.dm | 22 +-- .../ego_weapons/non_abnormality/_charge.dm | 2 +- .../non_abnormality/black_silence.dm | 34 ++--- .../ego_weapons/non_abnormality/blue_sicko.dm | 24 ++-- .../items/ego_weapons/non_abnormality/cane.dm | 14 +- .../ego_weapons/non_abnormality/carnival.dm | 14 +- .../items/ego_weapons/non_abnormality/cinq.dm | 10 +- .../non_abnormality/color_fixer.dm | 16 +-- .../items/ego_weapons/non_abnormality/dawn.dm | 10 +- .../ego_weapons/non_abnormality/fullstop.dm | 6 +- .../ego_weapons/non_abnormality/gradeone.dm | 22 +-- .../items/ego_weapons/non_abnormality/hana.dm | 12 +- .../ego_weapons/non_abnormality/index.dm | 28 ++-- .../ego_weapons/non_abnormality/jcorp.dm | 6 +- .../ego_weapons/non_abnormality/jeong.dm | 16 +-- .../ego_weapons/non_abnormality/leaflet.dm | 6 +- .../items/ego_weapons/non_abnormality/liu.dm | 32 ++--- .../ego_weapons/non_abnormality/mirae.dm | 12 +- .../non_abnormality/miscbackstreet.dm | 10 +- .../ego_weapons/non_abnormality/miscfixer.dm | 10 +- .../ego_weapons/non_abnormality/molar.dm | 10 +- .../ego_weapons/non_abnormality/ncorp.dm | 6 +- .../non_abnormality/purple_tear.dm | 44 +++--- .../items/ego_weapons/non_abnormality/rats.dm | 4 +- .../ego_weapons/non_abnormality/rcorp.dm | 24 ++-- .../non_abnormality/rcorp_assault.dm | 4 +- .../non_abnormality/rosespanner.dm | 8 +- .../ego_weapons/non_abnormality/seven.dm | 26 ++-- .../items/ego_weapons/non_abnormality/shi.dm | 20 +-- .../ego_weapons/non_abnormality/sweeper.dm | 10 +- .../ego_weapons/non_abnormality/syndicate.dm | 20 +-- .../ego_weapons/non_abnormality/thumb.dm | 16 +-- .../ego_weapons/non_abnormality/wcorp.dm | 4 +- .../non_abnormality/weak_edits/city.dm | 136 +++++++++--------- .../items/ego_weapons/non_abnormality/zwei.dm | 20 +-- code/game/objects/items/ego_weapons/ordeal.dm | 10 +- .../game/objects/items/ego_weapons/special.dm | 20 +-- .../items/ego_weapons/subtype/charge.dm | 10 +- .../items/ego_weapons/subtype/lance.dm | 16 +-- .../items/ego_weapons/subtype/shield.dm | 22 +-- code/game/objects/items/ego_weapons/teth.dm | 16 +-- code/game/objects/items/ego_weapons/waw.dm | 104 +++++++------- code/game/objects/items/ego_weapons/zayin.dm | 32 ++--- 50 files changed, 606 insertions(+), 604 deletions(-) diff --git a/ModularTegustation/tegu_cloning/machine.dm b/ModularTegustation/tegu_cloning/machine.dm index 451ada12efbf..4ac2e06d316f 100644 --- a/ModularTegustation/tegu_cloning/machine.dm +++ b/ModularTegustation/tegu_cloning/machine.dm @@ -3,7 +3,7 @@ //Potential replacement for genetics revives or something I dunno (?) -#define CLONE_INITIAL_DAMAGE 150 //Clones in clonepods start with 150 cloneloss damage and 150 brainloss damage, thats just logical +#define CLONE_INITIAL_DAMAGE 150 //Clones in clonepods start with 150 cloneloss damage and 150 brainloss damage, thats just logical #define MINIMUM_HEAL_LEVEL 40 #define SPEAK(message) radio.talk_into(src, message, radio_channel) diff --git a/ModularTegustation/tegu_security_code/detective_vendor.dm b/ModularTegustation/tegu_security_code/detective_vendor.dm index 788e33cdba55..9646c6dbb214 100644 --- a/ModularTegustation/tegu_security_code/detective_vendor.dm +++ b/ModularTegustation/tegu_security_code/detective_vendor.dm @@ -6,57 +6,63 @@ icon_state = "det" icon_deny = "det-deny" req_access = list(ACCESS_FORENSICS_LOCKERS) - products = list(/obj/item/clothing/suit/det_suit/disco = 1, - /obj/item/clothing/suit/det_suit/disco/aerostatic = 1, - /obj/item/clothing/suit/det_suit = 1, - /obj/item/clothing/suit/det_suit/grey = 1, - /obj/item/clothing/suit/det_suit/noir = 1, - /obj/item/clothing/suit/armor/vest/det_suit = 1, - /obj/item/clothing/under/rank/security/detective/disco = 4, - /obj/item/clothing/under/rank/security/detective/disco/aerostatic = 4, - /obj/item/clothing/under/rank/security/detective = 4, - /obj/item/clothing/under/rank/security/detective/skirt = 4, - /obj/item/clothing/under/rank/security/detective/grey = 4, - /obj/item/clothing/under/rank/security/detective/grey/skirt = 4, - /obj/item/clothing/accessory/waistcoat = 4, - /obj/item/clothing/neck/tie/detective/disco_necktie = 4, - /obj/item/clothing/gloves/color/black/aerostatic_gloves = 4, - /obj/item/clothing/gloves/color/black = 4, - /obj/item/clothing/shoes/sneakers/disco = 4, - /obj/item/clothing/shoes/jackboots/aerostatic = 4, - /obj/item/clothing/shoes/laceup/digitigrade = 4, - /obj/item/clothing/shoes/laceup = 4, - /obj/item/clothing/glasses/sunglasses/disco = 4, - /obj/item/clothing/head/fedora/det_hat = 4, - /obj/item/clothing/head/fedora = 4, - /obj/item/assembly/flash/handheld = 4, - /obj/item/flashlight/seclite = 4, - /obj/item/radio/off/security = 4, - /obj/item/detective_scanner = 1, - /obj/item/radio/headset/headset_discipline = 1, - /obj/item/holosign_creator/security = 1, - /obj/item/reagent_containers/spray/pepper = 1, - /obj/item/storage/belt/holster/detective/full = 1, - /obj/item/pinpointer/crew = 1, - /obj/item/binoculars = 1, - /obj/item/storage/box/rxglasses/spyglasskit = 1, - /obj/item/folder = 4, - /obj/item/disk/forensic = 12, - /obj/item/storage/box/evidence = 12, - /obj/item/storage/box/matches = 12, - /obj/item/storage/fancy/cigarettes/cigars = 12, - /obj/item/reagent_containers/food/drinks/coffee = 12, - /obj/item/food/donut = 12) - contraband = list(/obj/item/clothing/glasses/sunglasses = 2, - /obj/item/storage/fancy/donut_box = 2) - premium = list(/obj/item/storage/belt/security/webbing = 5, - /obj/item/coin/antagtoken = 1, - /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 4, - /obj/item/storage/box/gum/nicotine = 2, - /obj/item/lighter = 4, - /obj/item/clothing/mask/cigarette/pipe = 4, - /obj/item/storage/fancy/cigarettes/cigars/havana = 12, - /obj/item/storage/fancy/cigarettes/cigars/cohiba = 12) + products = list( + /obj/item/clothing/suit/det_suit/disco = 1, + /obj/item/clothing/suit/det_suit/disco/aerostatic = 1, + /obj/item/clothing/suit/det_suit = 1, + /obj/item/clothing/suit/det_suit/grey = 1, + /obj/item/clothing/suit/det_suit/noir = 1, + /obj/item/clothing/suit/armor/vest/det_suit = 1, + /obj/item/clothing/under/rank/security/detective/disco = 4, + /obj/item/clothing/under/rank/security/detective/disco/aerostatic = 4, + /obj/item/clothing/under/rank/security/detective = 4, + /obj/item/clothing/under/rank/security/detective/skirt = 4, + /obj/item/clothing/under/rank/security/detective/grey = 4, + /obj/item/clothing/under/rank/security/detective/grey/skirt = 4, + /obj/item/clothing/accessory/waistcoat = 4, + /obj/item/clothing/neck/tie/detective/disco_necktie = 4, + /obj/item/clothing/gloves/color/black/aerostatic_gloves = 4, + /obj/item/clothing/gloves/color/black = 4, + /obj/item/clothing/shoes/sneakers/disco = 4, + /obj/item/clothing/shoes/jackboots/aerostatic = 4, + /obj/item/clothing/shoes/laceup/digitigrade = 4, + /obj/item/clothing/shoes/laceup = 4, + /obj/item/clothing/glasses/sunglasses/disco = 4, + /obj/item/clothing/head/fedora/det_hat = 4, + /obj/item/clothing/head/fedora = 4, + /obj/item/assembly/flash/handheld = 4, + /obj/item/flashlight/seclite = 4, + /obj/item/radio/off/security = 4, + /obj/item/detective_scanner = 1, + /obj/item/radio/headset/headset_discipline = 1, + /obj/item/holosign_creator/security = 1, + /obj/item/reagent_containers/spray/pepper = 1, + /obj/item/storage/belt/holster/detective/full = 1, + /obj/item/pinpointer/crew = 1, + /obj/item/binoculars = 1, + /obj/item/storage/box/rxglasses/spyglasskit = 1, + /obj/item/folder = 4, + /obj/item/disk/forensic = 12, + /obj/item/storage/box/evidence = 12, + /obj/item/storage/box/matches = 12, + /obj/item/storage/fancy/cigarettes/cigars = 12, + /obj/item/reagent_containers/food/drinks/coffee = 12, + /obj/item/food/donut = 12, + ) + contraband = list( + /obj/item/clothing/glasses/sunglasses = 2, + /obj/item/storage/fancy/donut_box = 2, + ) + premium = list( + /obj/item/storage/belt/security/webbing = 5, + /obj/item/coin/antagtoken = 1, + /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 4, + /obj/item/storage/box/gum/nicotine = 2, + /obj/item/lighter = 4, + /obj/item/clothing/mask/cigarette/pipe = 4, + /obj/item/storage/fancy/cigarettes/cigars/havana = 12, + /obj/item/storage/fancy/cigarettes/cigars/cohiba = 12, + ) refill_canister = /obj/item/vending_refill/detective extra_price = 100 diff --git a/code/__DEFINES/~lobotomy_defines/adventure.dm b/code/__DEFINES/~lobotomy_defines/adventure.dm index f1dc251baeb6..479636486c81 100644 --- a/code/__DEFINES/~lobotomy_defines/adventure.dm +++ b/code/__DEFINES/~lobotomy_defines/adventure.dm @@ -1,13 +1,13 @@ // defines used in ModularTegustation/_adventure_console -#define DEBUG_TEXT_DISPLAY 1 -#define NORMAL_TEXT_DISPLAY 2 -#define ADVENTURE_TEXT_DISPLAY 3 +#define DEBUG_TEXT_DISPLAY (1<<0) +#define NORMAL_TEXT_DISPLAY (1<<1) +#define ADVENTURE_TEXT_DISPLAY (1<<2) //Modes for what is displayed on the adventure panel. -#define ADVENTURE_MODE_TRAVEL 1 -#define ADVENTURE_MODE_BATTLE 2 -#define ADVENTURE_MODE_EVENT_BATTLE 3 +#define ADVENTURE_MODE_TRAVEL (1<<0) +#define ADVENTURE_MODE_BATTLE (1<<1) +#define ADVENTURE_MODE_EVENT_BATTLE (1<<2) //Stats defined. I honestly didnt want to make it have limbus company sins but here we are. #define WRATH_STAT 1 diff --git a/code/game/objects/items/ego_weapons/_ego_weapon.dm b/code/game/objects/items/ego_weapons/_ego_weapon.dm index a362867a5da3..ee65200ba474 100644 --- a/code/game/objects/items/ego_weapons/_ego_weapon.dm +++ b/code/game/objects/items/ego_weapons/_ego_weapon.dm @@ -28,41 +28,41 @@ . = ..() . += EgoAttackInfo(user) if(special) - . += "[special]" + . += span_notice("[special]") if(LAZYLEN(attribute_requirements)) - . += "It has certain requirements for the wearer." + . += span_notice("It has certain requirements for the wearer.") if(type in GLOB.small_ego) - . += "This weapon fits in an EGO belt." + . += span_notice("This weapon fits in an EGO belt.") if(reach>1) - . += "This weapon has a reach of [reach]." + . += span_notice("This weapon has a reach of [reach].") if(throwforce>force) - . += "This weapon deals [throwforce] [damtype] damage when thrown." + . += span_notice("This weapon deals [throwforce] [damtype] damage when thrown.") if(!attack_speed) return //Can't switch for less than for some reason if(attack_speed<0.4) - . += "This weapon has a very fast attack speed." + . += span_notice("This weapon has a very fast attack speed.") else if(attack_speed<0.7) - . += "This weapon has a fast attack speed." + . += span_notice("This weapon has a fast attack speed.") else if(attack_speed<1) - . += "This weapon attacks slightly faster than normal." + . += span_notice("This weapon attacks slightly faster than normal.") else if(attack_speed<1.5) - . += "This weapon attacks slightly slower than normal." + . += span_notice("This weapon attacks slightly slower than normal.") else if(attack_speed<2) - . += "This weapon has a slow attack speed." + . += span_notice("This weapon has a slow attack speed.") else if(attack_speed>=2) - . += "This weapon attacks extremely slow." + . += span_notice("This weapon attacks extremely slow.") /obj/item/ego_weapon/Topic(href, href_list) . = ..() if(href_list["list_attributes"]) - var/display_text = "It requires the following attributes:" + var/display_text = span_warning("It requires the following attributes:") for(var/atr in attribute_requirements) if(attribute_requirements[atr] > 0) display_text += "\n [atr]: [attribute_requirements[atr]]." @@ -85,7 +85,7 @@ var/mob/living/carbon/human/H = user for(var/atr in attribute_requirements) if(attribute_requirements[atr] > get_attribute_level(H, atr)) - to_chat(H, "You cannot use [src]!") + to_chat(H, span_notice("You cannot use [src]!")) return FALSE if(!SpecialEgoCheck(H)) return FALSE @@ -99,8 +99,8 @@ /obj/item/ego_weapon/proc/EgoAttackInfo(mob/user) if(force_multiplier != 1) - return "It deals [round(force * force_multiplier, 0.1)] [damtype] damage. (+ [(force_multiplier - 1) * 100]%)" - return "It deals [force] [damtype] damage." + return span_notice("It deals [round(force * force_multiplier, 0.1)] [damtype] damage. (+ [(force_multiplier - 1) * 100]%)") + return span_notice("It deals [force] [damtype] damage.") /* * Used to clean up any remaining variables or timers in an ego weapon. diff --git a/code/game/objects/items/ego_weapons/_lists.dm b/code/game/objects/items/ego_weapons/_lists.dm index abc35eb6b831..cb2bcf13dd23 100644 --- a/code/game/objects/items/ego_weapons/_lists.dm +++ b/code/game/objects/items/ego_weapons/_lists.dm @@ -1,23 +1,23 @@ //Everything here fits in a belt GLOBAL_LIST_INIT(small_ego, list ( - //EGO weapons - /obj/item/gun/ego_gun/pistol, - /obj/item/ego_weapon/mini, - /obj/item/ego_weapon/warp/knife, - /obj/item/ego_weapon/support/letter_opener, - /obj/item/ego_weapon/charge/warring, - /obj/item/gun/ego_gun/feather, + //EGO weapons + /obj/item/gun/ego_gun/pistol, + /obj/item/ego_weapon/mini, + /obj/item/ego_weapon/warp/knife, + /obj/item/ego_weapon/support/letter_opener, + /obj/item/ego_weapon/charge/warring, + /obj/item/gun/ego_gun/feather, - //Non-EGO weapons - /obj/item/ego_weapon/city/ncorp_mark, - /obj/item/ego_weapon/city/ncorp_nail, - /obj/item/ego_weapon/city/ncorp_brassnail, - /obj/item/ego_weapon/city/rats, - /obj/item/ego_weapon/city/charge/rosespanner/minihammer, - /obj/item/ego_weapon/city/seven_fencing/dagger, - /obj/item/ego_weapon/city/jeong, - /obj/item/ego_weapon/city/awl, - /obj/item/ego_weapon/city/charge/wcorp/hatchet, - /obj/item/gun/ego_gun/city/fullstop/deagle, - )) + //Non-EGO weapons + /obj/item/ego_weapon/city/ncorp_mark, + /obj/item/ego_weapon/city/ncorp_nail, + /obj/item/ego_weapon/city/ncorp_brassnail, + /obj/item/ego_weapon/city/rats, + /obj/item/ego_weapon/city/charge/rosespanner/minihammer, + /obj/item/ego_weapon/city/seven_fencing/dagger, + /obj/item/ego_weapon/city/jeong, + /obj/item/ego_weapon/city/awl, + /obj/item/ego_weapon/city/charge/wcorp/hatchet, + /obj/item/gun/ego_gun/city/fullstop/deagle, +)) diff --git a/code/game/objects/items/ego_weapons/aleph.dm b/code/game/objects/items/ego_weapons/aleph.dm index 1f5d65a2117e..f3fdfdbc1b05 100644 --- a/code/game/objects/items/ego_weapons/aleph.dm +++ b/code/game/objects/items/ego_weapons/aleph.dm @@ -11,11 +11,11 @@ attack_verb_simple = list("purge", "purify") hitsound = 'sound/weapons/ego/paradise.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 100, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 100, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 100, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 100, + JUSTICE_ATTRIBUTE = 100, + ) var/ranged_cooldown var/ranged_cooldown_time = 0.8 SECONDS var/ranged_damage = 70 @@ -223,8 +223,8 @@ /obj/item/ego_weapon/twilight/EgoAttackInfo(mob/user) if(force_multiplier != 1) - return "It deals [round((force * 4) * force_multiplier)] red, white, black and pale damage combined. (+ [(force_multiplier - 1) * 100]%)" - return "It deals [force * 4] red, white, black and pale damage combined." + return span_notice("It deals [round((force * 4) * force_multiplier)] red, white, black and pale damage combined. (+ [(force_multiplier - 1) * 100]%)") + return span_notice("It deals [force * 4] red, white, black and pale damage combined.") /obj/item/ego_weapon/goldrush name = "gold rush" @@ -251,9 +251,9 @@ return if(do_after(user, 5, target)) - target.visible_message("[user] rears up and slams into [target]!", \ - "[user] punches you with everything you got!!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "You throw your entire body into this punch!") + target.visible_message(span_danger("[user] rears up and slams into [target]!"), \ + span_userdanger("[user] punches you with everything you got!!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("You throw your entire body into this punch!")) goldrush_damage = force //I gotta regrab justice here var/userjust = (get_modified_attribute_level(user, JUSTICE_ATTRIBUTE)) @@ -280,7 +280,7 @@ if(!istype(I, /obj/item/nihil/diamond)) return new /obj/item/ego_weapon/goldrush/nihil(get_turf(src)) - to_chat(user,"The [I] seems to drain all of the light away as it is absorbed into [src]!") + to_chat(user,span_warning("The [I] seems to drain all of the light away as it is absorbed into [src]!")) playsound(user, 'sound/abnormalities/nihil/filter.ogg', 15, FALSE, -3) qdel(I) qdel(src) @@ -345,7 +345,7 @@ damtype = RED_DAMAGE force = 80 icon_state = "rosered" - to_chat(user, "\[src] will now deal [force] [damtype] damage.") + to_chat(user, span_notice("\[src] will now deal [force] [damtype] damage.")) playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE) /obj/item/ego_weapon/censored @@ -380,9 +380,9 @@ return special_attack = !special_attack if(special_attack) - to_chat(user, "You prepare special attack.") + to_chat(user, span_notice("You prepare special attack.")) else - to_chat(user, "You decide to not use special attack.") + to_chat(user, span_notice("You decide to not use special attack.")) /obj/item/ego_weapon/censored/afterattack(atom/A, mob/living/user, proximity_flag, params) if(!CanUseEgo(user)) @@ -609,8 +609,8 @@ /obj/item/ego_weapon/space/EgoAttackInfo(mob/user) if(force_multiplier != 1) - return "It deals [round(force * force_multiplier)] of both white and black damage. (+ [(force_multiplier - 1) * 100]%)" - return "It deals [force] of both white and black damage." + return span_notice("It deals [round(force * force_multiplier)] of both white and black damage. (+ [(force_multiplier - 1) * 100]%)") + return span_notice("It deals [force] of both white and black damage.") /obj/item/ego_weapon/seasons name = "Seasons Greetings" @@ -661,12 +661,12 @@ /obj/item/ego_weapon/seasons/attack_self(mob/user) ..() if(transforming) - to_chat(user,"[src] will no longer transform to match the seasons.") + to_chat(user,span_warning("[src] will no longer transform to match the seasons.")) transforming = FALSE special = "This E.G.O. will not transform to match the seasons." return if(!transforming) - to_chat(user,"[src] will now transform to match the seasons.") + to_chat(user,span_warning("[src] will now transform to match the seasons.")) transforming = TRUE special = "This E.G.O. will transform to match the seasons." return @@ -688,7 +688,7 @@ inhand_y_dimension = 32 update_icon_state() if(current_holder) - to_chat(current_holder,"[src] suddenly transforms!") + to_chat(current_holder,span_notice("[src] suddenly transforms!")) current_holder.update_inv_hands() playsound(current_holder, "sound/abnormalities/seasons/[current_season]_change.ogg", 50, FALSE) force = season_list[current_season][1] @@ -741,7 +741,7 @@ /obj/item/ego_weapon/shield/distortion/EgoAttackInfo(mob/user) - return "It deals [force * 4] red, white, black and pale damage combined." + return span_notice("It deals [force * 4] red, white, black and pale damage combined.") /obj/item/ego_weapon/shield/distortion/attack(mob/living/target, mob/living/user) . = ..() @@ -759,7 +759,7 @@ /obj/item/ego_weapon/shield/distortion/CanUseEgo(mob/living/user) . = ..() if(user.get_inactive_held_item()) - to_chat(user, "You cannot use [src] with only one hand!") + to_chat(user, span_notice("You cannot use [src] with only one hand!")) return FALSE /obj/item/ego_weapon/shield/distortion/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) @@ -813,7 +813,7 @@ playsound(src, 'sound/weapons/ego/farmwatch_tree.ogg', 200, 1) user.adjustBruteLoss(-10) user.adjustSanityLoss(-15) - to_chat(user, "You reap the fruits of your labor!") + to_chat(user, span_notice("You reap the fruits of your labor!")) ..() return ..() @@ -823,7 +823,7 @@ if(!CanUseEgo(user)) return if(ability_cooldown > world.time) - to_chat(user, "You have used this ability too recently!") + to_chat(user, span_warning("You have used this ability too recently!")) return FALSE playsound(src, 'sound/effects/ordeals/white/white_reflect.ogg', 50, TRUE) to_chat(user, "You cultivate seeds of desires.") @@ -867,7 +867,7 @@ if(!CanUseEgo(user)) return if(ability_cooldown > world.time) - to_chat(user, "You have used this ability too recently!") + to_chat(user, span_warning("You have used this ability too recently!")) return FALSE if(do_after(user, 20, src)) playsound(src, 'sound/weapons/ego/spicebush_special.ogg', 50, FALSE) @@ -1040,7 +1040,7 @@ /obj/item/ego_weapon/shield/combust/CanUseEgo(mob/living/user) . = ..() if(user.get_inactive_held_item()) - to_chat(user, "You cannot use [src] with only one hand!") + to_chat(user, span_notice("You cannot use [src] with only one hand!")) return FALSE /obj/item/ego_weapon/shield/combust/attack_self(mob/user) @@ -1051,7 +1051,7 @@ if (block && !special_attack && special_cooldown < world.time) special_attack = TRUE - to_chat(user, "You prepare to perform a blazing strike.") + to_chat(user, span_notice("You prepare to perform a blazing strike.")) ..() // Counter @@ -1119,7 +1119,7 @@ continue if(L in been_hit || L == user) continue - user.visible_message("[user] blazes through [L]!") + user.visible_message(span_boldwarning("[user] blazes through [L]!")) L.apply_damage((special_damage + extra_damage), RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE) been_hit += L @@ -1228,7 +1228,7 @@ icon_state = "mockery_[form]" update_icon_state() if(current_holder) - to_chat(current_holder,"[src] suddenly transforms!") + to_chat(current_holder,span_notice("[src] suddenly transforms!")) current_holder.update_inv_hands() current_holder.playsound_local(current_holder, 'sound/effects/blobattack.ogg', 75, FALSE) force = weapon_list[form][1] diff --git a/code/game/objects/items/ego_weapons/he.dm b/code/game/objects/items/ego_weapons/he.dm index 8da203689bed..90c2aaaa4072 100644 --- a/code/game/objects/items/ego_weapons/he.dm +++ b/code/game/objects/items/ego_weapons/he.dm @@ -57,7 +57,7 @@ if(!CanUseEgo(user)) return if(!can_spin) - to_chat(user,"You attacked too recently.") + to_chat(user,span_warning("You attacked too recently.")) return if(do_after(user, 12, src)) can_spin = TRUE @@ -105,7 +105,7 @@ if(target.stat == DEAD && living) if(!rage) - to_chat(user, "LONG LIVE THE QUEEN!") + to_chat(user, span_userdanger("LONG LIVE THE QUEEN!")) rage = FALSE force *= 3 rage = TRUE @@ -216,7 +216,7 @@ force = 48 // bonus damage for like, 2 seconds. hit_message = "A GOD DOES NOT FEAR DEATH!" else if(damagetype == PALE_DAMAGE) - to_chat(source,"To attempt parry the aspect of death is to hide from inevitability. To hide is to fear. Show me that you do not fear death.") + to_chat(source,span_warning("To attempt parry the aspect of death is to hide from inevitability. To hide is to fear. Show me that you do not fear death.")) ..() /obj/item/ego_weapon/christmas @@ -473,7 +473,7 @@ force = 0 happy = TRUE icon_state = "pleasure_active" - to_chat(H, "The thorns start secreting some strange substance.") + to_chat(H, span_notice("The thorns start secreting some strange substance.")) playsound(H, 'sound/abnormalities/porccubus/porccu_giggle.ogg', 50, FALSE, 4) playsound(H, 'sound/weapons/bladeslice.ogg', 50, FALSE, 4) addtimer(CALLBACK(src, PROC_REF(Withdrawal)), 20 SECONDS) @@ -482,7 +482,7 @@ /obj/item/ego_weapon/pleasure/proc/Withdrawal(mob/living/M, mob/living/user) playsound(user, 'sound/abnormalities/porccubus/porccu_giggle.ogg', 50, FALSE, 4) - to_chat(user, "The [src] is returning back to normal.") + to_chat(user, span_notice("The [src] is returning back to normal.")) icon_state = "pleasure" happy = FALSE force = 30 @@ -647,11 +647,11 @@ /obj/item/ego_weapon/inheritance/attack_self(mob/user) ..() if(combo_on) - to_chat(user,"You change your stance, and will no longer perform a finisher.") + to_chat(user,span_warning("You change your stance, and will no longer perform a finisher.")) combo_on = FALSE return if(!combo_on) - to_chat(user,"You change your stance, and will now perform a finisher.") + to_chat(user,span_warning("You change your stance, and will now perform a finisher.")) combo_on =TRUE return @@ -669,7 +669,7 @@ force *= 6 combo = -4 playsound(src, 'sound/weapons/fwoosh.ogg', 300, FALSE, 9) - to_chat(user,"You take a moment to reset your stance.") + to_chat(user,span_warning("You take a moment to reset your stance.")) else user.changeNext_move(CLICK_CD_MELEE * 0.3) ..() @@ -715,9 +715,9 @@ /obj/item/ego_weapon/shield/legerdemain/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) if (damagetype == PALE_DAMAGE) - to_chat(source,"Your [src] withers at the touch of death!") + to_chat(source,span_nicegreen("Your [src] withers at the touch of death!")) return ..() - to_chat(source,"You are healed by [src].") + to_chat(source,span_nicegreen("You are healed by [src].")) source.adjustBruteLoss(-10) source.adjustSanityLoss(-5) ..() @@ -761,9 +761,9 @@ mode = "Gauntlet" if("Gauntlet") mode = "Spear" - to_chat(user, "[src] makes a whirling sound as it changes shape!") + to_chat(user, span_notice("[src] makes a whirling sound as it changes shape!")) if(prob(5)) - to_chat(user, "Do you love your city?") + to_chat(user, span_notice("Do you love your city?")) icon_state = "become_strong"+mode_stats[mode][1] update_icon_state() force = mode_stats[mode][2] @@ -783,9 +783,9 @@ if("Sword") windup = min(windup+2, 50) if("Gauntlet") - to_chat(user, "You start winding up your fist!") + to_chat(user, span_notice("You start winding up your fist!")) if(!do_after(user, 0.75 SECONDS, target)) - to_chat(user, "You stop winding up your fist!") + to_chat(user, span_warning("You stop winding up your fist!")) return force += windup windup = 0 @@ -794,7 +794,7 @@ switch(windup) if(50 to INFINITY) playsound(src, 'sound/weapons/ego/strong_charged2.ogg', 60) - to_chat(user, "[src] beeps and whirls as it reaches full capacity!") + to_chat(user, span_nicegreen("[src] beeps and whirls as it reaches full capacity!")) if(25 to 49) playsound(src, 'sound/weapons/ego/strong_charged1.ogg', 40) else @@ -829,7 +829,7 @@ if(target.stat == DEAD && living) if(!sacrifice) - to_chat(user, "Impending Day extends outward!") + to_chat(user, span_userdanger("Impending Day extends outward!")) playsound('sound/abnormalities/doomsdaycalendar/Doomsday_Attack.ogg', 3, TRUE) sacrifice = FALSE for(var/mob/living/L in livinginrange(1, target)) @@ -882,7 +882,7 @@ if(!isliving(A)) return if(dash_cooldown > world.time) - to_chat(user, "Your dash is still recharging!") + to_chat(user, span_warning("Your dash is still recharging!")) return if((get_dist(user, A) < 2) || (!(can_see(user, A, dash_range)))) return @@ -897,7 +897,7 @@ step_towards(user,A) if((get_dist(user, A) < 2)) JumpAttack(A,user) - to_chat(user, "You jump towards [A]!") + to_chat(user, span_warning("You jump towards [A]!")) animate(user, alpha = 255,pixel_x = 0, pixel_z = -16, time = 0.1 SECONDS) user.pixel_z = 0 @@ -977,10 +977,10 @@ /obj/item/ego_weapon/replica/attack_self(mob/user) ..() if(charge>=charge_cost) - to_chat(user, "You prepare to release your charge.") + to_chat(user, span_notice("You prepare to release your charge.")) activated = TRUE else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/replica/attack(mob/living/target, mob/living/user) ..() @@ -1075,14 +1075,14 @@ /obj/item/ego_weapon/warp/attack_self(mob/user) ..() if(activated == TRUE) - to_chat(user, "You are no longer prepared to release your charge.") + to_chat(user, span_notice("You are no longer prepared to release your charge.")) activated = FALSE return if(charge>=charge_cost) - to_chat(user, "You prepare to release your charge.") + to_chat(user, span_notice("You prepare to release your charge.")) activated = TRUE else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/warp/proc/UserMoved() SIGNAL_HANDLER @@ -1091,12 +1091,12 @@ /obj/item/ego_weapon/warp/afterattack(atom/target, mob/living/user, proximity_flag, clickparams) if(!CanUseEgo(user)) - to_chat(user, "You cannot use this!") + to_chat(user, span_notice("You cannot use this!")) return if(!activated) return if(!LAZYLEN(get_path_to(src,target, /turf/proc/Distance, 0, 20))) - to_chat(user, "Invalid target.") + to_chat(user, span_notice("Invalid target.")) activated = FALSE return if(!proximity_flag) @@ -1211,7 +1211,7 @@ ..() if(target != stored_target) stored_target = target - to_chat(user, "You pursue a new target.") + to_chat(user, span_notice("You pursue a new target.")) force = initial(force) target_hits = 0 @@ -1310,7 +1310,7 @@ if(!CanUseEgo(user)) return if(do_after(user, 30, src))//3 seconds - to_chat(user, "You hoist [src] over your shoulder.") + to_chat(user, span_notice("You hoist [src] over your shoulder.")) charged = TRUE /obj/item/ego_weapon/aedd/attack(mob/living/target, mob/living/user) @@ -1457,7 +1457,7 @@ if(!stored_projectiles) return if(firing_cooldown >= world.time) - to_chat(user, "[src] is overheated and not ready to fire!") + to_chat(user, span_notice("[src] is overheated and not ready to fire!")) return var/obj/projectile/ego_bullet/lifestew/G = new /obj/projectile/ego_bullet/lifestew(proj_turf) G.fired_from = src //for signal check @@ -1485,7 +1485,6 @@ damage_type = BLACK_DAMAGE -#define STATUS_EFFECT_FAIRYBITE /datum/status_effect/fairybite /obj/item/ego_weapon/faelantern name = "midwinter nightmare" desc = "How's about I tell you a tale?" @@ -1498,8 +1497,8 @@ attack_verb_simple = list("poke", "slash") hitsound = 'sound/weapons/fixer/generic/sword1.ogg' attribute_requirements = list( - PRUDENCE_ATTRIBUTE = 40 - ) + PRUDENCE_ATTRIBUTE = 40, + ) var/firing_cooldown = 0 var/hit_cooldown_time = 10 SECONDS var/firing_cooldown_time = 1 SECONDS @@ -1525,7 +1524,7 @@ if(!isturf(proj_turf)) return if(firing_cooldown >= world.time) - to_chat(user, "The fairy has yet to return!") + to_chat(user, span_notice("The fairy has yet to return!")) return var/obj/projectile/ego_bullet/faelantern/G = new /obj/projectile/ego_bullet/faelantern(proj_turf) G.fired_from = src //for signal check @@ -1550,7 +1549,7 @@ /obj/item/ego_weapon/faelantern/proc/Reload(mob/living/carbon/human/firer) if(firing_cooldown < world.time) - to_chat(firer, "The fairy has returned!") + to_chat(firer, span_notice("The fairy has returned!")) update_icon_state(firer) /obj/projectile/ego_bullet/faelantern @@ -1566,8 +1565,8 @@ . = ..() var/mob/living/H = target if(!isbot(H) && isliving(H)) - H.apply_status_effect(STATUS_EFFECT_FAIRYBITE) - H.visible_message("The [src] latches on [target]!") + H.apply_status_effect(/datum/status_effect/fairybite) + H.visible_message(span_warning("The [src] latches on [target]!")) /datum/status_effect/fairybite id = "fairybite" @@ -1589,7 +1588,6 @@ playsound(owner, 'sound/abnormalities/mountain/bite.ogg', 70, TRUE) //yes im reusing a sound bite me new /obj/effect/temp_visual/beakbite(get_turf(owner)) -#undef STATUS_EFFECT_FAIRYBITE /obj/item/ego_weapon/lance/brick_road name = "brick road" @@ -1735,7 +1733,7 @@ if(do_after(user, 12, src)) charged = TRUE force = 90 //FULL POWER - to_chat(user,"You put your strength behind this attack.") + to_chat(user,span_warning("You put your strength behind this attack.")) playsound(src.loc, 'sound/abnormalities/clock/clank.ogg', 75, TRUE) set_light(3, 6, "#D4FAF37") PlayChargeSound() @@ -1780,7 +1778,7 @@ //Crit stuff, taken from fourleaf, so thanks to whomever coded that! if(prob(poise*2)) force*=3 - to_chat(user, "Critical!") + to_chat(user, span_userdanger("Critical!")) poise = 0 ..() force = initial(force) @@ -1814,7 +1812,7 @@ if(!CanUseEgo(user)) return if(!can_spin) - to_chat(user,"You attacked too recently.") + to_chat(user,span_warning("You attacked too recently.")) return if(do_after(user, 12, src)) can_spin = TRUE diff --git a/code/game/objects/items/ego_weapons/joke.dm b/code/game/objects/items/ego_weapons/joke.dm index 608e3064afa3..7e8836ecd0a2 100644 --- a/code/game/objects/items/ego_weapons/joke.dm +++ b/code/game/objects/items/ego_weapons/joke.dm @@ -29,11 +29,11 @@ "purple" = "#FF00FF" ) attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 100, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 100, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 100, + ) /obj/item/ego_weapon/chaosdunk/Initialize() ..() @@ -48,7 +48,7 @@ if(activated) return if(!CanUseEgo(user)) - to_chat(user, "The [src] lies dormant in your hands...") + to_chat(user, span_warning("The [src] lies dormant in your hands...")) return activated = TRUE @@ -70,11 +70,11 @@ M.apply_damage(10, STAMINA) if(prob(75)) M.Paralyze(60) - visible_message("[M] barely manages to contain the power of the [src]!") + visible_message(span_danger("[M] barely manages to contain the power of the [src]!")) return else new /obj/effect/temp_visual/explosion(get_turf(src)) - visible_message("[src] explodes violently!") + visible_message(span_danger("[src] explodes violently!")) playsound(src, 'sound/abnormalities/crying_children/sorrow_shot.ogg', 45, FALSE, 5) for(var/mob/living/L in view(1, src)) var/aoe = 50 @@ -127,10 +127,10 @@ if(!CanUseEgo(user)) return if(charge>=charge_cost) - to_chat(user, "You prepare to jump.") + to_chat(user, span_notice("You prepare to jump.")) activated = TRUE else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/violet_curse/attack(mob/living/target, mob/living/user) if(!CanUseEgo(user)) @@ -193,6 +193,6 @@ if(L == user) //This WILL friendly fire there is no escape continue L.apply_damage(aoe, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE) - to_chat(L, "You are crushed by a monolith!") + to_chat(L, span_userdanger("You are crushed by a monolith!")) if(L.health < 0) L.gib() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/_charge.dm b/code/game/objects/items/ego_weapons/non_abnormality/_charge.dm index f529ae48dd66..00a27ff307ed 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/_charge.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/_charge.dm @@ -21,4 +21,4 @@ /obj/item/ego_weapon/city/charge/proc/release_charge(mob/living/target, mob/living/user) charge -= charge_cost charge = round(max(charge, 0), 1) - to_chat(user, "[release_message].") + to_chat(user, span_notice("[release_message].")) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/black_silence.dm b/code/game/objects/items/ego_weapons/non_abnormality/black_silence.dm index aabdf04c08a4..a45e1a1c25a7 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/black_silence.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/black_silence.dm @@ -15,11 +15,11 @@ attack_verb_simple = list("tap", "pat") hitsound = 'sound/effects/hit_punch.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 120, - PRUDENCE_ATTRIBUTE = 120, - TEMPERANCE_ATTRIBUTE = 120, - JUSTICE_ATTRIBUTE = 120 - ) + FORTITUDE_ATTRIBUTE = 120, + PRUDENCE_ATTRIBUTE = 120, + TEMPERANCE_ATTRIBUTE = 120, + JUSTICE_ATTRIBUTE = 120, + ) actions_types = list(/datum/action/item_action/toggle_iff) var/special_cooldown var/special_cooldown_time @@ -61,10 +61,10 @@ /obj/item/ego_weapon/black_silence_gloves/proc/toggle_iff(mob/living/user) if(iff) iff = FALSE - to_chat(user,"You will now attack everything indiscriminately!") + to_chat(user,span_warning("You will now attack everything indiscriminately!")) else iff = TRUE - to_chat(user,"You will now only attack enemies!") + to_chat(user,span_warning("You will now only attack enemies!")) /obj/item/ego_weapon/black_silence_gloves/proc/dash(mob/living/user, turf/target_turf) var/list/line_turfs = list(get_turf(user)) @@ -104,7 +104,7 @@ // Radial menu /obj/item/ego_weapon/black_silence_gloves/proc/exchange_armaments(mob/user) if(exchange_cooldown > world.time) - to_chat(user, "Your gloves are still recharging, keep hitting enemies to charge it faster.") + to_chat(user, span_notice("Your gloves are still recharging, keep hitting enemies to charge it faster.")) return var/list/display_names = list() @@ -144,7 +144,7 @@ user.put_in_hands(Y) if(!(unlocked) && Y.unlocked_list.len > 8) playsound(playsound(user, 'sound/weapons/black_silence/unlock.ogg', 100, 1)) - to_chat(user,"You are ready to unleash Furioso!") + to_chat(user,span_userdanger("You are ready to unleash Furioso!")) Y.unlocked = TRUE if(unlocked) Y.unlocked = TRUE @@ -179,7 +179,7 @@ if(unlocked_list.len > 8) furioso(user, target) else - to_chat(user,"You haven't used all of Black Silence's Weapons!") + to_chat(user,span_userdanger("You haven't used all of Black Silence's Weapons!")) // switching weapon increases damage dealt. Annoying but high damage, you're supposed to keep changing weapons anyway /obj/item/ego_weapon/black_silence_gloves/zelkova @@ -311,11 +311,11 @@ if (block == 0) var/mob/living/carbon/human/shield_user = user if(shield_user.physiology.armor.bomb) //"We have NOTHING that should be modifying this, so I'm using it as an existant parry checker." - Ancientcoders - to_chat(shield_user,"You're still off-balance!") + to_chat(shield_user,span_warning("You're still off-balance!")) return FALSE for(var/obj/machinery/computer/abnormality/AC in range(1, shield_user)) if(AC.datum_reference.working) // No blocking during work. - to_chat(shield_user,"You cannot defend yourself from responsibility!") + to_chat(shield_user,span_notice("You cannot defend yourself from responsibility!")) return FALSE block = TRUE block_success = FALSE @@ -326,7 +326,7 @@ shield_user.physiology.pale_mod *= max(0.001, (1 - ((reductions[4]) / 100))) RegisterSignal(user, COMSIG_MOB_APPLY_DAMGE, PROC_REF(AnnounceBlock)) addtimer(CALLBACK(src, PROC_REF(DisableBlock), shield_user), 1 SECONDS) - to_chat(user,"You attempt to parry the attack!") + to_chat(user, span_userdanger("You attempt to parry the attack!")) return TRUE /obj/item/ego_weapon/black_silence_gloves/old_boys/proc/DisableBlock(mob/living/carbon/human/user) @@ -343,15 +343,15 @@ /obj/item/ego_weapon/black_silence_gloves/old_boys/proc/BlockCooldown(mob/living/carbon/human/user) block = FALSE - to_chat(user,"You rearm your hammer") + to_chat(user,span_nicegreen("You rearm your hammer")) /obj/item/ego_weapon/black_silence_gloves/old_boys/proc/BlockFail(mob/living/carbon/human/user) - to_chat(user,"Your stance is widened.") + to_chat(user,span_warning("Your stance is widened.")) force = 50 addtimer(CALLBACK(src, PROC_REF(RemoveDebuff), user), 2 SECONDS) /obj/item/ego_weapon/black_silence_gloves/old_boys/proc/RemoveDebuff(mob/living/carbon/human/user) - to_chat(user,"You recollect your stance.") + to_chat(user,span_nicegreen("You recollect your stance.")) force = 80 /obj/item/ego_weapon/black_silence_gloves/old_boys/proc/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) @@ -359,7 +359,7 @@ block_success = TRUE playsound(get_turf(src), 'sound/weapons/black_silence/guard.ogg', 50, 0, 7) - source.visible_message("[source.real_name] parried the attack!") + source.visible_message(span_userdanger("[source.real_name] parried the attack!")) exchange_cooldown -= 100 if(!(buff_check)) parry_buff = TRUE diff --git a/code/game/objects/items/ego_weapons/non_abnormality/blue_sicko.dm b/code/game/objects/items/ego_weapons/non_abnormality/blue_sicko.dm index d66e3ed5645c..15edc55bca22 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/blue_sicko.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/blue_sicko.dm @@ -21,18 +21,18 @@ FORTITUDE_ATTRIBUTE = 120, PRUDENCE_ATTRIBUTE = 120, TEMPERANCE_ATTRIBUTE = 120, - JUSTICE_ATTRIBUTE = 120 + JUSTICE_ATTRIBUTE = 120, ) var/mode = MODE_ADD var/vibration = 4 var/vibration_timer var/active = FALSE var/list/intrusive_thoughts = list( - "Can’t you feel this tremor…?", + "Can't you feel this tremor…?", "Could there be an overture with a rhythm more beautiful than this?", - "We’ll complete our own score…", + "We'll complete our own score…", "One that can be played indefinitely, even if there seems to be an end!", - "So you will take the honor of remembering the first note of this everlasting performance…" + "So you will take the honor of remembering the first note of this everlasting performance…", ) var/finale_damage = 200 @@ -98,7 +98,7 @@ if(S) if(S.stacks == vibration) if(prob(8)) - to_chat(user, "[pick(intrusive_thoughts)]", MESSAGE_TYPE_LOCALCHAT) + to_chat(user, span_blueteamradio("[pick(intrusive_thoughts)]"), MESSAGE_TYPE_LOCALCHAT) if(target.stat != DEAD && target != user) for(var/datum/action/item_action/charging/CA in actions) CA.charge += 2 @@ -109,7 +109,7 @@ S.seers |= user S.UpdateStatus() if(!S) - to_chat(user, "Your blade emits a dull hum as your target ceases to vibrate.", MESSAGE_TYPE_INFO) + to_chat(user, span_notice("Your blade emits a dull hum as your target ceases to vibrate."), MESSAGE_TYPE_INFO) return /obj/item/ego_weapon/city/reverberation/proc/VibrationChange() @@ -145,7 +145,7 @@ if(active || !CanUseEgo(user)) return FALSE active = TRUE - to_chat(user, "We will shape this world together.", MESSAGE_TYPE_LOCALCHAT) + to_chat(user, span_blueteamradio("We will shape this world together."), MESSAGE_TYPE_LOCALCHAT) deltimer(vibration_timer) var/hit_target = FALSE for(var/mob/living/L in livinginrange(8, user)) @@ -181,7 +181,7 @@ return FALSE active = TRUE deltimer(vibration_timer) - user.visible_message("Your performance may be reaching an end, but I do hope you’ll shine gorgeously in your own right.") + user.visible_message(span_blueteamradio("Your performance may be reaching an end, but I do hope you’ll shine gorgeously in your own right.")) playsound(user, "sound/weapons/fixer/reverb_grand_start.ogg", 70, extrarange = 8) sleep(3) var/turf/original_turf = get_turf(user) @@ -209,7 +209,7 @@ T.AddCharge(T.max_charge) // Refund if no targets return user.forceMove(original_turf) - user.visible_message("I hope you can stay with me until the end of the performance, at least.") + user.visible_message(span_blueteamradio("I hope you can stay with me until the end of the performance, at least.")) playsound(user, "sound/weapons/fixer/reverb_grand_end.ogg", 70, extrarange = 8) for(var/mob/living/L in to_hit) var/datum/status_effect/stacking/vibration/V = L.has_status_effect(STATUS_EFFECT_VIBRATION) @@ -220,15 +220,15 @@ if(isanimal(L)) damage *= 1.5 L.apply_damage(damage, PALE_DAMAGE, null, L.run_armor_check(null, PALE_DAMAGE)) - to_chat(L, "[user] eviscerates you!", MESSAGE_TYPE_COMBAT) - to_chat(user, "You eviscerate [L]!", MESSAGE_TYPE_COMBAT) + to_chat(L, span_userdanger("[user] eviscerates you!"), MESSAGE_TYPE_COMBAT) + to_chat(user, span_warning("You eviscerate [L]!"), MESSAGE_TYPE_COMBAT) active = FALSE vibration_timer = addtimer(CALLBACK(src, PROC_REF(VibrationChange)), 10 SECONDS, TIMER_STOPPABLE) /obj/item/ego_weapon/city/reverberation/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args) if(attack_type == PROJECTILE_ATTACK) - owner.visible_message("[owner.real_name] deflects the projectile!", "*clang*") + owner.visible_message(span_blueteamradio("[owner.real_name] deflects the projectile!"), span_blueteamradio("Like the pecking of baby chicks~"), span_warning("*clang*")) return TRUE return FALSE diff --git a/code/game/objects/items/ego_weapons/non_abnormality/cane.dm b/code/game/objects/items/ego_weapons/non_abnormality/cane.dm index 66a0932a1286..5e1ffbfffe29 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/cane.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/cane.dm @@ -12,11 +12,11 @@ charge_effect = "deal an extra attack in damage." charge_cost = 2 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80, + ) /obj/item/ego_weapon/city/charge/cane/attack_self(mob/user) ..() @@ -26,7 +26,7 @@ var/target //Didn't even need new var, could literally put anything for first arg, but for consistency sake and less confusion release_charge(target, user) else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/city/charge/cane/release_charge(target, mob/living/user) ..() @@ -56,7 +56,7 @@ addtimer(CALLBACK(src, PROC_REF(Return), user), 5 SECONDS) /obj/item/ego_weapon/city/charge/cane/cane/proc/Return(mob/living/carbon/human/user) - to_chat(user, "You heal once more.") + to_chat(user, span_notice("You heal once more.")) user.adjustBruteLoss(-user.maxHealth*0.07) user.adjustSanityLoss(-user.maxSanity*0.07) playsound(src, 'sound/abnormalities/thunderbird/tbird_bolt.ogg', 50, TRUE) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/carnival.dm b/code/game/objects/items/ego_weapons/non_abnormality/carnival.dm index 12849a936f55..e01d6cb8550a 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/carnival.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/carnival.dm @@ -11,18 +11,18 @@ attack_verb_continuous = list("whacks", "slashes") attack_verb_simple = list("whack", "slash") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) var/list/empowered_targets = list( /mob/living/simple_animal/hostile/shrimp, /mob/living/simple_animal/hostile/shrimp_soldier, /mob/living/simple_animal/hostile/ordeal, - /mob/living/simple_animal/hostile/kcorp/drone - ) + /mob/living/simple_animal/hostile/kcorp/drone, + ) /obj/item/ego_weapon/city/carnival_spear/Initialize() . = ..() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/cinq.dm b/code/game/objects/items/ego_weapons/non_abnormality/cinq.dm index 4107fb08511e..e38c177ed168 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/cinq.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/cinq.dm @@ -11,11 +11,11 @@ attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore") hitsound = 'sound/weapons/fixer/generic/nail1.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80, + ) var/ready = TRUE var/multiplier = 2 diff --git a/code/game/objects/items/ego_weapons/non_abnormality/color_fixer.dm b/code/game/objects/items/ego_weapons/non_abnormality/color_fixer.dm index 93fb71e0a701..249d928ef96d 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/color_fixer.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/color_fixer.dm @@ -15,11 +15,11 @@ attack_verb_continuous = list("bashes", "crushes") attack_verb_simple = list("bash", "crush") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 120, - PRUDENCE_ATTRIBUTE = 120, - TEMPERANCE_ATTRIBUTE = 120, - JUSTICE_ATTRIBUTE = 120 - ) + FORTITUDE_ATTRIBUTE = 120, + PRUDENCE_ATTRIBUTE = 120, + TEMPERANCE_ATTRIBUTE = 120, + JUSTICE_ATTRIBUTE = 120, + ) var/ready = TRUE @@ -31,7 +31,7 @@ if(!ready) return ready = FALSE - to_chat(user, "READY.") + to_chat(user, span_userdanger("READY.")) force*=1.5 user.adjustBruteLoss(user.maxHealth*0.5) addtimer(CALLBACK(src, PROC_REF(Return), user), 15 SECONDS) @@ -47,14 +47,14 @@ living = FALSE if(force != initial(force) && !living) - to_chat(user, "ANOTHER.") + to_chat(user, span_userdanger("ANOTHER.")) force*=1.5 user.adjustBruteLoss(-user.maxHealth*0.1) /obj/item/ego_weapon/city/vermillion/proc/Return(mob/living/carbon/human/user) force = initial(force) ready = TRUE - to_chat(user, "I AM NOT SATED.") + to_chat(user, span_notice("I AM NOT SATED.")) /obj/item/ego_weapon/mimicry/kali name = "True Mimicry" diff --git a/code/game/objects/items/ego_weapons/non_abnormality/dawn.dm b/code/game/objects/items/ego_weapons/non_abnormality/dawn.dm index 6cf97c1abc08..43a4988133bc 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/dawn.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/dawn.dm @@ -12,11 +12,11 @@ var/aoe_range var/aoe_target attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80, + ) /obj/item/ego_weapon/city/dawn/attack(mob/living/target, mob/living/user) ..() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/fullstop.dm b/code/game/objects/items/ego_weapons/non_abnormality/fullstop.dm index e290bacd3201..607aff479a73 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/fullstop.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/fullstop.dm @@ -20,12 +20,12 @@ ..() if(shotsleft) return TRUE - visible_message("The gun is out of ammo.") + visible_message(span_notice("The gun is out of ammo.")) playsound(src, dry_fire_sound, 30, TRUE) return FALSE /obj/item/gun/ego_gun/city/fullstop/attack_self(mob/user) - to_chat(user,"You start loading a new magazine.") + to_chat(user,span_notice("You start loading a new magazine.")) playsound(src, 'sound/weapons/gun/general/slide_lock_1.ogg', 50, TRUE) if(do_after(user, reloadtime, src)) //gotta reload playsound(src, 'sound/weapons/gun/general/bolt_rack.ogg', 50, TRUE) @@ -33,7 +33,7 @@ /obj/item/gun/ego_gun/city/fullstop/EgoAttackInfo(mob/user) if(chambered && chambered.BB) - return "Its bullets deal [chambered.BB.damage*projectile_damage_multiplier] [chambered.BB.damage_type] damage." + return span_notice("Its bullets deal [chambered.BB.damage*projectile_damage_multiplier] [chambered.BB.damage_type] damage.") return /obj/item/gun/ego_gun/city/fullstop/examine(mob/user) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/gradeone.dm b/code/game/objects/items/ego_weapons/non_abnormality/gradeone.dm index ecf84edf8faa..175e0189b2a1 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/gradeone.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/gradeone.dm @@ -13,11 +13,11 @@ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 120, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 100, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 120, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 100, + JUSTICE_ATTRIBUTE = 100, + ) var/active var/attackchoice @@ -32,7 +32,7 @@ /obj/item/ego_weapon/city/donghwan/attack_self(mob/living/carbon/human/user) active = TRUE if(attackchoice == 1) - to_chat(user, "Now's my chance.") + to_chat(user, span_notice("Now's my chance.")) attackchoice = 2 /obj/item/ego_weapon/city/donghwan/attack(mob/living/target, mob/living/carbon/human/user) @@ -61,10 +61,10 @@ attackchoice = 0 else attackchoice = 1 - to_chat(user, "Ready to shove.") + to_chat(user, span_notice("Ready to shove.")) /obj/item/ego_weapon/city/donghwan/proc/Shove(mob/living/target, mob/living/carbon/human/user) - to_chat(user, "Fuck off.") + to_chat(user, span_notice("Fuck off.")) playsound(src, 'sound/weapons/fixer/generic/nail2.ogg', 100, FALSE, 4) var/atom/throw_target = get_edge_target_turf(target, user.dir) @@ -74,7 +74,7 @@ attackchoice = 5 /obj/item/ego_weapon/city/donghwan/proc/CriticalMoment(mob/living/target, mob/living/carbon/human/user) - to_chat(user, "Gotcha.") + to_chat(user, span_notice("Gotcha.")) playsound(src, 'sound/weapons/fixer/generic/nail1.ogg', 100, FALSE, 4) //Deals half of % of your sanity, inverted. force += force*((user.sanityhealth/user.maxSanity)-1)*-0.5 @@ -83,9 +83,9 @@ /obj/item/ego_weapon/city/donghwan/proc/Toughness(mob/living/target, mob/living/carbon/human/user) if(user.sanityhealth>= user.maxSanity*0.3) user.adjustSanityLoss(user.sanityhealth*0.71) - to_chat(user, "Feels good.") + to_chat(user, span_notice("Feels good.")) else - to_chat(user, "Shouldn't push it.") + to_chat(user, span_notice("Shouldn't push it.")) user.adjustSanityLoss(-user.sanityhealth*0.2) attackchoice = 0 diff --git a/code/game/objects/items/ego_weapons/non_abnormality/hana.dm b/code/game/objects/items/ego_weapons/non_abnormality/hana.dm index 3510b5c1907e..0a3223b0f7bd 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/hana.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/hana.dm @@ -11,11 +11,11 @@ attack_verb_simple = list("cuts", "slices") hitsound = 'sound/weapons/fixer/hana_slash.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 100, + ) var/mode = 1 /obj/item/ego_weapon/city/hana/attack_self(mob/living/user) @@ -55,5 +55,5 @@ force = 50 attack_speed = 1 - to_chat(user, "[message]") + to_chat(user, span_notice("[message]")) playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/index.dm b/code/game/objects/items/ego_weapons/non_abnormality/index.dm index 87b08b6d33d7..68bc858a49e4 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/index.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/index.dm @@ -14,16 +14,16 @@ var/prescript_target var/weapon_owner attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80, + ) /obj/item/ego_weapon/city/index/attack_self(mob/user) ..() if(force != initial(force)) - to_chat(user, "The prescript buff is still active.") + to_chat(user, span_notice("The prescript buff is still active.")) return //Okay, check if you have a prescript @@ -31,9 +31,9 @@ var/mob/living/simple_animal/hostile/abnormality/Y = prescript_target if(Y.stat == DEAD) prescript_target = null - to_chat(user, "Your prescript has died. Use it in hand to recieve a prescript.") + to_chat(user, span_notice("Your prescript has died. Use it in hand to recieve a prescript.")) else - to_chat(user, "Your prescript target is [prescript_target].") + to_chat(user, span_notice("Your prescript target is [prescript_target].")) //If you don't have one, pick a breached mob if available. else if(!prescript_target && user == weapon_owner) @@ -43,17 +43,17 @@ breached+=B if(LAZYLEN(breached)) prescript_target = pick(breached) - to_chat(user, "Your prescript target is [prescript_target]. Slay them, and deal the killing blow with this weapon.") + to_chat(user, span_userdanger("Your prescript target is [prescript_target]. Slay them, and deal the killing blow with this weapon.")) else - to_chat(user, "There are no prescripts available.") + to_chat(user, span_notice("There are no prescripts available.")) //If this weapon has no owner, than make you it. else if(!weapon_owner) - to_chat(user, "This weapon is now yours. Use it in hand to recieve a prescript.") + to_chat(user, span_notice("This weapon is now yours. Use it in hand to recieve a prescript.")) weapon_owner = user else - to_chat(user, "This is not your weapon!") + to_chat(user, span_warning("This is not your weapon!")) /obj/item/ego_weapon/city/index/attack(mob/living/target, mob/living/user) @@ -69,13 +69,13 @@ //Make this do something /obj/item/ego_weapon/city/index/proc/prescript_complete(mob/living/user) prescript_target = null - to_chat(user, "You have completed your prescript, and you have been graced.") + to_chat(user, span_userdanger("You have completed your prescript, and you have been graced.")) force *= 1.45 //BEEG BONUS addtimer(CALLBACK(src, PROC_REF(Return), user), 5 MINUTES) /obj/item/ego_weapon/city/index/proc/Return(mob/living/carbon/human/user) force /= 1.45 //BEEG BONUS - to_chat(user, "The power from your prescript is now gone.") + to_chat(user, span_notice("The power from your prescript is now gone.")) //Just gonna set this to the big proxy weapon for requirement reasons diff --git a/code/game/objects/items/ego_weapons/non_abnormality/jcorp.dm b/code/game/objects/items/ego_weapons/non_abnormality/jcorp.dm index e0877536d007..77597ba76546 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/jcorp.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/jcorp.dm @@ -86,7 +86,7 @@ //Crit itself. if(prob(poise*2)) force*=3 - to_chat(user, "Critical!") + to_chat(user, span_userdanger("Critical!")) poise = 0 ..() force = initial(force) @@ -94,10 +94,10 @@ /obj/item/ego_weapon/city/mariachi/attack_self(mob/user) var/obj/item/clothing/suit/armor/ego_gear/city/mariachi/aida/Y = user.get_item_by_slot(ITEM_SLOT_OCLOTHING) if(istype(Y)) - to_chat(user,"You shake the maracas. Your performance is beautiful.") + to_chat(user,span_notice("You shake the maracas. Your performance is beautiful.")) playsound(src, 'sound/weapons/fixer/generic/maracas_shake.ogg', 50, TRUE) else - to_chat(user,"Someone as uninspiring as you? You are not worthy to shake the maracas.") + to_chat(user,span_warning("Someone as uninspiring as you? You are not worthy to shake the maracas.")) //Sp healing for jobbers /obj/item/ego_weapon/city/mariachi_blades diff --git a/code/game/objects/items/ego_weapons/non_abnormality/jeong.dm b/code/game/objects/items/ego_weapons/non_abnormality/jeong.dm index e0239ecb856f..ee980b3bac44 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/jeong.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/jeong.dm @@ -13,11 +13,11 @@ attack_verb_simple = list("slice", "stab") hitsound = 'sound/weapons/bladeslice.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60, + ) var/ready = TRUE @@ -29,7 +29,7 @@ if(!ready) return ready = FALSE - to_chat(user, "Low at Night.") + to_chat(user, span_userdanger("Low at Night.")) force*=3 user.adjustBruteLoss(user.maxHealth*0.2) addtimer(CALLBACK(src, PROC_REF(Return), user), 5 SECONDS) @@ -37,13 +37,13 @@ /obj/item/ego_weapon/city/jeong/attack(mob/living/target, mob/living/carbon/human/user) ..() if(force != initial(force)) - to_chat(user, "High at Day.") + to_chat(user, span_userdanger("High at Day.")) force = initial(force) /obj/item/ego_weapon/city/jeong/proc/Return(mob/living/carbon/human/user) ready = TRUE force = initial(force) - to_chat(user, "Your blade is ready.") + to_chat(user, span_notice("Your blade is ready.")) //Grade 4 /obj/item/ego_weapon/city/jeong/large diff --git a/code/game/objects/items/ego_weapons/non_abnormality/leaflet.dm b/code/game/objects/items/ego_weapons/non_abnormality/leaflet.dm index 42772ffa1d0e..2301526f553c 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/leaflet.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/leaflet.dm @@ -28,10 +28,10 @@ if(!CanUseEgo(user)) return if(broken) - to_chat(user, "You start reparing your weapon...") + to_chat(user, span_notice("You start reparing your weapon...")) if(!do_after(user, 12 SECONDS, src)) return - to_chat(user, "You finish repairing your weapon") + to_chat(user, span_notice("You finish repairing your weapon")) durability = max_durability force = initial(force) @@ -41,7 +41,7 @@ durability -= 1 else if(durability == 0 && !broken) broken = TRUE - to_chat(user, "Your weapon has broken!") + to_chat(user, span_userdanger("Your weapon has broken!")) force = force*0.5 playsound(src, 'sound/weapons/ego/shield1.ogg', 100, FALSE, 4) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/liu.dm b/code/game/objects/items/ego_weapons/non_abnormality/liu.dm index 7caf7ea24ba7..5c6685e2f336 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/liu.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/liu.dm @@ -6,7 +6,7 @@ /obj/item/ego_weapon/city/liu/examine(mob/user) . = ..() - . += "This weapon kills insane people." + . += span_notice("This weapon kills insane people.") /obj/item/ego_weapon/city/liu/attack(mob/living/target, mob/living/user) //Happens before the attack so you need to do another attack. @@ -108,21 +108,21 @@ /obj/item/ego_weapon/city/liu/fist/examine(mob/user) . = ..() - . += "This weapon has light and heavy attacks. Use in hand to activate a heavy attack. Combos are as follows:" - . += "LLLLL - 5 Hit fast combo, ending in a knockback attack." - . += "H - Windup fist attack for 1.5x damage and deals massive stamina damage to humans." - . += "LH - AOE Fire fist attack. This does not kill insane people." - . += "LLH - High Damage Combo, last attack has a windup and deals 2x damage." - . += "LLLH - Deals good damage. Last hit backsteps you 2 tiles." - . += "LLLLH - High Damage combo, last hit ends in a 2x damage boost with no windup." + . += span_notice("This weapon has light and heavy attacks. Use in hand to activate a heavy attack. Combos are as follows:") + . += span_notice("LLLLL - 5 Hit fast combo, ending in a knockback attack.") + . += span_notice("H - Windup fist attack for 1.5x damage and deals massive stamina damage to humans.") + . += span_notice("LH - AOE Fire fist attack. This does not kill insane people.") + . += span_notice("LLH - High Damage Combo, last attack has a windup and deals 2x damage.") + . += span_notice("LLLH - Deals good damage. Last hit backsteps you 2 tiles.") + . += span_notice("LLLLH - High Damage combo, last hit ends in a 2x damage boost with no windup.") /obj/item/ego_weapon/city/liu/fist/attack_self(mob/living/carbon/user) if(activated) activated = FALSE - to_chat(user, "You revoke your preparation of a heavy attack.") + to_chat(user, span_danger("You revoke your preparation of a heavy attack.")) else activated = TRUE - to_chat(user, "You prep a heavy attack!") + to_chat(user, span_danger("You prep a heavy attack!")) /obj/item/ego_weapon/city/liu/fist/attack(mob/living/target, mob/living/user) @@ -146,7 +146,7 @@ switch(chain) if(1) if(activated) //H - Solar Plexus attack - to_chat(user, "You prepare to strike the solar plexus.") + to_chat(user, span_danger("You prepare to strike the solar plexus.")) during_windup = TRUE if(do_after(user, 5, target)) during_windup = FALSE @@ -160,13 +160,13 @@ if(2) if(activated) //LH - Fire AOE - to_chat(user, "You release a wave of fire.") + to_chat(user, span_danger("You release a wave of fire.")) hitsound = 'sound/weapons/fixer/generic/gen2.ogg' aoe(target, user) if(3) if(activated) //LLH - Higher damage windup attack - to_chat(user, "You prepare a strong punch.") + to_chat(user, span_danger("You prepare a strong punch.")) during_windup = TRUE if(do_after(user, 5, target)) during_windup = FALSE @@ -178,7 +178,7 @@ if(4) if(activated) //LLLH - Fast hit and jump back - to_chat(user, "You hit them and hop back.") + to_chat(user, span_danger("You hit them and hop back.")) force *= 1.5 hitsound = 'sound/weapons/fixer/generic/gen2.ogg' hopback(user) @@ -189,7 +189,7 @@ hitsound = 'sound/weapons/fixer/generic/finisher2.ogg' else force*=2 - to_chat(user, "You hit them with all you got!.") + to_chat(user, span_danger("You hit them with all you got!.")) hitsound = 'sound/weapons/fixer/generic/finisher2.ogg' chain=0 @@ -201,7 +201,7 @@ //Reset Everything if(activated) chain=0 - to_chat(user, "Your chain is reset.") + to_chat(user, span_danger("Your chain is reset.")) activated = FALSE force = initial(force) hitsound = initial(hitsound) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/mirae.dm b/code/game/objects/items/ego_weapons/non_abnormality/mirae.dm index 8a1659d07b7f..e8d7f556f4dc 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/mirae.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/mirae.dm @@ -10,11 +10,11 @@ attack_verb_continuous = list("bashes", "crushes") attack_verb_simple = list("bash", "crush") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 100, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 100, + JUSTICE_ATTRIBUTE = 80, + ) var/ahn_amount = 300 var/boxchance = 10 @@ -28,7 +28,7 @@ ..() if(target.stat == DEAD && living) - to_chat(user, "Payday!!!") + to_chat(user, span_minorannounce("Payday!!!")) var/obj/item/holochip/C = new (get_turf(src)) C.credits = rand(ahn_amount/4,ahn_amount) //10% chance for this diff --git a/code/game/objects/items/ego_weapons/non_abnormality/miscbackstreet.dm b/code/game/objects/items/ego_weapons/non_abnormality/miscbackstreet.dm index e1bb3d096fe6..9072c66a7f6a 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/miscbackstreet.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/miscbackstreet.dm @@ -18,9 +18,9 @@ icon_state = "axe_gang" force = 42 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 40, - TEMPERANCE_ATTRIBUTE = 40, - JUSTICE_ATTRIBUTE = 40 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 40, + TEMPERANCE_ATTRIBUTE = 40, + JUSTICE_ATTRIBUTE = 40, + ) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/miscfixer.dm b/code/game/objects/items/ego_weapons/non_abnormality/miscfixer.dm index 80fc3c38cc73..6db1e05635a5 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/miscfixer.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/miscfixer.dm @@ -12,11 +12,11 @@ attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore") hitsound = 'sound/weapons/ego/spear1.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 100, + ) /obj/item/ego_weapon/city/fixerblade name = "fixer blade" diff --git a/code/game/objects/items/ego_weapons/non_abnormality/molar.dm b/code/game/objects/items/ego_weapons/non_abnormality/molar.dm index dbac21d9cd84..b149e06ee569 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/molar.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/molar.dm @@ -11,11 +11,11 @@ attack_verb_simple = list("slice", "saw", "rip") hitsound = 'sound/abnormalities/helper/attack.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) /obj/item/ego_weapon/city/molar/attack(mob/living/target, mob/living/carbon/human/user) var/living = FALSE diff --git a/code/game/objects/items/ego_weapons/non_abnormality/ncorp.dm b/code/game/objects/items/ego_weapons/non_abnormality/ncorp.dm index 853730978f64..bb05b1bbd853 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/ncorp.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/ncorp.dm @@ -126,7 +126,7 @@ charges-=1 if(charges <= 0 && charged) damtype = initial(damtype) - to_chat(user, "Your hammer has run out of charges.") + to_chat(user, span_notice("Your hammer has run out of charges.")) charged = FALSE force = initial(force) @@ -134,7 +134,7 @@ ..() if(!istype(I, /obj/item/ego_weapon/city/ncorp_mark)) return - to_chat(user, "You apply a mark to your hammer, changing its damage type.") + to_chat(user, span_notice("You apply a mark to your hammer, changing its damage type.")) damtype = I.damtype charges = 10 charged = TRUE @@ -217,7 +217,7 @@ I.force += I.force* nails *0.1 nails = 0 - to_chat(user, "You transfer [nails] nails to your hammer, increasing it's damage.") + to_chat(user, span_notice("You transfer [nails] nails to your hammer, increasing it's damage.")) /obj/item/ego_weapon/city/ncorp_brassnail/big name = "Elektrumnagel" diff --git a/code/game/objects/items/ego_weapons/non_abnormality/purple_tear.dm b/code/game/objects/items/ego_weapons/non_abnormality/purple_tear.dm index fdf700b39780..568fda45b813 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/purple_tear.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/purple_tear.dm @@ -7,11 +7,11 @@ damtype = RED_DAMAGE attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 120, - PRUDENCE_ATTRIBUTE = 120, - TEMPERANCE_ATTRIBUTE = 120, - JUSTICE_ATTRIBUTE = 120 - ) + FORTITUDE_ATTRIBUTE = 120, + PRUDENCE_ATTRIBUTE = 120, + TEMPERANCE_ATTRIBUTE = 120, + JUSTICE_ATTRIBUTE = 120, + ) actions_types = list(/datum/action/item_action/miragestorm) var/special_cooldown var/special_cooldown_time = 30 SECONDS @@ -44,7 +44,7 @@ if(user.get_active_held_item() != src) return if(special_cooldown > world.time) - to_chat(user, "You can't sheathe your blade yet!") + to_chat(user, span_warning("You can't sheathe your blade yet!")) return else if(target == user) @@ -53,10 +53,10 @@ /obj/item/ego_weapon/city/pt/proc/Special(mob/living/user, atom/target) if(sheathed) - to_chat(user, "Your blade is already sheathed!") + to_chat(user, span_warning("Your blade is already sheathed!")) return sheathed = TRUE - to_chat(user, "You prepare your blade.") + to_chat(user, span_notice("You prepare your blade.")) /obj/item/ego_weapon/city/pt/attack(mob/living/target, mob/living/user) if(!CanUseEgo(user)) @@ -64,7 +64,7 @@ ..() if(target.stat != DEAD) if(mirage_charge == mirage_charge_max) - to_chat(user,"Your storm is ready.") //If i cant figure out how to update the action icon, heres the notif + to_chat(user,span_userdanger("Your storm is ready.")) //If i cant figure out how to update the action icon, heres the notif mirage_charge += 1 if(boost) boost = FALSE @@ -77,10 +77,10 @@ if(istype(trimming, H)) H.MirageStorm(owner) else - to_chat(owner,"You must hold the weapon to unleash Mirage Storm!") + to_chat(owner,span_warning("You must hold the weapon to unleash Mirage Storm!")) return else - to_chat(owner,"You're not ready to unleash Mirage Storm!") + to_chat(owner,span_warning("You're not ready to unleash Mirage Storm!")) return /obj/item/ego_weapon/city/pt/attack_self(mob/user) @@ -92,7 +92,7 @@ // currently causes a runtime everytime a switch occurs, killing myself /obj/item/ego_weapon/city/pt/proc/exchange_armaments(mob/user) if(exchange_cooldown > world.time) - to_chat(user, "You can't change stances yet.") + to_chat(user, span_notice("You can't change stances yet.")) return var/list/display_names = list() @@ -234,7 +234,7 @@ . = ..() if(ishuman(owner)) var/mob/living/carbon/human/L = owner - to_chat(L, "The hole in your chest heals.") //fluff text + to_chat(L, span_userdanger("The hole in your chest heals.")) //fluff text L.physiology.red_mod /= 2 L.physiology.white_mod /= 2 L.physiology.black_mod /= 2 @@ -304,7 +304,7 @@ . = ..() if(ishuman(owner)) var/mob/living/carbon/human/L = owner - to_chat(L, "You return to a normal posture.") + to_chat(L, span_userdanger("You return to a normal posture.")) L.physiology.red_mod *= 2 L.physiology.white_mod *= 2 L.physiology.black_mod *= 2 @@ -339,11 +339,11 @@ if (block == 0) var/mob/living/carbon/human/shield_user = user if(shield_user.physiology.armor.bomb) //"We have NOTHING that should be modifying this, so I'm using it as an existant parry checker." - Ancientcoders - to_chat(shield_user,"You're still off-balance!") + to_chat(shield_user,span_warning("You're still off-balance!")) return FALSE for(var/obj/machinery/computer/abnormality/AC in range(1, shield_user)) if(AC.datum_reference.working) // No blocking during work. - to_chat(shield_user,"You cannot defend yourself from responsibility!") + to_chat(shield_user,span_notice("You cannot defend yourself from responsibility!")) return FALSE block = TRUE block_success = FALSE @@ -354,7 +354,7 @@ shield_user.physiology.pale_mod *= max(0.001, (1 - ((reductions[4]) / 100))) RegisterSignal(user, COMSIG_MOB_APPLY_DAMGE, PROC_REF(AnnounceBlock)) addtimer(CALLBACK(src, PROC_REF(DisableBlock), shield_user), 1 SECONDS) - to_chat(user,"You attempt to parry the attack!") + to_chat(user,span_userdanger("You attempt to parry the attack!")) return TRUE /obj/item/ego_weapon/city/pt/guard/proc/DisableBlock(mob/living/carbon/human/user) @@ -371,15 +371,15 @@ /obj/item/ego_weapon/city/pt/guard/proc/BlockCooldown(mob/living/carbon/human/user) block = FALSE - to_chat(user,"You rearm your greatsword") + to_chat(user,span_nicegreen("You rearm your greatsword")) /obj/item/ego_weapon/city/pt/guard/proc/BlockFail(mob/living/carbon/human/user) - to_chat(user,"Your stance is widened.") + to_chat(user,span_warning("Your stance is widened.")) force = 50 addtimer(CALLBACK(src, PROC_REF(RemoveDebuff), user), 2 SECONDS) /obj/item/ego_weapon/city/pt/guard/proc/RemoveDebuff(mob/living/carbon/human/user) - to_chat(user,"You recollect your stance.") + to_chat(user,span_nicegreen("You recollect your stance.")) force = 90 /obj/item/ego_weapon/city/pt/guard/proc/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) @@ -387,7 +387,7 @@ block_success = TRUE playsound(get_turf(src), 'sound/weapons/purple_tear/guard.ogg', 50, 0, 7) - source.visible_message("[source.real_name] parried the attack!") + source.visible_message(span_userdanger("[source.real_name] parried the attack!")) if(!(buff_check)) parry_buff = TRUE @@ -417,7 +417,7 @@ continue targets += L if(!LAZYLEN(targets)) - to_chat(user, "There are no enemies nearby!") //so you dont fuck up i guess + to_chat(user, span_warning("There are no enemies nearby!")) //so you dont fuck up i guess active = FALSE return diff --git a/code/game/objects/items/ego_weapons/non_abnormality/rats.dm b/code/game/objects/items/ego_weapons/non_abnormality/rats.dm index 4ddbef8a7b30..f73d3fddab9e 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/rats.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/rats.dm @@ -80,14 +80,14 @@ ..() if(prob(33)) playsound(src, 'sound/weapons/gun/general/dry_fire.ogg', 30, TRUE) - visible_message("The gun jams.") + visible_message(span_notice("The gun jams.")) return FALSE else return TRUE /obj/item/gun/ego_gun/pistol/rats/afterattack(atom/target, mob/living/user, flag, params) if(prob(50)) - to_chat(user,"You pinch your fingers in the weapon.") + to_chat(user,span_warning("You pinch your fingers in the weapon.")) user.apply_damage(10, RED_DAMAGE, null, user.run_armor_check(null, BLACK_DAMAGE)) return FALSE ..() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/rcorp.dm b/code/game/objects/items/ego_weapons/non_abnormality/rcorp.dm index d5a5a09cc994..7260cac33c24 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/rcorp.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/rcorp.dm @@ -11,11 +11,11 @@ attack_verb_continuous = list("stabs", "slices") attack_verb_simple = list("stab", "slice") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 55, - PRUDENCE_ATTRIBUTE = 55, - TEMPERANCE_ATTRIBUTE = 55, - JUSTICE_ATTRIBUTE = 55 - ) + FORTITUDE_ATTRIBUTE = 55, + PRUDENCE_ATTRIBUTE = 55, + TEMPERANCE_ATTRIBUTE = 55, + JUSTICE_ATTRIBUTE = 55, + ) /obj/item/ego_weapon/city/rabbit_blade/attack_self(mob/living/user) switch(damtype) @@ -30,7 +30,7 @@ if(PALE_DAMAGE) damtype = RED_DAMAGE force = 35 - to_chat(user, "\The [src] will now deal [damtype] damage.") + to_chat(user, span_notice("\The [src] will now deal [damtype] damage.")) playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE) //Command Sabre @@ -59,7 +59,7 @@ damtype = PALE_DAMAGE if(PALE_DAMAGE) damtype = RED_DAMAGE - to_chat(user, "\The [src] will now deal [damtype] damage.") + to_chat(user, span_notice("\The [src] will now deal [damtype] damage.")) playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE) @@ -154,7 +154,7 @@ /obj/item/gun/energy/e_gun/rabbit/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread) if(user.mind) if(user.mind.assigned_role in banned_roles) - to_chat(user, "You are not trained to use Rcorp firearms!") + to_chat(user, span_notice("You are not trained to use Rcorp firearms!")) return FALSE ..() @@ -236,10 +236,10 @@ return if(teleporting) teleporting = FALSE - to_chat(user,"You disable teleport.") + to_chat(user,span_warning("You disable teleport.")) else teleporting = TRUE - to_chat(user,"You prepare to teleport.") + to_chat(user,span_warning("You prepare to teleport.")) /obj/item/ego_weapon/city/rabbit_rush/afterattack(atom/A, mob/living/user, proximity_flag, params) var/turf/target_turf = get_turf(A) @@ -259,7 +259,7 @@ targetfound = TRUE //So you can't fucking teleport into a place where you are immune to all damage if(!targetfound) - to_chat(user,"No target found!") + to_chat(user,span_warning("No target found!")) return new /obj/effect/temp_visual/kinetic_blast(target_turf) @@ -269,7 +269,7 @@ for(var/turf/open/Y in orange(1, target_turf)) teleport_targets+=Y if(!LAZYLEN(teleport_targets)) - to_chat(user,"Failed to Teleport!") + to_chat(user,span_warning("Failed to Teleport!")) return new /obj/effect/temp_visual/guardian/phase (get_turf(user)) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/rcorp_assault.dm b/code/game/objects/items/ego_weapons/non_abnormality/rcorp_assault.dm index 04b87581036e..22a73b44436f 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/rcorp_assault.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/rcorp_assault.dm @@ -10,7 +10,7 @@ cell_type = /obj/item/stock_parts/cell/infinite ammo_type = list( /obj/item/ammo_casing/energy/laser/red, - ) + ) can_charge = FALSE weapon_weight = WEAPON_HEAVY // No dual wielding pin = /obj/item/firing_pin @@ -22,7 +22,7 @@ /obj/item/gun/energy/e_gun/rabbitdash/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread) if(user.mind) if(user.mind.assigned_role in banned_roles) - to_chat(user, "You are not trained to use Rcorp firearms!") + to_chat(user, span_notice("You are not trained to use Rcorp firearms!")) return FALSE ..() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/rosespanner.dm b/code/game/objects/items/ego_weapons/non_abnormality/rosespanner.dm index 579d67209762..e25538345a5e 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/rosespanner.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/rosespanner.dm @@ -18,10 +18,10 @@ /obj/item/ego_weapon/city/charge/rosespanner/attack_self(mob/user) ..() if(charge>=charge_cost) - to_chat(user, "You prepare to release your charge.") + to_chat(user, span_notice("You prepare to release your charge.")) activated = TRUE else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/city/charge/rosespanner/examine(mob/user) . = ..() @@ -31,7 +31,7 @@ ..() if(!istype(I, /obj/item/rosespanner_gear)) return - to_chat(user, "You apply a gear to your weapon, changing its damage type.") + to_chat(user, span_notice("You apply a gear to your weapon, changing its damage type.")) damtype = I.damtype charged = TRUE qdel(I) @@ -54,7 +54,7 @@ playsound(src, 'sound/abnormalities/thunderbird/tbird_bolt.ogg', 50, TRUE) if(overcharged) - to_chat(user, "You overcharged your weapon!.") + to_chat(user, span_danger("You overcharged your weapon!.")) var/aoe = force * (1 + (get_attribute_level(user, JUSTICE_ATTRIBUTE))/100) for(var/turf/T in view(2, target)) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/seven.dm b/code/game/objects/items/ego_weapons/non_abnormality/seven.dm index 850742f2f105..9b78289483f8 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/seven.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/seven.dm @@ -21,38 +21,38 @@ var/hit_number var/hit_target = 7 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60, + ) /obj/item/ego_weapon/city/seven/examine(mob/user) . = ..() - . += "Attack an enemy [hit_target] times to store it." + . += span_notice("Attack an enemy [hit_target] times to store it.") /obj/item/ego_weapon/city/seven/attack_self(mob/living/carbon/human/user) ..() if(!stored_target) - to_chat(user, "You have no information stored.") + to_chat(user, span_notice("You have no information stored.")) return //not enough info for vitals var/mob/living/Y = stored_target if(hit_number <= hit_target-1) - to_chat(user, "Current target is [Y.name]. Not enough information for vitals.") + to_chat(user, span_notice("Current target is [Y.name]. Not enough information for vitals.")) return //Reset if they died, don't reset if you don't have info on them. if(Y.stat == DEAD) - to_chat(user, "The target has expired. Clearing information.") + to_chat(user, span_notice("The target has expired. Clearing information.")) stored_target = null return //Get a very accurate % of their HP var/printhealth = stored_target_hp/Y.maxHealth*100 - to_chat(user, "Current target is [Y.name]. Their last health gathered is [printhealth]%") + to_chat(user, span_notice("Current target is [Y.name]. Their last health gathered is [printhealth]%")) /obj/item/ego_weapon/city/seven/attack(mob/living/target, mob/living/user) @@ -64,7 +64,7 @@ force = initial(force) if(target != stored_target) stored_target = target - to_chat(user, "You pursue a new target.") + to_chat(user, span_notice("You pursue a new target.")) hit_number = 0 return else @@ -72,7 +72,7 @@ stored_target_hp = target.health if(hit_number == hit_target-1) - to_chat(user, "Target Analyzed. Combat effectiveness increased by 50%") + to_chat(user, span_danger("Target Analyzed. Combat effectiveness increased by 50%")) /obj/item/ego_weapon/city/seven/vet @@ -149,7 +149,7 @@ return if(!fencing_target || fencing_target != M) fencing_target = M - to_chat(user, "Target acquired.") + to_chat(user, span_notice("Target acquired.")) else force *= 1.35 ..() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/shi.dm b/code/game/objects/items/ego_weapons/non_abnormality/shi.dm index 585b06bc90d8..e9970679a655 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/shi.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/shi.dm @@ -13,11 +13,11 @@ attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore") hitsound = 'sound/weapons/bladeslice.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60 + ) var/force_update = 44 var/static/suicide_used = list() @@ -25,11 +25,11 @@ force = force_update if(target == user) if(user.ckey in suicide_used) - to_chat(user, "To suicide once more would bring dishonor to your name.") + to_chat(user, span_warning("To suicide once more would bring dishonor to your name.")) return user.death() for(var/mob/M in GLOB.player_list) - to_chat(M, "[uppertext(user.real_name)] has gone out with honor. 灰から灰へ") + to_chat(M, span_userdanger("[uppertext(user.real_name)] has gone out with honor. 灰から灰へ")) new /obj/effect/temp_visual/BoD(get_turf(target)) suicide_used |= user.ckey if(!CanUseEgo(user)) @@ -69,7 +69,7 @@ return ready = FALSE user.Immobilize(17) - to_chat(user, "Draw.") + to_chat(user, span_userdanger("Draw.")) force*=multiplier damtype = PALE_DAMAGE user.adjustBruteLoss(user.maxHealth*0.25) @@ -79,7 +79,7 @@ /obj/item/ego_weapon/city/shi_assassin/attack(mob/living/target, mob/living/carbon/human/user) ..() if(force != initial(force)) - to_chat(user, "Boundary of Death.") + to_chat(user, span_userdanger("Boundary of Death.")) new /obj/effect/temp_visual/BoD(get_turf(target)) force = initial(force) damtype = initial(damtype) @@ -87,7 +87,7 @@ /obj/item/ego_weapon/city/shi_assassin/proc/Return(mob/living/carbon/human/user) force = initial(force) ready = TRUE - to_chat(user, "Your blade is ready.") + to_chat(user, span_notice("Your blade is ready.")) damtype = initial(damtype) /obj/effect/temp_visual/BoD diff --git a/code/game/objects/items/ego_weapons/non_abnormality/sweeper.dm b/code/game/objects/items/ego_weapons/non_abnormality/sweeper.dm index bd4fa8d27d4a..3463f9c0a11f 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/sweeper.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/sweeper.dm @@ -11,11 +11,11 @@ attack_verb_simple = "stab" hitsound = 'sound/effects/ordeals/indigo/stab_1.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 40, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 40, - JUSTICE_ATTRIBUTE = 40 - ) + FORTITUDE_ATTRIBUTE = 40, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 40, + JUSTICE_ATTRIBUTE = 40, + ) /obj/item/ego_weapon/city/sweeper/attack(mob/living/target, mob/living/carbon/human/user) if(!CanUseEgo(user)) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/syndicate.dm b/code/game/objects/items/ego_weapons/non_abnormality/syndicate.dm index 98e3cfb0975f..4d35443d1d00 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/syndicate.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/syndicate.dm @@ -12,11 +12,11 @@ attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore") hitsound = 'sound/weapons/ego/spear1.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80, + ) /obj/item/ego_weapon/city/awl/attack(mob/living/target, mob/living/carbon/human/user) @@ -24,7 +24,7 @@ return if(prob(10)) force*=2 - to_chat(user, "Critical!") + to_chat(user, span_userdanger("Critical!")) ..() force = initial(force) @@ -67,7 +67,7 @@ //Crit itself. if(prob(poise*2)) force*=3 - to_chat(user, "Critical!") + to_chat(user, span_userdanger("Critical!")) poise = 0 icon_state = "kurokumo_sheathed" inhand_icon_state = "kurokumo_sheathed" @@ -107,7 +107,7 @@ return ready = FALSE user.Immobilize(3 SECONDS) - to_chat(user, "Yield my flesh.") + to_chat(user, span_userdanger("Yield my flesh.")) force*=multiplier addtimer(CALLBACK(src, PROC_REF(Return), user), 5 SECONDS) @@ -115,10 +115,10 @@ /obj/item/ego_weapon/city/bladelineage/attack(mob/living/target, mob/living/carbon/human/user) ..() if(force != initial(force)) - to_chat(user, "To claim their bones.") + to_chat(user, span_userdanger("To claim their bones.")) force = initial(force) /obj/item/ego_weapon/city/bladelineage/proc/Return(mob/living/carbon/human/user) force = initial(force) ready = TRUE - to_chat(user, "Your blade is ready.") + to_chat(user, span_notice("Your blade is ready.")) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/thumb.dm b/code/game/objects/items/ego_weapons/non_abnormality/thumb.dm index b1c3ac739fff..7317b331f3f9 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/thumb.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/thumb.dm @@ -15,11 +15,11 @@ var/shotsleft = 5 //Based off the Mas 36, That's what my Girlfirend things it looks like. Holds 5 bullets. var/reloadtime = 5 SECONDS attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) /obj/item/gun/ego_gun/city/thumb/process_chamber() @@ -37,12 +37,12 @@ ..() if(shotsleft) return TRUE - visible_message("The gun is out of ammo.") + visible_message(span_notice("The gun is out of ammo.")) playsound(src, dry_fire_sound, 30, TRUE) return FALSE /obj/item/gun/ego_gun/city/thumb/attack_self(mob/user) - to_chat(user,"You start loading a new clip, one bullet at a time.") + to_chat(user,span_notice("You start loading a new clip, one bullet at a time.")) playsound(src, 'sound/weapons/gun/general/slide_lock_1.ogg', 50, TRUE) if(do_after(user, reloadtime, src)) //gotta reload playsound(src, 'sound/weapons/gun/general/bolt_rack.ogg', 50, TRUE) @@ -50,7 +50,7 @@ /obj/item/gun/ego_gun/city/thumb/EgoAttackInfo(mob/user) if(chambered && chambered.BB) - return "Its bullets deal [chambered.BB.damage*projectile_damage_multiplier] [chambered.BB.damage_type] damage." + return span_notice("Its bullets deal [chambered.BB.damage*projectile_damage_multiplier] [chambered.BB.damage_type] damage.") return /obj/item/gun/ego_gun/city/thumb/examine(mob/user) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/wcorp.dm b/code/game/objects/items/ego_weapons/non_abnormality/wcorp.dm index 489eeb99e50b..22650847258a 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/wcorp.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/wcorp.dm @@ -16,10 +16,10 @@ /obj/item/ego_weapon/city/charge/wcorp/attack_self(mob/user) ..() if(charge>=charge_cost) - to_chat(user, "You prepare to release your charge.") + to_chat(user, span_notice("You prepare to release your charge.")) activated = TRUE else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/city/charge/wcorp/attack(mob/living/target, mob/living/user) . = ..() diff --git a/code/game/objects/items/ego_weapons/non_abnormality/weak_edits/city.dm b/code/game/objects/items/ego_weapons/non_abnormality/weak_edits/city.dm index cff8e1e19966..251c7f3867ee 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/weak_edits/city.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/weak_edits/city.dm @@ -22,11 +22,11 @@ attack_verb_continuous = list("smacks", "hammers", "beats") attack_verb_simple = list("smack", "hammer", "beat") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) //proxy randomizer /obj/effect/spawner/lootdrop/proxy @@ -34,10 +34,10 @@ lootdoubles = FALSE loot = list( - /obj/item/ego_weapon/city/fakeindex/proxy = 1, - /obj/item/ego_weapon/city/fakeindex/proxy/spear = 1, - /obj/item/ego_weapon/city/fakeindex/proxy/knife = 1, - ) + /obj/item/ego_weapon/city/fakeindex/proxy = 1, + /obj/item/ego_weapon/city/fakeindex/proxy/spear = 1, + /obj/item/ego_weapon/city/fakeindex/proxy/knife = 1, + ) /obj/item/ego_weapon/city/fakeindex/proxy name = "index longsword" @@ -49,11 +49,11 @@ hitsound = 'sound/weapons/bladeslice.ogg' force = 35 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 80, + ) //Just gonna set this to the big proxy weapon for requirement reasons /obj/item/ego_weapon/city/fakeindex/proxy/spear @@ -94,11 +94,11 @@ force = 55 attack_speed = 2 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 100, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 100, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 100, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 100, + JUSTICE_ATTRIBUTE = 100, + ) //Blade Lineage @@ -106,75 +106,75 @@ special = "Use this weapon in hand to immobilize yourself for 3 seconds and deal 3x damage on the next attack within 5 seconds." force = 30 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) multiplier = 3 //Kurokumo /obj/item/ego_weapon/city/kurokumo/weak force = 30 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) //Thumb /obj/item/gun/ego_gun/city/thumb/weak force = 20 - projectile_damage_multiplier = 2 //20 damage per bullet + projectile_damage_multiplier = 2 //20 damage per bullet attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) //Capo /obj/item/gun/ego_gun/city/thumb/capo/weak force = 25 - projectile_damage_multiplier = 3 //30 damage per bullet + projectile_damage_multiplier = 3 //30 damage per bullet attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 80, + ) //Sottocapo /obj/item/gun/ego_gun/city/thumb/sottocapo/weak force = 10 //It's a pistol - projectile_damage_multiplier = 0.7 //5 damage per bullet - ammo_type = /obj/item/ammo_casing/caseless/thumbshell //Does 8 shells at 7 damage, total 56 + projectile_damage_multiplier = 0.7 //5 damage per bullet + ammo_type = /obj/item/ammo_casing/caseless/thumbshell //Does 8 shells at 7 damage, total 56 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 100, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 100, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 100, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 100, + JUSTICE_ATTRIBUTE = 100, + ) //wepaons are kinda uninteresting /obj/item/ego_weapon/city/thumbmelee/weak force = 35 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 80, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 80, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 80, + ) /obj/item/ego_weapon/city/thumbcane/weak force = 45 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 100, - PRUDENCE_ATTRIBUTE = 100, - TEMPERANCE_ATTRIBUTE = 100, - JUSTICE_ATTRIBUTE = 100 - ) + FORTITUDE_ATTRIBUTE = 100, + PRUDENCE_ATTRIBUTE = 100, + TEMPERANCE_ATTRIBUTE = 100, + JUSTICE_ATTRIBUTE = 100, + ) /obj/item/clothing/suit/armor/ego_gear/city/ncorp/weak name = "nagel und hammer armor" @@ -195,11 +195,11 @@ force = 20 attack_speed = 0.7 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 40, - TEMPERANCE_ATTRIBUTE = 40, - JUSTICE_ATTRIBUTE = 40 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 40, + TEMPERANCE_ATTRIBUTE = 40, + JUSTICE_ATTRIBUTE = 40, + ) hitsound = 'sound/weapons/fixer/generic/fist1.ogg' @@ -208,8 +208,8 @@ icon_state = "liufist_vet" force = 32 attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 100, - PRUDENCE_ATTRIBUTE = 80, - TEMPERANCE_ATTRIBUTE = 60, - JUSTICE_ATTRIBUTE = 80 - ) + FORTITUDE_ATTRIBUTE = 100, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80, + ) diff --git a/code/game/objects/items/ego_weapons/non_abnormality/zwei.dm b/code/game/objects/items/ego_weapons/non_abnormality/zwei.dm index 199c5e2787b2..a87e5d1f0e2e 100644 --- a/code/game/objects/items/ego_weapons/non_abnormality/zwei.dm +++ b/code/game/objects/items/ego_weapons/non_abnormality/zwei.dm @@ -19,11 +19,11 @@ var/defense_buff_others = 0.8 var/list/buffed_people = list() attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 40, - TEMPERANCE_ATTRIBUTE = 40, - JUSTICE_ATTRIBUTE = 40 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 40, + TEMPERANCE_ATTRIBUTE = 40, + JUSTICE_ATTRIBUTE = 40, + ) /obj/item/ego_weapon/city/zweihander/attack_self(mob/living/carbon/human/user) @@ -39,7 +39,7 @@ user.physiology.white_mod *= defense_buff_self user.physiology.black_mod *= defense_buff_self user.physiology.pale_mod *= defense_buff_self - to_chat(user, "HOLD THE LINE!") + to_chat(user, span_userdanger("HOLD THE LINE!")) buffed_people = list() @@ -51,7 +51,7 @@ buffed_people += L //Visible message just didn't work here. No clue why. - to_chat(L, "HOLD THE LINE!") + to_chat(L, span_userdanger("HOLD THE LINE!")) playsound(src, 'sound/misc/whistle.ogg', 50, TRUE) addtimer(CALLBACK(src, PROC_REF(Return), user), 3 SECONDS) @@ -61,20 +61,20 @@ user.physiology.white_mod /= defense_buff_self user.physiology.black_mod /= defense_buff_self user.physiology.pale_mod /= defense_buff_self - to_chat(user, "Your defense buff has expired!") + to_chat(user, span_notice("Your defense buff has expired!")) for(var/mob/living/carbon/human/L in buffed_people) L.physiology.red_mod /= defense_buff_others L.physiology.white_mod /= defense_buff_others L.physiology.black_mod /= defense_buff_others L.physiology.pale_mod /= defense_buff_others - to_chat(L, "Your defense buff has expired!") + to_chat(L, span_notice("Your defense buff has expired!")) addtimer(CALLBACK(src, PROC_REF(Cooldown), user), 15 SECONDS) /obj/item/ego_weapon/city/zweihander/proc/Cooldown(mob/living/carbon/human/user) ready = TRUE - to_chat(user, "You can use your defense buff again.") + to_chat(user, span_notice("You can use your defense buff again.")) //Vet Zwei /obj/item/ego_weapon/city/zweihander/vet diff --git a/code/game/objects/items/ego_weapons/ordeal.dm b/code/game/objects/items/ego_weapons/ordeal.dm index e99fed4efb54..9e2432bef815 100644 --- a/code/game/objects/items/ego_weapons/ordeal.dm +++ b/code/game/objects/items/ego_weapons/ordeal.dm @@ -17,11 +17,11 @@ hitsound = 'ModularTegustation/Tegusounds/claw/attack.ogg' actions_types = list(/datum/action/item_action/switch_serum) attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 130, - PRUDENCE_ATTRIBUTE = 130, - TEMPERANCE_ATTRIBUTE = 130, - JUSTICE_ATTRIBUTE = 130 - ) + FORTITUDE_ATTRIBUTE = 130, + PRUDENCE_ATTRIBUTE = 130, + TEMPERANCE_ATTRIBUTE = 130, + JUSTICE_ATTRIBUTE = 130, + ) var/serum = "K" var/special_attack = FALSE var/special_cooldown diff --git a/code/game/objects/items/ego_weapons/special.dm b/code/game/objects/items/ego_weapons/special.dm index 24fffd711978..67167d3f575d 100644 --- a/code/game/objects/items/ego_weapons/special.dm +++ b/code/game/objects/items/ego_weapons/special.dm @@ -11,8 +11,8 @@ attack_verb_continuous = list("cuts", "smacks", "bashes") attack_verb_simple = list("cuts", "smacks", "bashes") attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 20 //It's 20 to keep clerks from using it - ) + FORTITUDE_ATTRIBUTE = 20, //It's 20 to keep clerks from using it + ) /obj/item/ego_weapon/eyeball/attack(mob/living/target, mob/living/carbon/human/user) var/userfort = (get_attribute_level(user, FORTITUDE_ATTRIBUTE)) @@ -99,7 +99,7 @@ . = ..() var/datum/status_effect/chosen/C = user.has_status_effect(/datum/status_effect/chosen) if(!C) - to_chat(user, "You cannot use [src], only the abnormality's chosen can!") + to_chat(user, span_notice("You cannot use [src], only the abnormality's chosen can!")) return FALSE /obj/item/ego_weapon/lance/famiglia/attack(mob/living/target, mob/living/user) @@ -189,9 +189,9 @@ /obj/item/ego_weapon/iron_maiden/attack_self(mob/user) if(ramping_speed == 0) - to_chat(user,"It is already revved down!") + to_chat(user,span_notice("It is already revved down!")) return - to_chat(user,"You being to cool down [src].") + to_chat(user,span_notice("You being to cool down [src].")) playsound(src, 'sound/abnormalities/we_can_change_anything/change_gas.ogg', 50, TRUE) if(do_after(user, 2.5 SECONDS, src)) icon_state = "iron_maiden" @@ -199,7 +199,7 @@ playsound(src, 'sound/abnormalities/we_can_change_anything/change_start.ogg', 50, FALSE) ramping_speed = 0 ramping_damage = 0 - to_chat(user,"The mechanism on [src] dies down!") + to_chat(user,span_notice("The mechanism on [src] dies down!")) //Event rewards /obj/item/ego_weapon/goldrush/nihil @@ -237,7 +237,7 @@ user.changeNext_move(CLICK_CD_MELEE * 2) force *= 5 // Should actually keep up with normal damage. playsound(src, 'sound/weapons/fixer/generic/finisher2.ogg', 50, FALSE, 9) - to_chat(user,"You are offbalance, you take a moment to reset your stance.") + to_chat(user,span_warning("You are offbalance, you take a moment to reset your stance.")) else user.changeNext_move(CLICK_CD_MELEE * 0.4) ..() @@ -247,12 +247,12 @@ /obj/item/ego_weapon/goldrush/nihil/attack_self(mob/user) ..() if(finisher_on) - to_chat(user,"You will now perform a combo attack instead of a heavy attack.") + to_chat(user,span_warning("You will now perform a combo attack instead of a heavy attack.")) finisher_on = FALSE force = 40 return - to_chat(user,"You will now perform a heavy attack instead of a combo attack.") + to_chat(user,span_warning("You will now perform a heavy attack instead of a combo attack.")) finisher_on =TRUE force = 140 @@ -317,7 +317,7 @@ user.changeNext_move(CLICK_CD_MELEE * 2) force *= 5 // Should actually keep up with normal damage. playsound(src, 'sound/weapons/fixer/generic/sword5.ogg', 50, FALSE, 9) - to_chat(user,"You are offbalance, you take a moment to reset your stance.") + to_chat(user,span_warning("You are offbalance, you take a moment to reset your stance.")) else user.changeNext_move(CLICK_CD_MELEE * 0.4) ..() diff --git a/code/game/objects/items/ego_weapons/subtype/charge.dm b/code/game/objects/items/ego_weapons/subtype/charge.dm index 63e9aee119ef..8813097c114f 100644 --- a/code/game/objects/items/ego_weapons/subtype/charge.dm +++ b/code/game/objects/items/ego_weapons/subtype/charge.dm @@ -34,10 +34,10 @@ /obj/item/ego_weapon/charge/onattack/attack_self(mob/user) ..() if(charge>=charge_cost) - to_chat(user, "You prepare to release your charge.") + to_chat(user, span_notice("You prepare to release your charge.")) activated = TRUE else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) /obj/item/ego_weapon/charge/onattack/attack(mob/living/target, mob/living/user) . = ..() @@ -45,7 +45,7 @@ return FALSE if(activated) charge -= charge_cost - to_chat(user, "[release_message].") + to_chat(user, span_notice("[release_message].")) release_charge(target, user) activated = FALSE @@ -57,7 +57,7 @@ return FALSE if(charge>=charge_cost) charge -= charge_cost - to_chat(user, "[release_message].") + to_chat(user, span_notice("[release_message].")) release_charge(user) else - to_chat(user, "You don't have enough charge.") + to_chat(user, span_notice("You don't have enough charge.")) diff --git a/code/game/objects/items/ego_weapons/subtype/lance.dm b/code/game/objects/items/ego_weapons/subtype/lance.dm index 15e798e09574..ff1ac6334a26 100644 --- a/code/game/objects/items/ego_weapons/subtype/lance.dm +++ b/code/game/objects/items/ego_weapons/subtype/lance.dm @@ -31,7 +31,7 @@ if(world.time > couch_cooldown + couch_cooldown_time) LowerLance(user) else - to_chat(user, "You are not ready to couch the [src] yet!") + to_chat(user, span_warning("You are not ready to couch the [src] yet!")) //Equipped setup /obj/item/ego_weapon/lance/equipped(mob/living/carbon/human/user, slot) @@ -80,7 +80,7 @@ return if(user.dir != initial_dir || src != user.get_active_held_item()) RaiseLance(user) - to_chat(user, "You lose control of [src]!") + to_chat(user, span_warning("You lose control of [src]!")) return if(force < force_cap) force += force_per_tile @@ -89,7 +89,7 @@ user.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/charge, multiplicative_slowdown = charge_speed) if(user.pulling) RaiseLance(user) //no stupid super speed dragging - to_chat(user, "You can't maintain your momentum while pulling something!") + to_chat(user, span_warning("You can't maintain your momentum while pulling something!")) addtimer(CALLBACK(src, PROC_REF(MoveCheck), user, user.loc), required_movement_time) //The player is readying a charge. CHARGE!!! @@ -128,21 +128,21 @@ if(ishuman(A) && user.faction_check_mob(A)) var/mob/living/carbon/human/H = A H.Knockdown(4 SECONDS) //we dont want humans getting skewered for a million damage - to_chat(user, "You crash into [H]!") + to_chat(user, span_warning("You crash into [H]!")) playsound(loc, 'sound/weapons/genhit1.ogg', 50, TRUE, -1) if(charge_speed > -(pierce_threshold)) user.Knockdown(2 SECONDS) return else A.attackby(src,user) - to_chat(user, "You successfully impale [A]!") + to_chat(user, span_warning("You successfully impale [A]!")) if(charge_speed < -(pierce_threshold)) //you can keep going! charge_speed += pierce_speed_cost force -= pierce_force_cost return else - to_chat(user, "You lose control of [src]!") + to_chat(user, span_warning("You lose control of [src]!")) user.Knockdown(4 SECONDS) //crash if you bump into a wall too fast playsound(loc, 'sound/weapons/genhit1.ogg', 50, TRUE, -1) RaiseLance(user) @@ -152,14 +152,14 @@ if(raised) return if(!user.loc.AllowClick() || user.loc == location) - to_chat(user, "Your momentum runs out.") + to_chat(user, span_warning("Your momentum runs out.")) RaiseLance(user) return //Examine text /obj/item/ego_weapon/lance/examine(mob/user) . = ..() - . += "This weapon can be used to perform a running charge by using it in hand. Charge into an enemy at high speeds for massive damage!" + . += span_notice("This weapon can be used to perform a running charge by using it in hand. Charge into an enemy at high speeds for massive damage!") /datum/movespeed_modifier/charge multiplicative_slowdown = 0 diff --git a/code/game/objects/items/ego_weapons/subtype/shield.dm b/code/game/objects/items/ego_weapons/subtype/shield.dm index ee6b4a4146e6..30a936821371 100644 --- a/code/game/objects/items/ego_weapons/subtype/shield.dm +++ b/code/game/objects/items/ego_weapons/subtype/shield.dm @@ -81,11 +81,11 @@ if(!CanUseEgo(shield_user)) return FALSE if(shield_user.physiology.armor.bomb) //"We have NOTHING that should be modifying this, so I'm using it as an existant parry checker." - Ancientcoders - to_chat(shield_user,"You're still off-balance!") + to_chat(shield_user,span_warning("You're still off-balance!")) return FALSE for(var/obj/machinery/computer/abnormality/AC in range(1, shield_user)) if(AC.datum_reference.working) // No blocking during work. - to_chat(shield_user,"You cannot defend yourself from responsibility!") + to_chat(shield_user,span_notice("You cannot defend yourself from responsibility!")) return FALSE block = TRUE block_success = FALSE @@ -99,7 +99,7 @@ DisableBlock(shield_user) else parry_timer = addtimer(CALLBACK(src, PROC_REF(DisableBlock), shield_user), block_duration, TIMER_STOPPABLE) - to_chat(user,"[block_message]") + to_chat(user, span_userdanger("[block_message]")) return TRUE //Ends the block, causes you to take more damage for as long as debuff_duration if you did not block any damage @@ -123,10 +123,10 @@ /obj/item/ego_weapon/shield/proc/BlockCooldown(mob/living/carbon/human/user) block = FALSE if(user.is_holding(src)) - to_chat(user,"[block_cooldown_message]") + to_chat(user,span_nicegreen("[block_cooldown_message]")) /obj/item/ego_weapon/shield/proc/BlockFail(mob/living/carbon/human/user) - to_chat(user,"Your stance is widened.") + to_chat(user,span_warning("Your stance is widened.")) user.physiology.red_mod *= 1.2 user.physiology.white_mod *= 1.2 user.physiology.black_mod *= 1.2 @@ -137,7 +137,7 @@ addtimer(CALLBACK(src, PROC_REF(RemoveDebuff), user), debuff_duration) /obj/item/ego_weapon/shield/proc/RemoveDebuff(mob/living/carbon/human/user) - to_chat(user,"You recollect your stance.") + to_chat(user,span_nicegreen("You recollect your stance.")) user.physiology.red_mod /= 1.2 user.physiology.white_mod /= 1.2 user.physiology.black_mod /= 1.2 @@ -155,13 +155,13 @@ block_success = TRUE playsound(get_turf(src), block_sound, block_sound_volume, 0, 7) - H.visible_message("[H.real_name] [hit_message]") + H.visible_message(span_userdanger("[H.real_name] [hit_message]")) //Adds projectile deflection on attack cooldown, you can override and return 0 to prevent this from happening. /obj/item/ego_weapon/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK && attacking) final_block_chance = 100 - owner.visible_message("[owner.real_name] deflects the projectile!", "[projectile_block_message]") + owner.visible_message(span_nicegreen("[owner.real_name] deflects the projectile!"), span_userdanger("[projectile_block_message]")) return ..() return ..() @@ -179,12 +179,12 @@ /obj/item/ego_weapon/shield/examine(mob/user) . = ..() if(projectile_block_duration) - . += "This weapon blocks ranged attacks while attacking and can block on command." + . += span_notice("This weapon blocks ranged attacks while attacking and can block on command.") else - . += "This weapon can block on command." + . += span_notice("This weapon can block on command.") if(LAZYLEN(resistances_list)) - . += "It has a tag listing its protection classes." + . += span_notice("It has a tag listing its protection classes.") //Code for armor tags /obj/item/ego_weapon/shield/Topic(href, href_list) diff --git a/code/game/objects/items/ego_weapons/teth.dm b/code/game/objects/items/ego_weapons/teth.dm index f472d27c9c43..645f04646681 100644 --- a/code/game/objects/items/ego_weapons/teth.dm +++ b/code/game/objects/items/ego_weapons/teth.dm @@ -169,7 +169,7 @@ /obj/item/ego_weapon/sorrow/attack_self(mob/living/user) var/area/turf_area = get_area(get_turf(user)) if(istype(turf_area, /area/fishboat)) - to_chat(user, "[src] will not work here!.") + to_chat(user, span_warning("[src] will not work here!.")) return if(do_after(user, 50, src)) //Five seconds of not doing anything, then teleport. new /obj/effect/temp_visual/dir_setting/ninja/phase/out (get_turf(user)) @@ -272,8 +272,8 @@ icon_state = "smash1" duration = 3 -#define LANTERN_MODE_REMOTE 1 -#define LANTERN_MODE_AUTO 2 +#define LANTERN_MODE_REMOTE (1<<0) +#define LANTERN_MODE_AUTO (1<<1) /obj/item/ego_weapon/lantern //meat lantern name = "lantern" @@ -290,10 +290,10 @@ /obj/item/ego_weapon/lantern/attack_self(mob/user) if(mode == LANTERN_MODE_REMOTE) - to_chat(user, "You adjust any newly-placed traps to be set off by motion.") + to_chat(user, span_info("You adjust any newly-placed traps to be set off by motion.")) mode = LANTERN_MODE_AUTO else - to_chat(user, "You can now remotely trigger any placed traps.") + to_chat(user, span_info("You can now remotely trigger any placed traps.")) mode = LANTERN_MODE_REMOTE /obj/item/ego_weapon/lantern/proc/CreateTrap(target, mob/user, proximity_flag) @@ -354,9 +354,9 @@ playsound(T,'sound/weapons/resonator_blast.ogg',50,TRUE) for(var/mob/living/L in creator.HurtInTurf(T, list(), resonance_damage, BLACK_DAMAGE, check_faction = TRUE, hurt_mechs = TRUE)) - to_chat(L, "[src] bites you!") + to_chat(L, span_userdanger("[src] bites you!")) if(creator) - creator.visible_message("[creator] activates [src] on [L]!","You activate [src] on [L]!", null, COMBAT_MESSAGE_RANGE, L) + creator.visible_message(span_danger("[creator] activates [src] on [L]!"),span_danger("You activate [src] on [L]!"), null, COMBAT_MESSAGE_RANGE, L) for(var/obj/effect/temp_visual/lanterntrap/field in range(1, src)) if(field != src && !field.rupturing) field.burst() @@ -448,7 +448,7 @@ //Crit itself. if(prob(poise*2)) force*=3 - to_chat(user, "Critical!") + to_chat(user, span_userdanger("Critical!")) poise = 0 ..() force = initial(force) diff --git a/code/game/objects/items/ego_weapons/waw.dm b/code/game/objects/items/ego_weapons/waw.dm index c78cf99fea4a..bae25e4ed63f 100644 --- a/code/game/objects/items/ego_weapons/waw.dm +++ b/code/game/objects/items/ego_weapons/waw.dm @@ -12,9 +12,9 @@ attack_verb_simple = list("slam", "attack") hitsound = 'sound/weapons/ego/hammer.ogg' attribute_requirements = list( - FORTITUDE_ATTRIBUTE = 60, - PRUDENCE_ATTRIBUTE = 60 - ) + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + ) /obj/item/ego_weapon/lamp/attack(mob/living/M, mob/living/user) . = ..() @@ -55,11 +55,11 @@ /obj/item/ego_weapon/despair/attack_self(mob/user) ..() if(combo_on) - to_chat(user,"You swap your grip, and will no longer perform a finisher.") + to_chat(user,span_warning("You swap your grip, and will no longer perform a finisher.")) combo_on = FALSE return if(!combo_on) - to_chat(user,"You swap your grip, and will now perform a finisher.") + to_chat(user,span_warning("You swap your grip, and will now perform a finisher.")) combo_on =TRUE return @@ -75,7 +75,7 @@ user.changeNext_move(CLICK_CD_MELEE * 2) force *= 5 // Should actually keep up with normal damage. playsound(src, 'sound/weapons/fwoosh.ogg', 300, FALSE, 9) - to_chat(user,"You are offbalance, you take a moment to reset your stance.") + to_chat(user,span_warning("You are offbalance, you take a moment to reset your stance.")) else user.changeNext_move(CLICK_CD_MELEE * 0.4) ..() @@ -87,7 +87,7 @@ if(!istype(I, /obj/item/nihil/spade)) return new /obj/item/ego_weapon/shield/despair_nihil(get_turf(src)) - to_chat(user,"The [I] seems to drain all of the light away as it is absorbed into [src]!") + to_chat(user,span_warning("The [I] seems to drain all of the light away as it is absorbed into [src]!")) playsound(user, 'sound/abnormalities/nihil/filter.ogg', 15, FALSE, -3) qdel(I) qdel(src) @@ -117,7 +117,7 @@ if(do_after(user, 12, src)) charged = TRUE force = 120 //FULL POWER - to_chat(user,"You put your strength behind this attack.") + to_chat(user,span_warning("You put your strength behind this attack.")) /obj/item/ego_weapon/totalitarianism/get_clamped_volume() return 50 @@ -143,7 +143,7 @@ /obj/item/ego_weapon/oppression/attack_self(mob/user) if (!charged) charged = TRUE - to_chat(user,"You focus your energy, adding [meter] damage to your next attack.") + to_chat(user,span_warning("You focus your energy, adding [meter] damage to your next attack.")) force += meter meter = 0 @@ -203,13 +203,13 @@ return if(mode) //Turn to nail mode = FALSE - to_chat(user,"You swap to nail mode, clearing all marks.") + to_chat(user,span_warning("You swap to nail mode, clearing all marks.")) targets = list() return if(!mode) //Turn to hammer mode = TRUE - to_chat(user,"You swap to hammer mode.") + to_chat(user,span_warning("You swap to hammer mode.")) return /obj/item/ego_weapon/mini/crimson @@ -267,9 +267,9 @@ return special_attack = !special_attack if(special_attack) - to_chat(user, "You prepare to throw [src].") + to_chat(user, span_notice("You prepare to throw [src].")) else - to_chat(user, "You decide to not throw [src], for now.") + to_chat(user, span_notice("You decide to not throw [src], for now.")) /obj/item/ego_weapon/mini/crimson/afterattack(atom/A, mob/living/user, proximity_flag, params) if(!CanUseEgo(user)) @@ -291,7 +291,7 @@ if(!LAZYLEN(turfs_to_hit)) return playsound(user, 'sound/abnormalities/redhood/throw.ogg', 75, TRUE, 3) - user.visible_message("[user] throws [src] towards [A]!") + user.visible_message(span_warning("[user] throws [src] towards [A]!")) var/dealing_damage = special_damage // Damage reduces a little with each mob hit dealing_damage*=force_multiplier for(var/i = 1 to turfs_to_hit.len) // Basically, I copied my code from helper's realized ability. Yep. @@ -313,7 +313,7 @@ continue if(special_checks_faction && user.faction_check_mob(L)) continue - to_chat(L, "You are hit by [src]!") + to_chat(L, span_userdanger("You are hit by [src]!")) L.apply_damage(dealing_damage, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE)) new /obj/effect/temp_visual/dir_setting/bloodsplatter(get_turf(L), pick(GLOB.alldirs)) dealing_damage = max(dealing_damage * 0.9, special_damage * 0.3) @@ -383,7 +383,7 @@ if(!CanUseEgo(user)) return if(vine_cooldown <= world.time) - user.visible_message("[user] stabs [src] into the ground.", "You stab your [src] into the ground.") + user.visible_message(span_notice("[user] stabs [src] into the ground."), span_nicegreen("You stab your [src] into the ground.")) var/mob/living/carbon/human/L = user L.adjustSanityLoss(30) @@ -392,7 +392,7 @@ var/channel_level = (3 SECONDS) / i //Burst is 3 + 1.5 + 1 + 0.75 + 0.6 + 0.2 seconds for a total of 60-90 damage over a period of 7.05 seconds if you allow it to finish. vine_cooldown = world.time + channel_level + (1 SECONDS) if(!do_after(user, channel_level, target = user)) - to_chat(user, "Your vineburst is interrupted.") + to_chat(user, span_warning("Your vineburst is interrupted.")) break for(var/mob/living/C in oview(3, get_turf(src))) var/vine_damage = 10 @@ -484,7 +484,7 @@ if(max_count > hit_count) hit_count++ else if(prob(10)) - to_chat(user, "[src]' feathers bristle!") // "Hey dumbass, you can stop smacking them now" + to_chat(user, span_notice("[src]' feathers bristle!")) // "Hey dumbass, you can stop smacking them now" combo_hold = world.time + decay_time ..() INVOKE_ASYNC(src, PROC_REF(SecondSwing), M, user) @@ -493,7 +493,7 @@ /obj/item/ego_weapon/wings/attack_self(mob/user) . = ..() if(world.time > combo_hold && hit_count > 0) - to_chat(user, "[src]' feathers fall still...") // Notify you the combo's over + to_chat(user, span_notice("[src]' feathers fall still...")) // Notify you the combo's over hit_count = 0 if(!(special_cost > hit_count) && !(specialing)) specialing = TRUE @@ -502,22 +502,22 @@ if(special_combo < 4) // Special combo goes up to 5. special_combo++ else if(prob(20)) // If your special combo is at max, you get some glory. - user.visible_message("[user] is moving like the wind!") + user.visible_message(span_notice("[user] is moving like the wind!")) Pirouette(user) specialing = FALSE /obj/item/ego_weapon/wings/afterattack(atom/A, mob/living/user, params) // Time for the ANIME BLADE DASH ATTACK if(world.time > combo_hold && hit_count > 0) - to_chat(user, "[src]' feathers fall still...") + to_chat(user, span_notice("[src]' feathers fall still...")) hit_count = 0 return if(special_cost > hit_count || !CanUseEgo(user) || get_dist(get_turf(A), get_turf(user)) < 2 || specialing) return var/aim_dir = get_cardinal_dir(get_turf(user), get_turf(A)) // You can only anime dash in a cardinal direction. if(CheckPath(user, aim_dir)) - to_chat(user,"You need more room to do that!") + to_chat(user,span_notice("You need more room to do that!")) else - user.visible_message("[user] lunges forward, [src] dancing in their grasp!") // ANIME AS FUCK + user.visible_message(span_notice("[user] lunges forward, [src] dancing in their grasp!")) // ANIME AS FUCK playsound(src, hitsound, 75, FALSE, 4) // Might need a punchier sound, but none come to mind. hit_count -= special_cost combo_hold = world.time + decay_time // Specials continue the regular AND special combo. @@ -525,7 +525,7 @@ if(special_combo < 4) special_combo++ else if(prob(20)) - user.visible_message("[user] is moving like the wind!") + user.visible_message(span_notice("[user] is moving like the wind!")) else special_combo = 1 special_combo_hold = world.time + decay_time @@ -536,7 +536,7 @@ return /obj/item/ego_weapon/wings/proc/Pirouette(mob/living/user) - user.visible_message("[user] whirls in place, [src] flicking out at enemies!") // You cool looking bitch + user.visible_message(span_notice("[user] whirls in place, [src] flicking out at enemies!")) // You cool looking bitch playsound(src, hitsound, 75, FALSE, 4) for(var/turf/T in orange(1, user)) // Most of this code was jacked from Harvest tbh new /obj/effect/temp_visual/smash_effect(T) @@ -553,7 +553,7 @@ if(!H.sanity_lost) continue L.apply_damage(aoe, WHITE_DAMAGE, null, L.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) - L.visible_message("[user] slices [L]!") + L.visible_message(span_danger("[user] slices [L]!")) /obj/item/ego_weapon/wings/proc/Leap(mob/living/user, dir = SOUTH, times_ran = 3) user.forceMove(get_step(get_turf(user), dir)) @@ -561,7 +561,7 @@ if(times_ran > 2) end_leap = TRUE if(CheckPath(user, dir)) // If we have something ahead of us, yes, but we're ALSO going to attack around us - to_chat(user,"You cut your leap short!") + to_chat(user,span_notice("You cut your leap short!")) for(var/turf/T in orange(1, user)) // I hate having to use this code twice but it's TWO LINES and I don't need to use callbacks with it so it's not getting a proc hit_turfs |= T end_leap = TRUE @@ -581,7 +581,7 @@ if(!H.sanity_lost) continue L.apply_damage(aoe, WHITE_DAMAGE, null, L.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) - L.visible_message("[user] evicerates [L]!") + L.visible_message(span_danger("[user] evicerates [L]!")) return for(var/turf/T in orange(1, user)) hit_turfs |= T @@ -607,12 +607,12 @@ if(get_dist(M, user) > 1) return if(force && HAS_TRAIT(user, TRAIT_PACIFISM)) - to_chat(user, "You don't want to harm other living beings!") + to_chat(user, span_warning("You don't want to harm other living beings!")) return if(max_count > hit_count) hit_count++ else if(prob(10)) - to_chat(user, "[src]' feathers bristle!") // "Hey dumbass, you can stop smacking them now" + to_chat(user, span_notice("[src]' feathers bristle!")) // "Hey dumbass, you can stop smacking them now" combo_hold = world.time + decay_time playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) user.do_attack_animation(M) @@ -649,11 +649,11 @@ /obj/item/ego_weapon/mini/mirth/attack_self(mob/user) ..() if(combo_on) - to_chat(user,"You swap your grip, and will no longer fight with two weapons.") + to_chat(user,span_warning("You swap your grip, and will no longer fight with two weapons.")) combo_on = FALSE return if(!combo_on) - to_chat(user,"You swap your grip, and will now fight with two weapons.") + to_chat(user,span_warning("You swap your grip, and will now fight with two weapons.")) combo_on =TRUE return @@ -724,11 +724,11 @@ /obj/item/ego_weapon/mini/malice/attack_self(mob/user) ..() if(combo_on) - to_chat(user,"You swap your grip, and will no longer fight with two weapons.") + to_chat(user,span_warning("You swap your grip, and will no longer fight with two weapons.")) combo_on = FALSE return if(!combo_on) - to_chat(user,"You swap your grip, and will now fight with two weapons.") + to_chat(user,span_warning("You swap your grip, and will now fight with two weapons.")) combo_on =TRUE return @@ -802,7 +802,7 @@ /obj/item/ego_weapon/shield/swan/attack_self(mob/user) if(close_cooldown > world.time) //prevents shield usage with no DPS loss - to_chat(user,"You cannot use this again so soon!") + to_chat(user,span_warning("You cannot use this again so soon!")) return if(do_after(user, 4, src)) icon_state = "swan" @@ -813,7 +813,7 @@ /obj/item/ego_weapon/shield/swan/DisableBlock(mob/living/carbon/human/user) . = ..() icon_state = "swan_closed" - to_chat(user,"You close the umbrella.") + to_chat(user,span_nicegreen("You close the umbrella.")) user.update_inv_hands() return @@ -888,7 +888,7 @@ playsound(src, 'sound/magic/staff_healing.ogg', 200, FALSE, 9) for(var/mob/living/carbon/human/L in range(5, get_turf(user))) if(L.is_working) - to_chat(L, "The powers of the moon are the same as the powers of the sun. The redundancy of moonlight does not make this work any less mind-numbing.") + to_chat(L, span_nicegreen("The powers of the moon are the same as the powers of the sun. The redundancy of moonlight does not make this work any less mind-numbing.")) continue L.adjustSanityLoss(-10) inuse = FALSE @@ -998,7 +998,7 @@ /obj/item/ego_weapon/shield/pharaoh/pre_attack(atom/A, mob/living/user, params) if(istype(A,/obj/structure/statue/petrified) && CanUseEgo(user)) playsound(A, 'sound/effects/break_stone.ogg', rand(10,50), TRUE) - A.visible_message("[A] returns to normal!", "You break free of the stone!") + A.visible_message(span_danger("[A] returns to normal!"), span_userdanger("You break free of the stone!")) A.Destroy() return ..() @@ -1060,7 +1060,7 @@ if(!istype(I, /obj/item/nihil/club)) return new /obj/item/ego_weapon/blind_rage/nihil(get_turf(src)) - to_chat(user,"The [I] seems to drain all of the light away as it is absorbed into [src]!") + to_chat(user,span_warning("The [I] seems to drain all of the light away as it is absorbed into [src]!")) playsound(user, 'sound/abnormalities/nihil/filter.ogg', 15, FALSE, -3) qdel(I) qdel(src) @@ -1126,9 +1126,9 @@ ..() if(do_after(user, 4, src)) playsound(loc, hitsound, 120, TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) - target.visible_message("[user] markes [target]!", \ - "[user] marks you!", COMBAT_MESSAGE_RANGE, user) - to_chat(user, "You enscribe a code on [target]!") + target.visible_message(span_danger("[user] markes [target]!"), \ + span_userdanger("[user] marks you!"), COMBAT_MESSAGE_RANGE, user) + to_chat(user, span_danger("You enscribe a code on [target]!")) mark_damage = force*2 //I gotta grab justice here @@ -1208,7 +1208,7 @@ if(!CanUseEgo(user)) return if(!can_spin) - to_chat(user,"You attacked too recently.") + to_chat(user,span_warning("You attacked too recently.")) return can_spin = FALSE if(do_after(user, 13, src)) @@ -1366,7 +1366,7 @@ if(!isliving(A)) return if(dash_cooldown > world.time) - to_chat(user, "Your dash is still recharging!") + to_chat(user, span_warning("Your dash is still recharging!")) return if((get_dist(user, A) < 2) || (!(can_see(user, A, dash_range)))) return @@ -1381,7 +1381,7 @@ step_towards(user,A) if((get_dist(user, A) < 2)) JumpAttack(A,user) - to_chat(user, "You jump towards [A]!") + to_chat(user, span_warning("You jump towards [A]!")) animate(user, alpha = 255,pixel_x = 0, pixel_z = -16, time = 0.1 SECONDS) user.pixel_z = 0 @@ -1478,12 +1478,12 @@ /obj/item/ego_weapon/grasp/attack_self(mob/user) ..() if(charging) - to_chat(user,"You change your stance, and will no longer perform a dash towards enemies.") + to_chat(user,span_warning("You change your stance, and will no longer perform a dash towards enemies.")) charging = FALSE force = initial(force) + 2 return if(!charging) - to_chat(user,"You change your stance, and will now perform a dash towards enemies.") + to_chat(user,span_warning("You change your stance, and will now perform a dash towards enemies.")) charging =TRUE force = initial(force) return @@ -1546,7 +1546,7 @@ if(!those_we_rend) return FALSE if(prob(25)) - wolf.visible_message("[wolf] claws [those_we_rend] in a blind frenzy!", "You swipe your claws at [those_we_rend]!") + wolf.visible_message(span_warning("[wolf] claws [those_we_rend] in a blind frenzy!"), span_warning("You swipe your claws at [those_we_rend]!")) wolf.do_attack_animation(those_we_rend) those_we_rend.apply_damage(10, damtype, null, those_we_rend.run_armor_check(null, damtype), spread_damage = TRUE) those_we_rend.lastattacker = wolf.real_name @@ -1742,16 +1742,16 @@ if("red") user.apply_damage(50, RED_DAMAGE, null, user.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE) damtype = RED_DAMAGE - to_chat(user, "Your bones are painfully sculpted to fit a muscular claw.") + to_chat(user, span_notice("Your bones are painfully sculpted to fit a muscular claw.")) hitsound = 'sound/weapons/bladeslice.ogg' if("white") user.apply_damage(50, WHITE_DAMAGE, null, user.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) damtype = WHITE_DAMAGE - to_chat(user, "Your angst is plastered onto your arm.") + to_chat(user, span_notice("Your angst is plastered onto your arm.")) if("black") user.apply_damage(50, BLACK_DAMAGE, null, user.run_armor_check(null, BLACK_DAMAGE), spread_damage = TRUE) damtype = BLACK_DAMAGE - to_chat(user, "Bristles are painfully ejected from your arm, filled with hate.") + to_chat(user, span_notice("Bristles are painfully ejected from your arm, filled with hate.")) hitsound = 'sound/weapons/ego/spear1.ogg' ADD_TRAIT(src, TRAIT_NODROP, null) user.update_inv_hands() @@ -1770,7 +1770,7 @@ REMOVE_TRAIT(src, TRAIT_NODROP, null) if(user) user.update_inv_hands() - to_chat(user, "Your arm returns to normal.") + to_chat(user, span_notice("Your arm returns to normal.")) /obj/item/ego_weapon/hyde/on_thrown(mob/living/carbon/user, atom/target)//you can't throw it. bleh if(transformed) diff --git a/code/game/objects/items/ego_weapons/zayin.dm b/code/game/objects/items/ego_weapons/zayin.dm index 0405886fabe6..86c2888c28d8 100644 --- a/code/game/objects/items/ego_weapons/zayin.dm +++ b/code/game/objects/items/ego_weapons/zayin.dm @@ -15,20 +15,20 @@ return FALSE var/mob/living/carbon/human/H = user if(ability_cooldown > world.time) - to_chat(H, "You have used this ability too recently!") + to_chat(H, span_warning("You have used this ability too recently!")) return FALSE var/obj/item/clothing/suit/armor/ego_gear/zayin/P = H.get_item_by_slot(ITEM_SLOT_OCLOTHING) if(istype(P, matching_armor)) pulse_enabled = TRUE ability_cooldown = world.time + ability_cooldown_time - to_chat(H, "[use_message]") + to_chat(H, span_nicegreen("[use_message]")) H.playsound_local(get_turf(H), use_sound, 25, 0) Pulse(user, 0) return TRUE else if(pulse_enable_toggle) pulse_enabled = FALSE - to_chat(H, "You must have the corrosponding armor equipped to use this ability!") + to_chat(H, span_warning("You must have the corrosponding armor equipped to use this ability!")) return FALSE /obj/item/ego_weapon/support/dropped(mob/user) @@ -69,7 +69,7 @@ if(L.stat == DEAD || L == user || L.is_working) //no self-healing continue L.adjustSanityLoss(pulse_healing) - to_chat(L, "A pulse from [user] makes your mind feel a bit clearer.") + to_chat(L, span_nicegreen("A pulse from [user] makes your mind feel a bit clearer.")) /obj/item/ego_weapon/support/little_alice name = "little alice" @@ -93,7 +93,7 @@ continue if(L.nutrition > NUTRITION_LEVEL_WELL_FED) continue - to_chat(L, "[user] gives you a snack!") + to_chat(L, span_warning("[user] gives you a snack!")) var/gift = pick(foodoptions) new gift(get_turf(L)) @@ -118,7 +118,7 @@ if(L.stat == DEAD || L == user || L.is_working) //no self-healing continue L.adjustBruteLoss(pulse_healing) - to_chat(L, "Fairies come from [user] to heal your wounds.") + to_chat(L, span_nicegreen("Fairies come from [user] to heal your wounds.")) /obj/item/ego_weapon/change name = "change" @@ -140,10 +140,10 @@ return var/mob/living/carbon/human/HT = M if(HT.is_working) - to_chat(user,"You cannot defend others from responsibility!") + to_chat(user,span_notice("You cannot defend others from responsibility!")) return playsound(get_turf(user), 'sound/abnormalities/change/change_end.ogg', 25, 0, -9) - HT.visible_message("[HT] is patched up with [src] by [user]!") + HT.visible_message(span_nicegreen("[HT] is patched up with [src] by [user]!")) HT.adjustBruteLoss(-10) user.changeNext_move(CLICK_CD_MELEE * 3) @@ -177,9 +177,8 @@ continue L.adjustSanityLoss(pulse_healing) L.adjustBruteLoss(pulse_healing) - to_chat(L, "You feel warmth coming from [user]!") + to_chat(L, span_nicegreen("You feel warmth coming from [user]!")) -#define STATUS_EFFECT_EVENING /datum/status_effect/evening /obj/item/ego_weapon/support/evening name = "evening twilight" desc = "I accepted the offer and paid the price." @@ -210,7 +209,7 @@ if(!ishuman(owner)) return var/mob/living/carbon/human/H = owner - to_chat(H,"A shield from [owner] increases your resistance to pale damage!") + to_chat(H, span_nicegreen("A shield from [owner] increases your resistance to pale damage!")) H.physiology.pale_mod /= 1.1 return ..() @@ -218,11 +217,10 @@ if(!ishuman(owner)) return var/mob/living/carbon/human/H = owner - to_chat(H,"Your shield has warn off.") + to_chat(H, span_warning("Your shield has warn off.")) H.physiology.pale_mod *= 1.1 return ..() -#undef STATUS_EFFECT_EVENING /obj/item/ego_weapon/melty_eyeball name = "melty eyeball" @@ -245,10 +243,10 @@ return var/mob/living/carbon/human/HT = M if(HT.is_working) - to_chat(user,"You cannot defend others from responsibility!") + to_chat(user,span_notice("You cannot defend others from responsibility!")) return playsound(get_turf(user), 'sound/abnormalities/blubbering_toad/blurble3.ogg', 25, 0, -9) //change to blubber sfx when toad is merged - HT.visible_message("[HT] is healed by the resin on [src] by [user]!") + HT.visible_message(span_nicegreen("[HT] is healed by the resin on [src] by [user]!")) HT.adjustSanityLoss(-5) HT.adjustBruteLoss(-5) user.changeNext_move(CLICK_CD_MELEE * 3) @@ -275,7 +273,7 @@ var/msg = stripped_input(usr, "What do you wish to tell [M]?", null, "") if(!msg) return - to_chat(M, "[user] has sent you a message!") + to_chat(M, span_warning("[user] has sent you a message!")) var/obj/item/paper/P = new(get_turf(M)) P.setText(msg) P.icon_state = "mail" @@ -297,7 +295,7 @@ if(/datum/attribute/justice) // "These two seem to be backwards?" Yes. Justice is the one stat that does basically nothing for grinding, this buffs those who want to be able to do damage AND work. new /obj/item/mailpaper/attachment(get_turf(H), H) QDEL_IN(P, 30 SECONDS) - to_chat(user, "You transmit to [M]: [msg]") + to_chat(user, span_boldnotice("You transmit to [M]: [msg]")) for(var/ded in GLOB.dead_mob_list) if(!isobserver(ded)) continue