deletes the forcesay() proc fixing tyder wizards getting murderized (#20398)

* deletes forcesay

* removes hit_appends fully
This commit is contained in:
GDN
2023-02-15 13:55:50 -06:00
committed by GitHub
parent 8d17e82c72
commit f567da369b
9 changed files with 0 additions and 61 deletions
-2
View File
@@ -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",
@@ -492,10 +492,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
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)
@@ -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)
-4
View File
@@ -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"
-6
View File
@@ -39,9 +39,6 @@
D.visible_message("<span class='danger'>[A] has knocked [D] out with a haymaker!</span>", \
"<span class='userdanger'>[A] has knocked [D] out with a haymaker!</span>")
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("<span class='danger'>[A] has knocked [D] out with a haymaker!</span>", \
"<span class='userdanger'>[A] has knocked [D] out with a haymaker!</span>")
D.Paralyse(10 SECONDS)
D.forcesay(GLOB.hit_appends)
else if(IS_HORIZONTAL(D))
D.forcesay(GLOB.hit_appends)
return 1
-3
View File
@@ -129,9 +129,6 @@
D.visible_message("<span class='danger'>[A] has weakened [D]!!</span>", \
"<span class='userdanger'>[A] has weakened [D]!</span>")
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)
@@ -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
@@ -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
@@ -507,9 +507,6 @@
target.visible_message("<span class='danger'>[user] has knocked down [target]!</span>", \
"<span class='userdanger'>[user] has knocked down [target]!</span>")
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)