mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 12:37:50 +01:00
Merge pull request #12245 from Heroman3003/xenobio-fixes
Fixes a bunch of xenobio bugs
This commit is contained in:
@@ -162,6 +162,10 @@ var/list/_slime_default_emotes = list(
|
||||
return TRUE
|
||||
else
|
||||
return FALSE
|
||||
if(ishuman(L))
|
||||
var/mob/living/carbon/human/H = L
|
||||
if(istype(H.species, /datum/species/monkey)) // Monke always food
|
||||
return FALSE
|
||||
// The other stuff was already checked in parent proc, and the . variable will implicitly return the correct value.
|
||||
|
||||
// Slimes regenerate passively.
|
||||
|
||||
@@ -51,4 +51,4 @@
|
||||
// Getting slimebatoned/xenotased.
|
||||
/mob/living/simple_mob/slime/xenobio/slimebatoned(mob/living/user, amount)
|
||||
adjust_discipline(round(amount/2))
|
||||
Weaken(amount) // This needs to come afterwards or else it will always be considered abuse to the slime.
|
||||
Weaken(amount*5) // This needs to come afterwards or else it will always be considered abuse to the slime. Multiply by 5 for stun to not end instantly.
|
||||
|
||||
@@ -563,7 +563,7 @@
|
||||
|
||||
/datum/modifier/aura/slime_heal
|
||||
name = "slime mending"
|
||||
desc = "You feel somewhat gooy."
|
||||
desc = "You feel somewhat gooey."
|
||||
mob_overlay_state = "pink_sparkles"
|
||||
stacks = MODIFIER_STACK_FORBID
|
||||
aura_max_distance = 2
|
||||
@@ -605,6 +605,7 @@
|
||||
)
|
||||
|
||||
/mob/living/simple_mob/slime/xenobio/gold/slimebatoned(mob/living/user, amount)
|
||||
adjust_discipline(round(amount/2))
|
||||
power_charge = between(0, power_charge + amount, 10)
|
||||
|
||||
/mob/living/simple_mob/slime/xenobio/gold/get_description_interaction() // So it doesn't say to use a baton on them.
|
||||
|
||||
Reference in New Issue
Block a user