Core

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

@@ -1206,7 +1206,7 @@
       - NotekeeperCartridge
       - NewsReaderCartridge
       - CrimeAssistCartridge
-      - SecWatchCartridge
+      - LogProbeCartridge
 
 - type: entity
   parent: BaseMedicalPDA

Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml

@@ -223,3 +223,59 @@
   - type: GuideHelp
     guides:
     - Cyborgs
+
+- type: entity
+  id: Quadborgendoskeleton
+  name: Quad endoskeleton
+  parent: CyborgEndoskeleton
+  description: A frame that cyborgs are built on. Significantly less spooky than expected.
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Items
+    sprite: Floof/Objects/Specific/Robotics/parts.rsi
+    scale: 0.7, 0.7
+    state: quad_suit
+  - type: ItemMapper
+    sprite: Floof/Objects/Specific/Robotics/parts.rsi
+    mapLayers:
+      borg_l_arm+o:
+        whitelist:
+          tags:
+          - BorgGenericLLeg
+      borg_r_arm+o:
+        whitelist:
+          tags:
+          - BorgGenericRLeg
+      borg_l_leg+o:
+        whitelist:
+          tags:
+          - BorgGenericLLeg
+      borg_r_leg+o:
+        whitelist:
+          tags:
+          - BorgGenericRLeg
+      borg_head+o:
+        whitelist:
+          tags:
+          - BorgGenericHead
+      borg_chest+o:
+        whitelist:
+          tags:
+          - BorgGenericTorso
+  - type: PartAssembly
+    parts:
+      quadborg:
+      - BorgGenericLLeg
+      - BorgGenericRLeg
+      - BorgGenericLLeg
+      - BorgGenericRLeg
+      - BorgGenericHead
+      - BorgGenericTorso
+  - type: Construction
+    graph: Cyborg
+    node: start
+    defaultTarget: Quadborg
+    containers:
+    - part-container
+    - cell_slot

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -21,6 +21,29 @@
   - type: Appearance
   - type: SpentAmmoVisuals
 
+- type: entity
+  id: CaselessShellShotgun
+  name: shell (.50)
+  parent: BaseCartridge
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+  - type: CartridgeAmmo
+    deleteOnSpawn: true
+    count: 6
+    spread: 15
+    soundEject:
+      collection: ShellEject
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: Appearance
+
 - type: entity
   id: ShellShotgunBeanbag
   name: shell (.50 beanbag)
@@ -35,7 +58,6 @@
     count: 1
   - type: SpentAmmoVisuals
     state: "beanbag"
-
 - type: entity
   id: ShellShotgunSlug
   name: shell (.50 slug)
@@ -78,6 +100,18 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: CartridgeAmmo
     proto: PelletShotgun
+
+- type: entity
+  id: eShellShotgun
+  name: eshell (.50)
+  parent: CaselessShellShotgun
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: CartridgeAmmo
+    proto: BulletLaserSpread
 
 - type: entity
   id: ShellShotgunIncendiary

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -1041,3 +1041,10 @@
         Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
     soundHit:
       collection: MeatLaserImpact
+
+- type: entity
+  name: wide laser barrage
+  id: BulletLaserSpread
+  categories: [ HideSpawnMenu ]
+  parent: BulletEnergyGunLaser
+

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -645,6 +645,8 @@
     - RightLegBorgService
     - HeadBorgService
     - TorsoBorgService
+    - Quadborgendoskeleton
+    - BaseSecModule
     dynamicRecipes:
     - ProximitySensor
     - BorgModuleLightReplacer
@@ -910,6 +912,7 @@
       - MagazineBoxSpecialMindbreaker
       - ClothingShoesBootsSecurityMagboots # Floofstation
       # Floof section - port to EE later
+      #- WeaponEnergyShotgun
       - WeaponGrapplingGun # Floof
       - JawsOfLife
       - HandHeldMassScanner

Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml

@@ -5,7 +5,7 @@
   components:
   - type: Sprite
     sprite: Floof/Mobs/Silicon/quad.rsi
-    scale: 0.6, 0.6
+    scale: 0.7, 0.7
     layers:
     - state: quadsprite
       map: ["movement"]
@@ -17,6 +17,19 @@
       shader: unshaded
       map: ["light"]
       visible: false
+  - type: Stripping
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Security
+    - Binary
+    - Common
+    - Science
+  - type: ActiveRadio
+  - type: Body
+    prototype: Primate
+    requiredLegs: 1 # TODO: More than 1 leg
+  - type: Inventory
+    templateId: Securityborg
   - type: BorgChassis
     maxModules: 4
     moduleWhitelist:
