From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Thu, 28 Dec 2023 05:32:55 +0000 (+1100) Subject: Kobold Monkeys (#22108) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d78e6cc818d6427d571ff880fb704e8ee8bff881;p=space-station-14.git Kobold Monkeys (#22108) * add * fix maybe * clean up yaml * clean up more yaml maybe * dash * second dash * aahhh handcuffss * balancing(?) * sprite and desc change --- diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index dae14a300d..dbc2257b51 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -44,6 +44,9 @@ ghost-role-information-kangaroo-description = You're a kangaroo! Do whatever kan ghost-role-information-monkey-name = Monkey ghost-role-information-monkey-description = Ook ook! +ghost-role-information-kobold-name = Kobold +ghost-role-information-kobold-description = Be the little gremlin you are, yell at people and beg for meat! + ghost-role-information-rat-king-name = Rat King ghost-role-information-rat-king-description = You are the Rat King, scavenge food in order to produce rat minions to do your bidding. ghost-role-information-rat-king-rules = You are an antagonist, scavenge, attack, and grow your hoard! diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl index ab974cbc79..f2ccc1c3ac 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl @@ -37,6 +37,9 @@ ent-CrateNPCGorilla = Gorilla crate ent-CrateNPCMonkeyCube = Monkey cube crate .desc = A crate containing three boxes of monkey cubes. +ent-CrateNPCKoboldCube = Kobold cube crate + .desc = A crate containing three boxes of kobold cubes. + ent-CrateNPCMouse = Mice crate .desc = A crate containing five mice. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 3133c0206e..eb5d5cd76e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -128,6 +128,16 @@ category: Livestock group: market +- type: cargoProduct + id: LivestockKoboldCube + icon: + sprite: Mobs/Animals/kobold.rsi + state: kobold + product: CrateNPCKoboldCube + cost: 2000 + category: Livestock + group: market + - type: cargoProduct id: LivestockMouse icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index b88b82d7d4..7960fe5598 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -126,6 +126,14 @@ contents: - id: MonkeyCubeBox +- type: entity + id: CrateNPCKoboldCube + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: KoboldCubeBox + - type: entity id: CrateNPCMouse parent: CrateLivestock diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 092677d550..6ed65d6856 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1156,6 +1156,77 @@ - type: IdExaminable - type: AlwaysRevolutionaryConvertible +- type: entity + name: kobold + id: MobKobold + parent: MobMonkey + description: Cousins to the sentient race of lizard people, kobolds blend in with industrial tiling and are as nasty as monkeys; ready to pull out your hair and stab you to death. + components: + - type: LizardAccent + - type: Speech # I don't know how to get it to work and i want someone to make them speak like a lizard with normal accents (or optionally another language altogether) + speechSounds: Lizard + speechVerb: Reptilian + - type: Vocal + sounds: + Male: UnisexReptilian + Female: UnisexReptilian + Unsexed: UnisexReptilian + - type: MobThresholds + thresholds: + 0: Alive + 40: Dead + - type: MovementSpeedModifier + baseWalkSpeed: 3.5 + baseSprintSpeed: 5 + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/pierce.ogg + angle: 30 + animation: WeaponArcPunch + damage: + types: + Piercing: 9 + - type: Temperature + heatDamageThreshold: 400 + coldDamageThreshold: 285 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold : 0.1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 0.1 #per second, scales with temperature & other constants + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: kobold + sprite: Mobs/Animals/kobold.rsi + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "ears" ] + - map: [ "id" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "clownedon" ] + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeat + amount: 2 + - type: GhostRole + prob: 0.1 + makeSentient: true + name: ghost-role-information-kobold-name + description: ghost-role-information-kobold-description + - type: entity name: guidebook monkey parent: MobMonkey diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml index 3814ec2923..acb04c2234 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml @@ -33,6 +33,41 @@ tags: - MonkeyCube +- type: entity + parent: BoxCardboard + name: kobold cube box + id: KoboldCubeBox + description: Condensed kobolds in a cube. Just add water! + components: + - type: StorageFill + contents: + - id: KoboldCubeWrapped + amount: 6 + - type: Sprite + sprite: Objects/Misc/monkeycube.rsi + state: box + +- type: entity + parent: BaseItem + name: kobold cube + suffix: Wrapped + id: KoboldCubeWrapped + description: Unwrap this to get a kobold cube. + components: + - type: Item + size: Tiny + - type: SpawnItemsOnUse + items: + - id: KoboldCube + sound: + path: /Audio/Effects/unwrap.ogg + - type: Sprite + sprite: Objects/Misc/monkeycube.rsi + state: wrapper + - type: Tag + tags: + - MonkeyCube + - type: entity parent: BoxCardboard name: monkey cube box diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 1888c4c4a9..c92fed2e00 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -49,6 +49,16 @@ layer: - LowImpassable +- type: entity + parent: MonkeyCube + id: KoboldCube + name: kobold cube + description: Just add water! + components: + - type: Rehydratable + possibleSpawns: + - MobKobold + - type: entity parent: PlushieCarp id: DehydratedSpaceCarp diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png b/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png new file mode 100644 index 0000000000..1abd0e22eb Binary files /dev/null and b/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png differ diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json b/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json new file mode 100644 index 0000000000..33b5878391 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser", + "states": [ + { + "name": "kobold", + "directions": 4 + } + ] +}