Prevents motion alarms from picking up QDELING mobs, and tries to make them drop those already picked up. (#17178)

* Atomization

* sdf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
This commit is contained in:
Fluffy
2023-08-30 22:36:27 +00:00
committed by GitHub
co-authored by FluffyGhost <FluffyGhost>
parent f05ecde9d0
commit 70bc97eef0
2 changed files with 44 additions and 3 deletions
+3 -3
View File
@@ -18,7 +18,7 @@
triggerAlarm()
else if (detectTime == -1)
for (var/mob/target in motionTargets)
if (target.stat == 2) lostTarget(target)
if (target.stat == 2 || QDELING(target)) lostTarget(target)
// If not detecting with motion camera...
if (!area_motion)
// See if the camera is still in range
@@ -30,7 +30,7 @@
if (istype(target, /mob/living/silicon/ai)) return 0
if (detectTime == 0)
detectTime = world.time // start the clock
if (!(target in motionTargets))
if (!(target in motionTargets) && !QDELING(target))
motionTargets += target
return 1
@@ -59,6 +59,6 @@
/obj/machinery/camera/HasProximity(atom/movable/AM as mob|obj)
// Motion cameras outside of an "ai monitored" area will use this to detect stuff.
if (!area_motion)
if(isliving(AM))
if(isliving(AM) && !QDELING(AM))
newTarget(AM)
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: FluffyGhost
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Prevents motion alarms from picking up QDELING mobs, and tries to make them drop those already picked up."