Merge remote-tracking branch 'upstream/master'

Resources/Changelog/ChangelogWhite.yml

@@ -5264,3 +5264,140 @@
   id: 339
   time: '2024-06-30T07:04:16.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/400
+- author: Warete
+  changes:
+  - message: "\u0423\u043F\u0440\u043E\u0449\u0435\u043D \u043A\u0440\u0430\u0444\u0442\
+      \ \u043F\u0430\u0440\u044B \u0440\u0435\u0446\u0435\u043F\u0442\u043E\u0432"
+    type: Fix
+  id: 340
+  time: '2024-07-01T04:33:47.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/401
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u043F\u043E\
+      \u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u043E \u043F\u0440\u0438\u0431\u044B\
+      \u0442\u0438\u0438 \u0433\u043B\u0430\u0432 \u043E\u0442\u0434\u0435\u043B\u043E\
+      \u0432 \u0432 \u043A\u0430\u043D\u0430\u043B\u044B \u043E\u0442\u0434\u0435\u043B\
+      \u0430 \u0438 \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u043E\u0435 \u043E\
+      \u043F\u043E\u0432\u0435\u0449\u0435\u043D\u0438\u0435"
+    type: Add
+  id: 341
+  time: '2024-07-01T10:10:32.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/402
+- author: Aviu
+  changes:
+  - message: "\u0423 \u0441\u0432\u0435\u0442\u043E\u0432\u043E\u0433\u043E \u043A\
+      \u043E\u043F\u044C\u044F \u0446\u0435\u043D\u0430 \u0441\u043D\u043E\u0432\u0430\
+      \ 10, \u0443\u0440\u043E\u043D \u043E\u0442 \u0431\u0440\u043E\u0441\u043A\u0430\
+      \ \u0441\u043D\u043E\u0432\u0430 60, \u043D\u043E \u043A\u0434 \u0442\u0435\u043F\
+      \u0435\u0440\u044C 2.5 \u0441\u0435\u043A\u0443\u043D\u0434."
+    type: Add
+  id: 342
+  time: '2024-07-01T11:36:15.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/405
+- author: ThereDrD
+  changes:
+  - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u043B\u0438\u0448\u043D\u0435\u0435\
+      \ \u043E\u043F\u043E\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u0441\u0442\u0430\
+      \u043D\u0446\u0438\u0438 \u043E \u043F\u0440\u0438\u0431\u044B\u0442\u0438\u0438\
+      \ \u0433\u043B\u0430\u0432\u044B"
+    type: Fix
+  id: 343
+  time: '2024-07-01T13:02:51.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/407
+- author: Aviu
+  changes:
+  - message: "\u041E\u0442\u043A\u0430\u0442 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\
+      \u0438\u0439, \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0441\
+      \ \u043E\u0433\u043D\u0435\u043C, \u043D\u043E \u043E\u0433\u043E\u043D\u044C\
+      \ \u0432\u0441\u0435 \u0435\u0449\u0435 \u043C\u0435\u043D\u0435\u0435 \u043E\
+      \u043F\u0430\u0441\u0435\u043D."
+    type: Fix
+  id: 344
+  time: '2024-07-01T13:27:22.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/408
+- author: ThereDrD
+  changes:
+  - message: "\u041E\u043F\u043E\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u043E\
+      \ \u0433\u043B\u0430\u0432\u0435 \u043E\u0442\u0434\u0435\u043B\u0430 \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u043E\u043F\u043E\u0432\u0435\u0449\u0430\u0435\
+      \u0442\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u043E\u0434\u0438\
+      \u043D \u043A\u0430\u043D\u0430\u043B"
+    type: Tweak
+  id: 345
+  time: '2024-07-01T13:46:56.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/409
+- author: ThereDrD
+  changes:
+  - message: "\u041C\u0435\u0442\u0435\u043E\u0440\u043E\u0432 \u0434\u043E\u043B\u0436\
+      \u043D\u043E \u0441\u0442\u0430\u0442\u044C \u043D\u0435\u043C\u043D\u043E\u0433\
+      \u043E \u043C\u0435\u043D\u044C\u0448\u0435"
+    type: Add
+  id: 346
+  time: '2024-07-02T09:55:38.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/410
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0413\u041D\u041E\
+      \u041C\u042B. \u041E\u043D\u0438 \u043C\u043E\u0433\u0443\u0442 \u043F\u043E\
+      \u043C\u043E\u0433\u0430\u0442\u044C \u0432 \u0441\u0430\u0434\u0443, \u0441\
+      \u043C\u0435\u0448\u043D\u043E \u0433\u043E\u0432\u043E\u0440\u0438\u0442\u044C\
+      , \u0441\u043C\u0435\u0448\u043D\u043E \u043A\u0440\u0438\u0447\u0430\u0442\u044C\
+      , \u0441\u0438\u0434\u0435\u0442\u044C \u043D\u0430 \u0433\u043E\u043B\u043E\
+      \u0432\u0435, \u0432\u043E\u0440\u043E\u0432\u0430\u0442\u044C, \u0438\u0441\
+      \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u043A\
+      \u0430\u043A \u043E\u0442\u0432\u0435\u0440\u0442\u043A\u0430 \u0438 \u0440\u0430\
+      \u0437\u0431\u0438\u0432\u0430\u0442\u044C\u0441\u044F \u043E\u0431 \u0441\u0442\
+      \u0435\u043D\u043A\u0443. \u0418\u0445 \u043C\u043E\u0436\u043D\u043E \u0432\
+      \u044B\u0440\u0430\u0441\u0442\u0438\u0442\u044C, \u0438\u0441\u043F\u043E\u043B\
+      \u044C\u0437\u0443\u044F \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\
+      \u044B\u0435 \u0441\u0435\u043C\u0435\u043D\u0430. \u041D\u0435\u0441\u043A\u043E\
+      \u043B\u044C\u043A\u043E \u0441\u0435\u043C\u044F\u043D \u043C\u043E\u0436\u043D\
+      \u043E \u043D\u0430\u0439\u0442\u0438 \u0432 \u0432\u0435\u043D\u0434\u043E\u043C\
+      \u0430\u0442\u0435 \u0431\u043E\u0442\u0430\u043D\u0438\u043A\u0430"
+    type: Add
+  id: 347
+  time: '2024-07-02T09:55:25.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/411
+- author: ThereDrD
+  changes:
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u043A\u043E\u043B\
+      \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0435\u043C\u044F\u043D \u0433\
+      \u043D\u043E\u043C\u043E\u0432 \u0432 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\
+      \u0435 \u0431\u043E\u0442\u0430\u043D\u0438\u043A\u0430 \u0434\u043E 1"
+    type: Tweak
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0434\u043B\u044F \u043F\u043E\
+      \u043B\u0443\u0447\u0435\u043D\u0438\u044F \u0441\u0435\u043C\u044F\u043D \u0433\
+      \u043D\u043E\u043C\u043E\u0432 \u0430\u0432\u0442\u043E\u043C\u0430\u0442 \u0431\
+      \u043E\u0442\u0430\u043D\u0438\u043A\u043E\u0432 \u0442\u0440\u0435\u0431\u0443\
+      \u0435\u0442\u0441\u044F \u0432\u0437\u043B\u043E\u043C\u0430\u0442\u044C"
+    type: Tweak
+  - message: "\u0423\u0440\u043E\u043D \u0433\u043D\u043E\u043C\u043E\u0432 \u043E\
+      \u0442 \u0434\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u0443\u043C\u0435\u043D\
+      \u044C\u0448\u0435\u043D"
+    type: Tweak
+  - message: "\u0420\u0430\u043D\u0434\u043E\u043C \u0438\u0433\u0440\u043E\u043A\u043E\
+      \u0432 \u0434\u043B\u044F \u0433\u043E\u0441\u0442\u0440\u043E\u043B\u0438 \u0433\
+      \u043D\u043E\u043C\u0430"
+    type: Tweak
+  - message: "\u0421\u0435\u043C\u0435\u043D\u0430 \u0433\u043D\u043E\u043C\u043E\u0432\
+      \ \u0432 \u044F\u0449\u0438\u043A \u0441 \u044D\u043A\u0437\u043E\u0442\u0438\
+      \u0447\u0435\u0441\u043A\u0438\u043C\u0438 \u0440\u0430\u0441\u0442\u0435\u043D\
+      \u0438\u044F\u043C\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0437\u0430\
+      \u043A\u0430\u0437\u044B\u0432\u0430\u0435\u0442\u0441\u044F \u0432 \u043A\u0430\
+      \u0440\u0433\u043E"
+    type: Tweak
+  id: 348
+  time: '2024-07-02T15:12:29.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/412
+- author: Remuchi
+  changes:
+  - message: "\u0422\u0422\u0421 \u0441\u043E \u0432\u0441\u0435\u0439 \u0441\u0442\
+      \u0430\u043D\u0446\u0438\u0438 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\
+      \ \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C \u0441\u043B\
+      \u044B\u0448\u0435\u043D \u0432 \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u044B\
+      \u0445 \u043C\u0435\u0441\u0442\u0430\u0445 \u043A\u0430\u0440\u0442\u044B."
+    type: Fix
+  id: 349
+  time: '2024-07-02T15:56:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/413

Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

