]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
SyndiCat (#22554)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Sun, 7 Jan 2024 01:52:41 +0000 (04:52 +0300)
committerGitHub <noreply@github.com>
Sun, 7 Jan 2024 01:52:41 +0000 (17:52 -0800)
* add content

* 4 tk to 8 tk

* replace to autoinject, now cat can explode in any moment. increase cost to 10tk

* Update animals.yml

Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Textures/Mobs/Pets/cat.rsi/meta.json
Resources/Textures/Mobs/Pets/cat.rsi/syndicat.png [new file with mode: 0644]
Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png [new file with mode: 0644]

index a42ce6df561bc4c1ea7f22a20c6314f8ea6d9362..936979a57a73655ddeb2ae9a6c72fec2cebdf52b 100644 (file)
@@ -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.
index 746ae3d9765df022951887572b9adcfe9e7de3f6..33bcdb22f6e8f3de36139ad6eca9539d1fa46755 100644 (file)
@@ -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.
index aa6bf7409644ea078a9ccb3fbc44777c0f963aec..bf726f2e53e84593fd39390c8f0fe26016a43d47 100644 (file)
   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
index 8309eda9a8a1039099d2582c2df3696cc0583f94..e47e14c9c8e27f2aa61671cb18f55574040443c0 100644 (file)
         Base: cat
       Dead:
         Base: cat_dead
+  - type: Speech
+    speechSounds: Cat
+    speechVerb: SmallMob
   - type: Butcherable
     spawned:
     - id: FoodMeat
       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
index d9a6c182a9ea544ec754f7cfefda16f62459f0b9..c7fac6f03a72bf462dc5a0d9b29109e0837ba5e7 100644 (file)
@@ -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",
           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 (file)
index 0000000..c1d4a2c
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 (file)
index 0000000..64ac5a0
Binary files /dev/null and b/Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png differ