Skip to content

Commit f594c2d

Browse files
authored
TAMEABLE DIREBEARS (#6965)
FINE, I DID IT MYSELF ## About The Pull Request Changed it such that dire bears can now be tamed if you're brave enough. ## Why It's Good For The Game We can tame bears in real life, we should be able to tame them in-game! We can tame gators! Why not bears, for the daring?! Plus, riding bears, it's the end of Pride Month, I had no choice but to get this joke in NOW ## Changelog Added pet commands and a taming chance to dire bears, taking the taming chances from moles (low-ish chance) and commands from the hound (because bears can fish) <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: added ability to tame dire bears fix: fixed a few typos in the comments of the bear file, but added one more (for balance) /:cl: ## Pre-Merge Checklist - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [x] You documented all of your changes.
1 parent 964e105 commit f594c2d

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

  • code/modules/mob/living/simple_animal/hostile/retaliate/creacher

code/modules/mob/living/simple_animal/hostile/retaliate/creacher/bear.dm

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
/obj/item/natural/head/direbear = 1)
9393
faction = list("bears") //This mf will kill undead - swapped to its own faction, doesn't trigger ambushes
9494
mob_biotypes = MOB_ORGANIC|MOB_BEAST
95-
melee_damage_lower = 50 // Ey, bo-bo!
96-
melee_damage_upper = 60 // We're gonna take his pick-in-ick basket!
95+
melee_damage_lower = 50 // Ey, Boo-Boo!
96+
melee_damage_upper = 60 // We're gonna take his pic-a-ic basket!
9797
vision_range = 6
9898
aggro_vision_range = 8
9999
environment_smash = ENVIRONMENT_SMASH_STRUCTURES // silly furniture won't stop our boy
@@ -106,6 +106,8 @@
106106
/obj/item/organ, //Woe be upon ye
107107
/obj/effect/decal/remains,
108108
)
109+
tame_chance = 15 // taken from mole
110+
bonus_tame_chance = 15 // likewise taken from mole
109111
base_constitution = 12
110112
base_strength= 13
111113
base_speed = 9
@@ -118,9 +120,25 @@
118120
dodgetime = 30
119121
stat_attack = UNCONSCIOUS //You falling unconcious won't save you, little one..
120122
ai_controller = /datum/ai_controller/direbear
123+
var/static/list/pet_commands = list( // list taken from hound, because sounds about right, and also bears fish!
124+
/datum/pet_command/fish,
125+
/datum/pet_command/idle,
126+
/datum/pet_command/free,
127+
/datum/pet_command/good_boy,
128+
/datum/pet_command/follow,
129+
/datum/pet_command/attack,
130+
/datum/pet_command/fetch,
131+
/datum/pet_command/play_dead,
132+
/datum/pet_command/protect_owner,
133+
/datum/pet_command/aggressive,
134+
/datum/pet_command/calm,
135+
)
121136
can_buckle = TRUE
122137

123-
/mob/living/simple_animal/hostile/retaliate/direbear/Initialize(mapload)
138+
139+
140+
/mob/living/simple_animal/hostile/retaliate/direbear/Initialize()
141+
AddComponent(/datum/component/obeys_commands, pet_commands) // here due to signal overridings from pet commands, apparently?
124142
. = ..()
125143
AddComponent(/datum/component/ai_aggro_system)
126144

0 commit comments

Comments
 (0)