cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes anim() interaction with firedoor causing them to become crossable. (#37027)

Browse Source
This commit is contained in:
DeityLink
2024-09-03 01:59:34 +02:00
committed by GitHub
parent 497dbf6011
commit fc40e74897
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
__DEFINES/atom_locking_and_control.dm
View File

@@ -6,6 +6,7 @@
#define CANT_BE_MOVED_BY_LOCKED_MOBS 4
#define LOCKED_CAN_LIE_AND_STAND 8
#define LOCKED_STAY_INSIDE 16
#define DONT_MESS_WITH_DENSITY 32
// Flags for atom.lockflags
#define DENSE_WHEN_LOCKED 1

32
code/datums/locking_category.dm
View File

@@ -25,8 +25,9 @@
AM.anchored = TRUE
if (flags & DENSE_WHEN_LOCKING || AM.lockflags & DENSE_WHEN_LOCKED)
owner.setDensity(TRUE)
if (!(flags & DONT_MESS_WITH_DENSITY))
if (flags & DENSE_WHEN_LOCKING || AM.lockflags & DENSE_WHEN_LOCKED)
owner.setDensity(TRUE)
AM.pixel_x += pixel_x_offset * PIXEL_MULTIPLIER
AM.pixel_y += pixel_y_offset * PIXEL_MULTIPLIER
@@ -89,21 +90,22 @@
AM.anchored = initial(AM.anchored)
// Okay so now we have to loop through ALL of the owner's locked atoms and their categories to see if the owner still needs to be dense.
var/found = FALSE
if (flags & DENSE_WHEN_LOCKING || AM.lockflags & DENSE_WHEN_LOCKED)
for (var/atom/movable/candidate in owner.locked_atoms)
if (candidate.lockflags & DENSE_WHEN_LOCKED)
found = TRUE
break
if (!(flags & DONT_MESS_WITH_DENSITY))
// Okay so now we have to loop through ALL of the owner's locked atoms and their categories to see if the owner still needs to be dense.
var/found = FALSE
if (flags & DENSE_WHEN_LOCKING || AM.lockflags & DENSE_WHEN_LOCKED)
for (var/atom/movable/candidate in owner.locked_atoms)
if (candidate.lockflags & DENSE_WHEN_LOCKED)
found = TRUE
break
var/datum/locking_category/cat = owner.locked_atoms[candidate]
if (cat.flags & DENSE_WHEN_LOCKING)
found = TRUE
break
var/datum/locking_category/cat = owner.locked_atoms[candidate]
if (cat.flags & DENSE_WHEN_LOCKING)
found = TRUE
break
if (!found)
owner.setDensity(initial(owner.density))
if (!found)
owner.setDensity(initial(owner.density))
if (ismob(AM))
var/mob/M = AM

5
code/game/turfs/turf_flick_animations.dm
View File

@@ -72,7 +72,7 @@
animation.transform = trans
if (target && ismovable(target))
var/atom/movable/AM = target
AM.lock_atom(animation, /datum/locking_category/buckle)
AM.lock_atom(animation, /datum/locking_category/animation)
if(a_icon_state)
animation.icon_state = a_icon_state
else
@@ -85,6 +85,9 @@
return animation
/datum/locking_category/animation
flags = DONT_MESS_WITH_DENSITY
/*
//called when the tile is cultified
/turf/proc/cultification()