Merge branch 'space-wizards:master' into master

.github/workflows/labeler-approved.yml

@@ -0,0 +1,17 @@
+name: "Labels: Approved"
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  add_label:
+    if: github.event.review.state == 'APPROVED'
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: "PR: Approved"

Resources/Changelog/Changelog.yml

@@ -1,59 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: You can drop food or drinks from your hands to interrupt eating it, again.
-    type: Fix
-  - message: Barber scissors are now interrupted if the item is dropped or if the
-      user changes hands.
-    type: Tweak
-  id: 7061
-  time: '2024-08-08T11:39:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30361
-- author: TheShuEd
-  changes:
-  - message: Add "thieving beacon" to Thief antag - a device that counts objects within
-      a radius of itself as stolen.
-    type: Add
-  - message: Return thief structures stealing objectives.
-    type: Add
-  - message: Animal theft objectives can no longer appear if the animals are not on
-      the station.
-    type: Fix
-  id: 7062
-  time: '2024-08-08T13:17:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29997
-- author: lzk228
-  changes:
-  - message: RD labcoat added in RD's dresser.
-    type: Add
-  id: 7063
-  time: '2024-08-08T22:50:57.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30671
-- author: SlamBamActionman
-  changes:
-  - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner.
-    type: Tweak
-  - message: Forensic Scanner can now scan fluid containers for DNA in reagents.
-    type: Tweak
-  - message: Fluids keep their DNA data when moved.
-    type: Fix
-  - message: Fluids now stain containers they're in with DNA. Make sure to scrub your
-      blood bucket after use!
-    type: Add
-  - message: Vomit now includes DNA!
-    type: Add
-  id: 7064
-  time: '2024-08-08T23:27:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26699
-- author: themias
-  changes:
-  - message: Butter can be sliced, cookie and toast recipes now use butter slices.
-    type: Tweak
-  - message: Chefvend butter reduced from 4 to 3.
-    type: Tweak
-  id: 7065
-  time: '2024-08-08T23:32:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30789
 - author: EmoGarbage404
   changes:
   - message: You should have significantly less friction when moving in space.
@@ -3955,3 +3900,46 @@
   id: 7560
   time: '2024-10-29T05:07:57.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33046
+- author: Blackern5000
+  changes:
+  - message: Proto-kitentic crushers, glaives, and daggers now have more accurate
+      inhand sprites.
+    type: Tweak
+  id: 7561
+  time: '2024-10-30T07:38:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32212
+- author: Blackern5000
+  changes:
+  - message: Security belts now contain a holobarrier projector and a handheld security
+      radio by default rather than tear gas and a flashbang.
+    type: Tweak
+  id: 7562
+  time: '2024-10-30T07:40:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32291
+- author: Blackern5000
+  changes:
+  - message: Added three bottle boxes to the nanomed plus inventory for doctors to
+      carry small amounts of chemicals on their person
+    type: Add
+  id: 7563
+  time: '2024-10-30T07:41:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33018
+- author: Blackern5000
+  changes:
+  - message: Added the interdyne defibrillator, a black-and-red defibrillator that
+      can be used as a melee weapon.
+    type: Add
+  - message: The syndicate medical bundle now contains an interdyne defibrillator,
+      a collection of various instant injectors, tourniquets, and several combat kits.
+      The price has been raised to 24 tc.
+    type: Tweak
+  id: 7564
+  time: '2024-10-30T09:15:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32720
+- author: Boaz1111
+  changes:
+  - message: Pill bottles can now only store pills.
+    type: Tweak
+  id: 7565
+  time: '2024-10-31T10:56:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33074

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -216,8 +216,8 @@ uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes tox
 uplink-knives-kit-name = Throwing Knives Kit
 uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
 
-uplink-meds-bundle-name = Medical Bundle
-uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
+uplink-meds-bundle-name = Interdyne Medical Bundle
+uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
 
 uplink-ammo-bundle-name = Ammo Bundle
 uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -302,13 +302,19 @@
   components:
   - type: StorageFill
     contents:
+      - id: DefibrillatorSyndicate
       - id: MedkitCombatFilled
-      - id: Defibrillator
+        amount: 4
+      - id: Tourniquet
+        amount: 4
       - id: CombatMedipen
-        amount: 3
-      - id: ClothingHandsGlovesNitrile
-      - id: SyringeTranexamicAcid
-      - id: SyringeHyronalin
+        amount: 4
+      - id: PunctAutoInjector
+        amount: 4
+      - id: PyraAutoInjector
+        amount: 4
+      - id: AirlossAutoInjector
+        amount: 4
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -46,10 +46,10 @@
   table: !type:AllSelector
     children:
     - id: Stunbaton
