cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into placeholder

Browse Source
This commit is contained in:
Ferner
2021-02-17 06:12:13 +01:00
parent 6b9933400a e86a59bc38
commit 2307beaff6
351 changed files with 3947 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/multiz/hoist.dm
+4 -4
View File
@@ -45,8 +45,8 @@
AM.forceMove(get_turf(source_hook))
hoistee = AM
if(ismob(AM))
source_hook.buckle_mob(AM)
AM.anchored = 1 // why isn't this being set by buckle_mob for silicons?
source_hook.buckle(AM)
AM.anchored = 1 // why isn't this being set by buckle for silicons?
source_hook.layer = AM.layer + 0.1
/obj/effect/hoist_hook/MouseDrop(atom/dest)
@@ -79,7 +79,7 @@
source_hoist.release_hoistee()
// This will handle mobs unbuckling themselves.
/obj/effect/hoist_hook/unbuckle_mob()
/obj/effect/hoist_hook/unbuckle()
. = ..()
if (. && !QDELETED(source_hoist))
var/mob/M = .
@@ -124,7 +124,7 @@
/obj/structure/hoist/proc/release_hoistee()
if(ismob(hoistee))
source_hook.unbuckle_mob(hoistee)
source_hook.unbuckle(hoistee)
else
hoistee.anchored = 0
hoistee = null
code/modules/multiz/movement.dm
+7 -7
View File
@@ -73,10 +73,10 @@
to_chat(src, SPAN_WARNING("\The [A] blocks you."))
return FALSE
if(buckled && istype(buckled, /obj/vehicle))
var/obj/vehicle/car = buckled
if(buckled_to && istype(buckled_to, /obj/vehicle))
var/obj/vehicle/car = buckled_to
if(car.flying)
buckled.Move(destination)
buckled_to.Move(destination)
return TRUE
// Actually move.
Move(destination)
@@ -91,7 +91,7 @@
if(.)
for(var/obj/item/grab/G in list(l_hand, r_hand))
if(G.state >= GRAB_NECK) //strong grip
if(G.affecting && !(G.affecting.buckled))
if(G.affecting && !(G.affecting.buckled_to))
G.affecting.Move(get_turf(src))
visible_message(SPAN_WARNING("[src] pulls [G.affecting] [direction & UP ? "upwards" : "downwards"]!"))
@@ -158,7 +158,7 @@
if(!destination)
return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled_to)
return
if(destination.density)
@@ -258,8 +258,8 @@
if (thrust && !lying && thrust.allow_thrust(0.01, src))
return TRUE
if(buckled && istype(buckled, /obj/vehicle))
var/obj/vehicle/car = buckled
if(buckled_to && istype(buckled_to, /obj/vehicle))
var/obj/vehicle/car = buckled_to
if(car.flying)
return TRUE