From cdef637e7f018d439d704eb81a3d603171248e10 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:45:29 +0200 Subject: [PATCH] Stops guardian spirits from being buckled (#21896) * the fix * We use defines now --- code/game/gamemodes/miniantags/guardian/guardian.dm | 3 +++ code/modules/mob/mob.dm | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index dc44ec147b9..51561388e6c 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -53,6 +53,9 @@ summoner = host host.grant_guardian_actions(src) +/mob/living/simple_animal/hostile/guardian/can_buckle() + return FALSE + /mob/living/simple_animal/hostile/guardian/med_hud_set_health() if(summoner) var/image/holder = hud_list[HEALTH_HUD] diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 5a517d3712e..4ce3294ae78 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1303,23 +1303,23 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ ///can the mob be buckled to something by default? /mob/proc/can_buckle() - return 1 + return TRUE ///can the mob be unbuckled from something by default? /mob/proc/can_unbuckle() - return 1 + return TRUE //Can the mob see reagents inside of containers? /mob/proc/can_see_reagents() - return 0 + return FALSE //Can this mob leave its location without breaking things terrifically? /mob/proc/can_safely_leave_loc() - return 1 // Yes, you can + return TRUE // Yes, you can /mob/proc/IsVocal() - return 1 + return TRUE /mob/proc/get_access() return list() //must return list or IGNORE_ACCESS