From 23ab5b8f3f08e99fef2c0d7f9786a95a38af801c Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Mon, 24 Jul 2023 18:02:15 -0500 Subject: [PATCH] Reworks the Python to match the SS13 .357 (#18197) * buffs the python to replicate /tg/ stats * meta.json shits * fuc * fix attributions.yml * yaml linter fix? * fix fill --- .../Weapons/Guns/Gunshots/attributions.yml | 5 +++ .../Weapons/Guns/Gunshots/revolver_357.ogg | Bin 0 -> 10327 bytes .../Locale/en-US/store/uplink-catalog.ftl | 18 +++++------ .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Prototypes/Catalog/uplink_catalog.yml | 10 +++--- .../Prototypes/Entities/Objects/Fun/toys.yml | 11 ++++--- .../Guns/Ammunition/Cartridges/magnum.yml | 16 ++++++++++ .../Guns/Ammunition/Projectiles/magnum.yml | 13 ++++++++ .../Guns/Ammunition/SpeedLoaders/magnum.yml | 26 ++++++++++++++++ .../Weapons/Guns/Revolvers/revolvers.yml | 29 ++++++++++++++++-- Resources/Prototypes/tags.yml | 6 ++++ .../magnum_speed_loader.rsi/base-357.png | Bin 0 -> 291 bytes .../magnum_speed_loader.rsi/icon-357.png | Bin 0 -> 310 bytes .../Magnum/magnum_speed_loader.rsi/meta.json | 29 +++++++++++++++++- .../threefiftyseven-1.png | Bin 0 -> 207 bytes .../threefiftyseven-2.png | Bin 0 -> 216 bytes .../threefiftyseven-3.png | Bin 0 -> 224 bytes .../threefiftyseven-4.png | Bin 0 -> 234 bytes .../threefiftyseven-5.png | Bin 0 -> 238 bytes .../threefiftyseven-6.png | Bin 0 -> 247 bytes .../threefiftyseven-7.png | Bin 0 -> 240 bytes 21 files changed, 142 insertions(+), 23 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/revolver_357.ogg create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/base-357.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon-357.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-5.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-6.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-7.png diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml index 4864ba4f82..66951e0eee 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml @@ -12,3 +12,8 @@ license: "CC0-1.0" copyright: "Grappling hook by 16bitstudios. Converted to .OGG and MONO by metalgearsloth" source: "https://freesound.org/people/16bitstudios/sounds/541975/" + +- files: ["revolver_357.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from /tg/station" + source: "https://github.com/tgstation/tgstation/pull/46689/commits/b9a455d6a07c800f14e385556b87815ef19727e9" \ No newline at end of file diff --git a/Resources/Audio/Weapons/Guns/Gunshots/revolver_357.ogg b/Resources/Audio/Weapons/Guns/Gunshots/revolver_357.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fcd3b99ff80c82965fb8e3053fa6e4e0438834b4 GIT binary patch literal 10327 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 Zrl;(Jk^b6A+CVokc)I$ztaD0e0subFV@Uu2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon-357.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/icon-357.png new file mode 100644 index 0000000000000000000000000000000000000000..0a415bbef45810e11cd65a94e83d557c4f3be760 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STRaI3(LqoH&vh3~cr%ajBAi%JG{ra0XZ+>Br2PzRx5SIZ`TqQw% z!T(`^Vbd9%^FUF~0*}aI1_r*vAk26?e?{6#roorVB625~|B5tdimei6nC0MdHjh7IZu-?j8=p3N^EFq-1$(`A^ZUY}{o%oa zwVDD~Pl+%H-*|O&{}L94k8P?p790zDwmw*O&9Fyi$^P$hDMmY5SDybceFuZ-Vc{wV s4m+bfnK>EnG^`j8|1Y>I-Y}=U?y>B&3n4cj1D(a->FVdQ&MBb@0D%j14gdfE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json index 512c3ccb2a..1483f7988d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/b4424d7e79cadb258a65aec2e1bc16cf3d4021dc, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", "states": [ { "name": "base" @@ -84,6 +84,33 @@ }, { "name": "rubber-6" + }, + { + "name": "base-357" + }, + { + "name": "icon-357" + }, + { + "name": "threefiftyseven-1" + }, + { + "name": "threefiftyseven-2" + }, + { + "name": "threefiftyseven-3" + }, + { + "name": "threefiftyseven-4" + }, + { + "name": "threefiftyseven-5" + }, + { + "name": "threefiftyseven-6" + }, + { + "name": "threefiftyseven-7" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d07f53a48258e9191b6cafbd042fd35a0c1e2df8 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V2Y=UV@QO1vIOhm1d*O5L4JvaCZPwWXa@gt zo>}l=nOb||{(ZKG4>q%Jyya@j-k>vm+O)I_mo7DR85qRuF6%vLx}ibQ@Ji3atEzopr0E1^ix&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-2.png new file mode 100644 index 0000000000000000000000000000000000000000..21dd3d78b991dbca791acc31d3786b83942781c2 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V6LZ&V@QO1vIOhm1d*O5L4JvaCZPwWXa@gt zo>}l=nOb||{(ZKG4>q%Jyya@j-k>vm+O)I_mo7DR85qRuF6%vLx}ibQ@Ji3atE!lvI6;>1s;*b3=DjSL74G){)!Z!V5z5zV@QO1vIOhm1d*O5L4JvaCZPwWXa@gt zo>}l=nOb||{(ZKG4>q%Jyya@j-k>vm+O)I_mo7DR85qRuF6%vLx}ibQ@Ji3atEX+R)Wf+1b-v^Q P9l+q}>gTe~DWM4fN%2PE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-4.png new file mode 100644 index 0000000000000000000000000000000000000000..73cc41a5752ce8560f8101465e23c2e2034aff55 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STr%ajBAi!X6Z@+&1`kOazeqoRg4GjfKp78tm7)WuH1o;L3hX96q z&3hw(Vw?pYk;M!Qe1}1p@p%4<6riBHr;B5Vg@1B_I)j_214AU2ghRtb&Qpy6CmI@O zwzjs;oXWeXNk-U#VIkXYCY9(DCXAdsGo%GR-4Io1SFKc2XbxmmIB<@S;fJ!6ppD?g QR-lm#p00i_>zopr06K(7kpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-5.png new file mode 100644 index 0000000000000000000000000000000000000000..5d27da33367334c2f55f55bd3b6278e38d4fedb0 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STr%ajBAi!X6Z@+&1`kOazeqoRg4GjfKp78tm7)WuH1o;L3hX96q z&3hw(Vw?pYk;M!Qe1}1p@p%4<6riBDr;B5Vg@1B_I)j_214AU2ghRtb&Qpy6CmI@O zwzjs;oXWeXNk-U#VIkXYCY9(DCXAds9nuSm0xEr23ob8A^xVbyA|Zs4W5Z@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/threefiftyseven-6.png new file mode 100644 index 0000000000000000000000000000000000000000..b3520b26a20c225299b60e3f9690c081df06a262 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STr%ajBAi!X6Z@+&1`kOazeqoRg4GjfKp78tm7)WuH1o;L3hX96q z&3hw(Vw?pYk;M!Qe1}1p@p%4<6rf;;r;B5Vh5y?Lo?JjDFs#-2|NpVT+9jOXy@!8q&P}AV>P42X=%?S}KwbeRbULLobP0l+XkKs-R7T literal 0 HcmV?d00001