Conflictfixes?

Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -11,21 +11,6 @@
 
 # Security Modules
 
-- type: entity
-  id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start
-  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
-  name: peacekeeper cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: security
-    - state: icon-peacekeeper
-  - type: ItemBorgModule
-    items:
-    - WoodBaton
-    - SecurityWhistle
-    - FlashlightSecliteRecharging
-
 # - type: entity
 #  id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start
 #  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
@@ -52,6 +37,7 @@
     items:
     - StunbatonSelfCharging
     - FlashRecharging
+-   - FlashlightSecliteRecharging
     - SecurityWhistle
     - HoloprojectorSecurityRecharging
     - WeaponLauncherFlashbangBorg

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -262,6 +262,97 @@
     zeroVisible: true
   - type: Appearance
 
+    parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ]
+  id: WeaponColdCannon
+  name: I.C.E.E.
+  description: It's cooler than a normal gun.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/cold_cannon.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/cold_cannon.rsi
+  - type: Gun
+    fireRate: 1.5
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: ColdLaser
+    fireCost: 100
+
+- type: entity
+  parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ]
+  id: WeaponBeamCannon
+  name: beam cannon
+  description: "For when a single shot just isn't enough"
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-0
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/beamcannon.ogg
+    selectedMode: FullAuto
+    fireRate: 15
+    availableModes: FullAuto
+  - type: Battery
+    maxCharge: 3000
+    startingCharge: 3000
+  - type: HitscanBatteryAmmoProvider
+    proto: BeamLaser
+    fireCost: 10
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+
+- type: entity
+  parent: BaseWeaponBattery
+  id: WeaponBeamDevastator
+  name: beam devastator
+  description: A powerful energy weapon that fires multiple rapid laser beams per second
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.7
+    sprintModifier: 0.7
+  - type: HeldSpeedModifier
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_devestator.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Gun
+    selectedMode: FullAuto
+    fireRate: 15
+    availableModes: FullAuto
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/beamcannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: BeamDev
+    fireCost: 600
+  - type: Battery
+    maxCharge: 300000
+    startingCharge: 300000
+  - type: Tag
+    tags:
+    - PowerCage
+-
 - type: entity
   name: disabler
   parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ]