Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BOUNTY] Ports Petheads from Beestation #3629

Merged
merged 3 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion monkestation/code/game/objects/items/choice_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
/mob/living/basic/pet/dog/pug,
/mob/living/basic/pet/dog/bullterrier,
/mob/living/basic/lizard,
/mob/living/basic/ant
/mob/living/basic/ant,
/mob/living/simple_animal/pet/hamster
)

for(var/mob/living/basic_mob as anything in selectable_pets)
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/blueshift/mobs/misc_pets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
unsuitable_atmos_damage = 0
minimum_survivable_temperature = 0
maximum_survivable_temperature = 30000
worn_slot_flags = null

/mob/living/basic/lizard/tegu
name = "tegu"
Expand Down
4 changes: 4 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/cat.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/mob/living/simple_animal/pet/cat
//. = ..()
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'
28 changes: 28 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/crab.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/mob/living/basic/crab
can_be_held = TRUE
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
held_state = "crab"

/mob/living/basic/crab/evil
held_state = "evilcrab"

// Unsprited crabs will not be worn, new sprites are welcome!

/mob/living/basic/crab/kreb
worn_slot_flags = null

/mob/living/basic/crab/evil/kreb
worn_slot_flags = null

/mob/living/basic/crab/plant
worn_slot_flags = null

/mob/living/basic/crab/spycrab
worn_slot_flags = null

/mob/living/basic/crab/shuffle
worn_slot_flags = null

29 changes: 29 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/dog_subtypes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/mob/living/basic/pet/dog/pug
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'

/mob/living/basic/pet/dog/bullterrier
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held_large.dmi'

/mob/living/basic/pet/dog/corgi
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'

/mob/living/basic/pet/dog/corgi/puppy
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'

/mob/living/basic/pet/dog/corgi/puppy/void
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'

/mob/living/basic/pet/dog/corgi/lisa
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'

/mob/living/basic/pet/dog/corgi/narsie
worn_slot_flags = null

/mob/living/basic/pet/dog/corgi/exoticcorgi
worn_slot_flags = null
3 changes: 3 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/fox.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/mob/living/basic/pet/fox
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'
40 changes: 40 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/hamster.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/mob/living/simple_animal/pet/hamster
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
response_help_continuous = "pets"
response_help_simple = "pet"
response_disarm_continuous = "bops"
response_disarm_simple = "bop"
response_harm_continuous = "bites"
response_harm_simple = "bite"
speak = list("Squeak", "SQUEAK!")
speak_emote = list("squeak", "hisses", "squeals")
emote_hear = list("squeaks.", "hisses.", "squeals.")
emote_see = list("skitters", "examines it's claws", "rolls around")
see_in_dark = 5
speak_chance = 1
turns_per_move = 3
footstep_type = FOOTSTEP_MOB_CLAW
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
name = "\improper hamster"
real_name = "hamster"
desc = "It's a hamster."
icon = 'monkestation/icons/mob/pets.dmi'
icon_state = "hamster"
icon_living = "hamster"
held_state = "hamster"
icon_dead = "hamster_dead"
butcher_results = list(/obj/item/food/meat/slab = 1)
childtype = list(/mob/living/simple_animal/pet/hamster = 1)
animal_species = /mob/living/simple_animal/pet/hamster
gold_core_spawnable = FRIENDLY_SPAWN
can_be_held = TRUE
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'

/mob/living/simple_animal/pet/hamster/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
18 changes: 18 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/lizard.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/mob/living/basic/lizard
can_be_held = TRUE
held_w_class = WEIGHT_CLASS_TINY
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'

// Unsprited crabs will not be worn, new sprites are welcome!

/mob/living/basic/lizard/snake
worn_slot_flags = null

/mob/living/basic/lizard/space
worn_slot_flags = null

/mob/living/basic/lizard/tegu
worn_slot_flags = null
8 changes: 8 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/mouse.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/mob/living/basic/mouse
worn_slot_flags = ITEM_SLOT_HEAD
head_icon = 'monkestation/icons/mob/pets_held.dmi'

// Unsprited crabs will not be worn, new sprites are welcome!

/mob/living/basic/mouse/plague
worn_slot_flags = null
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/mob/living/basic/parrot
can_be_held = TRUE
worn_slot_flags = ITEM_SLOT_HEAD
held_state = "parrot"
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'

/mob/living/basic/parrot/honk_platinum
name = "Honk Platinum"
Expand All @@ -7,7 +14,4 @@
icon_living = "honk_fly"
icon_sit = "honk_sit"
icon_dead = "honk_dead"
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'//icons for holding mobs
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
held_state = "honk_fly"
7 changes: 7 additions & 0 deletions monkestation/code/modules/mob/living/basic/pets/snake.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/mob/living/basic/snake
can_be_held = TRUE
worn_slot_flags = ITEM_SLOT_HEAD
held_state = "snake"
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
6 changes: 6 additions & 0 deletions monkestation/code/modules/ranching/chickens/_chick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
gold_core_spawnable = FRIENDLY_SPAWN
can_be_held = TRUE
worn_slot_flags = ITEM_SLOT_HEAD
held_state = "chick"
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'

ai_controller = /datum/ai_controller/basic_controller/chick

Expand Down
4 changes: 4 additions & 0 deletions monkestation/code/modules/ranching/chickens/_chicken.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
icon_living = "chicken_white"
icon_dead = "dead_state"
held_state = "chicken_white"
head_icon = 'monkestation/icons/mob/pets_held.dmi'
held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'

speak_emote = list("clucks","croons")

Expand All @@ -40,6 +43,7 @@

