From fd87d261883aee8ea64220ccba7b5a180ff05a56 Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 25 Dec 2020 19:47:53 +1300 Subject: [PATCH] Add the license information (#55678) Fixes goofs mistake when porting wrestling and adds a notif to hulk swing loop --- code/datums/martial/wrestling.dm | 7 +++++++ code/datums/mutations/hulk.dm | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 8f7b341282d..ba11785d612 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -1,3 +1,10 @@ +/* +The contents of this file were originally licensed under CC-BY-NC-SA 3.0 as part of Goonstation(https://ss13.co). +However, /tg/station and derivative codebases have been granted the right to use this code under the terms of the AGPL. +The original authors are: cogwerks, pistoleer, spyguy, angriestibm, marquesas, and stuntwaffle. +If you make a derivative work from this code, you must include this notification header alongside it. +*/ + /mob/living/carbon/human/proc/wrestling_help() set name = "Recall Teachings" set desc = "Remember how to wrestle." diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 989f7cdf4f9..da2f1d3df55 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -151,7 +151,13 @@ yeeted_person.emote("scream") swing_loop(the_hulk, yeeted_person, 0, original_dir) -/// For each step of the swinging, with the delay getting shorter along the way. Checks to see we still have them in our grasp at each step. +/** + * Does the animations for the hulk swing loop + * + * This code is based in part on the wrestling swing code ported from goon, see [code/datums/martial/wrestling.dm] + * credit to: cogwerks, pistoleer, spyguy, angriestibm, marquesas, and stuntwaffle. + * For each step of the swinging, with the delay getting shorter along the way. Checks to see we still have them in our grasp at each step. + */ /datum/mutation/human/hulk/proc/swing_loop(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, step, original_dir) if(!yeeted_person || !the_hulk || the_hulk.incapacitated()) return