diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml new file mode 100644 index 0000000000..bd3593b52c --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml @@ -0,0 +1,57 @@ +- type: entity + name: space bear + id: MobBearSpace + parent: SimpleSpaceMobBase + description: It looks friendly. Why don't you give it a hug? + components: + - type: UtilityAI + behaviorSets: + - Idle + - UnarmedAttackHostiles + - type: AiFactionTag + factions: + - SimpleHostile + - type: Sprite + drawdepth: Mobs + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: bear + sprite: Mobs/Animals/bear.rsi + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.5 + mass: 100 + mask: + - Impassable + - MobImpassable + - SmallImpassable + layer: + - Opaque + - type: MobState + thresholds: + 0: !type:NormalMobState {} + 150: !type:DeadMobState {} + - type: Appearance + visuals: + - type: DamageStateVisualizer + normal: bear + crit: bear_dead + dead: bear_dead + - type: Butcherable + spawned: + - id: FoodMeatBear + amount: 3 + - id: MaterialHideBear + amount: 1 + prob: 0.3 + - type: Bloodstream + bloodMaxVolume: 500 + - type: UnarmedCombat + range: 0.5 + arcwidth: 0 + arc: claw + damage: + groups: + Brute: 15 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index f87f303c54..7506926602 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -201,7 +201,7 @@ # Tastes like meat, cabbage. - type: entity - name: Filet migrawr + name: filet migrawr parent: FoodMealBase id: FoodMealBearsteak description: Because eating bear wasn't manly enough. diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 49241a6241..c0af8f8f52 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -46,6 +46,25 @@ FoodBreadBun: 1 FoodMeatXeno: 1 +- type: microwaveMealRecipe + id: RecipeBearger + name: bearger recipe + result: FoodBurgerBear + time: 5 + solids: + FoodBreadBun: 1 + FoodMeatBear: 1 + +- type: microwaveMealRecipe + id: RecipeFiletMigrawr + name: filet migrawr recipe + result: FoodMealBearsteak + time: 10 + solids: + FoodMeatBear: 1 + reagents: + Beer: 15 + #- type: microwaveMealRecipe # id: RecipeSuperBiteBurger # name: super bite burger recipe diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/armor_bear.png b/Resources/Textures/Mobs/Animals/bear.rsi/armor_bear.png deleted file mode 100644 index a9513d2c82..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/armor_bear.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/bear_gib.png b/Resources/Textures/Mobs/Animals/bear.rsi/bear_gib.png deleted file mode 100644 index 75e436ca6a..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/bear_gib.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/brownbear.png b/Resources/Textures/Mobs/Animals/bear.rsi/brownbear.png deleted file mode 100644 index dd8fff69da..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/brownbear.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/brownbear_dead.png b/Resources/Textures/Mobs/Animals/bear.rsi/brownbear_dead.png deleted file mode 100644 index afcf4ba574..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/brownbear_dead.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/brownbear_gib.png b/Resources/Textures/Mobs/Animals/bear.rsi/brownbear_gib.png deleted file mode 100644 index 8b73affbac..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/brownbear_gib.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/combatbear.png b/Resources/Textures/Mobs/Animals/bear.rsi/combatbear.png deleted file mode 100644 index 98f1213c4b..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/combatbear.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/combatbear_dead.png b/Resources/Textures/Mobs/Animals/bear.rsi/combatbear_dead.png deleted file mode 100644 index 06d2112737..0000000000 Binary files a/Resources/Textures/Mobs/Animals/bear.rsi/combatbear_dead.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/meta.json b/Resources/Textures/Mobs/Animals/bear.rsi/meta.json index 6102a50503..5ac44ac4e9 100644 --- a/Resources/Textures/Mobs/Animals/bear.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/bear.rsi/meta.json @@ -7,127 +7,12 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", "states": [ - { - "name": "brownbear", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "brownbear_dead", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "brownbear_gib", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "combatbear", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "combatbear_dead", - "delays": [ - [ - 1 - ] - ] - }, { "name": "bear", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "bear_dead", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "bear_gib", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "bear_dead" } ] }