cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some basic mob zaps (#30569)

Browse Source
This commit is contained in:
PollardTheDragon
2025-09-28 16:29:35 +00:00
committed by GitHub
parent bb61976b97
commit e4b5e22917
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm
+1 -1
View File
@@ -66,7 +66,7 @@
return FALSE
/datum/ai_behavior/attack_obstructions/proc/can_smash_object(mob/living/basic/basic_mob, obj/object)
if(!object.density && !can_attack_dense_objects)
if(!object.density || !can_attack_dense_objects)
return FALSE
if(object.IsObscured())
return FALSE
code/game/machinery/doors/airlock.dm
+5
View File
@@ -810,6 +810,11 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
if(isElectrified())
shock(user, 100)
/obj/machinery/door/airlock/attack_basic_mob(mob/user, list/modifiers)
. = ..()
if(isElectrified())
shock(user, 100)
/obj/machinery/door/airlock/attack_hand(mob/user)
if(shock_user(user, 100))
return