From e2cfb948dc8a68eee1db51a3fb2b5a5f3e9460b8 Mon Sep 17 00:00:00 2001 From: keslik Date: Wed, 5 Mar 2025 01:31:51 +0300 Subject: [PATCH 1/4] shotgun shells tweak --- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 6 +++--- .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index fb7cb21ae3..87c2abcb00 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -10,7 +10,7 @@ - ShellShotgun - type: CartridgeAmmo count: 6 - spread: 28 + spread: 14 # WD soundEject: collection: ShellEject - type: Sprite @@ -125,9 +125,9 @@ ammo: reagents: - ReagentId: ChloralHydrate - Quantity: 5 + Quantity: 12 # WD - type: SolutionTransfer - maxTransferAmount: 7 + maxTransferAmount: 15 # WD - type: SpentAmmoVisuals state: "practice" 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 f7b30f214d..d9f8adb2ca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -10,7 +10,10 @@ - type: Projectile damage: types: - Piercing: 40 + Piercing: 50 # WD start + - type: StaminaDamageOnCollide + ignoreResistances: false + damage: 80 # WD end - type: entity id: PelletShotgunBeanbag From 2e3b615590e7e6a33b891dcb1c84a6ba2bbac25d Mon Sep 17 00:00:00 2001 From: keslik Date: Wed, 5 Mar 2025 02:24:31 +0300 Subject: [PATCH 2/4] magnum nerf, tranquilizer box sprite --- .../Weapons/Guns/Ammunition/Boxes/shotgun.yml | 2 +- .../Guns/Ammunition/Projectiles/magnum.yml | 2 +- .../Textures/Objects/Storage/boxes.rsi/meta.json | 5 ++++- .../Storage/boxes.rsi/shelltranquilizer.png | Bin 0 -> 238 bytes 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 831c3c3352..2d4941dd7e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -113,4 +113,4 @@ - type: Sprite layers: - state: boxwide - - state: shellslug \ No newline at end of file + - state: shelltranquilizer # WD 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 364ba18c42..a31a086845 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 35 + Piercing: 32 # WD - type: entity id: BulletMagnumPractice diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 1c7574b71a..357b36f5bb 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef, ziplock by CaypenNow, shelltranquilizer modified by keslik.", "size": { "x": 32, "y": 32 @@ -203,6 +203,9 @@ { "name": "shelltoy" }, + { + "name": "shelltranquilizer" + }, { "name": "ziptie" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltranquilizer.png new file mode 100644 index 0000000000000000000000000000000000000000..344de1168268bbbf9cce1685621e6b84e86a0ec9 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7e7W z#W5tJ_3ibIyoU@#ST1lUHHhqAw9KP%6Q{62jF#F4@snJdL4g|%23mNO{F^2dsZoAu zdfmE@lY@6EcTTf3wT)$9WD#&+VEo4>kgUSM^kCcW-C7N{mt`0x-JE&WW68|35tp7G zW93l%Fgv%rJd~mO-hrE+XHUyK^y#y$Sjo;E42P?ZAHB41A49{tbzBdsm@n90`d24b jy0fH8oI~NjLq_> Date: Wed, 5 Mar 2025 02:38:44 +0300 Subject: [PATCH 3/4] candle boxes fix --- Resources/Prototypes/Catalog/Fills/Boxes/general.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 59d5056ec2..d0cef80701 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -441,6 +441,9 @@ - type: Storage grid: - 0,0,9,2 + whitelist: # WD start + components: + - ExtinguishOnInteract # WD end - type: StorageFill contents: - id: Candle @@ -466,6 +469,9 @@ - type: Storage grid: - 0,0,9,2 + whitelist: # WD start + components: + - ExtinguishOnInteract # WD end - type: StorageFill contents: - id: CandleSmall From a63f86ef866d848e8c12df10e04b5a5e5dc02b96 Mon Sep 17 00:00:00 2001 From: keslik Date: Wed, 5 Mar 2025 08:03:05 +0300 Subject: [PATCH 4/4] hop egun --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 1f551bf5f6..9d5a34f81c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -102,7 +102,7 @@ - id: BoxID - id: BoxHeadset - id: IDComputerCircuitboard - - id: WeaponEgun + - id: WeaponDisabler - id: DoorRemoteService - id: ClothingNeckGoldmedal - id: RubberStampHop