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

Jump to bottom

parries don't cut npcs in half #3405

Merged
merged 2 commits into from
Jun 19, 2023
Merged

parries don't cut npcs in half #3405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9677bfb
parries don't cut npcs in half
X0-11 Jun 17, 2023
a781478
typo
X0-11 Jun 17, 2023
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
4 changes: 4 additions & 0 deletions code/game/objects/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
if(isnull(item_to_disintegrate))
return 1

//Once we have all the references, let's make sure we're not cutting an npc in half.
if(item_to_disintegrate == mob_holding_disintegrated)
return 1

if(!isnull(item_to_disintegrate) && istype(item_to_disintegrate,/obj/item/weapon/gun) && !prob(BASE_PARRY_PLASMA_DESTROY))
force_half_damage = 1

Expand Down