cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Not as scary as it looks attackby() to item_interaction() (#96795)

Browse Source
This commit is contained in:
Leland Kemble
2026-07-12 13:45:35 +02:00
committed by GitHub
parent 55e1b1fe0f
commit f29fccfc2c
52 changed files with 329 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/farm_animals/pig.dm
+1 -1
View File
@@ -50,7 +50,7 @@
///wrapper for the tameable component addition so you can have non tamable cow subtypes
/mob/living/basic/pig/proc/make_tameable()
var/list/food_types = string_list(list(/obj/item/food/grown/carrot))
var/list/food_types = string_list(list(/obj/item/food/grown/carrotlike/carrot))
AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 25, bonus_tame_chance = 15)
/mob/living/basic/pig/tamed(mob/living/tamer, atom/food)
code/modules/mob/living/basic/farm_animals/rabbit.dm
+1 -1
View File
@@ -91,7 +91,7 @@
var/list/feed_messages = list("[p_they()] nibbles happily.", "[p_they()] noms happily.")
AddComponent(/datum/component/egg_layer,\
/obj/item/surprise_egg,\
list(/obj/item/food/grown/carrot),\
list(/obj/item/food/grown/carrotlike/carrot),\
feed_messages,\
list("hides an egg.","scampers around suspiciously.","begins making a huge racket.","begins shuffling."),\
initial_egg_amount,\
code/modules/mob/living/basic/space_fauna/eyeball/_eyeball.dm
+2 -2
View File
@@ -58,7 +58,7 @@
grant_actions_by_list(innate_actions)
AddElement(/datum/element/simple_flying)
var/list/food_types = string_list(list(/obj/item/food/grown/carrot))
var/list/food_types = string_list(list(/obj/item/food/grown/carrotlike/carrot))
AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 100)
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
on_hit_overlay = mutable_appearance(icon, "[icon_state]_crying")
@@ -71,7 +71,7 @@
if(!proximity_flag)
return
if(istype(attack_target, /obj/item/food/grown/carrot))
if(istype(attack_target, /obj/item/food/grown/carrotlike/carrot))
adjust_brute_loss(-5)
to_chat(src, span_warning("You eat [attack_target]! It restores some health!"))
qdel(attack_target)
code/modules/mob/living/basic/space_fauna/eyeball/eyeball_ai_subtree.dm
+1 -1
View File
@@ -49,5 +49,5 @@
/datum/ai_planning_subtree/find_and_hunt_target/carrot
target_key = BB_LOW_PRIORITY_HUNTING_TARGET
hunting_behavior = /datum/ai_behavior/hunt_target/interact_with_target/carrot
hunt_targets = list(/obj/item/food/grown/carrot)
hunt_targets = list(/obj/item/food/grown/carrotlike/carrot)
hunt_range = 6