diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_forge/mech/mechs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_forge/mech/mechs.ftl index 114c9a546001..402b9c5e8dea 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_forge/mech/mechs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_forge/mech/mechs.ftl @@ -74,4 +74,9 @@ ent-MechGygaxPirateBattery = { ent-MechGygaxPirate } .desc = { ent-MechGygaxPirate.desc } ent-MechGygaxPirateFilled = { ent-MechGygaxPirateBattery } .suffix = Батарея, Заполненный - .desc = { ent-MechGygaxPirateBattery.desc } \ No newline at end of file + .desc = { ent-MechGygaxPirateBattery.desc } + +ent-MechMeow = М.Я.У + .desc = Механический Яростный Уничтожитель подпольно созданный на одной из пиратских баз, пахнет кошкой. +ent-WeaponMechSpecialBola = Боламёт + .desc = Наспех созданная пушка плетущая и выбрасывающая самодельные сети из заранее загруженных в неё верёвок, пахнет кошкой. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6c82fb07ce7a..b462d3f0a550 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3150,6 +3150,7 @@ - type: Tag tags: - VimPilot + - Cat - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 4 diff --git a/Resources/Prototypes/_Forge/Catalog/Fills/Paper/manuals.yml b/Resources/Prototypes/_Forge/Catalog/Fills/Paper/manuals.yml new file mode 100644 index 000000000000..97ae70603fc9 --- /dev/null +++ b/Resources/Prototypes/_Forge/Catalog/Fills/Paper/manuals.yml @@ -0,0 +1,17 @@ +- type: entity + parent: BaseItem + id: MeowInfo + name: "holoparasite terms and conditions" + description: A tiny volumetric display for documents, makes one wonder if Cybersun's legal budget is way too high. + components: + - type: Sprite + sprite: Forge/Objects/Misc/meow_info.rsi + state: guardian_info + - type: ActivatableUI + key: enum.PaperUiKey.Key + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Paper + content: book-text-holoparasite-info diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml b/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml index 77d5ac3af424..dfb4c92a1f09 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml @@ -53,3 +53,34 @@ proto: TrashBananaPeel fireCost: 100 - type: Appearance + +- type: entity + id: WeaponMechSpecialBola + parent: [ BaseMechWeaponRange, SmallMechEquipment ] + suffix: Mech Weapon, Gun, Special, Mortar, Bola + name: bola mortar + description: Mounted mousetrap launcher. + components: + - type: Sprite + state: mecha_mousetrapmrtr + - type: Gun + minAngle: 24 + maxAngle: 45 + angleIncrease: 4 + angleDecay: 16 + fireRate: 0.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + - type: AmmoCounter + - type: ProjectileBatteryAmmoProvider + proto: Bola + fireCost: 100 + - type: Appearance + - type: Tag + tags: + - SmallMech diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mecha_equipment.yml index 5b10506afab2..6edd00d0ca70 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mecha_equipment.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mecha_equipment.yml @@ -47,3 +47,33 @@ tags: - SmallMech # TODO: Make medical mech with equipment. + +- type: entity + id: MeowMechKit + parent: BaseItem + name: nutribrick + description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit. + components: + - type: MultiHandedItem + - type: Sprite + sprite: Forge/Objects/Storage/Cases/guncaselong.rsi + layers: + - map: [ base ] + state: icon + - state: unshaded + shader: unshaded + - type: Item + sprite: Forge/Objects/Storage/Cases/guncaselong.rsi + size: Ginormous + shape: + - 0,0,8,3 + - type: SpawnItemsOnUse + items: + - id: MechAirTankFilled + - id: MechMeow + - id: PowerCageSmall + - id: HoloparasiteInfo + sound: + path: /Audio/Effects/tesla_collapse.ogg + - type: StaticPrice + price: 500 diff --git a/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mechs.yml index ea75a47defff..b35703721582 100644 --- a/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Forge/Entities/Objects/Specific/Mech/mechs.yml @@ -687,6 +687,43 @@ # Pirate Combat Mech # Black Pearal +- type: entity + parent: [ BaseMech, SmallMech ] # Forge-Change: +SmallMech + id: MechMeow + name: MEOW + description: "An experimental mech which uses a brain–computer interface to connect directly to a hamsters brain." + components: + - type: Sprite + drawdepth: Mobs + noRot: true + sprite: Forge/Objects/Specific/Mech/mecha.rsi + layers: + - map: [ "enum.MechVisualLayers.Base" ] + state: Meow + - type: FootstepModifier + footstepSoundCollection: + path: /Audio/Mecha/sound_mecha_powerloader_step.ogg + - type: Mech + baseState: Meow + openState: Meow-open + brokenState: Meow-broken + mechToPilotDamageMultiplier: 0.65 + maxEquipmentAmount: 2 + airtight: true + pilotWhitelist: + tags: + - Cat + - type: MeleeWeapon + hidden: true + attackRate: 1 + damage: + types: + Blunt: 30 #thwack + Structural: 170 + - type: MovementSpeedModifier + baseWalkSpeed: 2.4 + baseSprintSpeed: 3.7 + - type: entity id: MechGygaxPirate parent: [ BaseMech, CombatMech, SyndieMech, BaseC3PirateContraband ] diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml index 63e160472238..005bbb000ca6 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/emotionalsupportanimals.yml @@ -54,6 +54,12 @@ - type: RotationVisuals defaultRotation: 90 horizontalRotation: 90 + - type: Tag + tags: + - CannotSuicide + - DoorBumpOpener + - VimPilot + - Cat - type: entity id: BaseEmotionalGhostDog diff --git a/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/guardian_info.png b/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/guardian_info.png new file mode 100644 index 000000000000..94ad552222b1 Binary files /dev/null and b/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/guardian_info.png differ diff --git a/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/icon.png b/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/icon.png new file mode 100644 index 000000000000..e9bb2dea2302 Binary files /dev/null and b/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/icon.png differ diff --git a/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/meta.json b/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/meta.json new file mode 100644 index 000000000000..b81bdbf5f171 --- /dev/null +++ b/Resources/Textures/Forge/Objects/Misc/meow_info.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "By terrafrog github.com/ilivor/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "guardian_info", + "delays": [ + [ + 0.2, + 0.1, + 0.2, + 0.1 + ] + ] + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow-broken.png b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow-broken.png new file mode 100644 index 000000000000..1ef9fff3b605 Binary files /dev/null and b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow-broken.png differ diff --git a/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow-open.png b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow-open.png new file mode 100644 index 000000000000..02b23a4bc96d Binary files /dev/null and b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow-open.png differ diff --git a/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow.png b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow.png new file mode 100644 index 000000000000..9c0780b20033 Binary files /dev/null and b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/Meow.png differ diff --git a/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/meta.json index 7d70df94743d..d0a1804b1297 100644 --- a/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/meta.json +++ b/Resources/Textures/Forge/Objects/Specific/Mech/mecha.rsi/meta.json @@ -24,6 +24,16 @@ ] ] }, + { + "name": "Meow", + "directions": 4 + }, + { + "name": "Meow-open" + }, + { + "name": "Meow-broken" + }, { "name": "blackpearal", "directions": 4 @@ -35,4 +45,4 @@ "name": "blackpearal-open" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/icon.png b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/icon.png new file mode 100644 index 000000000000..67e477228af5 Binary files /dev/null and b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/icon.png differ diff --git a/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png new file mode 100644 index 000000000000..b54f302af7a3 Binary files /dev/null and b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/inhand-left.png differ diff --git a/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png new file mode 100644 index 000000000000..91dd3c92db6d Binary files /dev/null and b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/inhand-right.png differ diff --git a/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/meta.json b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/meta.json new file mode 100644 index 000000000000..24875600c544 --- /dev/null +++ b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/obj/storage/case.dmi , held sprites and open sprite made by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "unshaded", + "delays": [ + [ 0.2, 0.1, 0.1, 0.2 ] + ] + } + ] +} diff --git a/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/unshaded.png b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/unshaded.png new file mode 100644 index 000000000000..d52aeda93b4f Binary files /dev/null and b/Resources/Textures/Forge/Objects/Storage/Cases/guncaselong.rsi/unshaded.png differ