From 5ee56995e233057424be1280e81dd9e475939a18 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:14:22 +0200 Subject: [PATCH 1/3] sec tweaks --- .../Guns/Ammunition/Projectiles/light_rifle.yml | 5 +++-- .../Weapons/Guns/Ammunition/Projectiles/magnum.yml | 5 +++-- .../Weapons/Guns/Ammunition/Projectiles/pistol.yml | 4 ++-- .../Weapons/Guns/Ammunition/Projectiles/rifle.yml | 5 +++-- .../Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 4 ++-- .../Prototypes/Roles/Jobs/Security/security_cadet.yml | 10 ++++------ 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 7eac4b53d09..f817c97602a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -29,8 +29,9 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 16 + Piercing: 14 #ADT tweak + # Blunt: 3 ADT tweak + # Heat: 16 ADT tweak - type: entity id: BulletLightRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index b4017fd5507..b2faa8a8730 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -29,8 +29,9 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 32 + Piercing: 32 #ADT tweak + # Blunt: 3 ADT tweak + # Heat: 32 ADT tweak - type: entity id: BulletMagnumAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 8d146939b75..70d001e4dd4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -29,8 +29,8 @@ - type: Projectile damage: types: - Blunt: 2 - Heat: 14 + Blunt: 10 #ADT tweak 3->10 + # Heat: 14 - type: entity id: BulletPistolUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index e3e26bf9f32..5da3e2f31f4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -29,8 +29,9 @@ - type: Projectile damage: types: - Blunt: 2 - Heat: 15 + Piercing: 15 + # Blunt: 15 ADT tweak + # Heat: 15 ADT tweak - type: entity id: BulletRifleUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d8c465cf9e8..c17d1eb8819 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -64,8 +64,8 @@ - type: Projectile damage: types: - Blunt: 3 - Heat: 7 + Blunt: 7 #ADT tweak 3-> 7 + # Heat: 7 ADT tweak - type: IgnitionSource ignited: true diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 12aa657cbcb..010cbe82248 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,12 +6,10 @@ requirements: - !type:OverallPlaytimeRequirement time: 54000 #15 hrs # ADT-RoleTime -# ADT-Tweak - # - !type:DepartmentTimeRequirement - # department: Security - # time: 72000 #20 hrs # Corvax-RoleTime - # inverted: true # stop playing intern if you're good at security! -# ADT-Tweak + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #20 hrs # Corvax-RoleTime + inverted: true # stop playing intern if you're good at security! # ADT Restrict Start - !type:SpeciesRequirement inverted: true From 823d6fbad716f8c0f652ce9e2b3426a1d1f4d485 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sat, 1 Mar 2025 11:28:49 +0200 Subject: [PATCH 2/3] Update pistol.yml --- .../Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 70d001e4dd4..c8ab77337be 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -29,7 +29,8 @@ - type: Projectile damage: types: - Blunt: 10 #ADT tweak 3->10 + Piercing: 10 #ADT tweak + # Blunt: 3 ADT twea # Heat: 14 - type: entity From 9d78b233e55534332aa27074305c1f9e873e0d98 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Sat, 1 Mar 2025 11:30:57 +0200 Subject: [PATCH 3/3] Update shotgun.yml --- .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index c17d1eb8819..4893d4a7843 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -64,7 +64,8 @@ - type: Projectile damage: types: - Blunt: 7 #ADT tweak 3-> 7 + Piercing: 7 #ADT tweak + # Blunt: 3 ADT tweak # Heat: 7 ADT tweak - type: IgnitionSource ignited: true