From 0a05ee9a27ecce39c0c4923ac9a9b41c1d18d50b Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 18 Aug 2024 23:04:59 -0400 Subject: [PATCH] add space carp and sharkminnow teeth (#31070) --- Resources/Locale/en-US/cargo/bounties.ftl | 4 + .../Prototypes/Catalog/Bounties/bounties.yml | 22 +++++ .../Prototypes/Entities/Mobs/NPCs/carp.yml | 6 ++ .../Entities/Objects/Materials/materials.yml | 77 ++++++++++++++++++ .../Prototypes/Stacks/Materials/materials.yml | 14 ++++ Resources/Prototypes/tags.yml | 6 ++ .../Materials/Mob/carptooth.rsi/meta.json | 20 +++++ .../Materials/Mob/carptooth.rsi/tooth.png | Bin 0 -> 234 bytes .../Materials/Mob/carptooth.rsi/tooth_2.png | Bin 0 -> 306 bytes .../Materials/Mob/carptooth.rsi/tooth_3.png | Bin 0 -> 394 bytes .../Mob/sharktooth.rsi/inhand-left.png | Bin 0 -> 649 bytes .../Mob/sharktooth.rsi/inhand-right.png | Bin 0 -> 650 bytes .../Materials/Mob/sharktooth.rsi/meta.json | 28 +++++++ .../Materials/Mob/sharktooth.rsi/tooth.png | Bin 0 -> 419 bytes .../Materials/Mob/sharktooth.rsi/tooth_2.png | Bin 0 -> 562 bytes .../Materials/Mob/sharktooth.rsi/tooth_3.png | Bin 0 -> 661 bytes 16 files changed, 177 insertions(+) create mode 100644 Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth.png create mode 100644 Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_2.png create mode 100644 Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_3.png create mode 100644 Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth.png create mode 100644 Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_2.png create mode 100644 Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_3.png diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index c19de391f7..3a68bc07c5 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -66,6 +66,8 @@ bounty-item-wine = Wine bottle bounty-item-cotton-boll = Cotton boll bounty-item-microwave-machine-board = Microwave machine board bounty-item-flash = Flash +bounty-item-tooth-space-carp = Space Carp Tooth +bounty-item-tooth-sharkminnow = Sharkminnow Tooth bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. @@ -134,3 +136,5 @@ bounty-description-wine = The new librarian and the Quartermaster are falling he bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed. bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers. bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal]. +bounty-description-tooth-space-carp = Some lads from "down unda" need some teeth to make their traditional apparel. Send them a few from some space carp. +bounty-description-tooth-sharkminnow = The chef is claiming that the teeth of sharkminnows are some kind of high-quality knife. I don't know what they're on about, but they want a set. Send it to them. diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 71d0d0b665..50d3eb2387 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -743,3 +743,25 @@ whitelist: components: - Flash + +- type: cargoBounty + id: BountyTeethSpaceCarp + reward: 800 + description: bounty-description-tooth-space-carp + entries: + - name: bounty-item-tooth-space-carp + amount: 8 + whitelist: + tags: + - ToothSpaceCarp + +- type: cargoBounty + id: BountyTeethSharkminnow + reward: 1500 + description: bounty-description-tooth-sharkminnow + entries: + - name: bounty-item-tooth-sharkminnow + amount: 5 + whitelist: + tags: + - ToothSharkminnow diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index e345ec477b..4d9f408d9d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -54,6 +54,9 @@ spawned: - id: FoodMeatFish amount: 2 + - id: MaterialToothSpaceCarp1 + amount: 1 + maxAmount: 4 - type: MeleeWeapon altDisarm: false angle: 0 @@ -234,6 +237,9 @@ spawned: - id: FoodMeatFish amount: 4 + - id: MaterialToothSharkminnow1 + amount: 1 + maxAmount: 3 - type: MeleeWeapon damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 867b83f9ff..31777c2a84 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -599,6 +599,83 @@ - type: Stack count: 1 +- type: entity + parent: MaterialBase + id: MaterialToothSpaceCarp + name: space carp tooth + description: Pretty small but plenty nasty. You like them best when they're not sinking into you. + suffix: Full + components: + - type: Sprite + sprite: Objects/Materials/Mob/carptooth.rsi + layers: + - state: tooth + map: [ "base" ] + - type: Item + sprite: Objects/Materials/Mob/carptooth.rsi + size: Normal + - type: Appearance + - type: Stack + stackType: SpaceCarpTooth + count: 30 + baseLayer: base + layerStates: + - tooth + - tooth_2 + - tooth_3 + - type: StackPrice + price: 50 + - type: Tag + tags: + - ToothSpaceCarp + +- type: entity + parent: MaterialToothSpaceCarp + id: MaterialToothSpaceCarp1 + suffix: 1 + components: + - type: Stack + count: 1 + +- type: entity + parent: [ MaterialBase, BaseKnife ] + id: MaterialToothSharkminnow + name: sharkminnow tooth + description: Looks sharp. Sharp enough to poke someone's eye out. Holy fuck it's big. + suffix: Full + components: + - type: Sprite + sprite: Objects/Materials/Mob/sharktooth.rsi + layers: + - state: tooth + map: [ "base" ] + - type: Item + sprite: Objects/Materials/Mob/sharktooth.rsi + size: Normal + - type: Appearance + - type: Stack + stackType: SharkMinnowTooth + count: 30 + baseLayer: base + layerStates: + - tooth + - tooth_2 + - tooth_3 + - type: StackPrice + price: 150 + - type: Tag + tags: + - Knife + - ToothSharkminnow + +- type: entity + parent: MaterialToothSharkminnow + id: MaterialToothSharkminnow1 + suffix: 1 + components: + - type: Stack + count: 1 + - type: entity parent: MaterialBase id: MaterialBones diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml index 049f538bcc..69d4749548 100644 --- a/Resources/Prototypes/Stacks/Materials/materials.yml +++ b/Resources/Prototypes/Stacks/Materials/materials.yml @@ -75,6 +75,20 @@ spawn: MaterialWebSilk1 maxCount: 50 +- type: stack + id: SpaceCarpTooth + name: space carp tooth + icon: { sprite: /Textures/Objects/Materials/Mob/carptooth.rsi, state: tooth} + spawn: MaterialToothSpaceCarp1 + maxCount: 30 + +- type: stack + id: SharkMinnowTooth + name: sharkminnow tooth + icon: { sprite: /Textures/Objects/Materials/Mob/sharktooth.rsi, state: tooth} + spawn: MaterialToothSharkminnow1 + maxCount: 30 + - type: stack id: Bones name: bones diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 1e3ae71958..9b11570a25 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1263,6 +1263,12 @@ - type: Tag id: Toolbox +- type: Tag + id: ToothSharkminnow + +- type: Tag + id: ToothSpaceCarp + - type: Tag id: Torch diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json new file mode 100644 index 0000000000..58ed20a9a6 --- /dev/null +++ b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tooth" + }, + { + "name": "tooth_2" + }, + { + "name": "tooth_3" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth.png b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth.png new file mode 100644 index 0000000000000000000000000000000000000000..e87d03cbae68d99f59ed82b01fffc2bc64cd7370 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFUg1Ln2z= zUNq!8WWd9Efj?=rk~X(apx%S2$p$4UFBmNuj=#92JK21~j5X&H7kcy44nTpzXr%V!ARy`H`eXTLo zQc!UzixQLZVxHP;5r)U&9Ui=jHRo4#&DpHEdS~O-nQ^>-wh1JgJf9&Qp%osQedNE( ilDzGAEuY`Px#>`6pHR9J=W)S(W-FcbyQJAzx9W(E?nOpzdJ_Zbs75OaJC9*;wSL+}}MO9jc) z93+V4rMeiJ3uO_t)$XE&I3puNXK!<%vmr4$~oXN}gV0GnTqkqh?;b_N}R3zt$NP1CoUonOKMk0bb} z=1+oL!hd+ZLBEA0NrHUBUJba)i6}(&Z`==uF~(RZPZUvHh%Hpz!2kdN07*qoM6N<$ Eg2bJA>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_3.png b/Resources/Textures/Objects/Materials/Mob/carptooth.rsi/tooth_3.png new file mode 100644 index 0000000000000000000000000000000000000000..836a44b8fb43af06d007eae7bc29d083eff5225d GIT binary patch literal 394 zcmV;50d@X~P)Px$L`g(JR9J=WlrK-iKp4iK5nS`;QUeKTsz?x*x_yj_IV$Gx1WSU)<8c$kA^I`u zniC{d6(pN$E;X1#-BQNV_1zU_?&o^{p68zT`T`!0=fupo8$RzJjb3j60J`fiFLL%7 zea<F}q`BnwgK=yI5+s*F+!*Q<9>5P&W(aP{(h@chXP z*hJd4Mc>HH+v}jlQEysW zsuPxJW^5O<)JmZQ%)H2FR-7Yj8C8OQ3yz}bN6eOE!~sSLTw)$#l1JzQ>jwQ4!Z4iV o7iJ}3Be$*iBIZcmMzZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-left.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4b76d5c85decd76746c50a0776262a3b8ea097f1 GIT binary patch literal 649 zcmV;40(Sk0P)EX>4Tx04R}tkv&MmKpe$iTcuJe4i*)0$WS|35EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$WplX(p zP9}tGZdC}rB7{KbWYY7*5n`d(!Ey()lA#h$5l0nOqkMnX zWrgz=XSGset$XqphV$CWGS_L2Ac;jRL4*JqHIz|-g*dGmDJIgipYZSxJARQ|GP%lN z5bWxZDATo^;8O94SE4Unl_YXY@@up#K&Kt+~Cm_Hp_EWT>mu4RCM> z#EO)??(y!P&ffk#)9UXBteSGZmRC~f0002MNkl{VfB0sP<7x0h$hfKiUT!7b>A1I~BIxp9o jgtKx1-n&@^Kt}!I!00000NkvXXu0mjf12Q1@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-right.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5c9f045194ad122159c753e8994edb0ae4b9e8 GIT binary patch literal 650 zcmV;50(Jd~P)EX>4Tx04R}tkv&MmKpe$iTcuJe4i*)0$WS|35EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$WplX(p zP9}tGZdC}rB7{KbWYY7*5n`d(!Ey()lA#h$5l0nOqkMnX zWrgz=XSGset$XqphV$CWGS_L2Ac;jRL4*JqHIz|-g*dGmDJIgipYZSxJARQ|GP%lN z5bWxZDATo^;8O94SE4Unl_YXY@@up#K&Kt+~Cm_Hp_EWT>mu4RCM> z#EO)??(y!P&ffk#)9UXBteSGZmRC~f0002NNkl>^lex5C!~}lgwPZfU(c7S zn+E^@0000000026zIQwLQhQ_-Mz_PCD%!!%P(@Z@>ny?6_b-}&zU^|1aoG-j!hKfZ kEA5pbAgcfX006A&270e{8cUeVZ2$lO07*qoM6N<$f|sTytpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json new file mode 100644 index 0000000000..5aab9fb09d --- /dev/null +++ b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "tooth" + }, + { + "name": "tooth_2" + }, + { + "name": "tooth_3" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth.png new file mode 100644 index 0000000000000000000000000000000000000000..695d772879748f0b97f2c1d9ad8a41e74bb91fec GIT binary patch literal 419 zcmV;U0bKrxP)Px$T}ebiR9J=Wm9a|0P!xv0O1E-3TMH5{F6s~*?2|YME^fX9+wczu82 zb2cN-a{xpHKc7>UWyeem(YPEri0n3@1ONyLzp0MMRVMN`BfApvXcKu@jcJc!8t4Q!(+WLXBlVzG#> zk@N*~&NbVS>o!Px$>`6pHR9J=WmAz^kK@^2Q1$EYNI~&3>q)AdNDdJMCUm!)mDgrM24l;TLy+aC@ z2ERgDsdGSK3neMSumtQz48wK~nG1(QVJlLSAv;61ap3Ro;QJ5 z3!t^`_%6VHg88iOgGwoWU0l%b_Ysk>CL+XfOdQAD4~P8t`Lz*1tu08?v;t$T#W{yk zDr}L6pc_ub#t!(g6A^m7URW2A00ERnw23x$pxAD$by)XRd(&;qp=JiWSrkP~r_)fi zmp`aHY^wlT>y9@})3me=MKFNLWYQR*RtUX$vBKqGI_DS+28~a|+G7aSeHRf#qyp1A zfYv%xHk-|Yad8Cq3IGq&FdB_IK*e~kQvl^IEC*9W!g1VGTmMFlF}bxibfyT{M2$lD zH~q5=EUQ@YHuK+#j4}CQvB)3C{f{0U;7PmcHwsAa6f%lwy8r+H07*qoM6N<$f-bN8 AApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_3.png b/Resources/Textures/Objects/Materials/Mob/sharktooth.rsi/tooth_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2ce73e5c139e297cd19968c54898139a683eccfd GIT binary patch literal 661 zcmV;G0&4wPx%Pf0{UR9J=Wl`(7EKp2J}7jN?M4Tc1Y5XH33AT%_i*ZhG}3iVK$q5r}D5B?7s z(k)QBdF*O$>0mUZ%}|UeB#Su?Zz=AO-sLP?vV>DIH18sO_v+sFyYKyEc*OsXM%m`) z!^36r;uUIt4|8=5z`@zc#&_y)D;cl{n#BSY1n#N!_W&?g*G`}gx3YnYcORE#vEcIk zYq!=M4te(U<%-C`*-4`gH?PwyGBEw|jhlX-IF11j5%lRPX_~GG)a6#b0f5w~L6lH4!0>W8ygGrr+o1ukQpw06-Xq0F1}u!gDLN zAj`5fGg@nmF({>6i$sLUU_iUwc3fi&y{Yg=!?_E1DlpsBG9o#P#3b+sQx_MGY&MW!Xv_d}DAM zwoa$xxFX^vqzGI8F5&irq_svwm`feoOM)dokcwmJen=Y}@+oqcSm%x?w9qtq^WP)v(>W vfx2P)Cz#D<%lUl1d>Hk=cyI%c*cE>OP