TG Buckle Update (#12375)

This commit is contained in:
Fox McCloud
2019-09-22 18:22:57 -07:00
committed by variableundefined
parent 7846268dae
commit c87389a595
60 changed files with 640 additions and 533 deletions
+1 -1
View File
@@ -139,7 +139,7 @@
if(isliving(teleatom))
var/mob/living/L = teleatom
if(L.buckled)
L.buckled.unbuckle_mob()
L.buckled.unbuckle_mob(L, force = TRUE)
destarea.Entered(teleatom)
+1 -1
View File
@@ -56,7 +56,7 @@
return
if(target && target.buckled)
target.buckled.unbuckle_mob()
target.buckled.unbuckle_mob(target, force = TRUE)
var/list/tempL = L
var/attempt = null
-8
View File
@@ -131,14 +131,6 @@
playsound(get_turf(src), 'sound/misc/enter_blood.ogg', 100, 1, -1)
var/obj/effect/dummy/slaughter/s_holder = new(loc)
ExtinguishMob()
if(buckled)
buckled.unbuckle_mob(src,force=1)
if(has_buckled_mobs())
unbuckle_mob()
if(pulledby)
pulledby.stop_pulling()
if(pulling)
stop_pulling()
forceMove(s_holder)
holder = s_holder
notransform = FALSE
@@ -26,8 +26,10 @@
/datum/weather/floor_is_lava/weather_act(mob/living/L)
if(issilicon(L))
return
if(istype(L.buckled, /obj/structure/bed))
return
for(var/obj/structure/O in L.loc)
if(O.density || O.buckled_mob && istype(O, /obj/structure/bed))
if(O.density)
return
if(L.loc.density)
return