diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/Mobs/NPCs/moproach.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/Mobs/NPCs/moproach.ftl new file mode 100644 index 0000000000..2c79348c55 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/Mobs/NPCs/moproach.ftl @@ -0,0 +1,2 @@ +ent-MobMoproach = швабракан + .desc = Кто додумался надеть на таракамоль швабротапки? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/consumable/food/food.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/consumable/food/food.ftl new file mode 100644 index 0000000000..e0a6eb6a11 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/consumable/food/food.ftl @@ -0,0 +1,2 @@ +ent-FoodSnackWhiteChocolateBar = плитка белого шоколада + .desc = Как шоколад, но почти без какао. \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_LuaM/Entities/Markers/Spawners/mobs.yml new file mode 100644 index 0000000000..6b982f631c --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Markers/Spawners/mobs.yml @@ -0,0 +1,14 @@ +- type: entity + parent: MarkerBase + id: SpawnMobMoproach + name: Moproach Spawner + components: + - type: Sprite + layers: + - state: green + - sprite: _LuaM/Mobs/Animals/moproach.rsi + state: icon + - state: ai + - type: ConditionalSpawner + prototypes: + - MobMoproach \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/Entities/Mobs/NPCs/moproach.yml b/Resources/Prototypes/_LuaM/Entities/Mobs/NPCs/moproach.yml new file mode 100644 index 0000000000..c85962a22d --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Mobs/NPCs/moproach.yml @@ -0,0 +1,55 @@ +- type: entity + name: moproach + parent: MobMothroach + id: MobMoproach + description: This little mothroach has mopshoes on its feet! How adorable! + components: + - type: GhostRole + name: ghost-role-information-moproach-name + description: ghost-role-information-moproach-description + - type: Sprite + sprite: _LuaM/Mobs/Animals/moproach.rsi + - type: Clothing + quickEquip: false + sprite: _LuaM/Mobs/Animals/moproach.rsi + equippedPrefix: 0 + slots: + - HEAD + - type: MobThresholds + thresholds: + 0: Alive + 45: Critical + 65: Dead + - type: MovementSpeedModifier + baseWalkSpeed : 5 # extra speed for that moppin'! + - type: HTN + rootTask: + task: MoproachCompound + - type: Absorbent + pickupAmount: 2 # small feet + - type: UseDelay + delay: 0.5 # quick feet + - type: SolutionRegeneration + solution: absorbed + generated: + reagents: + - ReagentId: Water + Quantity: 10 + - type: SolutionPurge + solution: absorbed + preserve: + - Water + quantity: 10 + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 50 + food: + reagents: + - ReagentId: Slime + Quantity: 5 + - type: DrainableSolution + solution: drainBuffer + - type: InteractionPopup + interactSuccessString: petting-success-cleanbot + interactFailureString: petting-failure-cleanbot diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/food.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/food.yml new file mode 100644 index 0000000000..c49b7d8991 --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/food.yml @@ -0,0 +1,29 @@ +- type: entity + name: white chocolate bar + parent: FoodSnackBaseNorot + id: FoodSnackWhiteChocolateBar + description: Tastes like cardboard. + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: _LuaM/Objects/Consumable/Food/snacks.rsi + state: whitechocolatebar-open + - type: Item + sprite: _LuaM/Objects/Consumable/Food/snacks.rsi + - type: Tag + tags: + - FoodSnack + - ReptilianFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Butter + Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/food_base.yml new file mode 100644 index 0000000000..a30d330016 --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/food_base.yml @@ -0,0 +1,6 @@ +- type: entity + parent: EdibleBase + id: FoodBaseNorot + abstract: true + components: + - type: SpaceGarbage \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/snacks.yml new file mode 100644 index 0000000000..2c580dacc9 --- /dev/null +++ b/Resources/Prototypes/_LuaM/Entities/Objects/Consumable/Food/snacks.yml @@ -0,0 +1,24 @@ +- type: entity + parent: [VendPriceFoodBase200, FoodBaseNorot] + id: FoodSnackBaseNorot + abstract: true + components: + - type: Food + - type: Tag + tags: + - FoodSnack + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: Item + sprite: Objects/Consumable/Food/snacks.rsi + heldPrefix: packet + size: Tiny + - type: StaticPrice + price: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/NPCs/mob.yml b/Resources/Prototypes/_LuaM/NPCs/mob.yml new file mode 100644 index 0000000000..fffa571e4e --- /dev/null +++ b/Resources/Prototypes/_LuaM/NPCs/mob.yml @@ -0,0 +1,12 @@ +- type: htnCompound + id: MoproachCompound + branches: + - tasks: + - !type:HTNCompoundTask + task: FoodCompound + - tasks: + - !type:HTNCompoundTask + task: BufferNearbyPuddlesCompound + - tasks: + - !type:HTNCompoundTask + task: IdleCompound \ No newline at end of file diff --git a/Resources/Prototypes/_LuaM/Reactions/food.yml b/Resources/Prototypes/_LuaM/Reactions/food.yml new file mode 100644 index 0000000000..07d932ec78 --- /dev/null +++ b/Resources/Prototypes/_LuaM/Reactions/food.yml @@ -0,0 +1,15 @@ +- type: reaction + id: CreateWhiteChocolate + impact: Low + quantized: true + conserveEnergy: false + reactants: + Butter: + amount: 5 + Milk: + amount: 2 + Sugar: + amount: 2 + effects: + - !type:CreateEntityReactionEffect + entity: FoodSnackWhiteChocolateBar diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/0-equipped-HELMET.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/0-equipped-HELMET.png new file mode 100644 index 0000000000..f756efee72 Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/icon.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/icon.png new file mode 100644 index 0000000000..1923b5d594 Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/icon.png differ diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/inhand-left.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/inhand-left.png new file mode 100644 index 0000000000..7b6b9a28a3 Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/inhand-right.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/inhand-right.png new file mode 100644 index 0000000000..f184340af0 Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/meta.json b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/meta.json new file mode 100644 index 0000000000..3629b336ee --- /dev/null +++ b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/meta.json @@ -0,0 +1,60 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf, all edited by lzk228", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach-moving.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach-moving.png new file mode 100644 index 0000000000..929cf998c8 Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach.png new file mode 100644 index 0000000000..8bc772c31f Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach.png differ diff --git a/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach_dead.png b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach_dead.png new file mode 100644 index 0000000000..83cbc86e4d Binary files /dev/null and b/Resources/Textures/_LuaM/Mobs/Animals/moproach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/_LuaM/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/_LuaM/Objects/Consumable/Food/snacks.rsi/meta.json new file mode 100644 index 0000000000..cfcb959aa9 --- /dev/null +++ b/Resources/Textures/_LuaM/Objects/Consumable/Food/snacks.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, modified by not_so_big_chungus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "whitechocolatebar-open" + } + ] +} diff --git a/Resources/Textures/_LuaM/Objects/Consumable/Food/snacks.rsi/whitechocolatebar-open.png b/Resources/Textures/_LuaM/Objects/Consumable/Food/snacks.rsi/whitechocolatebar-open.png new file mode 100644 index 0000000000..66145f559f Binary files /dev/null and b/Resources/Textures/_LuaM/Objects/Consumable/Food/snacks.rsi/whitechocolatebar-open.png differ diff --git a/Resources/Textures/_LuaM/Structures/Wallmonts/meta.json b/Resources/Textures/_LuaM/Structures/Wallmonts/meta.json new file mode 100644 index 0000000000..f89cc755dd --- /dev/null +++ b/Resources/Textures/_LuaM/Structures/Wallmonts/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, modified by Spessmann, poster54_legit by hex_reject on Discord, poster64_contraband, poster65_contraband, poster66_contraband by JuneSzalkowska (Discord), poster55_legit by FairlySadPanda (Github), based on art and a character owned by Vytian (Discord).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "poster55_legit" + } + ] +}