From d22fe3f92141a1068d632ea0a139becf1bc6cf6f Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 7 Jan 2024 04:52:41 +0300 Subject: [PATCH] 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 --- .../ghost/roles/ghost-role-component.ftl | 4 +++ .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Prototypes/Catalog/uplink_catalog.yml | 16 +++++++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 33 ++++++++++++++++++ .../Textures/Mobs/Pets/cat.rsi/meta.json | 28 ++++++++++++++- .../Textures/Mobs/Pets/cat.rsi/syndicat.png | Bin 0 -> 1657 bytes .../Mobs/Pets/cat.rsi/syndicat_dead.png | Bin 0 -> 506 bytes 7 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/syndicat.png create mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png 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 0000000000000000000000000000000000000000..c1d4a2caf6dedb09727f5df7568b6aa42a83c6bf GIT binary patch literal 1657 zcmV-<28Q{GP)KvP>_xNm*3f9zaSb3AMOqlMo+YgV#s^%}W$>7pEY@+5km7yvH3 z)t9XOactU}dC!a1Xi9K`@Kg6}IsV(PP0eKiVr2RJG1a#JeIZqfW^P=>zDV&M&;1L*MtD< zz5ToJxz!355a4&VOkPWefC*5X?R57tvG^r310cZpg$v}v>t_Uuu|cS#OE<{6+jmR? zSd<^?-qvC&gOx&?L8Li!f)6|h>s0s#7A{jxEYG5}kE0t{ZcCnGE7 z3;(9ijgF{HA-)F#@S7~)zSm5I_0cM0003}SzIe_l&pikbhS#ij)U476XclAvV6i^t zGHn4^;N^L9odaa^oe&)1KldksEf8vb-H%LwAL4p^A8L8_HvvHOZ!UkujsIx;vK;vN zl6jDptk=04|-+K_jBBu4)B348UFm1`?rM!CIHBQhu?l9I0b_4 z41L%ZI2F!$cUz?lpc7^Y1|!k_ymeC$imguA1ORCRA)xH|mVSW%ut3l0Q3r|z{TTWa zfWh6HM25eUp|`g>84kbmP)3gYQau3L0!z-GNp-mK`i3YASV7S1V=NA0Gy=~i79*G$ zz%YnI59!B!2m#Qli~{-`06#Ev;&Cbm{7_J)p-vVgZgH;2dPlNafLtE9m zD0RS=Qy>PJ8K6&sWC45tt#5Tg)-3=40Qj4ekJ6!tN{|81u_Y{_&B)@J<|81JH?9X{Ssz1KNppC$3d9pcAdqPMK;3 zv=i-4T&re4Ct9VQGSv*I3hh>=%3C>?ukSPlF!zp*G5L0kL$Lx9C5KO*Xf#ts!?Am| z4q|^%W0+e$h7ia-Nr_h){^*`5h zeE{$NtN<{1s`K};*W@}A4F#-;SABn&SHja$0J3TakTt&0-)FKMx6#_sF_(eX&2sD9 z5&&5LQ?}Q5RmOfgg^p)_QB%=;EO%T;ZLd-uuWLqoJMvzY!Hem;|rS zF&wX%^`F|r0+}$Tj0HgeU=mE`vMx$_2f{#??D*=gOOC+GxSB>I5ZDSak$@3E&x3iP zJlKJR%<-Ksx!j;H6H|3?e9-`4F(e+eMUfB0qEMKBnGfVXhhPND;y?13p%p+M0Ij!1 znM^PMbBI}yAeRBY@>CFuGbCjRO^Y*g97_8<0I(hKj+v;e@;JPwOn%7@-{n=angAdO zIOt>v;%AIoRX*#pK(kK!1{O{EV3GyF44_lnwREcdL^mLu2SBT>&vipsfVJ}g`11Nh zZUoBp%2{5W0%1ZQ9KF}9De92Oz_fUlZ^E-InMnVliuS^=1nMEq8CJ$x@7c@Lq?*JeHLL06L=; z6+!EhW0l3ytV5u3d6o_Bhj~g*W>AhHvFHdI+An0k=k?*2X4!wx2<>ME00Z(s&;S(m ziv@t6#zi3wbBFe$9Hk6E$It?V(0(x>_(c(UbA=-b#Gv+n z8Z+Y=@D!+bT77hP%31&b01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf DvFQQ| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..64ac5a00d0ca430216dfd631705d60ae97844714 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFfR9WaSVxYPfn3YIAC$$n{kg- zf(eV8bHbCB17Vi?{@?4jORSior&w^;>F} z)naYgPE9;f@9#Cgyn4L