From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 7 Jan 2024 01:52:41 +0000 (+0300) Subject: SyndiCat (#22554) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d22fe3f92141a1068d632ea0a139becf1bc6cf6f;p=space-station-14.git SyndiCat (#22554) * add content * 4 tk to 8 tk * replace to autoinject, now cat can explode in any moment. increase cost to 10tk * Update animals.yml --- 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 a42ce6df56..936979a57a 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -195,6 +195,10 @@ ghost-role-information-hellspawn-description = You are an antagonist, bring deat ghost-role-information-Death-Squad-name = Death Squad Operative ghost-role-information-Death-Squad-description = One of Nanotrasen's top internal affairs agents. Await orders from CentComm or an official. +ghost-role-information-SyndiCat-name = SyndiCat +ghost-role-information-SyndiCat-description = You're the faithful trained pet of nuclear operatives with a microbomb. Serve your master to the death! +ghost-role-information-SyndiCat-rules = You're the faithful trained pet of nuclear operatives with a microbomb. Serve your master to the death! + ghost-role-information-Cak-name = Cak ghost-role-information-Cak-description = You are the chef's favorite child. You're a living cake cat. ghost-role-information-Cak-rules = You are a living edible sweet cat. Your task is to find your place in this world where everything wants to eat you. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 746ae3d976..33bcdb22f6 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -337,6 +337,9 @@ uplink-syndicate-sponge-box-desc = A box containing 6 syndicate sponges disguise uplink-slipocalypse-clustersoap-name = Slipocalypse Clustersoap uplink-slipocalypse-clustersoap-desc = Scatters arounds small pieces of syndicate-brand soap after being thrown, these pieces of soap evaporate after 60 seconds. +uplink-mobcat-microbomb-name = SyndiCat +uplink-mobcat-microbomb-desc = A hand cat equipped with a microbomb implant. Explodes when seriously injured. Can bite painfully + # Pointless uplink-revolver-cap-gun-name = Cap Gun uplink-revolver-cap-gun-desc = Looks almost like the real thing! Ages 8 and up. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index aa6bf74096..bf726f2e53 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1387,6 +1387,22 @@ categories: - UplinkMisc +- type: listing + id: UplinkMobCatMicrobomb + name: uplink-mobcat-microbomb-name + description: uplink-mobcat-microbomb-desc + icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat } + productEntity: MobCatSyndy + cost: + Telecrystal: 10 + categories: + - UplinkMisc + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + # Pointless - type: listing diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 8309eda9a8..e47e14c9c8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2475,6 +2475,9 @@ Base: cat Dead: Base: cat_dead + - type: Speech + speechSounds: Cat + speechVerb: SmallMob - type: Butcherable spawned: - id: FoodMeat @@ -2518,6 +2521,36 @@ Dead: Base: cat2_dead +- type: entity + name: syndicat + id: MobCatSyndy + parent: MobCatSpace + description: Explosive kitten. + components: + - type: Sprite + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: syndicat + - type: DamageStateVisuals + states: + Alive: + Base: syndicat + Dead: + Base: syndicat_dead + - type: GhostRole + prob: 1 + name: ghost-role-information-SyndiCat-name + allowMovement: true + description: ghost-role-information-SyndiCat-description + rules: ghost-role-information-SyndiCat-rules + - type: GhostTakeoverAvailable + - type: AutoImplant + implants: + - MicroBombImplant + - type: NpcFactionMember + factions: + - Syndicate + - type: entity name: space cat id: MobCatSpace diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/Mobs/Pets/cat.rsi/meta.json index d9a6c182a9..c7fac6f03a 100644 --- a/Resources/Textures/Mobs/Pets/cat.rsi/meta.json +++ b/Resources/Textures/Mobs/Pets/cat.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", + "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, syndicat created by Aleksh (discord)", "states": [ { "name": "cak", @@ -418,6 +418,32 @@ 1 ] ] + }, + { + "name": "syndicat", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "syndicat_dead", + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/syndicat.png b/Resources/Textures/Mobs/Pets/cat.rsi/syndicat.png new file mode 100644 index 0000000000..c1d4a2caf6 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/cat.rsi/syndicat.png differ diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png b/Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png new file mode 100644 index 0000000000..64ac5a00d0 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png differ