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

[MIRROR] Airlocks trying to autoclose are no longer blocked by phased shadekin, nore do they crush them (#11033)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-07 19:47:31 -07:00
committed by GitHub
parent 84a9803b2f
commit e0906bc868
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/doors/airlock.dm
View File

@@ -1381,7 +1381,7 @@ About the new airlock wires panel:
return 0
/mob/living/blocks_airlock()
return 1
return !is_incorporeal()
/atom/movable/proc/airlock_crush(var/crush_damage)
return 0
@@ -1402,6 +1402,8 @@ About the new airlock wires panel:
return 1
/mob/living/airlock_crush(var/crush_damage)
if(is_incorporeal())
return 0
. = ..()
var/turf/T = get_turf(src)
adjustBruteLoss(crush_damage)
@@ -1413,7 +1415,7 @@ About the new airlock wires panel:
/mob/living/carbon/airlock_crush(var/crush_damage)
. = ..()
if(can_feel_pain())
if(. && can_feel_pain()) // Only scream if actually crushed!
emote("scream")
/mob/living/silicon/robot/airlock_crush(var/crush_damage)