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

Fix butchering #12471

Merged
merged 1 commit into from Dec 21, 2022
Merged

Fix butchering #12471

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/mob/living/critter.dm
View file
Open in desktop
Expand Up @@ -312,7 +312,7 @@ ABSTRACT_TYPE(/mob/living/critter)
src.skinresult = null
M.visible_message("<span class='alert'>[M] skins [src].</span>","You skin [src].")
return
if (issawingtool(I) || iscuttingtool(I))
if (src.butcherable && (issawingtool(I) || iscuttingtool(I)))
actions.start(new/datum/action/bar/icon/butcher_living_critter(src,src.butcher_time), M)
return

Expand Down
2 changes: 1 addition & 1 deletion code/mob/living/critter/capybara.dm
View file
Open in desktop
Expand Up @@ -6,4 +6,4 @@
is_npc = TRUE
ai_type = /datum/aiHolder/capybara
can_lie = FALSE

butcherable = 2 //2 makes butchering this creature an abominable act. Which it is. You monsters.
2 changes: 1 addition & 1 deletion code/mob/living/critter/sawfly.dm
View file
Open in desktop
Expand Up @@ -128,7 +128,7 @@ This file is the critter itself, and all the custom procs it needs in order to f
proc/do_retaliate(mob/living/user)
if(!(issawflybuddy(user) || (user in src.friends) || (user.health < 40)))//are you an eligible target: nonantag or healthy enough?
if(prob(50) && !ON_COOLDOWN(src, "sawfly_retaliate_cd", 5 SECONDS) && !isdead(src))//now that you're eligible, are WE eligible?
if((ai.target != user))
if(ai && (ai.target != user))
src.lastattacker = user
src.retaliate = TRUE
src.visible_message("<span class='alert'><b>[src]'s targeting subsystems identify [user] as a high priority threat!</b></span>")
Expand Down