This commit is contained in:
Geeves
2021-01-16 13:30:02 +02:00
committed by GitHub
parent 001dea87ba
commit eb47aa907a
9 changed files with 44 additions and 1 deletions

View File

@@ -47,6 +47,7 @@
/mob/living/simple_animal/rat = TRADER_THIS_TYPE,
/mob/living/simple_animal/parrot = TRADER_THIS_TYPE,
/mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
/mob/living/simple_animal/pig = TRADER_THIS_TYPE,
/mob/living/simple_animal/cow = TRADER_THIS_TYPE,
/mob/living/simple_animal/chick = TRADER_THIS_TYPE,
/mob/living/simple_animal/chicken = TRADER_THIS_TYPE,

View File

@@ -567,7 +567,8 @@
allowed_mobs = list(
/mob/living/simple_animal/hostile/retaliate/goat, /mob/living/simple_animal/cow, /mob/living/simple_animal/corgi/fox,
/mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/hostile/bear, /mob/living/simple_animal/hostile/alien, /mob/living/simple_animal/hostile/giant_spider,
/mob/living/simple_animal/hostile/commanded/dog, /mob/living/simple_animal/hostile/retaliate/cavern_dweller, /mob/living/carbon/human/)
/mob/living/simple_animal/hostile/commanded/dog, /mob/living/simple_animal/hostile/retaliate/cavern_dweller, /mob/living/carbon/human,
/mob/living/simple_animal/pig)
/obj/item/trap/animal/large/attack_hand(mob/user)
if(user == buckled_mob)

View File

@@ -51,6 +51,10 @@
name = "cow crate"
held_type = /mob/living/simple_animal/cow
/obj/structure/largecrate/animal/pig
name = "pig crate"
held_type = /mob/living/simple_animal/pig
/obj/structure/largecrate/animal/goat
name = "goat crate"
held_type = /mob/living/simple_animal/hostile/retaliate/goat

View File

@@ -118,6 +118,32 @@
else
..()
/mob/living/simple_animal/pig
name = "pig"
desc = "Used in the past simply as meat farms, modern people recognize the affectionate side of these bacon factories."
icon = 'icons/mob/npc/livestock.dmi'
icon_state = "pig"
icon_living = "pig"
icon_dead = "pig_dead"
speak = list("oink", "oink oink", "OINK")
speak_emote = list("squeels")
emote_hear = list("snorts", "grunts")
emote_see = list("sways its tail")
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
meat_type = /obj/item/reagent_containers/food/snacks/meat/pig
meat_amount = 20
organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
attacktext = "kicked"
health = 120
emote_sounds = list('sound/effects/creatures/pigsnort.ogg')
butchering_products = list(/obj/item/stack/material/hairlesshide = 6)
forbidden_foods = list(/obj/item/reagent_containers/food/snacks/egg)
/mob/living/simple_animal/chick
name = "\improper chick"
desc = "Adorable! They make such a racket though."

View File

@@ -47,6 +47,10 @@
filling_color = "#BBBBAA"
reagents_to_add = list(/datum/reagent/nutriment/protein = 6) //Chicken is low fat. Less total calories than other meats
/obj/item/reagent_containers/food/snacks/meat/pig
name = "pig meat"
reagents_to_add = list(/datum/reagent/nutriment/protein = 6, /datum/reagent/nutriment/triglyceride = 4)
/obj/item/reagent_containers/food/snacks/meat/biogenerated
name = "bio meat"
desc = "Did this come from the Biogenerator, or is it a biohazard? Perhaps it is both."

View File

@@ -35,6 +35,7 @@
/mob/living/simple_animal/corgi/puppy,\
/mob/living/simple_animal/chicken,\
/mob/living/simple_animal/cow,\
/mob/living/simple_animal/pig,\
/mob/living/simple_animal/parrot,\
/mob/living/simple_animal/slime,\
/mob/living/simple_animal/crab,\