@@ -37,4 +50,36 @@
   - type: Speech
     speechVerb: Robotic
   - type: LayingDown
-  - type: LeashAnchor # Floofstation
+  - type: LeashAnchor # Floofstation
+
+- type: entity
+  id: BorgChassisQuadCC
+  parent: BorgChassisQuad
+  components:
+  - type: Sprite
+    sprite: Floof/Mobs/Silicon/quad.rsi
+    scale: 0.7, 0.7
+    layers:
+    - state: quadspriteCC
+      map: ["movement"]
+    - state: quadspritel
+      map: ["enum.BorgVisualLayers.Light"]
+      shader: unshaded
+      visible: false
+    - state: quadspriter
+      shader: unshaded
+      map: ["light"]
+      visible: false
+
+- type: inventoryTemplate
+  id: Securityborg
+  slots:
+  - name: pocket1
+    slotTexture: pocket
+    slotFlags: POCKET
+    slotGroup: MainHotbar
+    stripTime: 3
+    uiWindowPos: 0,3
+    strippingWindowPos: 0,4
+    displayName: Pocket 1
+    stripHidden: false

Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml

@@ -17,10 +17,14 @@
     layers:
     - state: security
     - state: icon-stun
+  - type: Construction
+    graph: BorgmoduleDisabler
+    node: icon
   - type: ItemBorgModule
     items:
     - WeaponBorgDisabler
     - BorgStunbaton
+    - BorgFlash
 
 - type: entity
   id: BorgModuleKill
@@ -32,8 +36,66 @@
     layers:
     - state: security
     - state: icon-kill
+  - type: Construction
+    graph: BorgmoduleCombat
+    node: icon
   - type: ItemBorgModule
     items:
     - WeaponAdvancedLaser
     - WeaponborgPistolMk58
-    - CombatKnife
+    - CombatKnife
+
+- type: entity
+  id: BorgModuleInvestigation
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: Investigation cyborg module
+  components:
+  - type: Sprite
+    sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: security
+    - state: icon-investigation
+  - type: Construction
+    graph: BorgModuleInvestigation
+    node: icon
+  - type: ItemBorgModule
+    items:
+    - ForensicScanner
+    - DetectivePDA
+    - SecurityWhistle
+
+- type: entity
+  id: BorgModuleadvancedmeasures
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: advanced combat cyborg module
+  components:
+  - type: Sprite
+    sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: security
+    - state: icon-Advmeasures
+  - type: ItemBorgModule
+    items:
+    - WeaponEnergyShotgun
+    - BorgWeaponXrayCannon
+
+- type: entity
+  id: BaseSecModule
+  parent: BaseItem
+  name: blank security borg module
+  description: A piece of tech that gives cyborgs new abilities.
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Sprite
+    sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: security
+  - type: StaticPrice
+    price: 100
+  - type: Tag
+    tags:
+    - BorgModuleGeneric
+  - type: GuideHelp
+    guides:
+      - Cyborgs

Resources/Prototypes/Floof/Entities/Objects/Weapons/flash.yml

@@ -0,0 +1,47 @@
+- type: entity
+  name: Borg flash
+  parent: BaseItem
+  id: BorgFlash
+  description: An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out.
+  components:
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/flash.rsi
+      layers:
+      - state: flash
+        map: [ "enum.FlashVisuals.BaseLayer" ]
+      - state: flashing
+        map: [ "enum.FlashVisuals.LightLayer" ]
+        visible: false
+        shader: unshaded
+    - type: Flash
+    - type: UseDelay
+      delay: 3
+    - type: MeleeWeapon
+      wideAnimationRotation: 180
+      damage:
+        types:
+          Blunt: 0 # melee weapon to allow flashing individual targets
+      angle: 10
+    - type: Item
+      size: Small
+      sprite: Objects/Weapons/Melee/flash.rsi
+#    - type: DynamicPrice
+#      price: 40
+    - type: ReverseEngineering # Nyano
+      recipes:
+        - Flash
+    - type: StaticPrice
+      price: 40
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.FlashVisuals.Burnt:
+          enum.FlashVisuals.BaseLayer:
+            True: {state: burnt}
+        enum.FlashVisuals.Flashing:
+          enum.FlashVisuals.LightLayer:
+            True: {visible: true}
+            False: {visible: false}
+    - type: GuideHelp
+      guides:
+      - Security