cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor throwing fixes (#26179)

Browse Source 
* fix treadmill throwat

* fixes dropdel runtimes and end_throw() not being called

* dgl review
This commit is contained in:
chuga-git
2024-07-08 16:07:18 -05:00
committed by GitHub
parent b287cdb7bf
commit c1e97f712c
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/games/cards.dm
+1 -1
View File
@@ -220,7 +220,7 @@
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to [user.p_themselves()].</span>")
else
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to [target].</span>")
H.throw_at(get_step(target,target.dir),3,1,H)
H.throw_at(get_step(target, target.dir), 3, 1, null)
/obj/item/deck/attack_self()
code/modules/mob/living/carbon/carbon_procs.dm
+7 -5
View File
@@ -694,11 +694,13 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
to_chat(src, "<span class='notice'>You set [I] down gently on the ground.</span>")
return
if(thrown_thing)
if(!HAS_TRAIT(thrown_thing, TRAIT_NO_THROWN_MESSAGE))
visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
newtonian_move(get_dir(target, src))
thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force)
if(QDELETED(thrown_thing))
return
if(!HAS_TRAIT(thrown_thing, TRAIT_NO_THROWN_MESSAGE))
visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
newtonian_move(get_dir(target, src))
thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force)
/mob/living/carbon/can_use_hands()
if(handcuffed)
code/modules/power/generators/treadmill.dm
+1 -1
View File
@@ -41,7 +41,7 @@
// if 2fast, throw the person, otherwise they just slide off, if there's reasonable speed at all
if(speed && A.move_resist < INFINITY)
var/dist = max(throw_dist * speed / MAX_SPEED, 1)
A.throw_at(get_distant_turf(get_turf(src), REVERSE_DIR(dir), dist), A.throw_range, A.throw_speed, src, 1)
A.throw_at(get_distant_turf(get_turf(src), REVERSE_DIR(dir), dist), A.throw_range, A.throw_speed, null, 1)
/obj/machinery/power/treadmill/process()
if(!anchored)