mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Xenobiology QOL tweaks (#30062)
* Xenobiology QOL tweaks * fixes * Update generic.dm * name tweak * Update code/__HELPERS/trait_helpers.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
co-authored by
warriorstar-orion
parent
ad159dc4e0
commit
e6e5f5ce36
@@ -446,6 +446,10 @@
|
||||
phrases += "What happened?"
|
||||
if(!slimes_near)
|
||||
phrases += "Lonely..."
|
||||
if(trained && prob(3))
|
||||
phrases += "Treat? Have treat?"
|
||||
phrases += "Can have treat?"
|
||||
phrases += "Treat?..."
|
||||
if(stat == CONSCIOUS)
|
||||
say (pick(phrases))
|
||||
|
||||
|
||||
@@ -417,6 +417,7 @@
|
||||
S.use(5)
|
||||
if(Discipline)
|
||||
trained = TRUE
|
||||
name = "tamed [name]"
|
||||
else
|
||||
discipline_slime(user, positive_reinforcement = TRUE)
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
@@ -431,7 +432,8 @@
|
||||
Discipline = 0
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
if(trained && prob(20)) // trained slimes are more resistant to losing discipline
|
||||
trained = 0
|
||||
trained = FALSE
|
||||
name = initial(name)
|
||||
visible_message("<span class='warning'>[src] gets spooked and cowers from [user]!</span>")
|
||||
|
||||
/mob/living/simple_animal/slime/attacked_by(obj/item/I, mob/living/user)
|
||||
@@ -455,6 +457,7 @@
|
||||
if(trained && prob(75))
|
||||
say("Ow! HEY!!!", pick(speak_emote))
|
||||
trained = FALSE
|
||||
name = initial(name)
|
||||
rabid = TRUE
|
||||
if(!client && Target && volume >= 3) // Like cats
|
||||
Target = null
|
||||
|
||||
Reference in New Issue
Block a user