@@ -232,3 +232,7 @@ ghost-role-information-artifact-name = Sentient Artifact
 ghost-role-information-artifact-description =
       Enact your eldritch whims.
       Forcibly activate your nodes for good or for evil.
+
+
+ghost-role-information-gnome-name = Garden Gnome
+ghost-role-information-gnome-description = You are the trusted keeper of the station garden, keep your domain safe.

Resources/Locale/en-US/seeds/seeds.ftl

@@ -111,3 +111,5 @@ seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
 seeds-cotton-name = cotton
 seeds-cotton-display-name = cotton plant
+seeds-gome-name = gnome
+seeds-gnome-display-name = gnome plant

Resources/Locale/ru-RU/_white/announce/announce.ftl

@@ -0,0 +1,3 @@
+head-arrived-message = { $character }, { $job }, Глава отдела
+head-arrived-message-global = { $job } { $character } на станции
+head-arrived-sender = Автоматическая Система Оповещений

Resources/Locale/ru-RU/_white/mobs/gnomes.ftl

@@ -0,0 +1,6 @@
+ent-MobGnome = гном
+    .desc = Добросовестный помощник по саду
+ent-GnomeSeeds = пакет семян гнома
+    .desc = { ent-SeedBase.desc }
+ent-ClothingHeadHatGnome = шляпа гнома
+    .desc = Шляпа настоящего садового помощника

