From 2fddf343ad6283ec41f2b8c9f7ab5dc1d37e6f66 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 20 Nov 2019 21:12:44 +0100
Subject: [PATCH] Run
---
code/datums/martial/boxing.dm | 2 +-
code/datums/martial/wrestling.dm | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm
index 6636bbe879..33562ca357 100644
--- a/code/datums/martial/boxing.dm
+++ b/code/datums/martial/boxing.dm
@@ -19,7 +19,7 @@
var/damage = rand(8, 13)
var/extra_damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh)
- if(extra_damage = A.dna.species.punchdamagelow)
+ if(extra_damage == A.dna.species.punchdamagelow)
playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1)
D.visible_message("[A] has attempted to [atk_verb] [D]!", \
"[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE)
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index d40af24acd..153cd8eb3d 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -49,8 +49,8 @@
if(owner.incapacitated())
to_chat(owner, "You can't WRESTLE while you're OUT FOR THE COUNT.")
return
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You are too HIPPIE to WRESTLE other living beings!")
+ if(HAS_TRAIT(owner, TRAIT_PACIFISM))
+ to_chat(owner, "You are too HIPPIE to WRESTLE other living beings!")
return
owner.visible_message("[owner] prepares to BODY SLAM!", "Your next attack will be a BODY SLAM.")
var/mob/living/carbon/human/H = owner
@@ -64,8 +64,8 @@
if(owner.incapacitated())
to_chat(owner, "You can't WRESTLE while you're OUT FOR THE COUNT.")
return
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You are too HIPPIE to WRESTLE other living beings!")
+ if(HAS_TRAIT(owner, TRAIT_PACIFISM))
+ to_chat(owner, "You are too HIPPIE to WRESTLE other living beings!")
return
owner.visible_message("[owner] prepares to THROW!", "Your next attack will be a THROW.")
var/mob/living/carbon/human/H = owner
@@ -79,8 +79,8 @@
if(owner.incapacitated())
to_chat(owner, "You can't WRESTLE while you're OUT FOR THE COUNT.")
return
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You are too HIPPIE to WRESTLE other living beings!")
+ if(HAS_TRAIT(owner, TRAIT_PACIFISM))
+ to_chat(owner, "You are too HIPPIE to WRESTLE other living beings!")
return
owner.visible_message("[owner] prepares to KICK!", "Your next attack will be a KICK.")
var/mob/living/carbon/human/H = owner
@@ -94,8 +94,8 @@
if(owner.incapacitated())
to_chat(owner, "You can't WRESTLE while you're OUT FOR THE COUNT.")
return
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You are too HIPPIE to WRESTLE other living beings!")
+ if(HAS_TRAIT(owner, TRAIT_PACIFISM))
+ to_chat(owner, "You are too HIPPIE to WRESTLE other living beings!")
return
owner.visible_message("[owner] prepares to STRIKE!", "Your next attack will be a STRIKE.")
var/mob/living/carbon/human/H = owner
@@ -109,8 +109,8 @@
if(owner.incapacitated())
to_chat(owner, "You can't WRESTLE while you're OUT FOR THE COUNT.")
return
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You are too HIPPIE to WRESTLE other living beings!")
+ if(HAS_TRAIT(owner, TRAIT_PACIFISM))
+ to_chat(owner, "You are too HIPPIE to WRESTLE other living beings!")
return
owner.visible_message("[owner] prepares to LEG DROP!", "Your next attack will be a LEG DROP.")
var/mob/living/carbon/human/H = owner