-    - id: GrenadeFlashBang
-    - id: TearGasGrenade
     - id: Handcuffs
     - id: Handcuffs
+    - id: HoloprojectorSecurity
+    - id: RadioHandheldSecurity
 
 - type: entity
   id: ClothingBeltSecurityFilled

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

@@ -7,6 +7,7 @@
     Bloodpack: 5
     EpinephrineChemistryBottle: 3
     Syringe: 5
+    BoxBottle: 3
     ClothingEyesHudMedical: 2
     ClothingEyesEyepatchHudMedical: 2
 

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -699,9 +699,9 @@
   productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 12
+    Telecrystal: 16
   cost:
-    Telecrystal: 20
+    Telecrystal: 24
   categories:
   - UplinkChemicals
   conditions:

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -487,7 +487,6 @@
         - CartridgeAmmo
         - DoorRemote
         - Whistle
-        - HolosignProjector
         - BalloonPopper
   - type: ItemMapper
     mapLayers:

Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

@@ -121,6 +121,7 @@
     - type: Tag
       tags:
         - HolofanProjector
+        - SecBeltEquip
     - type: StaticPrice
       price: 50
 

Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml

@@ -71,3 +71,69 @@
   id: DefibrillatorOneHandedUnpowered
   parent: BaseDefibrillator
   suffix: One-Handed, Unpowered
+
+- type: entity
+  id: DefibrillatorCompact # This should be a research item at some point
+  parent: [ BaseDefibrillator, PowerCellSlotMediumItem ]
+  name: compact defibrillator
+  description: Now in fun size!
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsmall.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: Item
+    size: Normal
+  - type: ToggleCellDraw
+  - type: PowerCellDraw
+    useRate: 100
+  - type: Defibrillator
+    zapHeal:
+      types:
+        Asphyxiation: -40
+    doAfterDuration: 6
+  - type: DoAfter
+  - type: UseDelay
+
+- type: entity
+  id: DefibrillatorSyndicate
+  parent: DefibrillatorCompact
+  name: interdyne defibrillator
+  description: Doubles as a self-defense weapon against war-crime inclined tiders.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/defibsyndi.rsi
+    layers:
+      - state: icon
+      - state: screen
+        map: [ "enum.ToggleVisuals.Layer" ]
+        visible: false
+        shader: unshaded
+      - state: ready
+        map: ["enum.PowerDeviceVisualLayers.Powered"]
+        shader: unshaded
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+    activatedSoundOnHitNoDamage:
+      path: /Audio/Items/Defib/defib_zap.ogg
+      params:
+        variation: 0.250
+        volume: -10
+    activatedDamage:
+      types:
+        Blunt: 8
+        Shock: 16

Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -271,7 +271,6 @@
     transferAmount: 20
     onlyAffectsMobs: false
     injectOnly: true
-
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -284,6 +283,102 @@
   - type: Tag
     tags: []
 
+- type: entity
+  name: puncturase auto-injector
+  parent: ChemicalMedipen
+  id: PunctAutoInjector
+  description: A rapid dose of puncturase and tranexamic acid, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: punctpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: punctpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 15
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 15
+        reagents:
+        - ReagentId: Puncturase
+          Quantity: 10
+        - ReagentId: TranexamicAcid
+          Quantity: 5
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: pyrazine auto-injector
+  parent: ChemicalMedipen
+  id: PyraAutoInjector
+  description: A rapid dose of pyrazine and dermaline, intended for combat applications.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: pyrapen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: pyrapen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 20
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 20
+        reagents:
+        - ReagentId: Pyrazine
+          Quantity: 10
+        - ReagentId: Dermaline
+          Quantity: 10
+  - type: Tag
+    tags: []
+
+- type: entity
+  name: airloss auto-injector
+  parent: ChemicalMedipen
+  id: AirlossAutoInjector
+  description: A rapid dose of saline and dexalin plus, intended to get someone up quickly.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: dexpen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: dexpen_empty
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 40
+    onlyAffectsMobs: false
+    injectOnly: true
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 40
+        reagents:
+        - ReagentId: Saline
+          Quantity: 20
+        - ReagentId: DexalinPlus
+          Quantity: 20
+  - type: Tag
+    tags: []
+
 - type: entity
   name: space medipen
   parent: ChemicalMedipen

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -586,4 +586,7 @@
     areaInsertRadius: 1
     storageInsertSound: /Audio/Effects/pill_insert.ogg
     storageRemoveSound: /Audio/Effects/pill_remove.ogg
+    whitelist: 
+      tags:
+      - Pill
   - type: Dumpable