Resources/Prototypes/Body/Prototypes/bot.yml

@@ -1,4 +1,4 @@
-- type: body
+- type: body
   id: Bot
   name: "bot"
   root: hand 1

Resources/Prototypes/Body/Prototypes/gnome.yml

@@ -0,0 +1,19 @@
+- type: body
+  id: gnome
+  name: "gnome"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - hands
+      - legs
+      organs:
+    hands:
+      part: HandsAnimal
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal

Resources/Prototypes/Catalog/Fills/Crates/botany.yml

@@ -20,6 +20,8 @@
         amount: 2
       - id: BungoSeeds
         amount: 2
+      - id: GnomeSeeds
+        amount: 1
 
 - type: entity
   id: CrateHydroponicsSeedsMedicinal

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -125,7 +125,19 @@
         - id: Soap
           prob: 0.10
         - id: PlushieCarp
-          prob: 0.1
+          prob: 0.2
+          orGroup: carp
+        - id: ClothingHeadHatGnome
+          prob: 0.2
+        - id: PlushieHolocarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieMagicarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieRainbowCarp
+          prob: 0.03
+          orGroup: carp
         - id: PlushieSlime
           prob: 0.1
         - id: PlushieSnake

Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

@@ -37,5 +37,7 @@
     BerrySeeds: 5
     PeaSeeds: 5
     CottonSeeds: 5
+  contrabandInventory:
+    GnomeSeeds: 1
   emaggedInventory:
     FlyAmanitaSeeds: 1

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -1108,3 +1108,19 @@
     sprite: Clothing/Head/Hats/beret_medic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/beret_medic.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGnome
+  name: gnome hat
+  description: The cap of a true garden helper
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/hat_gnome.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/hat_gnome.rsi
+  - type: Seed
+    seedId: gnome
+  - type: AddAccentClothing
+    accent: GnomeAccent
+

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -819,3 +819,182 @@
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
     stealGroup: AnimalTropico
