From 7d4952fdab8b7cad7a92a04ce6cc338a0ceb3484 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sun, 27 Oct 2024 16:04:42 -0400 Subject: [PATCH 01/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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