cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] do_teleport proc fixes (#11968)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-11 14:46:22 -07:00
committed by GitHub
parent 174138f7cd
commit ae54169ed8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/datums/helper_datums/teleport.dm
View File

@@ -60,7 +60,6 @@ GLOBAL_LIST_INIT(bluespace_item_types, list(
if(isliving(teleatom)) if(isliving(teleatom))
var/mob/living/telemob = teleatom var/mob/living/telemob = teleatom
var/mob/living/mob = locate() in destturf var/mob/living/mob = locate() in destturf
// Needs the vore helpers later. Ough.
if(can_spontaneous_vore(mob, telemob)) if(can_spontaneous_vore(mob, telemob))
destturf = mob.vore_selected destturf = mob.vore_selected
else if(can_spontaneous_vore(telemob, mob)) else if(can_spontaneous_vore(telemob, mob))
@@ -86,7 +85,13 @@ GLOBAL_LIST_INIT(bluespace_item_types, list(
tele_play_specials(teleatom, curturf, effectin, asoundin) tele_play_specials(teleatom, curturf, effectin, asoundin)
if(teleatom.buckle_movable) // Specifically office chairs. Fuck you.
teleatom.buckle_movable = FALSE
var/success = teleatom.forceMove(destturf) var/success = teleatom.forceMove(destturf)
teleatom.buckle_movable = initial(teleatom.buckle_movable) // Double fuck you, office chairs
if(!success) if(!success)
return FALSE return FALSE
@@ -98,7 +103,7 @@ GLOBAL_LIST_INIT(bluespace_item_types, list(
for(var/mob/living/rider in teleatom.buckled_mobs) for(var/mob/living/rider in teleatom.buckled_mobs)
teleatom.unbuckle_mob(rider, TRUE) teleatom.unbuckle_mob(rider, TRUE)
var/rider_success = do_teleport(rider, destturf, precision, channel = channel, no_effects = TRUE) var/rider_success = do_teleport(rider, destination, precision, channel = channel, no_effects = TRUE)
if(!rider_success) if(!rider_success)
continue continue

2
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View File

@@ -199,8 +199,6 @@
for (var/mob/O in src.loc) for (var/mob/O in src.loc)
if (O != occupant) if (O != occupant)
Bump(O) Bump(O)
else
unbuckle_mob()
/obj/structure/bed/chair/office/Bump(atom/A) /obj/structure/bed/chair/office/Bump(atom/A)
..() ..()