+
+
+- type: entity #WHY MUST YOU THROW ERRORS HOW DARE YOU
+  name: Gnome #this thing is covered in comments, its for my sanity, ignore them please.
+  parent: [BaseSimpleMob, MobCombat, MobAtmosExposed]
+  id: MobGnome
+  description: "A garden's trusty helper"
+  components:
+  - type: Inventory
+    templateId: gnome
+    speciesId: gnome
+  - type: InventorySlots
+  - type: RotationVisuals
+    defaultRotation: 90
+    horizontalRotation: 90
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle #displays error, works anyways so i wont touch it, whatever it does
+          radius: 0.2
+        density: 80
+        mask:
+        - SmallMobMask #lets em go under doors for escapes from sec/greytide/hunting mice
+        layer:
+        - SmallMobLayer
+  - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+  - type: GhostRole
+    prob: 1
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: ghost-role-information-gnome-name
+    description: ghost-role-information-gnome-description
+    raffle:
+      settings: short
+  - type: GhostTakeoverAvailable
+  - type: Flashable
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - VimPilot
+  - type: MobThresholds
+    thresholds: #VERY easy to kill, if it was harder to kill them the sneaky fuckers would rule the world
+      0: Alive
+      10: Dead
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: Gnome-0
+      Dead:
+        Base: dead-1
+  - type: GnomeAccent
+  - type: NameIdentifier
+    group: Gnome
+  - type: Sprite
+    drawdepth: SmallMobs
+    sprite: Mobs/Animals/gnome.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: Gnome-0
+  - type: Item
+    size: Small
+  - type: Clothing #TO VALLHALLA
+    quickEquip: false
+    sprite: Mobs/Animals/gnome.rsi
+    equippedPrefix: 1
+    slots:
+    - HEAD
+  - type: IdExaminable
+  - type: InteractionPopup
+    interactSuccessString: hugging-success-generic
+    interactSuccessSound: /Audio/Effects/thudswoosh.ogg
+    messagePerceivedByOthers: hugging-success-generic-others
+  - type: MeleeWeapon
+    soundHit:
+      collection: ToySqueak
+    angle: 30
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Piercing: 3
+  - type: Puller #dont need hands because they are at a disadvantage anyway, this way they can hold a light and drag a box for a backpack
+    needsHands: false
+  - type: CanHostGuardian #touch this stuff to make the fuckers hold still when not possesed (NOT THE GAURDIAN)
+  - type: FactionException
+  - type: NpcFactionMember
+    factions:
+      - Passive
+  - type: Hands #gives em hands, the item sprites for holding things look all strange but its FINE, I DONT WANNA FIX IT ITS FINE ILL DO IT LATER
+  - type: Body #gives em a body, is needed for organs and hands
+    prototype: gnome
+    requiredLegs: 0
+  - type: Clumsy #no guns for youuuu if they shoot a gun they die >:3
+    clumsyDamage:
+      types:
+        Blunt: 2
+        Piercing: 7
+      groups:
+        Burn: 2
+    clumsySound:
+      path: /Audio/Voice/Gnome/Gnome_Clumsy_Sound_Effect.ogg
+  - type: Barotrauma #gnomes instantly explode in space, gnomes shouldnt go in space
+    damage:
+      types:
+        Blunt: 20 #per second, scales with pressure and other constants.
+  - type: Repairable
+    fuelCost: 5
+    qualityNeeded: Gluing
+    doAfterDelay: 8
+  - type: ZombieImmune
+  - type: Damageable
+    damageContainer: StructuralInorganic
+  - type: CanEscapeInventory
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger #gnomes gib once they are in enough bits that they cant be glued back together
+        damageType: Blunt
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ClothingHeadHatGnome:
+           min: 1
+           max: 1
+          ShardGlass:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: DamageOnHighSpeedImpact #gnomes break when thrown, another anti gnometide device
+    minimumSpeed: 10
+    damage:
+      types:
+        Blunt: 20
+    soundHit:
+      collection: GlassBreak
+  - type: Vocal
+    sounds:
+      Male: Gnome
+      Female: Gnome
+      Unsexed: Gnome
+    wilhelmProbability: 0.0001
+  - type: Unrevivable
+  - type: Tool
+    qualities:
+    - Screwing
+    useSound:
+      collection: Screwdriver
+  - type: FelinidFood
+  - type: Speech
+    speechSounds: GnomesSpeech
+    speechVerb: SmallMob
+  - type: Extractable
+    grindableSolutionName: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UnstableMutagen
+          Quantity: 5
+  - type: BadFood
+  - type: DeathGasps
+    deathSounds:
+      collection: GnomesDeathCollection
+    canOtherHearDeathSound: True
+  - type: Thieving
+    stripTimeReduction: 4
+  - type: Pacified
+

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml

@@ -19,6 +19,8 @@
         map: [ "enum.SolutionContainerLayers.Overlay" ]
   - type: Appearance
   - type: Glue
+  - type: RefillableSolution
+    solution: drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -26,6 +28,11 @@
         reagents:
         - ReagentId: SpaceGlue
           Quantity: 30
+      Welder:
+        reagents:
+        - ReagentId: SpaceGlue
+          Quantity: 30
+        maxVol: 30
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     fillBaseName: fill
@@ -38,8 +45,15 @@
   - type: Tag
     tags:
       - DrinkSpaceGlue
+      - GlueTool
   - type: TrashOnSolutionEmpty
     solution: drink
+  - type: Tool
+    qualities: Gluing
+  - type: Welder #this here uses welding code to take fuel out of the bottle (fuel being glue)
+    fuelSolutionName: drink
+    fuelReagent: SpaceGlue
+    hiddenInfo: true
 
 - type: entity
   parent: DrinkBase

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -1514,6 +1514,8 @@
   - type: Tag
     tags:
       - DrinkSpaceGlue
+  - type: Tool
+    qualities: Gluing
 
 - type: entity
   parent: BaseItem

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -571,3 +571,13 @@
       seedId: cotton
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/cotton.rsi
+
+- type: entity #you should never see this, this is for testing, if someone has these then I FUCKED UP and you should ping BITTERLYNX
+  parent: SeedBase
+  name: packet of Gnome seeds
+  id: GnomeSeeds
+  components:
+    - type: Seed
+      seedId: gnome
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cotton.rsi

Resources/Prototypes/Hydroponics/seeds.yml

@@ -1501,3 +1501,22 @@
       Max: 10
       PotencyDivisor: 20
 
+- type: seed #once again, replacing learning with comments because ive been in this file for 10 hours
+  id: gnome
+  name: seeds-gome-name #the name of the seeds
+  noun: seeds-noun-seeds 
+  displayName: seeds-gnome-display-name #name of the plant when looking at the tray
+  plantRsi: Objects/Specific/Hydroponics/gnome.rsi
+  packetPrototype: GnomeSeeds #seeds you get when clipping? BUT YOU CANT CLIP THIS PLANT TAKE THAT BOTANISTS! 
+  productPrototypes:
+    - MobGnome #THE THING THAT SPAWNS!
+  lifespan: 25
+  maturation: 10
+  production: 1
+  yield: 1
+  potency: 1
+  idealLight: 8
+  growthStages: 2
+  waterConsumption: 0
+  seedless: true #fuckin does nothing but im keeping it just in case someone wants botany to riot 
+  unclippable: true

Resources/Prototypes/InventoryTemplates/gome_inventory_template.yml

@@ -0,0 +1,13 @@
+- type: inventoryTemplate
+  id: gnome
+  #slots: i was on the fence to give them an id slot so ill comment this out for now
+ # - name: id
+  #  slotTexture: id
+  #  slotFlags: IDCARD
+   # slotGroup: SecondHotbar
+   # stripTime: 6
+  #  uiWindowPos: 2,1
+   # strippingWindowPos: 2,4
+   # dependsOn: jumpsuit
+  #  displayName: ID  
+ 

Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml

@@ -32,12 +32,5 @@
               icon:
                 sprite: Objects/Misc/stock_parts.rsi
                 state: capacitor
-              doAfter: 5
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-              doAfter: 5
     - node: medsecHud
       entity: ClothingEyesHudMedSec

Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml

@@ -65,10 +65,5 @@
               icon:
                 sprite: Objects/Misc/stock_parts.rsi
                 state: capacitor
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
     - node: potatoaichip
-      entity: PotatoAIChip
+      entity: PotatoAIChip

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -15,6 +15,7 @@
   weight: 10
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
+  announcementPrototype: QuartermasterArrivalNotification
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -20,6 +20,7 @@
   icon: "JobIconCaptain"
   requireAdminNotify: true
   joinNotifyCrew: true
+  announcementPrototype: CaptainArrivalNotification
   supervisors: job-supervisors-centcom
   whitelistedSpecies:
     - Human

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -19,6 +19,7 @@
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
   requireAdminNotify: true
+  announcementPrototype: HeadOfPersonnelArrivalNotification
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -16,6 +16,7 @@
   startingGear: ChiefEngineerGear
   icon: "JobIconChiefEngineer"
   requireAdminNotify: true
+  announcementPrototype: ChiefEngineerArrivalNotification
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human

Resources/Prototypes/Roles/Jobs/Justice/inspector.yml

@@ -14,6 +14,7 @@
       time: 36000 #10 hrs
   startingGear: InspectorGear
   icon: "JobIconInspector"
+  announcementPrototype: InspectorArrivalNotification
   supervisors: job-supervisors-captain
   access:
     - Service

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -14,6 +14,7 @@
   weight: 10
   startingGear: CMOGear
   icon: "JobIconChiefMedicalOfficer"
+  announcementPrototype: ChiefMedicalOfficerArrivalNotification
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   whitelistedSpecies:

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -13,6 +13,7 @@
   startingGear: ResearchDirectorGear
   icon: "JobIconResearchDirector"
   requireAdminNotify: true
+  announcementPrototype: ResearchDirectorArrivalNotification
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -16,6 +16,7 @@
   startingGear: HoSGear
   icon: "JobIconHeadOfSecurity"
   requireAdminNotify: true
+  announcementPrototype: HeadOfSecurityArrivalNotification
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -620,3 +620,13 @@
     path: /Audio/Animals/parrot_raught.ogg
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Gnome
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Gnome/Gnome_Woo_Sound_Effect.ogg
+    Weh:
+      collection: Weh

Resources/Prototypes/_White/Actions/types.yml

@@ -20,7 +20,7 @@
   noSpawn: true
   components:
   - type: InstantAction
-    useDelay: 1.5
+    useDelay: 2.5
     itemIconStyle: BigAction
     priority: -20
     icon:

Resources/Prototypes/_White/Announcement/ArrivalNotification.yml

@@ -0,0 +1,49 @@
+- type: arrivalNotification
+  id: CaptainArrivalNotification
+  message: head-arrived-message
+  globalMessage: head-arrived-message-global
+  radioChannelsPrototypes:
+  - Command
+  useGlobalAnnouncement: True
+
+- type: arrivalNotification
+  id: HeadOfPersonnelArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Service
+
+- type: arrivalNotification
+  id: HeadOfSecurityArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Security
+
+- type: arrivalNotification
+  id: ChiefMedicalOfficerArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Medical
+
+- type: arrivalNotification
+  id: ChiefEngineerArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Engineering
+
+- type: arrivalNotification
+  id: ResearchDirectorArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Science
+
+- type: arrivalNotification
+  id: QuartermasterArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Cargo
+
+- type: arrivalNotification
+  id: InspectorArrivalNotification
+  message: head-arrived-message
+  radioChannelsPrototypes:
+  - Security

Resources/Prototypes/_White/Catalog/uplink.yml

@@ -93,7 +93,7 @@
   icon: { sprite: /Textures/White/Objects/Weapons/hardlight_spear.rsi, state: spear }
   productEntity: HardlightSpearImplanter
   cost:
-    Telecrystal: 12
+    Telecrystal: 10
   categories:
   - UplinkImplants
   conditions:

Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml

@@ -18,8 +18,8 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 20
-        Heat: 20
+        Piercing: 30
+        Heat: 30
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:

Resources/Prototypes/_White/Ghosts/custom_ghosts.yml

@@ -61,8 +61,8 @@
   ckey: reider207
   sprite: White/Ghosts/reider207-ghost.rsi
   alpha: 0.8
-  ghostName: Соня
-  ghostDescription: Видишь спит соня? Так не буди
+  ghostName: Tighnari
+  ghostDescription: But what are they going to do, lock me up?
   size: 0.8, 0.8
 
 #mikvisan

Resources/Prototypes/_White/Sound/Speech/gnomes.yml

@@ -0,0 +1,8 @@
+- type: speechSounds
+  id: GnomesSpeech
+  saySound:
+    collection: GnomesSpeechCollection
+  askSound:
+    collection: GnomesSpeechCollection
+  exclaimSound:
+    collection: GnomesSpeechCollection

Resources/Prototypes/_White/SoundCollections/gnomes.yml

@@ -0,0 +1,19 @@
+- type: soundCollection
+  id: GnomesSpeechCollection
+  files:
+  - /Audio/White/Voice/Gnomes/Gnome1V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome2V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome3V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome4V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome5V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome6V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome7V1.ogg
+  - /Audio/White/Voice/Gnomes/Gnome8V1.ogg
+
+- type: soundCollection
+  id: GnomesDeathCollection
+  files:
+  - /Audio/White/Voice/Gnomes/Death1.ogg
+  - /Audio/White/Voice/Gnomes/Death2.ogg
+  - /Audio/White/Voice/Gnomes/Death3.ogg
+  - /Audio/White/Voice/Gnomes/Death4.ogg

Resources/Prototypes/_White/Spawners/spawners.yml

@@ -0,0 +1,12 @@
+- type: entity
+  name: Gnome spawner
+  id: SpawnMobGnome
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+    - MobGnome

Resources/Prototypes/_White/Wizard/magic_items.yml

@@ -15,12 +15,15 @@
   - type: Clothing
     sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
     slots:
-    - back
-    - suitStorage
+    - none
   - type: Reflect
     reflectProb: 0.4
   - type: Item
     sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
+    size: Large
+    storedRotation: 44
+    shape:
+    - 0, 0, 3, 0
 
 - type: entity
   name: клинок заклинаний

Resources/Prototypes/game_presets.yml

@@ -8,6 +8,7 @@
   rules:
     - RampingStationEventScheduler
     - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
 
 - type: gamePreset
   id: AllAtOnce
@@ -24,6 +25,7 @@
     - Cult
     - Wizard
     - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
 
 - type: gamePreset
   id: Extended
@@ -175,6 +177,7 @@
     - Pirates
     - BasicStationEventScheduler
     - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
 
 #WD EDIT START
 - type: gamePreset
@@ -190,6 +193,7 @@
     - SubGamemodesRule
     - BasicStationEventScheduler
     - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
 
 - type: gamePreset
   id: Changeling
@@ -204,6 +208,7 @@
     - SubGamemodesRule
     - BasicStationEventScheduler
     - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
 
 - type: gamePreset
   id: Wizard
@@ -219,4 +224,5 @@
     - SubGamemodesRule
     - BasicStationEventScheduler
     - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
 #WD EDIT END

Resources/Prototypes/name_identifier_groups.yml

@@ -1,8 +1,12 @@
-# Non-fungible apes, anyone?
+# Non-fungible apes, anyone?
 - type: nameIdentifierGroup
   id: Monkey
   prefix: MK
 
+- type: nameIdentifierGroup
+  id: Gnome
+  prefix: GN
+
 - type: nameIdentifierGroup
   id: Kobold
   prefix: KB

Resources/Prototypes/tags.yml

@@ -644,6 +644,9 @@
 - type: Tag
   id: Grenade
 
+- type: Tag # tag to make a glue tool use glue on repair
+  id: GlueTool
+
 - type: Tag
   id: HudMedical
 
@@ -1325,5 +1328,3 @@
 
 - type: Tag
   id: WriteIgnoreStamps
-
-# ALPHABETICAL

Resources/Prototypes/tool_qualities.yml

@@ -74,3 +74,10 @@
   toolName: tool-quality-rolling-tool-name
   spawn: RollingPin
   icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }
+
+- type: tool
+  id: Gluing
+  name: tool-quality-gluing-name
+  toolName: tool-quality-rolling-tool-name
+  spawn: DrinkSpaceGlue
+  icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }

Resources/Textures/Clothing/Head/Hats/hat_gnome.rsi/meta.json

@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by DanoftheE (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+
+    {
+        "name": "equipped-HELMET",
+        "directions": 4
+    },
+
+    {
+        "name": "icon"
+     
+    }
+  ]
+}

Resources/Textures/Mobs/Animals/gnome.rsi/meta.json

@@ -0,0 +1,63 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by DanoftheE (Discord)",
+    "states": [
+        {
+            "name": "dead-1",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "Gnome-0",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "Gnome-1",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "0-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "1-equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Objects/Specific/Hydroponics/gnome.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by DanoftheE (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "dead"
+        },
+        {
+            "name": "harvest"
+        },
+        {
+            "name": "stage-1"
+        },
+        {
+            "name": "stage-2"
+        }
+    ]
+}

Resources/Textures/White/Ghosts/reider207-ghost.rsi/meta.json

@@ -3,8 +3,8 @@
   "license": "CC-BY-SA-3.0",
   "copyright": "reider207",
   "size": {
-    "x": 64,
-    "y": 64
+    "x": 128,
+    "y": 128
   },
   "states": [
     {