From 7d4952fdab8b7cad7a92a04ce6cc338a0ceb3484 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 27 Oct 2024 16:04:42 -0400 Subject: [PATCH 01/33] Secborg rework begin A total rewqwork of secborg modules --- .../Specific/Robotics/borg_modules.yml | 60 ++++++++-------- .../Weapons/Guns/Battery/battery_guns.yml | 27 ++++++++ .../Weapons/Guns/Launchers/launchers.yml | 68 +++++++++++++++++++ 3 files changed, 128 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 9491cc6f329..bcb8aa4d055 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -24,33 +24,33 @@ items: - WoodBaton - SecurityWhistle - -- type: entity - id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start - parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: patrol cyborg module - components: - - type: Sprite - layers: - - state: security - - state: icon-patrol - - type: ItemBorgModule - items: - FlashlightSecliteRecharging - - SecurityWhistle +# - type: entity +# id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start +# parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] +# name: patrol cyborg module +# components: +# - type: Sprite +# layers: +# - state: security +# - state: icon-patrol +# - type: ItemBorgModule +# items: +# - FlashlightSecliteRecharging +# - SecurityWhistle -- type: entity - id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start - parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: bastion cyborg module - components: - - type: Sprite - layers: - - state: security - - state: icon-hold - - type: ItemBorgModule - items: - - HoloprojectorSecurityRecharging +# - type: entity +# id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start +# parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] +# name: bastion cyborg module +# components: +# - type: Sprite +# layers: +# - state: security +# - state: icon-hold +# - type: ItemBorgModule +# items: +# - HoloprojectorSecurityRecharging - type: entity id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl @@ -65,7 +65,9 @@ items: - StunbatonSelfCharging - FlashRecharging - - BorgHypoPax + - SecurityWhistle + - HoloprojectorSecurityRecharging + - WeaponLauncherFlashbangBorg - type: entity id: BorgModuleSecurityEscalate @@ -81,6 +83,8 @@ items: - Truncheon # Anti-Fauna option to stop them being relied on the Seclite (which will be removed when the Laws menu is fixed) - FlashRecharging + - WeaponLauncherCrowdControlBorg + - SecurityWhistle - type: entity id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced @@ -93,4 +97,6 @@ - state: icon-chase - type: ItemBorgModule items: - - WeaponEnergyGunMiniRecharging + - WeaponDisablerSelfCharge + - FlashlightSecliteRecharging + - SecurityWhistle diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2b74330b141..e2ca6fd4c67 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -261,3 +261,30 @@ steps: 5 zeroVisible: true - type: Appearance + +- type: entity + name: disabler + parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ] + id: WeaponDisablerSelfCharge + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This One Recharges + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/disabler.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/disabler.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 50 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 8040e79c352..68b71efb512 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -28,3 +28,71 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 2 + +- type: entity + name: Flashbang Launcher + parent: [BaseWeaponLauncher, BaseGunWieldable] + suffix: Robot, energy based + id: WeaponLauncherFlashbangBorg + description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs. Refills its own ammo + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: Battery + maxCharge: 600 + startingCharge: 200 + - type: ProjectileBatteryAmmoProvider + proto: GrenadeFlash + fireCost: 200 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 6 + +- type: entity + name: Crowd Control Launcher + parent: [BaseWeaponLauncher, BaseGunWieldable] + suffix: Robot, energy based + id: WeaponLauncherCrowdControlBorg + description: A hybrid stinger and teargas grenade launcher + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: BatteryWeapon + maxCharge: 600 + startingCharge: 300 + - type: ProjectileBatteryAmmoProvider + proto: TearGasGrenade + fireCost: 300 + - type: BatteryWeaponFireModes + fireModes: + -proto: TearGasGrenade + firecost: 300 + -proto: GrenadeStinger + firecost: 300 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 3 From ec7bdc62faa4ee0a75311228143ecb2836247a61 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 28 Oct 2024 09:46:20 -0400 Subject: [PATCH 02/33] Patrol be gone! Removed patrol module fully --- .../Objects/Specific/Robotics/borg_modules.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index bcb8aa4d055..a7eb0cfbb32 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -25,19 +25,6 @@ - WoodBaton - SecurityWhistle - FlashlightSecliteRecharging -# - type: entity -# id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start -# parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] -# name: patrol cyborg module -# components: -# - type: Sprite -# layers: -# - state: security -# - state: icon-patrol -# - type: ItemBorgModule -# items: -# - FlashlightSecliteRecharging -# - SecurityWhistle # - type: entity # id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start From 4ac00c6bb933224415121f4dad0eb8daa57040de Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 24 Dec 2024 20:05:14 -0500 Subject: [PATCH 03/33] Conflictfixes? --- .../Specific/Robotics/borg_modules.yml | 16 +--- .../Weapons/Guns/Battery/battery_guns.yml | 91 +++++++++++++++++++ 2 files changed, 92 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index de15924998e..6bbadef0b62 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index e2ca6fd4c67..5a4f69892dc 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/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 ] From c454f34f91425ccf149325fc22faf8aaf3cf6ff5 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 24 Dec 2024 20:22:53 -0500 Subject: [PATCH 04/33] Update battery_guns.yml --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 5a4f69892dc..c4666b8420a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -262,6 +262,7 @@ zeroVisible: true - type: Appearance + -type: entity parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ] id: WeaponColdCannon name: I.C.E.E. From 6f7e9941ee5a8641da490100eb15da211b64c213 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 24 Dec 2024 20:25:02 -0500 Subject: [PATCH 05/33] fixin oop --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index c4666b8420a..76a505debbd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -262,8 +262,8 @@ zeroVisible: true - type: Appearance - -type: entity - parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ] + - type: entity + parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ] id: WeaponColdCannon name: I.C.E.E. description: It's cooler than a normal gun. @@ -286,6 +286,7 @@ proto: ColdLaser fireCost: 100 + - type: entity parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ] id: WeaponBeamCannon From 290bd658843aefd55f22c9b55f42642ba35ff477 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 29 Dec 2024 20:32:38 -0500 Subject: [PATCH 06/33] Mergeconflictfixes --- .../Specific/Robotics/borg_modules.yml | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 6bbadef0b62..16ba894646b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -11,18 +11,32 @@ # Security Modules -# - type: entity -# id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start -# parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] -# name: bastion cyborg module -# components: -# - type: Sprite -# layers: -# - state: security -# - state: icon-hold -# - type: ItemBorgModule -# items: -# - HoloprojectorSecurityRecharging +- type: entity + id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: patrol cyborg module + components: + - type: Sprite + layers: + - state: security + - state: icon-patrol + - type: ItemBorgModule + items: + - FlashlightSecliteRecharging + - SecurityWhistle + +- type: entity + id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: bastion cyborg module + components: + - type: Sprite + layers: + - state: security + - state: icon-hold + - type: ItemBorgModule + items: + - HoloprojectorSecurityRecharging - type: entity id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl @@ -39,7 +53,6 @@ - FlashRecharging - - FlashlightSecliteRecharging - SecurityWhistle - - HoloprojectorSecurityRecharging - WeaponLauncherFlashbangBorg - type: entity @@ -60,7 +73,7 @@ - SecurityWhistle - type: entity - id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced + id: BorgModuleSecurityChase # Research Locked - NonLethalAmmunition parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: chase cyborg module components: From d46dba52b6cdcb9464e5eeac7eb2d9d026913821 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 29 Dec 2024 23:32:05 -0500 Subject: [PATCH 07/33] Delete dupes --- .../Weapons/Guns/Battery/battery_guns.yml | 61 +------------------ 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 3ccb3a16e52..16071bd6921 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -285,66 +285,7 @@ - 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, 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 From d885ea1fa4a6edc333ae80f4a178dc4f9a9a44af Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 29 Dec 2024 23:46:18 -0500 Subject: [PATCH 08/33] More fixin --- .../Weapons/Guns/Battery/battery_guns.yml | 20 +-- .../Weapons/Guns/Launchers/launchers.yml | 146 +++++++++--------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 16071bd6921..25c86e7b313 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -285,7 +285,7 @@ - type: HitscanBatteryAmmoProvider proto: ColdLaser fireCost: 100 - + - type: entity parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ] id: WeaponBeamCannon @@ -363,20 +363,20 @@ - type: Sprite sprite: Objects/Weapons/Guns/Battery/disabler.rsi layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-0 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded - type: Clothing sprite: Objects/Weapons/Guns/Battery/disabler.rsi quickEquip: false slots: - - suitStorage - - Belt + - suitStorage + - Belt - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 100 - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 50 + autoRecharge: true + autoRechargeRate: 50 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 68b71efb512..14bf39440c6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,33 +1,33 @@ -- type: entity +- type: entity name: china lake parent: [BaseWeaponLauncher, BaseGunWieldable] suffix: Robot, energy based id: WeaponLauncherChinaLakeBorg description: PLOOP! Contains a built in replicator to slowly make more ammo. components: - - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - - type: Gun - fireRate: 1 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: Battery - maxCharge: 600 - startingCharge: 300 - - type: ProjectileBatteryAmmoProvider - proto: GrenadeFrag - fireCost: 300 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 2 + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: Battery + maxCharge: 600 + startingCharge: 300 + - type: ProjectileBatteryAmmoProvider + proto: GrenadeFrag + fireCost: 300 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 2 - type: entity name: Flashbang Launcher @@ -36,29 +36,29 @@ id: WeaponLauncherFlashbangBorg description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs. Refills its own ammo components: - - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - - type: Gun - fireRate: 1 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: Battery - maxCharge: 600 - startingCharge: 200 - - type: ProjectileBatteryAmmoProvider - proto: GrenadeFlash - fireCost: 200 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 6 + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: Battery + maxCharge: 600 + startingCharge: 200 + - type: ProjectileBatteryAmmoProvider + proto: GrenadeFlash + fireCost: 200 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 6 - type: entity name: Crowd Control Launcher @@ -67,32 +67,32 @@ id: WeaponLauncherCrowdControlBorg description: A hybrid stinger and teargas grenade launcher components: - - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - - type: Gun - fireRate: 1 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: BatteryWeapon - maxCharge: 600 - startingCharge: 300 - - type: ProjectileBatteryAmmoProvider - proto: TearGasGrenade - fireCost: 300 - - type: BatteryWeaponFireModes - fireModes: - -proto: TearGasGrenade - firecost: 300 - -proto: GrenadeStinger - firecost: 300 + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: BatteryWeapon + maxCharge: 600 + startingCharge: 300 + - type: ProjectileBatteryAmmoProvider + proto: TearGasGrenade + fireCost: 300 + - type: BatteryWeaponFireModes + fireModes: + - proto: TearGasGrenade + firecost: 300 + - proto: GrenadeStinger + firecost: 300 - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 3 From 9344d992f202c6acf885cb76bc5cd7e59549d05a Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 29 Dec 2024 23:53:28 -0500 Subject: [PATCH 09/33] Movin ops --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 1 - Resources/Prototypes/Research/arsenal.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 5a0dfda8883..99f950104cf 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -26,7 +26,6 @@ recipeUnlocks: - WeaponEnergyGun - WeaponEnergyGunMini - - BorgModuleSecurityChase # DeltaV SecBorg research - type: technology id: EnergyGunsAdvanced diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a768ac45639..bd1ebab1350 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -60,6 +60,7 @@ - MagazineBoxRifleRubber - MagazineBoxSpecialRubber # End of modified code + - BorgModuleSecurityChase # DeltaV SecBorg research - type: technology id: UraniumMunitions From d66bf4944c32ce8fe09bc13ffe883636623ace19 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 29 Dec 2024 23:55:36 -0500 Subject: [PATCH 10/33] FUCKOFF UNEEDED DATA --- .../Entities/Objects/Specific/Security/security.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 68a9c18f879..e091ee81c4d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -63,16 +63,6 @@ guides: - Security -- type: entity - parent: WeaponEnergyGunMini - id: WeaponEnergyGunMiniRecharging - suffix: Recharging, Do Not Map - categories: [ HideSpawnMenu ] - components: - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 12 - - type: entity parent: HoloprojectorSecurity id: HoloprojectorSecurityRecharging From 5203496e407d2d41e8fff0bfa26c99dc0e9842b0 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 30 Dec 2024 08:36:45 -0500 Subject: [PATCH 11/33] More fixes --- .../Objects/Specific/Robotics/borg_modules.yml | 2 +- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 1 + .../Objects/Weapons/Guns/Launchers/launchers.yml | 11 ++++------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 16ba894646b..ca2475bc22f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -51,7 +51,7 @@ items: - StunbatonSelfCharging - FlashRecharging -- - FlashlightSecliteRecharging + - FlashlightSecliteRecharging - SecurityWhistle - WeaponLauncherFlashbangBorg diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 25c86e7b313..1490d586317 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -357,6 +357,7 @@ - type: entity name: disabler parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ] + suffix: Robot, Self-Charging id: WeaponDisablerSelfCharge description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This One Recharges components: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 14bf39440c6..f8d33406bb7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -81,18 +81,15 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: BatteryWeapon + - type: ProjectileBatteryAmmoProvider maxCharge: 600 startingCharge: 300 - - type: ProjectileBatteryAmmoProvider - proto: TearGasGrenade - fireCost: 300 - type: BatteryWeaponFireModes fireModes: - proto: TearGasGrenade firecost: 300 - proto: GrenadeStinger firecost: 300 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 3 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 3 From 3863ecea716e73f6e90ab89c0cb6c4d2b8b4be66 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 30 Dec 2024 16:08:00 -0500 Subject: [PATCH 12/33] More work --- .../Weapons/Guns/Battery/battery_guns.yml | 24 ++--------- .../Weapons/Guns/Launchers/launchers.yml | 41 ++++++++++--------- 2 files changed, 24 insertions(+), 41 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 1490d586317..40e33155456 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -355,29 +355,11 @@ - PowerCage - - type: entity - name: disabler - parent: [ WeaponDisablerPractice, BaseSecurityCommandContraband ] - suffix: Robot, Self-Charging + parent: WeaponDisabler id: WeaponDisablerSelfCharge - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This One Recharges + name: disabler + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one recharges components: - - type: Sprite - sprite: Objects/Weapons/Guns/Battery/disabler.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-0 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Clothing - sprite: Objects/Weapons/Guns/Battery/disabler.rsi - quickEquip: false - slots: - - suitStorage - - Belt - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 100 - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 50 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index f8d33406bb7..f09a25e2ceb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -59,37 +59,38 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 6 + - type: GunWieldBonus + wieldBonusExamineMessage: null + minAngle: 0 + maxAngle: 0 + - type: Gun + minAngle: 1 + maxAngle: 2 + - type: UseDelay + delay: 0 # You can't dual wield this as a borg so no need for a delay - type: entity name: Crowd Control Launcher - parent: [BaseWeaponLauncher, BaseGunWieldable] + parent: WeaponLauncherChinaLakeBorg suffix: Robot, energy based id: WeaponLauncherCrowdControlBorg description: A hybrid stinger and teargas grenade launcher components: - - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - - type: Gun - fireRate: 1 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: ProjectileBatteryAmmoProvider - maxCharge: 600 - startingCharge: 300 - type: BatteryWeaponFireModes fireModes: - proto: TearGasGrenade - firecost: 300 + fireCost: 300 - proto: GrenadeStinger - firecost: 300 + fireCost: 300 - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 3 + - type: GunWieldBonus + wieldBonusExamineMessage: null + minAngle: 0 + maxAngle: 0 + - type: Gun + minAngle: 1 + maxAngle: 2 + - type: UseDelay + delay: 0 # You can't dual wield this as a borg so no need for a delay From 60756e179d61d650983d646d6adc513a6982752e Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 30 Dec 2024 18:02:59 -0500 Subject: [PATCH 13/33] Maybe last fixes? --- .../Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Objects/Weapons/Guns/Launchers/launchers.yml | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 40e33155456..c8554595a30 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -353,7 +353,7 @@ - type: Tag tags: - PowerCage -- + - type: entity parent: WeaponDisabler id: WeaponDisablerSelfCharge diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index f09a25e2ceb..1098e68d971 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -31,7 +31,7 @@ - type: entity name: Flashbang Launcher - parent: [BaseWeaponLauncher, BaseGunWieldable] + parent: BaseWeaponLauncher suffix: Robot, energy based id: WeaponLauncherFlashbangBorg description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs. Refills its own ammo @@ -44,6 +44,8 @@ - type: Clothing sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Gun + minAngle: 1 + maxAngle: 2 fireRate: 1 selectedMode: SemiAuto availableModes: @@ -63,19 +65,23 @@ wieldBonusExamineMessage: null minAngle: 0 maxAngle: 0 - - type: Gun - minAngle: 1 - maxAngle: 2 - type: UseDelay delay: 0 # You can't dual wield this as a borg so no need for a delay - type: entity name: Crowd Control Launcher - parent: WeaponLauncherChinaLakeBorg + parent: BaseWeaponLauncher suffix: Robot, energy based id: WeaponLauncherCrowdControlBorg description: A hybrid stinger and teargas grenade launcher components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: BatteryWeaponFireModes fireModes: - proto: TearGasGrenade From e7170f51107fbda78b77f6111b2ed80f0e091d77 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 30 Dec 2024 20:32:45 -0500 Subject: [PATCH 14/33] MOre fixes --- .../Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 1098e68d971..615bb99d85f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -67,6 +67,7 @@ maxAngle: 0 - type: UseDelay delay: 0 # You can't dual wield this as a borg so no need for a delay + - type: AmmoCounter - type: entity name: Crowd Control Launcher @@ -82,6 +83,12 @@ map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: ProjectileBatteryAmmoProvider + proto: TearGasGrenade + cost: 300 + - type: Battery + maxCharge: 600 + startingCharge: 300 - type: BatteryWeaponFireModes fireModes: - proto: TearGasGrenade @@ -100,3 +107,4 @@ maxAngle: 2 - type: UseDelay delay: 0 # You can't dual wield this as a borg so no need for a delay + - type: AmmoCounter From adddaa634a1bf7bcc748b16fdf55e3d34b8879cd Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 15:26:21 +0000 Subject: [PATCH 15/33] fix --- .../_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 615bb99d85f..ee61747b3d6 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -85,7 +85,7 @@ sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: ProjectileBatteryAmmoProvider proto: TearGasGrenade - cost: 300 + fireCost: 300 - type: Battery maxCharge: 600 startingCharge: 300 From 1521fb7a5a885245a194d13a02a0a7b261a1005f Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Tue, 28 Jan 2025 11:40:26 +0000 Subject: [PATCH 16/33] cleanup launchers --- .../Weapons/Guns/Launchers/launchers.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index ee61747b3d6..bb4649ff382 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -1,22 +1,22 @@ - type: entity - name: china lake parent: [BaseWeaponLauncher, BaseGunWieldable] - suffix: Robot, energy based id: WeaponLauncherChinaLakeBorg + name: china lake + suffix: Robot, energy based description: PLOOP! Contains a built in replicator to slowly make more ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] + - state: icon + map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Gun fireRate: 1 selectedMode: SemiAuto availableModes: - - SemiAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - type: Battery @@ -30,17 +30,17 @@ autoRechargeRate: 2 - type: entity - name: Flashbang Launcher parent: BaseWeaponLauncher - suffix: Robot, energy based id: WeaponLauncherFlashbangBorg + name: flashbang launcher + suffix: Robot, energy based description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs. Refills its own ammo components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] + - state: icon + map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Gun @@ -49,7 +49,7 @@ fireRate: 1 selectedMode: SemiAuto availableModes: - - SemiAuto + - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - type: Battery @@ -70,17 +70,17 @@ - type: AmmoCounter - type: entity - name: Crowd Control Launcher parent: BaseWeaponLauncher - suffix: Robot, energy based id: WeaponLauncherCrowdControlBorg + name: crowd control launcher + suffix: Robot, energy based description: A hybrid stinger and teargas grenade launcher components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] + - state: icon + map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: ProjectileBatteryAmmoProvider From 6839780db0041b0e74b4effa265266d078337454 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 15 Feb 2025 00:21:25 -0500 Subject: [PATCH 17/33] Fixes and changes --- .../Specific/Robotics/borg_modules.yml | 4 +- .../Weapons/Guns/Launchers/launchers.yml | 49 +++----------- .../Weapons/Guns/Shotguns/shotguns.yml | 67 +++++++++++++++++++ 3 files changed, 77 insertions(+), 43 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml index 0e7216d28c0..d65bef1c1be 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -53,7 +53,7 @@ - FlashRecharging - FlashlightSecliteRecharging - SecurityWhistle - - WeaponLauncherFlashbangBorg + - WeaponLauncherNonLethal - type: entity id: BorgModuleSecurityEscalate @@ -69,7 +69,7 @@ items: - Truncheon # Anti-Fauna option to stop them being relied on the Seclite (which will be removed when the Laws menu is fixed) - FlashRecharging - - WeaponLauncherCrowdControlBorg + - WeaponRiotShotgunBorg - SecurityWhistle - type: entity diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index bb4649ff382..49c9e18d2e2 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -31,10 +31,10 @@ - type: entity parent: BaseWeaponLauncher - id: WeaponLauncherFlashbangBorg - name: flashbang launcher + id: WeaponLauncherNonLethal + name: Nonlethal Launcher suffix: Robot, energy based - description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs. Refills its own ammo + description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs, or expend all of its energy to fire an EMP. Refills its own ammo components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi @@ -68,43 +68,10 @@ - type: UseDelay delay: 0 # You can't dual wield this as a borg so no need for a delay - type: AmmoCounter - -- type: entity - parent: BaseWeaponLauncher - id: WeaponLauncherCrowdControlBorg - name: crowd control launcher - suffix: Robot, energy based - description: A hybrid stinger and teargas grenade launcher - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - - type: ProjectileBatteryAmmoProvider - proto: TearGasGrenade - fireCost: 300 - - type: Battery - maxCharge: 600 - startingCharge: 300 - type: BatteryWeaponFireModes fireModes: - - proto: TearGasGrenade - fireCost: 300 - - proto: GrenadeStinger - fireCost: 300 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 3 - - type: GunWieldBonus - wieldBonusExamineMessage: null - minAngle: 0 - maxAngle: 0 - - type: Gun - minAngle: 1 - maxAngle: 2 - - type: UseDelay - delay: 0 # You can't dual wield this as a borg so no need for a delay - - type: AmmoCounter + - proto: GrenadeFlash + fireCost: 200 + - proto: GrenadeEMP + fireCost: 600 + diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index dceaa80d123..05c2ec8c973 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -44,3 +44,70 @@ - type: BallisticAmmoProvider capacity: 4 proto: ShellShotgunBeanbag + +# - type: entity +# name: Borg Riot Shotgun +# parent: BaseWeaponShotgun +# id: WeaponShotgunRiotBorg +# description: A modified shotgun used by Borg security forces. It has a lower capacity, but self loads shells. +# components: +# - type: Sprite +# sprite: _DV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi +# - type: Gun +# fireRate: 1.5 +# selectedMode: SemiAuto +# availableModes: +# - SemiAuto +# soundGunshot: +# path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg +# soundEmpty: +# path: /Audio/Weapons/Guns/Empty/empty.ogg +# - type: ProjectileBatteryAmmoProvider +# proto: PelletShotgunBeanbag +# fireCost: 100 +# - type: Battery +# maxcharge: 400 +# startingCharge: 200 +# - type: BatterySelfRecharger +# autorRecharge: true +# autoRechargeRate: 20 +# - type: AmmoCounter + +- type: entity + name: Borg Riot Shotgun + parent: BaseItem + id: WeaponRiotShotgunBorg + description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses replicated .30 rifle ammo generated internally. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/LMGs/l6.rsi + netsync: false + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Item + size: Huge + - type: Gun + minAngle: 0 + maxAngle: 10 + angleIncrease: 1 + angleDecay: 16 + fireRate: 1.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + - type: Battery + maxCharge: 400 + startingCharge: 200 + - type: ProjectileBatteryAmmoProvider + proto: PelletShotgunBeanbag + fireCost: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 20 + - type: AmmoCounter + - type: Appearance From b1d721770ced2734fb10fb53c41d62b58faf61a5 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 15 Feb 2025 08:01:22 -0500 Subject: [PATCH 18/33] Update shotguns.yml --- .../Weapons/Guns/Shotguns/shotguns.yml | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 05c2ec8c973..4d29e6410ba 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -45,39 +45,11 @@ capacity: 4 proto: ShellShotgunBeanbag -# - type: entity -# name: Borg Riot Shotgun -# parent: BaseWeaponShotgun -# id: WeaponShotgunRiotBorg -# description: A modified shotgun used by Borg security forces. It has a lower capacity, but self loads shells. -# components: -# - type: Sprite -# sprite: _DV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi -# - type: Gun -# fireRate: 1.5 -# selectedMode: SemiAuto -# availableModes: -# - SemiAuto -# soundGunshot: -# path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg -# soundEmpty: -# path: /Audio/Weapons/Guns/Empty/empty.ogg -# - type: ProjectileBatteryAmmoProvider -# proto: PelletShotgunBeanbag -# fireCost: 100 -# - type: Battery -# maxcharge: 400 -# startingCharge: 200 -# - type: BatterySelfRecharger -# autorRecharge: true -# autoRechargeRate: 20 -# - type: AmmoCounter - - type: entity name: Borg Riot Shotgun parent: BaseItem id: WeaponRiotShotgunBorg - description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses replicated .30 rifle ammo generated internally. + description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates overtime components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi From 40ccdca9cf5a4a12207876b0c0cb83d28fb99768 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 15 Feb 2025 20:44:39 -0500 Subject: [PATCH 19/33] feck i broke the texture --- Resources/Prototypes/Research/arsenal.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 10 ++- .../Weapons/Guns/Shotguns/shotguns.yml | 66 +++++++++--------- .../Launchers/nonlethal_launcher.rsi/Icon.png | Bin 0 -> 566 bytes .../nonlethal_launcher.rsi/meta.json | 19 +++++ 5 files changed, 57 insertions(+), 40 deletions(-) create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 12873deaff4..bec2443da59 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -85,7 +85,7 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG - - BorgModuleSecurityEscalate # Delta-V : SecBorg Research + - BorgModuleSecurityEscalate # DeltaV - SecBorg Research - type: technology id: ExplosiveTechnology diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 49c9e18d2e2..e2f68ca6eab 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -37,12 +37,10 @@ description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs, or expend all of its energy to fire an EMP. Refills its own ammo components: - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi + - type: Item + sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi + size: Huge - type: Gun minAngle: 1 maxAngle: 2 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 4d29e6410ba..fb74f719030 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -46,40 +46,40 @@ proto: ShellShotgunBeanbag - type: entity - name: Borg Riot Shotgun parent: BaseItem id: WeaponRiotShotgunBorg + name: borg riot shotgun description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates overtime components: - - type: Sprite - sprite: Objects/Weapons/Guns/LMGs/l6.rsi - netsync: false - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - type: Item - size: Huge - - type: Gun - minAngle: 0 - maxAngle: 10 - angleIncrease: 1 - angleDecay: 16 - fireRate: 1.5 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - - type: Battery - maxCharge: 400 - startingCharge: 200 - - type: ProjectileBatteryAmmoProvider - proto: PelletShotgunBeanbag - fireCost: 100 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 20 - - type: AmmoCounter - - type: Appearance + - type: Sprite + sprite: Objects/Weapons/Guns/LMGs/l6.rsi + netsync: false + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Item + size: Huge + - type: Gun + minAngle: 0 + maxAngle: 10 + angleIncrease: 1 + angleDecay: 16 + fireRate: 1.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + - type: Battery + maxCharge: 400 + startingCharge: 200 + - type: ProjectileBatteryAmmoProvider + proto: PelletShotgunBeanbag + fireCost: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 20 + - type: AmmoCounter + - type: Appearance diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff96afab81227a967d7a9780409cc40e773a9f5f GIT binary patch literal 566 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQjEnx?oJHr&dIz4vafl%IEG|2 zzP)Cjf7wCe_{aPuIxc;W4K2OzuJD=0rx54#q|uO>S@{+B1670a2mMD5Xg^SOsbyU1 zVh|#F>}_3ILgBi5X9Mn@EPZ1pd8z47%{2G2ckjwA=TBxi7a5`odpmm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!09a)G A;Q#;t literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json new file mode 100644 index 00000000000..5af6a12b6a6 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by JustAnOrange from discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "Icon", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } +} From b3121c6c3384f960f8cf054ea8debee636b1d93c Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 15 Feb 2025 22:37:50 -0500 Subject: [PATCH 20/33] FIXED --- .../Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 3 +++ .../Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index e2f68ca6eab..2adb0adf200 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -38,6 +38,9 @@ components: - type: Sprite sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] - type: Item sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi size: Huge diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json index 5af6a12b6a6..0899d7d4da3 100644 --- a/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/meta.json @@ -8,12 +8,13 @@ }, "states": [ { - "name": "Icon", + "name": "icon", "delays": [ [ 0.1, 0.1 ] ] - } + } + ] } From df3feb09e0015c7b5e621be107cb966542a5ee81 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 16 Feb 2025 05:42:34 -0500 Subject: [PATCH 21/33] Update shotguns.yml Signed-off-by: Avalon --- .../_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index fb74f719030..175015c2103 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -53,7 +53,6 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi - netsync: false layers: - state: base map: [ "enum.GunVisualLayers.Base" ] From 61538859343a94e291d0a5864aa0d65817758098 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 17 Feb 2025 22:42:35 -0500 Subject: [PATCH 22/33] Direction fixes --- Resources/Prototypes/Research/arsenal.yml | 1 + .../Specific/Robotics/borg_modules.yml | 10 ++++--- .../Objects/Specific/Security/security.yml | 29 ------------------- .../Weapons/Guns/Shotguns/shotguns.yml | 2 +- Resources/Prototypes/_DV/borg_types.yml | 3 +- 5 files changed, 9 insertions(+), 36 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index bec2443da59..f568e5a1d05 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -86,6 +86,7 @@ - HoloprojectorSecurity - WeaponDisablerSMG - BorgModuleSecurityEscalate # DeltaV - SecBorg Research + - BorgModuleSecurityBastion # DeltaV - SecBorg Research - type: technology id: ExplosiveTechnology diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml index d65bef1c1be..037443dd040 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -23,10 +23,11 @@ - type: ItemBorgModule items: - FlashlightSecliteRecharging + - HoloprojectorSecurityRecharging - SecurityWhistle - type: entity - id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start + id: BorgModuleSecurityBastion # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: bastion cyborg module components: @@ -36,7 +37,9 @@ - state: icon-hold - type: ItemBorgModule items: - - HoloprojectorSecurityRecharging + - FlashRecharging + - WeaponLauncherNonLethal + - SecurityWhistle - type: entity id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl @@ -53,7 +56,6 @@ - FlashRecharging - FlashlightSecliteRecharging - SecurityWhistle - - WeaponLauncherNonLethal - type: entity id: BorgModuleSecurityEscalate @@ -68,7 +70,7 @@ - type: ItemBorgModule items: - Truncheon # Anti-Fauna option to stop them being relied on the Seclite (which will be removed when the Laws menu is fixed) - - FlashRecharging + - CombatKnife # Anti-fauna for blunt resistant slimes - WeaponRiotShotgunBorg - SecurityWhistle diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Security/security.yml index 965f955ee91..1f6e5b0a9e7 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Security/security.yml @@ -75,32 +75,3 @@ name: power-cell-slot-component-slot-name-default startingItem: PowerCellMicroreactor disableEject: true - -####################################### -####### PEACEKEEPING MODULES ########## -####################################### - -- type: entity - parent: BorgHypo - id: BorgHypoPax - name: Borg Pax Injector - description: A sterile injector for rapid administration of Pax to the unruly. - components: - - type: SolutionContainerManager - solutions: - hypospray: - maxVol: 5 # After testing, lowered to 5u maximum capacity. - # 10u of Pax would pacify someone for 40 seconds. A *very* long time, and given this can pierce hardsuits... - # Now can only pacify for 20 seconds, which lets you recharge 1u of Pax in the meantime (which pacifies for 4 seconds) - - type: Hypospray - injectOnly: true # Pax regenerates, this does handicap Antag Borgs but worth seeing. - onlyAffectsMobs: false - - type: SolutionRegeneration - solution: hypospray - duration: 20 # After testing, raised to 20 seconds to recharge. - # Refer to https://discord.com/channels/968983104247185448/1206353544186171482/1267039694068387893 - # Worth thinking more on this later, needs a careful balance to not wipe out Antags! - generated: - reagents: - - ReagentId: Pax - Quantity: 1 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 175015c2103..70ec9efea51 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -49,7 +49,7 @@ parent: BaseItem id: WeaponRiotShotgunBorg name: borg riot shotgun - description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates overtime + description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates over time. components: - type: Sprite sprite: Objects/Weapons/Guns/LMGs/l6.rsi diff --git a/Resources/Prototypes/_DV/borg_types.yml b/Resources/Prototypes/_DV/borg_types.yml index e2f47ebb2bd..e8485de3bb9 100644 --- a/Resources/Prototypes/_DV/borg_types.yml +++ b/Resources/Prototypes/_DV/borg_types.yml @@ -6,7 +6,7 @@ dummyPrototype: BorgChassisSecurity # Functional - extraModuleCount: 3 + extraModuleCount: 2 moduleWhitelist: tags: - BorgModuleGeneric @@ -16,7 +16,6 @@ defaultModules: - BorgModuleSecurityDeescalate - BorgModuleSecurityPatrol - - BorgModuleSecurityBastion lawset: SiliconPolice From 5fff1b600887d15a64939395ce08825109086eb9 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 17 Feb 2025 23:09:15 -0500 Subject: [PATCH 23/33] Conflict fix, parenting fixes --- .../Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 9 +-------- Resources/Prototypes/_DV/Research/arsenal.yml | 1 + RobustToolbox | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 70ec9efea51..b3739f2102d 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -46,16 +46,11 @@ proto: ShellShotgunBeanbag - type: entity - parent: BaseItem + parent: WeaponLightMachineGunL6Borg id: WeaponRiotShotgunBorg name: borg riot shotgun description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates over time. components: - - type: Sprite - sprite: Objects/Weapons/Guns/LMGs/l6.rsi - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - type: Item size: Huge - type: Gun @@ -80,5 +75,3 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 20 - - type: AmmoCounter - - type: Appearance diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index f29ceb3436c..b2cdae077ff 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -111,6 +111,7 @@ - AdvancedTruncheon - TelescopicShield - BorgModuleSecurityEscalate + - BorgModuleSecurtiyBastion # Tier 3 diff --git a/RobustToolbox b/RobustToolbox index 55571ef5b13..1a7e490e4b0 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 55571ef5b131dfa6f00a38e71a356ded34ca5911 +Subproject commit 1a7e490e4b00200bfa3ebebc6d9b12cb1ec82adf From 55a84121942288e1ac0441ac125679095672c385 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 17 Feb 2025 23:09:53 -0500 Subject: [PATCH 24/33] Update shotguns.yml --- .../_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index b3739f2102d..1a51f8a15a4 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -51,8 +51,6 @@ name: borg riot shotgun description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates over time. components: - - type: Item - size: Huge - type: Gun minAngle: 0 maxAngle: 10 From 3e2e6454bd9557689bfe66366fda39d24834248f Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 18 Feb 2025 07:47:28 -0500 Subject: [PATCH 25/33] Tool modules for all --- Resources/Prototypes/_DV/borg_types.yml | 1 + Resources/Prototypes/borg_types.yml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/borg_types.yml b/Resources/Prototypes/_DV/borg_types.yml index 36e42308d55..ef9ef5a11ea 100644 --- a/Resources/Prototypes/_DV/borg_types.yml +++ b/Resources/Prototypes/_DV/borg_types.yml @@ -14,6 +14,7 @@ # TODO: change these when reworking secborg modules to have the equivalent of roundstart gear defaultModules: + - BorgModuleTool - BorgModuleSecurityDeescalate - BorgModuleSecurityPatrol diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 7c87edd7016..d81474114aa 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -1,4 +1,4 @@ -# Generic borg +# Generic borg - type: borgType id: generic @@ -86,6 +86,7 @@ - BorgModuleCargo defaultModules: + - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleGrapplingGun - BorgModuleMining - BorgModuleAppraisal @@ -127,6 +128,7 @@ - BorgModuleJanitor defaultModules: + - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleLightReplacer - BorgModuleCleaning @@ -168,6 +170,7 @@ - BorgModuleMedical defaultModules: + - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleTreatment - BorgModuleSurgery # DeltaV @@ -227,6 +230,7 @@ - BorgModuleService defaultModules: + - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleMusique - BorgModuleService - BorgModuleClowning From 4120a2ed62b74b5118e7822a3e41bc9129a44282 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 18 Feb 2025 08:06:36 -0500 Subject: [PATCH 26/33] Untouch the box --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 1a7e490e4b0..55571ef5b13 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 1a7e490e4b00200bfa3ebebc6d9b12cb1ec82adf +Subproject commit 55571ef5b131dfa6f00a38e71a356ded34ca5911 From ff7466412857213ee13904de4da8ebf096d72754 Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 28 Feb 2025 14:01:08 -0500 Subject: [PATCH 27/33] Webedit ops are go Signed-off-by: Avalon --- .../_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 2adb0adf200..b32fb2d73ec 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -37,12 +37,12 @@ description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs, or expend all of its energy to fire an EMP. Refills its own ammo components: - type: Sprite - sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi + sprite: _DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi layers: - state: icon map: ["enum.GunVisualLayers.Base"] - type: Item - sprite: _DV\Objects\Weapons\Guns\Launchers\nonlethal_launcher.rsi + sprite: _DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi size: Huge - type: Gun minAngle: 1 From 5590d242d5276de474799616cd5b9caa3beff7ec Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 1 Mar 2025 20:08:10 -0500 Subject: [PATCH 28/33] Fixes --- Resources/Prototypes/_DV/borg_types.yml | 1 - Resources/Prototypes/borg_types.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Resources/Prototypes/_DV/borg_types.yml b/Resources/Prototypes/_DV/borg_types.yml index ef9ef5a11ea..36e42308d55 100644 --- a/Resources/Prototypes/_DV/borg_types.yml +++ b/Resources/Prototypes/_DV/borg_types.yml @@ -14,7 +14,6 @@ # TODO: change these when reworking secborg modules to have the equivalent of roundstart gear defaultModules: - - BorgModuleTool - BorgModuleSecurityDeescalate - BorgModuleSecurityPatrol diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index d81474114aa..65fd802fb41 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -86,7 +86,6 @@ - BorgModuleCargo defaultModules: - - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleGrapplingGun - BorgModuleMining - BorgModuleAppraisal @@ -128,7 +127,6 @@ - BorgModuleJanitor defaultModules: - - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleLightReplacer - BorgModuleCleaning @@ -170,7 +168,6 @@ - BorgModuleMedical defaultModules: - - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleTreatment - BorgModuleSurgery # DeltaV @@ -230,7 +227,6 @@ - BorgModuleService defaultModules: - - BorgModuleTool # DeltaV - Added Tool Module to default - BorgModuleMusique - BorgModuleService - BorgModuleClowning From 35ea035cda79cb09f9dbd6c4dd21d08a168e7699 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 1 Mar 2025 21:00:52 -0500 Subject: [PATCH 29/33] Delete Icon.png --- .../Launchers/nonlethal_launcher.rsi/Icon.png | Bin 566 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/Icon.png deleted file mode 100644 index ff96afab81227a967d7a9780409cc40e773a9f5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQjEnx?oJHr&dIz4vafl%IEG|2 zzP)Cjf7wCe_{aPuIxc;W4K2OzuJD=0rx54#q|uO>S@{+B1670a2mMD5Xg^SOsbyU1 zVh|#F>}_3ILgBi5X9Mn@EPZ1pd8z47%{2G2ckjwA=TBxi7a5`odpmm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!09a)G A;Q#;t From 6cab4b59860a3b3fb9d82c4c7e6c8fdc15f268bc Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 1 Mar 2025 21:01:05 -0500 Subject: [PATCH 30/33] Create icon.png --- .../Launchers/nonlethal_launcher.rsi/icon.png | Bin 0 -> 566 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/icon.png diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Launchers/nonlethal_launcher.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff96afab81227a967d7a9780409cc40e773a9f5f GIT binary patch literal 566 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gigQjEnx?oJHr&dIz4vafl%IEG|2 zzP)Cjf7wCe_{aPuIxc;W4K2OzuJD=0rx54#q|uO>S@{+B1670a2mMD5Xg^SOsbyU1 zVh|#F>}_3ILgBi5X9Mn@EPZ1pd8z47%{2G2ckjwA=TBxi7a5`odpmm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!09a)G A;Q#;t literal 0 HcmV?d00001 From 1f365af6ae5ec31da6b7a457ca4deb752091432d Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 2 Mar 2025 15:24:07 -0500 Subject: [PATCH 31/33] Typo ops --- Resources/Prototypes/_DV/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index b2cdae077ff..90c60570dcb 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -111,7 +111,7 @@ - AdvancedTruncheon - TelescopicShield - BorgModuleSecurityEscalate - - BorgModuleSecurtiyBastion + - BorgModuleSecurityBastion # Tier 3 From 6f8ffc3f7ce98cbfea15270e9a924d9e5ab4db26 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 2 Mar 2025 21:27:49 -0500 Subject: [PATCH 32/33] Update robotics.yml --- Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml index c51c78f6d25..7c562507867 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml @@ -10,6 +10,7 @@ recipes: - BorgModuleSecurityChase - BorgModuleSecurityEscalate + - BorgModuleSecurityBastion - type: latheRecipePack id: RoboticsStaticDeltaV From 2203df74d944a4639732482d8b90591a4cf227af Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 3 Mar 2025 23:23:32 -0500 Subject: [PATCH 33/33] Some fixes --- .../_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 1 - .../_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- .../_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index b2495b2258c..b316bcb3b96 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -358,7 +358,6 @@ - type: entity parent: WeaponDisabler id: WeaponDisablerSelfCharge - name: disabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. This one recharges components: - type: BatterySelfRecharger diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index b32fb2d73ec..23fc7676f1e 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -32,7 +32,7 @@ - type: entity parent: BaseWeaponLauncher id: WeaponLauncherNonLethal - name: Nonlethal Launcher + name: nonlethal launcher suffix: Robot, energy based description: A Cyborg Mounted Grenade Launcher, designed to fire flashbangs, or expend all of its energy to fire an EMP. Refills its own ammo components: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 1a51f8a15a4..311e17932cd 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -49,7 +49,7 @@ parent: WeaponLightMachineGunL6Borg id: WeaponRiotShotgunBorg name: borg riot shotgun - description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo repplicates over time. + description: A heavily modified shotgun for borgs, firing off beanbag rounds. Ammo replicates over time. components: - type: Gun minAngle: 0