Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Prevents polymorph using specific mobs for deleting items/people #2280

Merged
merged 1 commit into from
Mar 6, 2024
Merged

[MIRROR] Prevents polymorph using specific mobs for deleting items/people #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions code/modules/clothing/belts/polymorph_belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@
if (target_mob.mob_biotypes & (MOB_HUMANOID|MOB_ROBOTIC|MOB_SPECIAL|MOB_SPIRIT|MOB_UNDEAD))
balloon_alert(user, "incompatible!")
return TRUE
if (isanimal_or_basicmob(target_mob))
if (!target_mob.compare_sentience_type(SENTIENCE_ORGANIC))
balloon_alert(user, "target too intelligent!")
return TRUE
if (!target_mob.compare_sentience_type(SENTIENCE_ORGANIC))
balloon_alert(user, "target too intelligent!")
return TRUE
if (stored_mob_type == target_mob.type)
balloon_alert(user, "already scanned!")
return TRUE
Expand Down
6 changes: 6 additions & 0 deletions code/modules/spells/spell_types/shapeshift/_shape_status.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@
// is no longer in control of the shapeshifted mob, such as mindswapping out of a shapeshift
if(!QDELETED(source_spell) && source_spell.owner == owner)
source_spell.Grant(caster_mob)
if(owner?.contents)
// Prevent round removal and consuming stuff when losing shapeshift
for(var/atom/movable/thing as anything in owner.contents)
if(thing == caster_mob)
continue
thing.forceMove(get_turf(owner))

for(var/datum/action/bodybound_action as anything in owner.actions)
if(bodybound_action.target != caster_mob)
Expand Down
Loading