From 45f92de889961ad02bf5d6f9574aed40e6626acb Mon Sep 17 00:00:00 2001 From: LandsharkRAWR Date: Mon, 12 May 2025 07:12:26 -0300 Subject: [PATCH 1/7] Ports Impstation #2426 growable and throwable red/black/bloodred roses and the rose box uplink. --- .../Locale/en-US/_Impstation/seeds/seeds.ftl | 5 + .../_Impstation/store/uplink-catalog.ftl | 2 + .../Catalog/Fills/Crates/botany.yml | 2 + .../Catalog/Fills/Boxes/syndicate.yml | 17 ++ .../_Impstation/Catalog/uplink_catalog.yml | 13 ++ .../Objects/Specific/Hydroponics/seeds.yml | 21 +++ .../Objects/Weapons/Throwable/roses.yml | 152 ++++++++++++++++++ .../_Impstation/Hydroponics/seeds.yml | 49 ++++++ .../Hydroponics/blackRose.rsi/dead.png | Bin 0 -> 365 bytes .../blackRose.rsi/equipped-HELMET.png | Bin 0 -> 228 bytes .../blackRose.rsi/equipped-MASK.png | Bin 0 -> 235 bytes .../Hydroponics/blackRose.rsi/harvest.png | Bin 0 -> 364 bytes .../Hydroponics/blackRose.rsi/icon.png | Bin 0 -> 285 bytes .../Hydroponics/blackRose.rsi/inhand-left.png | Bin 0 -> 268 bytes .../blackRose.rsi/inhand-right.png | Bin 0 -> 263 bytes .../Hydroponics/blackRose.rsi/meta.json | 57 +++++++ .../Hydroponics/blackRose.rsi/seed.png | Bin 0 -> 240 bytes .../Hydroponics/blackRose.rsi/stage-1.png | Bin 0 -> 174 bytes .../Hydroponics/blackRose.rsi/stage-2.png | Bin 0 -> 236 bytes .../Hydroponics/blackRose.rsi/stage-3.png | Bin 0 -> 282 bytes .../Hydroponics/blackRose.rsi/stage-4.png | Bin 0 -> 408 bytes .../Hydroponics/blackRose.rsi/stage-5.png | Bin 0 -> 542 bytes .../Hydroponics/blackRose.rsi/stage-6.png | Bin 0 -> 341 bytes .../Specific/Hydroponics/rose.rsi/dead.png | Bin 0 -> 365 bytes .../Hydroponics/rose.rsi/equipped-HELMET.png | Bin 0 -> 292 bytes .../Hydroponics/rose.rsi/equipped-MASK.png | Bin 0 -> 326 bytes .../Specific/Hydroponics/rose.rsi/harvest.png | Bin 0 -> 981 bytes .../Specific/Hydroponics/rose.rsi/icon.png | Bin 0 -> 623 bytes .../Hydroponics/rose.rsi/inhand-left.png | Bin 0 -> 356 bytes .../Hydroponics/rose.rsi/inhand-right.png | Bin 0 -> 357 bytes .../Specific/Hydroponics/rose.rsi/meta.json | 57 +++++++ .../Specific/Hydroponics/rose.rsi/seed.png | Bin 0 -> 357 bytes .../Specific/Hydroponics/rose.rsi/stage-1.png | Bin 0 -> 174 bytes .../Specific/Hydroponics/rose.rsi/stage-2.png | Bin 0 -> 236 bytes .../Specific/Hydroponics/rose.rsi/stage-3.png | Bin 0 -> 282 bytes .../Specific/Hydroponics/rose.rsi/stage-4.png | Bin 0 -> 408 bytes .../Specific/Hydroponics/rose.rsi/stage-5.png | Bin 0 -> 542 bytes .../Specific/Hydroponics/rose.rsi/stage-6.png | Bin 0 -> 784 bytes .../Objects/Storage/boxes.rsi/meta.json | 14 ++ .../Storage/boxes.rsi/syndicaterosebox.png | Bin 0 -> 812 bytes 40 files changed, 389 insertions(+) create mode 100644 Resources/Locale/en-US/_Impstation/seeds/seeds.ftl create mode 100644 Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl create mode 100644 Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml create mode 100644 Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Specific/Hydroponics/seeds.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml create mode 100644 Resources/Prototypes/_Impstation/Hydroponics/seeds.yml create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/dead.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/harvest.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/seed.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-1.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-2.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-3.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-4.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-5.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-6.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/dead.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/harvest.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/seed.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-1.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-2.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-3.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-4.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-5.png create mode 100644 Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-6.png create mode 100644 Resources/Textures/_Impstation/Objects/Storage/boxes.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Objects/Storage/boxes.rsi/syndicaterosebox.png diff --git a/Resources/Locale/en-US/_Impstation/seeds/seeds.ftl b/Resources/Locale/en-US/_Impstation/seeds/seeds.ftl new file mode 100644 index 00000000000..50909443a89 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/seeds/seeds.ftl @@ -0,0 +1,5 @@ +seeds-rose-display-name = rose bush +seeds-rose-name = rose seeds + +seeds-blackrose-display-name = black rose bush +seeds-blackrose-name = black rose seeds diff --git a/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl new file mode 100644 index 00000000000..2b8037ed60e --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl @@ -0,0 +1,2 @@ +uplink-bloodredrosekit-name = Blood Red Rose Kit +uplink-bloodredrosekit-desc = A set of roses for the romantic killer to get close to their dear victims. diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 99702bc018e..5c326b9d8f5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -22,6 +22,8 @@ amount: 2 - id: BungoSeeds amount: 2 + - id: RoseSeeds #imp + amount: 2 #imp - type: entity parent: CrateHydroSecure diff --git a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml new file mode 100644 index 00000000000..4ef4854cfe9 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml @@ -0,0 +1,17 @@ +- type: entity + parent: [BoxCardboard, Tier3Contraband] + id: BloodRedRoseBox + name: blood red roses box + description: A set of 4 Blood Red Roses, perfect to create a stunning display of violence. + components: + - type: Storage + grid: + - 0,0,3,1 + - type: StorageFill + contents: + - id: RoseSyndicate + amount: 4 + - type: Sprite + sprite: /Textures/_Impstation/Objects/Storage/boxes.rsi + layers: + - state: syndicaterosebox diff --git a/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml new file mode 100644 index 00000000000..fd115b3abf8 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Catalog/uplink_catalog.yml @@ -0,0 +1,13 @@ +- type: listing + id: UplinkBloodRedRoseBox + name: uplink-bloodredrosekit-name + description: uplink-bloodredrosekit-desc + icon: { sprite: /Textures/_Impstation/Objects/Storage/boxes.rsi, state: syndicaterosebox } # imp + productEntity: BloodRedRoseBox + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 4 + cost: + Telecrystal: 7 + categories: + - UplinkWeaponry diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Hydroponics/seeds.yml new file mode 100644 index 00000000000..efd1ca09c54 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -0,0 +1,21 @@ +- type: entity + parent: SeedBase + name: packet of rose seeds + description: "Seeds of a most romantic variety." + id: RoseSeeds + components: + - type: Seed + seedId: rose + - type: Sprite + sprite: _Impstation/Objects/Specific/Hydroponics/rose.rsi + +- type: entity + parent: SeedBase + name: packet of black rose seeds + description: "Seeds of a most diabolical variety." + id: BlackRoseSeeds + components: + - type: Seed + seedId: blackRose + - type: Sprite + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml new file mode 100644 index 00000000000..7db79e7d879 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml @@ -0,0 +1,152 @@ +- type: entity + parent: BaseItem + id: Rose + name: Rose + description: Smells like love. + components: + - type: EmbeddableProjectile + minimumSpeed: 3 + removalTime: 0.5 + offset: 0.0,0.0 + - type: ThrowingAngle + angle: 315 + - type: LandAtCursor + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + vertices: + - -0.20,0.10 + - -0.10,0.20 + - 0.20,-0.10 + - 0.10,-0.20 + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: Sprite + sprite: _Impstation/Objects/Specific/Hydroponics/rose.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -45 + damage: + types: + Piercing: 2 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/pierce.ogg + - type: DamageOtherOnHit + damage: + types: + Piercing: 4 + - type: Item + sprite: _Impstation/Objects/Specific/Hydroponics/rose.rsi + size: Small + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + - type: MeleeChemicalInjector + solution: food + - type: InjectableSolution + solution: food + - type: SolutionInjectOnEmbed + transferAmount: 2 + solution: food + - type: SolutionTransfer + maxTransferAmount: 2 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 #excess damage avoids cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: BalloonPopper + - type: Clothing + sprite: _Impstation/Objects/Specific/Hydroponics/rose.rsi + slots: + - HEAD + - MASK + - type: Produce + seedId: rose + - type: Extractable + grindableSolutionName: food + - type: FlavorProfile + flavors: + - food + - type: Food + - type: Tag + tags: + - Flower + +- type: entity + parent: [Rose, BaseMajorContraband] + id: RoseBlack + name: Black Rose + description: Smells like darkness. + components: + - type: Clothing + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + - type: Sprite + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + - type: Item + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + - type: Produce + seedId: blackRose + - type: DamageOtherOnHit + damage: + types: + Piercing: 5 + - type: SolutionContainerManager + solutions: + food: + maxVol: 3 + reagents: + - ReagentId: SulfuricAcid + Quantity: 1 + - ReagentId: Razorium + Quantity: 1 + +- type: entity + parent: [Rose, Tier3Contraband] + id: RoseSyndicate + name: Blood Red Rose + description: They say the Gorlex Marauders got their start as a deeply unhealthy polycule. # starcup - Syndies aren't communists, unfortunately. + components: + - type: SolutionInjectOnEmbed + transferAmount: 5 + solution: food + - type: DamageOtherOnHit + damage: + types: + Piercing: 5 + Slash: 3 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Tazinide + Quantity: 2 + - ReagentId: PolytrinicAcid + Quantity: 3 diff --git a/Resources/Prototypes/_Impstation/Hydroponics/seeds.yml b/Resources/Prototypes/_Impstation/Hydroponics/seeds.yml new file mode 100644 index 00000000000..c390d87b52d --- /dev/null +++ b/Resources/Prototypes/_Impstation/Hydroponics/seeds.yml @@ -0,0 +1,49 @@ +- type: seed + id: rose + name: seeds-rose-name + noun: seeds-noun-seeds + displayName: seeds-rose-display-name + plantRsi: _Impstation/Objects/Specific/Hydroponics/rose.rsi + packetPrototype: RoseSeeds + productPrototypes: + - Rose + mutationPrototypes: + - blackRose + harvestRepeat: Repeat + lifespan: 55 + maturation: 8 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + chemicals: + Razorium: + Min: 1 + Max: 3 + PotencyDivisor: 12 + +- type: seed + id: blackRose + name: seeds-blackrose-name + noun: seeds-noun-seeds + displayName: seeds-blackrose-display-name + plantRsi: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + packetPrototype: BlackRoseSeeds + productPrototypes: + - RoseBlack + harvestRepeat: Repeat + lifespan: 55 + maturation: 8 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + chemicals: + Razorium: + Min: 1 + Max: 5 + PotencyDivisor: 8 + SulfuricAcid: + Min: 1 + Max: 8 + PotencyDivisor: 10 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/dead.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..01efc5ba7fea2b2a5e9fc091256e44122c7abfd9 GIT binary patch literal 365 zcmV-z0h0cSP)Px$CrLy>R9J=WRLcp2KoDKiLTU)4fRMXbgGd^XusK^r&WhN81Zxm;77Gw0C0N7e zG%}8}{$j`>`%cQv?0auMD};f8fx!j{15f3NR6iH7CeK=$kS9_(e#GW+Re;zq@YM0J z7j@H$+x@YawzT7F&0UHilem_5xx3@6(0Ba7P#E-_prp^ zh$^Pe;F}KL*fxy56*xdw0dB3Z&^(a?;n;wdd@2|V!fr63jvQBR^^;ALu=}xA;By)e znDq|m)(BQF3_OM30a#tSw(!3SxWw2k=ZYKPb*zktuM!v-82lyP=`SQd>R8el00000 LNkvXXu0mjfT{E5y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/equipped-HELMET.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..f4f57ba4a5619e5196a8710004c0f2ca1e3d7144 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s08?gxB_Wm zWl?D>Y0VT>vpQt~K6w>sYjd^05S!dkN0X_g;d^Igc`?Qt1J&`A1o;Is{6_%JBLQka z@i0#p$B>BDx7RlEG8l3=Uo<)R#{T17Cbwyml#bTxa!ue`|5fhfbgj$_TYXc*)p=Ll zo%80e{fWN^bJ-Xe+_>^TTuAH?j6CuoeNS!0i4~<1LOFjJ86NcUb6GJw-L(9JGSCJF MPgg&ebxsLQ0N3bH`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/equipped-MASK.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..838d0f504afad0a5e5a55ff6c121df8c78d77606 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s08?gxB_Wm zWl?D>Y0VT>vpQt~K6w>sYjd^05S!dkN0X_g;d^Igc`?Qt1J&`A1o;Is{6_%JBLQka z@mNn6$B>BDx7Rju9WdZ<4ZP^~_rHFgqO;i2yw)QBV|!T4=X2Dl+Aa$`|Ebwy_q@f+ z&RW}^d}VdX|5<87S=j77>vCF<={liajch@ZbwBe#K!vksaw^57? U4e<|e11)0kboFyt=akR{0Gz;ALjV8( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/harvest.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..48bfcebce36c98e40c5019ec7be921c7aa3d7125 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!FN( zvZ%C`v}TH`S)H-~pS+5+wYgegh)r&&qsi3L@V&FLycpw+f$Dflg8YIR{v!bAkpMNI z_&rY-#}JF&w}H`<4jb@XioWyz2=_fTU;C=2*mSi%9=DDef4_#tpWA4WP%E(MQ;gT6 z%>iGlKP3pP)Ny8>J+E+z+*^YK1@S_Hhn}CEAT>)pO-^OkT&dq%wua}{FFp__9&RAtj9&aSzA+QsuW^Q46v-FB^>%y!(f zL3~w&&YWXxaVOsge4ORHuO;Wy`<8;Xg&yl<4p)Z0E18$8oCZS#p=hPIY=BwJpGfX(?kn!)->z zGggP5yeyJ-ddKDZfm=DO{P&p(@4CdADEDLk;;!BH6Tdm{qny8NZU66{`qko5rk44ofy`glX(f`s08?gxB_Wm zWl?D>Y0VT>vpQt~K6w>sYjd^05S!dkN0X_g;d^Igc`?Qt1J&`A1o;Is{6_%JBLQka z@j6cz$B>BDx6?NA9Z=wK3GMmuKR%`{Dx}O9n#f?m_k3ylye-F=VSeni}L5!f@a@ljVHI6}P!xc7gPHy85}Sb4q9e00^96 AVE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/inhand-right.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..89572bf6479bb333e8f89475155ac915b7271cb5 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s08?gxB_Wm zWl?D>Y0VT>vpQt~K6w>sYjd^05S!dkN0X_g;d^Igc`?Qt1J&`A1o;Is{6_%JBLQka z@k&n@$B>BDx6=-C9Z=wLzUuMy|Ne?Y3;bp#l-*3IT;64JELf;X;F0r`Un#4_=C3(_ zW_4I?j@SX|7w5&C)4m($Y?vFto@t}x64v-{vw#!FM=|q6f71@{54%+^Dj2Zr&lciM w;``aHcHJ*^xh^{K}#3@I%K}d^V7K^=HFl ZrcF0lwiL#mmIvC#;OXk;vd$@?2>`L0S*rj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-1.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6d8813878b8bb33c41b40f0e66a34a43b26de5c6 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8J;eVArY;~ z2@R)Ajn&#-7w1h*Wpm|A0D=oXfq&0y zf9-!5ayiybVm3$#kTvPdk`rG~@GW%9n83PZ?UMhO?_Po!w?K`7A(vgE*g@(10-&7? Mp00i_>zopr0Bwpsi2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-2.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..41749b766b7b7ce8a66ec7955a0a96572068b0c3 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%RF5iLn2y} z6C_v{Cy4Yk1sZU<9n@IBbipU^Z+_VFKl5ew`b>$^$W{G2Km3*a;pgcol1C4C^gZ1Z z^j~7$yPpRSEI)d*p!Qtuq_YY)84bMsP4Bt}>H}5B-)d#n z^`95mIm e%0k@a$jRWdz}bXnVVWe+#SEUVelF{r5}E*))Lfka literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-3.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..ae7411aaad981c5e405c2751ac10ab74ca404114 GIT binary patch literal 282 zcmV+#0pPx#)Ja4^R9J=Wk}(c~KoCVg8w+Ei2XIP4fd`3nlJT+!~@#94#+@*b13UtEfL@;YPL;=cQ^)_4bkaMq!CIPXt;@wJKA g^VkJc6h-+79Px$Qb|NXR9J=Wld)~XFc3vQg%m;nWdL6(uwVvIp<1JG4i%omqo{V_0qjChNey5D zhALkQ;~2sgBg05i@in6ENdA9E5=bNxiA3TBs!~IVbCR#xlBY4lY1gl6Mcv1YNp7jaXOHG7S5if> zxdQmE+*r-U<_g!%aC`T#7uCc|@sPJ?#ifN*6NiSTG4tYK{IDI=?MQAWVn>nvBuq6u zh*Oh8V$+!6e7rmub=~a$smcANUAhO024u0@J0)!g0BUj^wu3tDdR4V07n>_SKHq&_ z1l-;!*Ui2Y@?FweG$10e?#LWzx3QX~YAFB!rZGd+mK+n08VGUS>{}=s0=Ek&?LQwc zzUr`hFF(C|s3!lMjMZ$cW{HL4*!*8Hkw_#Gf5jKeUgPx$*hxe|R9J=WRlSOXKp32rBZv^W<}Q#e#lk#*MY@B$#kD?%MV=$=y+zB*j6fg{doU|Tube)9H{-T{a@*)cz$`*RA-9kZqQ1}6+-{} g)(^Hq)$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-6.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/blackRose.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..ddfbc3674a8806046ba3b757b9c1dd29cc759ead GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|R04cLT!FN( zvZ%C`v}TH`S)H-~pS+5+wYgegh)r&&qsi3L@V&FLycpw+f$Dflg8YIR{v!bAkpMNI z_;F7c#}JF&w-W>Nju>#boNd^$?|Fx~H3G=?soHBdav`se(9&%4I_7Hy%D6M3Ztgz+jgPX0{ z+VPh0vu948>n|R0VdbskxrYq9?1}}_n(ePHYrOK>w&l!&TZ^mG4Y_Oo38=Le*L}77 cf4=nI)0NCwi_Y}N1HHuH>FVdQ&MBb@0MZYPvH$=8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/dead.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..01efc5ba7fea2b2a5e9fc091256e44122c7abfd9 GIT binary patch literal 365 zcmV-z0h0cSP)Px$CrLy>R9J=WRLcp2KoDKiLTU)4fRMXbgGd^XusK^r&WhN81Zxm;77Gw0C0N7e zG%}8}{$j`>`%cQv?0auMD};f8fx!j{15f3NR6iH7CeK=$kS9_(e#GW+Re;zq@YM0J z7j@H$+x@YawzT7F&0UHilem_5xx3@6(0Ba7P#E-_prp^ zh$^Pe;F}KL*fxy56*xdw0dB3Z&^(a?;n;wdd@2|V!fr63jvQBR^^;ALu=}xA;By)e znDq|m)(BQF3_OM30a#tSw(!3SxWw2k=ZYKPb*zktuM!v-82lyP=`SQd>R8el00000 LNkvXXu0mjfT{E5y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/equipped-HELMET.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..83d1cdfc01091cca499df0936d48340cfc423da1 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|?s>X6hE&XX zd&{tk$x)#7;dNuj!%7wb%`>#m7%uZqO4t|vLFnFr$uBs2c+c>-$P_F}UHpxWdv}>R z_rLp$uMRG@dNrwGdhRXHJ6k44Xl38^o17Y|*{1W>S^Vm&wI`#T@_qNL2s4=ZW>d^FFvIPFFFKaZ-tdoU4??`>9Qpz2Ci-di^iI_SU4x d0B+a^ZhwtsW-sSdFWCb!+|$+1Wt~$(695>%b%_7~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/equipped-MASK.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..dbcc52058600a4c9256e752f2dfe4309806b2f30 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89ZGaLn`LH zy=9np$U(s2BIlAQOUBIbX&h7B#4MS3!%s*GJTI8o9PmSBWf6;(mq#nN!lo%oK3d+6 zT^n4l9cubND>uw|^Q@O?t_%zZG&5yhT`4swY>eAA%_#W#MH4>l>y`0eA35w(-Q?z` zZ(Cbob>iP*)uTJ3pM3g}ld}Cp>fe3)tk-`j`db+9f7JhR!1Ty>_Jxm_beBCSH~eS( z*Z<<*Tk54I(q`{I0^JP->zp4oEq=O2f9mzesY2ozDZM(IW8%!`Z(VcZ`Rujdcj(49 zDrG;>{XOY~RJ>yUnkBlzx33<{Tc*Bkb!l(r!p?f3e^+kkF+$8bu=Y2j&0Vj9U+SK7 PgG4-C{an^LB{Ts5hDwI} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/harvest.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..72a3112446020e507ae3c8359f7f5595eb4b886b GIT binary patch literal 981 zcmV;`11kK9P)Px&k4Z#9R9J=Wl|4)&R}_W6XFCRYF<2UVP_Vl(Yk{b@Kw1IPN|b>jO0iOkK(*N> zB@G1)`gF`9tEycFg=jrmDZq+8$SY2M#C z@7#Otz%Yg}j4vf#Y+CZM`N;oq`Ch@4o9QvRS1>h581N}@fY?(DGwahbIdw~?8R2B- zRD{=FY+6#y?-fj0a|7x`!423enDXcEl60DbZ@d5fuLMqZPK6>7204C{rqhg&oVwL} z%QD7VIu1b14d^r{aEcx?>(kP&1iXFUq2>nU3#R=3PiNpUkJ3_-o$Q>7x9>ZY+$-`% zf<XybImt3B88J&#lQ32dn*G)CBdIia1Q$f{JR`J*jc+g7QotL^wrnmSQ-TU|b_n2b)w zQQ+I|H5&(Qma7*yMNfn0jRZM*?6$gW9JJ{)BiQ@C2KOt0-XBhLov2nk0{y0=NYo0? zaEcz;SEE?3$62ekDY;hw(P>85IA{;l(l)R$ z8K+il>pSX1AKFkwxVq=OYZkIJqGlwD6eNkFOK6g^z~T!d}-*N+CBW(23`albef>2KOya`ZG|bxw6p)#8t~ zZ1HF-cI|WFR|4$0V;bC9&1hv+%Afi< zJsO6Uk>N2rpVgybWu*F6Aldn>RO5d~8OAV%@ukM!1UWircz!P%00000NkvXXu0mjf Du9(#= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/icon.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..232a6403867008299b3e87a1c08f73c13df4dce5 GIT binary patch literal 623 zcmV-#0+9WQP)Px%DM>^@R9J=Wmc4G;U=)U*4`?EG7iABjPMw+UbqA8)y12v?BhHYl# zMFrSqM%toq{D4#Mo~oI`@dNUPPFoatL+8lcS&N7#EjTOgisJ`V%@pUpP&HEkbkN98 z`Q;b^P`0g!kbXD8)yZ|N_ROq62Mxy$s2FJg96z8fVO&f7dwAKlq~A@foE$)VZ1|v( zUn@qM%fXl*!I+!DkPFeUlrS9J^Tl`rz~x}fMK6K*ISldZo3qkjK50SS>!} zCt@P|qIhfngApZt?wxoM0dYjcZozXX)e16wtd_N5!-fs7%3s!5{KuIjmvI09002ov JPDHLkV1k0%D3|~M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/inhand-left.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..50f447d3a345b096e473b618d8e519435a709937 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zH6p`xCW>$0fhtjmgZPK!Gzh4vj#tl<;4?D9XLJHf*Fg$|dCR)E!vkZBza zDZiS*LqW9^Nm@rXLFxEo4+dL{yg`h>i-Ln`LH zy=CZks6gcS$N6s)oL+s=mt7N`>7k#XG}--wfUP@w-yzODt(@rx))pEVW#0Jm-eHyp zX9U;UKaal~msTu%zjxE$c`QJa85+6_Hf%0T`M;|_cy_OHbj!hOF>!lWOwrHW+cB@| zb&RREX8hOw-5VQ@7A>tVUI`>8N_tG%WK&uvsBC;=#@prHRfU3V+or5v-tG~8J${z| z{OwsWMbRqX{vN%2_wnkyFDqZ(cK=-Y$TKJQKl_o%J7WJ|eV`_3wV&nsZ+4LNAaLO3 z&8Y{sU%WoI>3g-O@o%Fa&R;8+7kpt_^`J1Gt$u~wdlA1$f90nheE;CgT&HQvx0SNp zzi{)OW=dt2uhEvP#o_NKTr1~_{bL6-s^R}j>HLDylY5lfd_YEfy85}Sb4q9e0Nv7} Aga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/meta.json new file mode 100644 index 00000000000..804dbbfbc8e --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by LandsharkRAWR for Impstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "icon" + }, + { + "name": "seed" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/seed.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/seed.png new file mode 100644 index 0000000000000000000000000000000000000000..cf36cf2de10397117fff8fc9fd613434ea924de0 GIT binary patch literal 357 zcmV-r0h<1aP)Px$A4x<(R9J=WmBC8GKoEw%HH(EJC~Q3lx!Ko{^cDIHK1DAcy!cv%9(;-9mXo+( zK^BCR^-xl4jCH0Wde{%b!ZOVK`_JqK5{X3Ok1^7~!kxv!w3N}ZZw0u0dJ*S6(x{!f zF@_pbn3CnVTIiVqd2d?05{ z<-_j?*!1Q~fWH6tANZon9rN6CsI{7EdG+iGRTxt;Tld$lx4o00000NkvXXu0mjf D#z>R)Ajn&#-7w1h*Wpm|A0D=oXfq&0y zf9-!5ayiybVm3$#kTvPdk`rG~@GW%9n83PZ?UMhO?_Po!w?K`7A(vgE*g@(10-&7? Mp00i_>zopr0Bwpsi2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-2.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..41749b766b7b7ce8a66ec7955a0a96572068b0c3 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%RF5iLn2y} z6C_v{Cy4Yk1sZU<9n@IBbipU^Z+_VFKl5ew`b>$^$W{G2Km3*a;pgcol1C4C^gZ1Z z^j~7$yPpRSEI)d*p!Qtuq_YY)84bMsP4Bt}>H}5B-)d#n z^`95mIm e%0k@a$jRWdz}bXnVVWe+#SEUVelF{r5}E*))Lfka literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-3.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..ae7411aaad981c5e405c2751ac10ab74ca404114 GIT binary patch literal 282 zcmV+#0pPx#)Ja4^R9J=Wk}(c~KoCVg8w+Ei2XIP4fd`3nlJT+!~@#94#+@*b13UtEfL@;YPL;=cQ^)_4bkaMq!CIPXt;@wJKA g^VkJc6h-+79Px$Qb|NXR9J=Wld)~XFc3vQg%m;nWdL6(uwVvIp<1JG4i%omqo{V_0qjChNey5D zhALkQ;~2sgBg05i@in6ENdA9E5=bNxiA3TBs!~IVbCR#xlBY4lY1gl6Mcv1YNp7jaXOHG7S5if> zxdQmE+*r-U<_g!%aC`T#7uCc|@sPJ?#ifN*6NiSTG4tYK{IDI=?MQAWVn>nvBuq6u zh*Oh8V$+!6e7rmub=~a$smcANUAhO024u0@J0)!g0BUj^wu3tDdR4V07n>_SKHq&_ z1l-;!*Ui2Y@?FweG$10e?#LWzx3QX~YAFB!rZGd+mK+n08VGUS>{}=s0=Ek&?LQwc zzUr`hFF(C|s3!lMjMZ$cW{HL4*!*8Hkw_#Gf5jKeUgPx$*hxe|R9J=WRlSOXKp32rBZv^W<}Q#e#lk#*MY@B$#kD?%MV=$=y+zB*j6fg{doU|Tube)9H{-T{a@*)cz$`*RA-9kZqQ1}6+-{} g)(^Hq)$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-6.png b/Resources/Textures/_Impstation/Objects/Specific/Hydroponics/rose.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..e9aff204eb000262fcb4df39c439213a7f85c621 GIT binary patch literal 784 zcmV+r1MmEaP)Px%%1J~)R9J=WR55DfKoor=f*1_a28=Dxl)?o204@w$1au3xuJ#7oxNws)7jPBu z9kvL#Sa9J3$c3$P3~~^7#~_3jJSnn&cI4Pgs%_%e2+c_I-hco70j{{>iqC@nIMV0V zo&Q02i5viKE^Ty29qolj9JUTt(=|Ii++HVw4A4htV7a&Kx@MuT@Kn#QifK6VY zKaR9Y3bgNUp^^fAuK_PS8gZw1r|Q&RpxzFZ6p#za0H7JQG!I;qS%vofEzY&f?!PVi zq5%5ov_ikvfJzDgFoaYgiRz9zdN<#reSZr8P)Pw1a{z$dHv8;a3#iY_Ny=>Hey@Sm zbj{>KGQZaV4_vIKYewW{R>3A;P1lUXr889v;HeAm(rv$|Gi9um&n3#N0$I)j7k;k+ zBDLKpvkH0o!kSS_(;l_$6tyuVn<&M3`oaKc^@ohy5HUA-uwC-PBfOA9J_Aj>kpqB; zIYb;8XYHIAZ~Eg%Q@T}BfCsJ#8C6P8A}_NFk2lQp`>=J8&QvWU^gU$>0KWhHWrRDx zTgquc41_MT3L@r+hCa%yf)^g~c*Bg{yZIhvRv{Ytpz#EN-F%N|=o|8f{5N>uLL~*# znKFTV`1++TU^QK{PAKwBTwvNdKxg%nZP5yTZ zc;K3UcJuxD5E8nhjwXwF;F?1KKt7kI=e8pNYGDLm@ldMJa7$pnN_vktE7NR-fl>_kW4P5xm_;`$kP|5lERD<%`^4V3y)?TZBn_A zj6%x;*JOo?p{&sr|6w$vmbRb9%7M_$sHN$hNW?&BdVZYciYu=8tat?i0tHC5Bdsd{ O0000EX>4Tx04R}tkv&MmKpe$iQ$>-AgGE#vGE^t)P(>U|6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Kg)$ED_s%9Cf zcudUZR>huI_%VVZL@*^WQ%|H9Gw>W=_we!cF3hvM&;2?2mAuISpGX{Kx?vG-5YKK} zI_G`jAS+1<@j3CNK^G)`TEu3I+g z76@cladXV>TIisIi?m3|R75O-DCpn^aLAS~;2?g2K(?X;%os?ZlpFU~;c%GNrW0l85*L8$pSgJ9l6t3$Qa?7P$e?UzD zt{DJ6_Vm{R7=|Ha&NGC6<26)O6#x(f0YXCMdy5JF%PlFN}#HVsi* z073{%)6DMguP)GOt>Jm^V1acUhu4-r0079c3`J4!aCC@Hi(nj1(Z0LJ>+vXKq9`h3 zDSi%&!zo^{B3fQ8!1nni+H@T|l;Ctr1^}Ero(KgfwFUD^m%R_*=4pujrX}Q4%Tc_) zVPSAP5US-~0mc~OI7S@D-#+i|cH#Se#?~HyQVQF)K?=?R##pKE23LS2NwVwVWRlDF qBx#|ha)9~2p|k-n->6ZeBE18T{bxT{qI;460000 Date: Mon, 4 May 2026 21:33:19 -0700 Subject: [PATCH 2/7] fixed some caps --- .../Entities/Objects/Weapons/Throwable/roses.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml index 7db79e7d879..2f80d576c96 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml @@ -1,7 +1,7 @@ - type: entity parent: BaseItem id: Rose - name: Rose + name: rose # starcup - lowercase description: Smells like love. components: - type: EmbeddableProjectile @@ -102,7 +102,7 @@ - type: entity parent: [Rose, BaseMajorContraband] id: RoseBlack - name: Black Rose + name: black rose # starcup - lowercase description: Smells like darkness. components: - type: Clothing @@ -130,7 +130,7 @@ - type: entity parent: [Rose, Tier3Contraband] id: RoseSyndicate - name: Blood Red Rose + name: bloodred rose # starcup - lowercase description: They say the Gorlex Marauders got their start as a deeply unhealthy polycule. # starcup - Syndies aren't communists, unfortunately. components: - type: SolutionInjectOnEmbed From 21898133c6fa4512406ae6d46ccc58334cb22aad Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Mon, 4 May 2026 21:50:28 -0700 Subject: [PATCH 3/7] fixed broken contraband parent --- .../Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml | 2 +- .../_Impstation/Entities/Objects/Weapons/Throwable/roses.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml index 4ef4854cfe9..b10129c2020 100644 --- a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml @@ -1,5 +1,5 @@ - type: entity - parent: [BoxCardboard, Tier3Contraband] + parent: [BoxCardboard, BaseMajorContraband] # starcup - Tier3Contraband -> BaseMajorContraband id: BloodRedRoseBox name: blood red roses box description: A set of 4 Blood Red Roses, perfect to create a stunning display of violence. diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml index 2f80d576c96..7cd89bfabab 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml @@ -128,7 +128,7 @@ Quantity: 1 - type: entity - parent: [Rose, Tier3Contraband] + parent: [ Rose, BaseMajorContraband ] # starcup - Tier3Contraband -> BaseMajorContraband id: RoseSyndicate name: bloodred rose # starcup - lowercase description: They say the Gorlex Marauders got their start as a deeply unhealthy polycule. # starcup - Syndies aren't communists, unfortunately. From 86b11e28dcfd196de191e7bdaf2cd3ed972dbd45 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Mon, 4 May 2026 22:01:48 -0700 Subject: [PATCH 4/7] gave roses flavor and fixed a component --- Resources/Locale/en-US/_starcup/flavors/flavor-profiles.ftl | 1 + .../_Impstation/Entities/Objects/Weapons/Throwable/roses.yml | 5 ++++- Resources/Prototypes/_starcup/Flavors/flavors.yml | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_starcup/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_starcup/flavors/flavor-profiles.ftl index dfa0786776c..eabe9b3f9c6 100644 --- a/Resources/Locale/en-US/_starcup/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_starcup/flavors/flavor-profiles.ftl @@ -138,3 +138,4 @@ flavor-complex-zombie-cocktail-starcup = like you just took a bite out of someon # Other flavor-complex-bug = the foundations for a good buguette +flavor-complex-floral = sweet and floral diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml index 7cd89bfabab..6e266d0ee0c 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml @@ -94,7 +94,10 @@ - type: FlavorProfile flavors: - food - - type: Food + - type: Edible # starcup - FoodComponent -> EdibleComponent + - type: FlavorProfile # starcup + flavors: + - floral - type: Tag tags: - Flower diff --git a/Resources/Prototypes/_starcup/Flavors/flavors.yml b/Resources/Prototypes/_starcup/Flavors/flavors.yml index e77a7320001..3a41d547377 100644 --- a/Resources/Prototypes/_starcup/Flavors/flavors.yml +++ b/Resources/Prototypes/_starcup/Flavors/flavors.yml @@ -671,3 +671,8 @@ id: bug flavorType: Complex description: flavor-complex-bug + +- type: flavor + id: floral + flavorType: Complex + description: flavor-complex-floral From 610c8d77c83b00b153f06908828291db36049c2b Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Mon, 4 May 2026 22:08:33 -0700 Subject: [PATCH 5/7] fixed flavor profile (my hubris!) --- .../_Impstation/Entities/Objects/Weapons/Throwable/roses.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml index 6e266d0ee0c..a8f41a94fea 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Throwable/roses.yml @@ -91,9 +91,6 @@ seedId: rose - type: Extractable grindableSolutionName: food - - type: FlavorProfile - flavors: - - food - type: Edible # starcup - FoodComponent -> EdibleComponent - type: FlavorProfile # starcup flavors: From 358032427e3524fc0e27730cd4aa863c7a3640dc Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 21:04:13 -0700 Subject: [PATCH 6/7] fixed capitalization --- Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl b/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl index 2b8037ed60e..391114b473c 100644 --- a/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Impstation/store/uplink-catalog.ftl @@ -1,2 +1,2 @@ -uplink-bloodredrosekit-name = Blood Red Rose Kit +uplink-bloodredrosekit-name = blood red rose Kit uplink-bloodredrosekit-desc = A set of roses for the romantic killer to get close to their dear victims. From b56f226adaf5c70f443b745152bd672483db3a03 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 21:05:03 -0700 Subject: [PATCH 7/7] fixed capitalizations --- .../Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml index b10129c2020..1857007c120 100644 --- a/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/syndicate.yml @@ -2,7 +2,7 @@ parent: [BoxCardboard, BaseMajorContraband] # starcup - Tier3Contraband -> BaseMajorContraband id: BloodRedRoseBox name: blood red roses box - description: A set of 4 Blood Red Roses, perfect to create a stunning display of violence. + description: A set of 4 blood red roses, perfect to create a stunning display of violence. components: - type: Storage grid: