From b98ea98ed60d6e123705fdc88a8ceabfb645ce17 Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 16 Dec 2020 23:23:18 +0200 Subject: [PATCH] Human Pinball (#10762) Throwing a humanoid at another humanoid will knock both over. --- code/modules/mob/living/carbon/human/human_defense.dm | 5 +++++ html/changelogs/geeves-pinball.yml | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 html/changelogs/geeves-pinball.yml diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 1aba1476965..3e8451aa5d8 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -447,6 +447,11 @@ emp_act visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") src.anchored = 1 src.pinned += O + else if(ishuman(AM)) + var/mob/living/carbon/human/H = AM + H.Weaken(3) + Weaken(3) + visible_message(SPAN_WARNING("[src] get knocked over by [H]!"), SPAN_WARNING("You get knocked over by [H]!")) /mob/living/carbon/human/embed(var/obj/O, var/def_zone=null) if(!def_zone) ..() diff --git a/html/changelogs/geeves-pinball.yml b/html/changelogs/geeves-pinball.yml new file mode 100644 index 00000000000..4aa961aa454 --- /dev/null +++ b/html/changelogs/geeves-pinball.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Throwing a humanoid at another humanoid will knock both over." \ No newline at end of file