diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 448c00aa42c..d45db7b7dce 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -45,8 +45,6 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals", "Robotics", "HoP Office", "Library", "Chapel", "Captain's Office", "Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics", "Detective", "Morgue")) -GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")) - GLOBAL_LIST_INIT(greek_letters, list("Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi", diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 7cfed545f93..5724dd68834 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -492,10 +492,6 @@ Congratulations! You are now trained for invasive xenobiology research!"} "[user] has stunned you with [src]!") playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - H.forcesay(GLOB.hit_appends) - add_attack_logs(user, L, "Stunned with [src]") /obj/item/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index c30e109f939..baf0f9db968 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -191,7 +191,6 @@ if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that playsound(L, 'sound/weapons/genhit.ogg', 50, TRUE) return FALSE - H.forcesay(GLOB.hit_appends) H.Confused(10 SECONDS) H.Jitter(10 SECONDS) H.adjustStaminaLoss(stam_damage) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index f7698a91771..e5421ed5321 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -58,10 +58,6 @@ item_state = "gy_suit" item_color = "ancient" -/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - owner.forcesay(GLOB.hit_appends) - return - /obj/item/clothing/under/color/orange name = "orange jumpsuit" desc = "Don't wear this near paranoid security officers" diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index 20d2a2613ac..3c464a91571 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -39,9 +39,6 @@ D.visible_message("[A] has knocked [D] out with a haymaker!", \ "[A] has knocked [D] out with a haymaker!") D.Weaken(10 SECONDS) - D.forcesay(GLOB.hit_appends) - else if(IS_HORIZONTAL(D)) - D.forcesay(GLOB.hit_appends) return 1 /datum/martial_art/drunk_brawling @@ -97,7 +94,4 @@ D.visible_message("[A] has knocked [D] out with a haymaker!", \ "[A] has knocked [D] out with a haymaker!") D.Paralyse(10 SECONDS) - D.forcesay(GLOB.hit_appends) - else if(IS_HORIZONTAL(D)) - D.forcesay(GLOB.hit_appends) return 1 diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index ef8a905a155..09f2ba5385d 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -129,9 +129,6 @@ D.visible_message("[A] has weakened [D]!!", \ "[A] has weakened [D]!") D.apply_effect(8 SECONDS, WEAKEN, armor_block) - D.forcesay(GLOB.hit_appends) - else if(IS_HORIZONTAL(D)) - D.forcesay(GLOB.hit_appends) return TRUE /datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 031b19925ba..57260ab78ee 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -481,7 +481,6 @@ emp_act weapon_sharp = 0 if(armor == INFINITY) return 0 - var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) var/bonus_damage = 0 if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -540,11 +539,6 @@ emp_act w_uniform.add_mob_blood(src) update_inv_w_uniform() - - - if(Iforce > 10 || Iforce >= 5 && prob(33)) - forcesay(GLOB.hit_appends) //forcesay checks stat already - dna.species.spec_attacked_by(I, user, affecting, user.a_intent, src) //this proc handles being hit by a thrown atom diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index 79fb2341003..c465861677a 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -6,38 +6,6 @@ return " (as [get_id_name("Unknown")])" return ..() -/mob/living/carbon/human/proc/forcesay(list/append) - if(stat == CONSCIOUS) - if(client) - var/modified = FALSE //has the text been modified yet? - var/temp = winget(client, "input", "text") - if(findtextEx(temp, "Say \"", 1, 7) && length(temp) > 5) //case sensitive means - - temp = replacetext(temp, ";", "") //general radio - - if(findtext(trim_left(temp), ":", 6, 7)) //dept radio - temp = copytext(trim_left(temp), 8) - modified = TRUE - - if(!modified) - temp = copytext(trim_left(temp), 6) //normal speech - modified = TRUE - - while(findtext(trim_left(temp), ":", 1, 2)) //dept radio again (necessary) - temp = copytext(trim_left(temp), 3) - - if(findtext(temp, "*", 1, 2)) //emotes - return - temp = copytext(trim_left(temp), 1, rand(5,8)) - - var/trimmed = trim_left(temp) - if(length(trimmed)) - if(append) - temp += pick(append) - - say(temp) - winset(client, "input", "text=[null]") - /mob/living/carbon/human/say_understands(mob/other, datum/language/speaking = null) if(dna.species.can_understand(other)) return 1 diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 4357cabea2b..7e1cf0d6f47 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -507,9 +507,6 @@ target.visible_message("[user] has knocked down [target]!", \ "[user] has knocked down [target]!") target.KnockDown(4 SECONDS) - target.forcesay(GLOB.hit_appends) - else if(IS_HORIZONTAL(target)) - target.forcesay(GLOB.hit_appends) SEND_SIGNAL(target, COMSIG_PARENT_ATTACKBY) /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)