mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 20:47:43 +01:00
Makes slimes able to be eaten if pacified (#18216)
* prefs * obedience * Update xenobio.dm --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
94704c89b8
commit
58a9913dee
@@ -132,10 +132,14 @@
|
||||
|
||||
/mob/living/simple_mob/slime/xenobio/update_mood()
|
||||
var/old_mood = mood
|
||||
var/pacified = FALSE //Tracks if we are currently pacified (and if we can be drop prey or not)
|
||||
var/obedient = 0
|
||||
if(incapacitated(INCAPACITATION_DISABLED))
|
||||
mood = "sad"
|
||||
pacified = TRUE
|
||||
else if(harmless)
|
||||
mood = ":33"
|
||||
pacified = TRUE
|
||||
else if(has_AI())
|
||||
var/datum/ai_holder/simple_mob/xenobio_slime/AI = ai_holder
|
||||
if(AI.rabid)
|
||||
@@ -144,14 +148,37 @@
|
||||
mood = "mischevous"
|
||||
else if(AI.discipline)
|
||||
mood = "pout"
|
||||
pacified = TRUE
|
||||
else
|
||||
mood = ":3"
|
||||
pacified = TRUE
|
||||
obedient = AI.obedience
|
||||
else
|
||||
mood = ":3"
|
||||
pacified = TRUE
|
||||
if(obedient < 5)
|
||||
pacified = FALSE //We are not obedient enough to be considered pacified.
|
||||
|
||||
if(!client) //Only update if we don't have a client.
|
||||
if(old_mood == "angry") //We were recently angry, so we're still upset and won't let you eat us no matter what! (Unless we had a docility potion put on us, making us harmless)
|
||||
update_allowed_vore_types(FALSE, harmless)
|
||||
else
|
||||
update_allowed_vore_types(pacified, harmless)
|
||||
|
||||
if(old_mood != mood)
|
||||
update_icon()
|
||||
|
||||
/mob/living/simple_mob/slime/proc/update_allowed_vore_types(allowed, harmless)
|
||||
if(harmless) // If we're harmless, we should always be able to be eaten.
|
||||
allowed = TRUE
|
||||
devourable = allowed
|
||||
can_be_drop_prey = allowed
|
||||
stumble_vore = allowed
|
||||
slip_vore = allowed
|
||||
drop_vore = allowed
|
||||
throw_vore = allowed
|
||||
devourable = allowed
|
||||
|
||||
/mob/living/simple_mob/slime/xenobio/proc/enrage()
|
||||
if(harmless)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user