Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Reworks wall attacking #308

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[MIRROR] Reworks wall attacking #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61039d3
Merge pull request #1054 from NataKilar/wall-damage-fixes
MistakeNot4892 Dec 24, 2020
81be4c1
Reworks wall attacking
SkyratBot Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions code/game/turfs/simulated/wall_attacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,26 +339,31 @@
return TRUE

// Attack the wall with items
if(istype(W,/obj/item/rcd) || !istype(W, /obj/item/chems))
if(istype(W,/obj/item/rcd) || istype(W, /obj/item/chems))
return
if(!W.force)
return
if(isliving(user))
var/mob/living/L = user
if(L.a_intent == I_HELP)
return
var/dam_threshhold = material.integrity
if(reinf_material)
dam_threshhold = ceil(max(dam_threshhold,reinf_material.integrity)/2)
var/dam_prob = min(100,material.hardness*1.5)
if(dam_prob < 100 && W.force > (dam_threshhold/10))
playsound(src, 'sound/effects/metalhit.ogg', 50, 1)
if(!prob(dam_prob))
visible_message("<span class='danger'>\The [user] attacks \the [src] with \the [W] and it [material.destruction_desc]!</span>")
dismantle_wall(1)
else
visible_message("<span class='danger'>\The [user] attacks \the [src] with \the [W]!</span>")
else
visible_message("<span class='danger'>\The [user] attacks \the [src] with \the [W], but it bounces off!</span>")

user.do_attack_animation(src)
if(W.force < 5)
visible_message(SPAN_DANGER("\The [user] [pick(W.attack_verb)] \the [src] with \the [W], but it had no effect!"))
playsound(src, hitsound, 25, 1)
return
// Check for a glancing blow.
var/dam_prob = max(0, 100 - material.hardness + W.force)
if(!prob(dam_prob))
visible_message(SPAN_DANGER("\The [user] [pick(W.attack_verb)] \the [src] with \the [W], but it bounced off!"))
playsound(src, hitsound, 25, 1)
if(user.skill_fail_prob(SKILL_HAULING, 40, SKILL_ADEPT))
user.Weaken(2)
visible_message(SPAN_DANGER("\The [user] is knocked back by the force of the blow!"))
return

playsound(src, 'sound/effects/metalhit.ogg', 50, 1)
visible_message(SPAN_DANGER("\The [user] [pick(W.attack_verb)] \the [src] with \the [W]!"))
take_damage(10)
return TRUE
2 changes: 1 addition & 1 deletion code/game/turfs/simulated/walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ var/list/wall_noblend_objects = list(
cap = cap / 10

if(damage >= cap)
dismantle_wall()
dismantle_wall(1)
else
update_icon()

Expand Down