From 8d898c5757c726a5cc9de6f13ef04e6b3e8605a8 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Tue, 9 Sep 2014 15:32:35 -0700 Subject: [PATCH 1/6] climbing onto tables --- code/game/objects/structures/tables_racks.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a91c555d6bf..34d366d0ce5 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -696,6 +696,23 @@ Destroy type values: return ..() +/obj/structure/table/MouseDrop_T(mob/target, mob/user) + if(istype(target) && user == target) + stuff_mob_in(target, user) + +/obj/structure/table/proc/stuff_mob_in(mob/target, mob/user) + if (!user.canUseTopic(target) || istype(user, /mob/living/silicon)) + return + src.add_fingerprint(user) + user.visible_message("[user] starts climbing onto [src].", \ + "[user] starts climbing onto [src].") + if(do_mob(usr, target, 20)) + target.loc = src.loc + if(user == target) + user.visible_message("[user] climbs onto [src].", \ + "[user] climbs onto [src].") + add_logs(user, target, "climbed", addition="onto [src]") + /* * Racks */ @@ -799,4 +816,4 @@ Destroy type values: density = 0 qdel(src) /obj/structure/rack/attack_tk() // no telehulk sorry - return + return \ No newline at end of file From 92baf35204fd18249d31de4f27e33254406de0a2 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Tue, 9 Sep 2014 15:35:48 -0700 Subject: [PATCH 2/6] muh whitespace --- code/game/objects/structures/tables_racks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 34d366d0ce5..46d9ad965f3 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -816,4 +816,4 @@ Destroy type values: density = 0 qdel(src) /obj/structure/rack/attack_tk() // no telehulk sorry - return \ No newline at end of file + return From 3f7fb4870e84edd586e14a131aafe06cf55c22f6 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Tue, 9 Sep 2014 15:51:00 -0700 Subject: [PATCH 3/6] renamed proc --- code/game/objects/structures/tables_racks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 46d9ad965f3..c26eea637d4 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -698,9 +698,9 @@ Destroy type values: /obj/structure/table/MouseDrop_T(mob/target, mob/user) if(istype(target) && user == target) - stuff_mob_in(target, user) + climb_table(target, user) -/obj/structure/table/proc/stuff_mob_in(mob/target, mob/user) +/obj/structure/table/proc/climb_table(mob/target, mob/user) if (!user.canUseTopic(target) || istype(user, /mob/living/silicon)) return src.add_fingerprint(user) From adbb99a81851fc76e20c25fecb98c6a07e4e9543 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Tue, 16 Sep 2014 11:33:57 -0700 Subject: [PATCH 4/6] make prok gud --- code/game/objects/structures/tables_racks.dm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c26eea637d4..546ce995e3c 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -696,22 +696,19 @@ Destroy type values: return ..() -/obj/structure/table/MouseDrop_T(mob/target, mob/user) +/obj/structure/table/MouseDrop_T(mob/target, mob/living/carbon/human/user) if(istype(target) && user == target) - climb_table(target, user) + climb_table(user) -/obj/structure/table/proc/climb_table(mob/target, mob/user) - if (!user.canUseTopic(target) || istype(user, /mob/living/silicon)) - return +/obj/structure/table/proc/climb_table(mob/user) src.add_fingerprint(user) user.visible_message("[user] starts climbing onto [src].", \ "[user] starts climbing onto [src].") - if(do_mob(usr, target, 20)) - target.loc = src.loc - if(user == target) - user.visible_message("[user] climbs onto [src].", \ + if(do_mob(user, user, 20)) + user.loc = src.loc + user.visible_message("[user] climbs onto [src].", \ "[user] climbs onto [src].") - add_logs(user, target, "climbed", addition="onto [src]") + add_logs(user, src, "climbed onto") /* * Racks From 1b9eddc2e492ca78a811f742396d5bfa170c796e Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 19 Sep 2014 13:32:44 -0700 Subject: [PATCH 5/6] climbing a table stuns you --- code/game/objects/structures/tables_racks.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 546ce995e3c..5380a28b4df 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -698,7 +698,8 @@ Destroy type values: /obj/structure/table/MouseDrop_T(mob/target, mob/living/carbon/human/user) if(istype(target) && user == target) - climb_table(user) + if(user.canmove) + climb_table(user) /obj/structure/table/proc/climb_table(mob/user) src.add_fingerprint(user) @@ -709,6 +710,7 @@ Destroy type values: user.visible_message("[user] climbs onto [src].", \ "[user] climbs onto [src].") add_logs(user, src, "climbed onto") + user.Weaken(2) /* * Racks From 7f059a82fad3c73fb63c1d14bb6a46852d254af4 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 19 Sep 2014 22:31:54 -0700 Subject: [PATCH 6/6] changed stun to Stun() :^) --- code/game/objects/structures/tables_racks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5380a28b4df..eff9154992b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -710,7 +710,7 @@ Destroy type values: user.visible_message("[user] climbs onto [src].", \ "[user] climbs onto [src].") add_logs(user, src, "climbed onto") - user.Weaken(2) + user.Stun(2) /* * Racks