/mob/living/basic/chicken/Initialize(mapload)
. = ..()
head_icon = 'monkestation/icons/mob/pets_held_large.dmi'
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
health = maxHealth
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/misc/gary.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
///gary is gonna have nothing to do with other crows because of how much unique code it has
/mob/living/basic/chicken/gary
worn_slot_flags = null
breed_name_male = "Gary"
breed_name_female = "Gary"
desc = "Gary the Crow. An inquisitive, yet cruel barterer."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
icon_state = "turkey_plain"
icon_living = "turkey_plain"
icon_dead = "turkey_plain_dead"
worn_slot_flags = null
speak_emote = list("clucks","gobbles")
density = FALSE
health = 15
Expand Down
2 changes: 2 additions & 0 deletions monkestation/code/modules/ranching/chickens/tier1/clown.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/clown
icon_suffix = "clown"
worn_slot_flags = null

breed_name_female = "Henk"
breed_name_male = "Henkster"
Expand All @@ -14,6 +15,7 @@
targeted_ability = /datum/action/cooldown/mob_cooldown/chicken/honk

book_desc = "Tries very hard to be funny and occasionally honks."

/obj/item/food/egg/clown
name = "Clown Egg?"
food_reagents = list(/datum/reagent/water = 50)
Expand Down
2 changes: 2 additions & 0 deletions monkestation/code/modules/ranching/chickens/tier1/glass.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/mob/living/basic/chicken/glass
icon_suffix = "glass"
worn_slot_flags = null

breed_name = "Glass"
egg_type = /obj/item/food/egg/glass
mutation_list = list(/datum/mutation/ranching/chicken/wiznerd, /datum/mutation/ranching/chicken/stone)
liked_foods = list(/obj/item/food/grown/rice = 2)

book_desc = "Fragile as glass, but produces the chemical injected into its egg overtime."

/obj/item/food/egg/glass
name = "Glass Egg"
food_reagents = list()
Expand Down
2 changes: 2 additions & 0 deletions monkestation/code/modules/ranching/chickens/tier1/ixworth.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/mob/living/basic/chicken/ixworth
icon_suffix = "ixworth"
worn_slot_flags = null

breed_name = "Ixworth"
egg_type = /obj/item/food/egg/ixworth
mutation_list = list()
liked_foods = list(/obj/item/food/grown/tomato = 2)

book_desc = "A very stylish breed."

/obj/item/food/egg/ixworth
name = "Ixworth Egg"
icon_state = "ixworth"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

/mob/living/basic/chicken/onagadori
icon_suffix = "onagadori"
worn_slot_flags = null

breed_name = "Onagadori"
egg_type = /obj/item/food/egg/onagadori
Expand All @@ -9,6 +10,7 @@

book_desc = "Japanese long-tailed chickens, with no unique features aside from its plumage."


/obj/item/food/egg/onagadori
name = "Onagadori Egg"
icon_state = "onagadori"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/silkie
icon_suffix = "silkie"
worn_slot_flags = null

breed_name = "Selkie"
egg_type = /obj/item/food/egg/silkie
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/silkie_black
icon_suffix = "silkie_black"
worn_slot_flags = null

breed_name = "Black Selkie"
egg_type = /obj/item/food/egg/silkie_black
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/silkie_white
icon_suffix = "silkie_white"
worn_slot_flags = null

breed_name = "White Silkie"
egg_type = /obj/item/food/egg/silkie_white
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier1/void.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/void
icon_suffix = "void"
worn_slot_flags = null

breed_name = "Void"
egg_type = /obj/item/food/egg/void
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/clown_sad
icon_suffix = "sad_clown"
worn_slot_flags = null

breed_name_male = "huOnkHoNkHoeNK"
breed_name_female = "huOnkHoNkHoeNK"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/cotton_candy
icon_suffix = "cotton_candy"
worn_slot_flags = null

breed_name = "Cotton Candy"
egg_type = /obj/item/food/egg/cotton_candy
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier2/dream.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/dream
icon_suffix = "dreaming"
worn_slot_flags = null

breed_name = "Dream"
egg_type = /obj/item/food/egg/dream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/golden
icon_suffix = "gold"
worn_slot_flags = null

breed_name = "Golden"
egg_type = /obj/item/food/egg/golden
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier2/mime.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/mime
icon_suffix = "mime"
worn_slot_flags = null

breed_name = "Mime"
egg_type = /obj/item/food/egg/mime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/pigeon
icon_suffix = "pigeon"
worn_slot_flags = null

breed_name_male = "Pigeon"
breed_name_female = "Pigeon"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/raptor
icon_suffix = "raptor"
worn_slot_flags = null

breed_name = "Raptor"
breed_name_male = "Tiercel"
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier2/snowy.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/snowy
icon_suffix = "snowy"
worn_slot_flags = null

breed_name = "Snow"
egg_type = /obj/item/food/egg/snowy
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier2/spicy.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/spicy
icon_suffix = "spicy"
worn_slot_flags = null

breed_name = "Spicy"
egg_type = /obj/item/food/egg/spicy
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier2/stone.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#define MINIMUM_BREAK_FORCE 10
/mob/living/basic/chicken/stone
icon_suffix = "stone"
worn_slot_flags = null

breed_name = "Stone"
egg_type = /obj/item/food/egg/stone
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/ranching/chickens/tier2/sword.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/mob/living/basic/chicken/sword
icon_suffix = "sword"
worn_slot_flags = null

maxHealth = 300
melee_damage_lower = 2 //weak damage but strong health
Expand Down
Loading
Loading