This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 456
.357 Alternative Ammo Update #15519
Merged
Merged
.357 Alternative Ammo Update #15519
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
I am scared of wallstake but I trust your judgement and testing for that one. |
Contributor
Author
Good. |
KillerOrcaCora
approved these changes
Aug 30, 2022
Contributor
KillerOrcaCora
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks fine
tattax
reviewed
Aug 30, 2022
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
Yogbot-13
added a commit
that referenced
this pull request
Sep 4, 2022
JamieD1
pushed a commit
that referenced
this pull request
Sep 17, 2022
* he he he haw * Update krav_maga.dm * Squashed commit of the following: commit e00516b Author: Changelogs <action@github.com> Date: Mon Sep 5 14:12:25 2022 +0000 Automatic changelog compile [ci skip] commit 81d641e Author: Yogbot-13 <admin@yogstation.net> Date: Mon Sep 5 05:46:20 2022 -0400 Automatic changelog generation #15627 [ci skip] commit 1eba047 Author: Bop <smmsmsmsmmm@gmail.com> Date: Mon Sep 5 16:46:17 2022 +0700 Big slap hand fix (#15627) * oh fbauh8fhwai fuck * aye * aaa commit 8e6ea28 Author: Changelogs <action@github.com> Date: Mon Sep 5 06:40:18 2022 +0000 Automatic changelog compile [ci skip] commit 5d32bd1 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 21:04:08 2022 -0400 Automatic changelog generation #15625 [ci skip] commit 71a6000 Author: cuackles <68789204+cuackles@users.noreply.github.com> Date: Sun Sep 4 18:04:06 2022 -0700 Update storage.dmi (#15625) commit 797e94e Author: Changelogs <action@github.com> Date: Sun Sep 4 22:20:19 2022 +0000 Automatic changelog compile [ci skip] commit c205d55 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 11:44:12 2022 -0400 Automatic changelog generation #15614 [ci skip] commit 8f966ba Author: Redmoogle <dakotamew@gmail.com> Date: Sun Sep 4 11:44:11 2022 -0400 Fix autolathe searching & also github line ending enforcement (#15614) * fix * doink console.log * also rename cornflake * linty commit 58b20dd Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:50:12 2022 -0400 Automatic changelog generation #15596 [ci skip] commit 9a1aadf Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:50:11 2022 -0400 fixes snowflake unmodular ID checks (#15596) * GetID * Update expressconsole.dm * Update mech_fabricator.dm commit 67d732c Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:48:44 2022 -0400 Automatic changelog generation #15587 [ci skip] commit b9128c8 Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:48:42 2022 -0400 Update reactive_armour.dm (#15587) commit d47220a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:48:29 2022 -0400 Automatic changelog generation #15586 [ci skip] commit 1d97603 Author: Theos <theubernyan@gmail.com> Date: Sun Sep 4 10:48:28 2022 -0400 should maybe make toolset implant tools count for crafting (#15586) * should maybe make toolset implant tools count for crafting * Update crafting.dm * Update crafting.dm commit a530b8a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:48:05 2022 -0400 Automatic changelog generation #15583 [ci skip] commit d9df053 Author: Byemoh <baiomurang@gmail.com> Date: Sun Sep 4 09:48:03 2022 -0500 Adds gen_turf_only to all map_generators and turns it on (#15583) * Update CaveGenerator.dm * Update CaveGenerator.dm commit abf9497 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:47:46 2022 -0400 Automatic changelog generation #15582 [ci skip] commit 0c706f9 Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:47:45 2022 -0400 Fixes PDA detonations not sending the message (#15582) * Update bomberman.dm * Update bomberman.dm commit 54d38f5 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:47:30 2022 -0400 Automatic changelog generation #15581 [ci skip] commit 9a01898 Author: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun Sep 4 09:47:28 2022 -0500 THE FIX (#15581) commit dab32fe Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:47:16 2022 -0400 Automatic changelog generation #15578 [ci skip] commit 3d53a2b Author: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun Sep 4 09:47:15 2022 -0500 fuck yuo (#15578) commit e5eaa10 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:43:42 2022 -0400 Automatic changelog generation #15576 [ci skip] commit 7160ba9 Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 09:43:40 2022 -0500 die orion DIE (#15576) commit 4470959 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:43:02 2022 -0400 Automatic changelog generation #15575 [ci skip] commit f4291dd Author: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com> Date: Sun Sep 4 17:43:00 2022 +0300 buff (#15575) commit 3d0570a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:42:26 2022 -0400 Automatic changelog generation #15574 [ci skip] commit 9627411 Author: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com> Date: Sun Sep 4 17:42:24 2022 +0300 Ratvarian cyborgs tweaks (#15574) commit 536b34e Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:42:03 2022 -0400 Automatic changelog generation #15573 [ci skip] commit c62824e Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 09:42:02 2022 -0500 Update snacks_pastry.dm (#15573) commit ec97c69 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:41:52 2022 -0400 Automatic changelog generation #15572 [ci skip] commit f502ad9 Author: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com> Date: Sun Sep 4 17:41:50 2022 +0300 Adds clockwork stargazers (#15572) * e * pog * trait * Add files via upload * Update stargazer.dm commit f72ce0b Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:41:10 2022 -0400 Automatic changelog generation #15571 [ci skip] commit d701167 Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 09:41:09 2022 -0500 chimken nugget (#15571) commit a90409d Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:40:04 2022 -0400 Automatic changelog generation #15570 [ci skip] commit 412f960 Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 09:40:02 2022 -0500 Update Yogsmeta.dmm (#15570) commit 01571b2 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:39:43 2022 -0400 Automatic changelog generation #15569 [ci skip] commit 9fbe192 Author: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun Sep 4 09:39:41 2022 -0500 Update singularity.dm (#15569) commit ce815fc Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:39:22 2022 -0400 Automatic changelog generation #15567 [ci skip] commit 9327e40 Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Sun Sep 4 10:39:21 2022 -0400 Moar (#15567) commit fe629ff Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:34:27 2022 -0400 fix a useless runtime (#15564) commit 8448f8c Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:31:27 2022 -0400 Automatic changelog generation #15558 [ci skip] commit ea0535f Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:31:25 2022 -0400 NTOS Download based on distance (#15558) * Update ntdownloader.dm * typo * clamp * ethernet unaffected + buff commit b1b6769 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:28:22 2022 -0400 Automatic changelog generation #15556 [ci skip] commit 81f6eb3 Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 09:28:20 2022 -0500 Dankpockets now subtype of donkpockets & dank pizza now costs cannabis not ambrosia vulgaris (#15556) * Update snacks_pastry.dm * Update recipes_pizza.dm * Update snacks_pastry.dm * Update recipes_pastry.dm commit bda2c32 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:17:38 2022 -0400 Automatic changelog generation #15553 [ci skip] commit dda7ca7 Author: GraveHat <107460718+GraveHat@users.noreply.github.com> Date: Sun Sep 4 22:17:36 2022 +0800 Secure storage sprite indication (#15553) Abra Kadabra since you're all unlocked, you now show to all that you aren't locked! commit 528a38a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:17:03 2022 -0400 Automatic changelog generation #15584 [ci skip] commit 3cbe5b8 Author: Redmoogle <dakotamew@gmail.com> Date: Sun Sep 4 10:17:01 2022 -0400 Makes surgerys not cancel if wrong step (#15584) * a * Update helpers.dm commit 26c48d4 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:13:33 2022 -0400 Automatic changelog generation #15547 [ci skip] commit e573d79 Author: Bop <smmsmsmsmmm@gmail.com> Date: Sun Sep 4 21:13:31 2022 +0700 [PORT] Table smacking (#15547) * EAEAE * e * ea * no * anea * NO SLAPPING ACROSS MAP commit 11ca67a Author: Changelogs <action@github.com> Date: Sun Sep 4 14:08:00 2022 +0000 Automatic changelog compile [ci skip] commit 32ad92e Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:03:39 2022 -0400 Automatic changelog generation #15546 [ci skip] commit 6c6b7d2 Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:03:37 2022 -0400 Adds F.R.A.M.E. to NTOS (#15546) * frame * get told code on purchase * typo * typo2 * no sillycons commit adab5a7 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:02:45 2022 -0400 Automatic changelog generation #15545 [ci skip] commit 195e256 Author: adamsong <adamsong@users.noreply.github.com> Date: Sun Sep 4 10:02:43 2022 -0400 Adds round number to unclaimed ticket (#15545) commit a41bb41 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:02:29 2022 -0400 Automatic changelog generation #15544 [ci skip] commit 581c7d1 Author: Bop <smmsmsmsmmm@gmail.com> Date: Sun Sep 4 21:02:27 2022 +0700 Makes receiving pda message more noticeable (#15544) * makes pda message receiving more noticeable * Update ntpda_msg.dm commit de1776d Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 10:00:42 2022 -0400 Automatic changelog generation #15542 [ci skip] commit 795b0e8 Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 10:00:41 2022 -0400 Restores the law office's ability to @everyone (#15542) * at everyone * Update computer.dm commit 235a050 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:59:58 2022 -0400 Automatic changelog generation #15541 [ci skip] commit c85dba4 Author: Redmoogle <dakotamew@gmail.com> Date: Sun Sep 4 09:59:56 2022 -0400 clarity (#15541) commit 1cf633a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:54:15 2022 -0400 Automatic changelog generation #15540 [ci skip] commit a7f9382 Author: Bop <smmsmsmsmmm@gmail.com> Date: Sun Sep 4 20:54:13 2022 +0700 Makes NIRN accessible for PDA (#15540) commit 1f6bd93 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:53:46 2022 -0400 Automatic changelog generation #15538 [ci skip] commit bbc838d Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 09:53:45 2022 -0400 Makes robo control program free-access and limits bot control to access (#15538) * Update robocontrol.dm * Update robocontrol.dm commit 786170b Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:18:23 2022 -0400 Automatic changelog generation #15537 [ci skip] commit a1270b5 Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 08:18:21 2022 -0500 Makes Fire Extinguishers Bulky (Adv. Fire Extinuishers & Mini Extinguishers Exempt) + Adds Mini Extinguishers To Mining Vendor + Survival Boxes & Makes Non-Pocket Extinguishers Hold More (#15537) * Update extinguisher.dm * Update machine_vending.dm * Update boxes.dm * guh commit 67a813d Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:16:52 2022 -0400 Automatic changelog generation #15536 [ci skip] commit f42b525 Author: Bop <smmsmsmsmmm@gmail.com> Date: Sun Sep 4 20:16:49 2022 +0700 Excludes hardhat, radhood, biohood, bombhood, firesuit helmet from falling off when you slip (#15536) * muh why * vra * gulp * vler * Revert "gulp" This reverts commit 1ac9f60. * Revert "vra" This reverts commit ed75b1d. * Revert "muh why" This reverts commit 10cc009. commit ecd8a27 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:16:26 2022 -0400 Automatic changelog generation #15535 [ci skip] commit b5dd42f Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 08:16:24 2022 -0500 Limits Abductors to 25 Pop (#15535) * Update dynamic_rulesets_midround.dm * Update abductor.dm commit 431b25d Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:16:03 2022 -0400 Automatic changelog generation #15533 [ci skip] commit 73f65ee Author: Byemoh <baiomurang@gmail.com> Date: Sun Sep 4 08:16:01 2022 -0500 New ash drake fire buff doesn't stack 5 morbillion fire stacks directly in front of its snout (#15533) * Update drake.dm * Update drake.dm commit 86491b5 Author: Redmoogle <dakotamew@gmail.com> Date: Sun Sep 4 09:14:35 2022 -0400 #6 is no more. (#15531) * Update PULL_REQUEST_TEMPLATE.md * skre Co-authored-by: ynot01 <ynot000001@gmail.com> Co-authored-by: ynot01 <ynot000001@gmail.com> commit 7df1aa8 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:13:00 2022 -0400 Automatic changelog generation #15530 [ci skip] commit 3771954 Author: Theos <theubernyan@gmail.com> Date: Sun Sep 4 09:12:59 2022 -0400 should prevent admin spqned xeno queens from causing shuttle shenanigans (#15530) commit 5eef956 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:11:58 2022 -0400 Automatic changelog generation #15529 [ci skip] commit 02f7d79 Author: Redmoogle <dakotamew@gmail.com> Date: Sun Sep 4 09:11:56 2022 -0400 Fixes Regal Rats & Reenables them (#15529) * Update regalrat.dm * rest of fixes * Misc * add text commit cc16307 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:11:27 2022 -0400 Automatic changelog generation #15528 [ci skip] commit 1ad31d1 Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 09:11:25 2022 -0400 budget viewer program (#15528) * budget viewer * fix indentation * Update budgetviewer.dm commit a52a0fb Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:09:20 2022 -0400 Automatic changelog generation #15526 [ci skip] commit f88c97b Author: Theos <theubernyan@gmail.com> Date: Sun Sep 4 09:09:18 2022 -0400 fixes rice being invisible (#15526) commit f8fc7e9 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:07:49 2022 -0400 Automatic changelog generation #15520 [ci skip] commit ad906a0 Author: GraveHat <107460718+GraveHat@users.noreply.github.com> Date: Sun Sep 4 21:07:47 2022 +0800 I forgor to fix that time VCS crashed (#15520) oopsies commit 344d406 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:07:36 2022 -0400 Automatic changelog generation #15519 [ci skip] commit a93c7a3 Author: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Sun Sep 4 08:07:34 2022 -0500 .357 Alternative Ammo Update (#15519) * i will make bullets unique * spontaneous re-spriting * updates some comments * two new ammo types * Update code/modules/projectiles/projectile/bullets/revolver.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update revolver.dm * Update uplink_items.dm * Update ammo_boxes.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> commit 9fd4a61 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:06:41 2022 -0400 Automatic changelog generation #15518 [ci skip] commit 7d4a34a Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Sun Sep 4 09:06:39 2022 -0400 blut (#15518) commit 5ec2766 Author: LazennG <58535870+LazennG@users.noreply.github.com> Date: Sun Sep 4 06:06:11 2022 -0700 Update miscellaneous.dm (#15517) commit 2904fd8 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:04:25 2022 -0400 Automatic changelog generation #15515 [ci skip] commit bdcd183 Author: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Sun Sep 4 08:04:23 2022 -0500 oops i had an idea (#15515) commit 8364ef0 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:01:22 2022 -0400 Automatic changelog generation #15514 [ci skip] commit 1a56ea2 Author: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Sun Sep 4 08:01:21 2022 -0500 i hate image files i hate image files (#15514) commit 55733c4 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 09:00:23 2022 -0400 Automatic changelog generation #15511 [ci skip] commit 0463d24 Author: adamsong <adamsong@users.noreply.github.com> Date: Sun Sep 4 09:00:21 2022 -0400 Instable (#15511) commit 511e895 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:59:38 2022 -0400 Automatic changelog generation #15506 [ci skip] commit 8169e99 Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Sun Sep 4 08:59:36 2022 -0400 i hate pod people (#15506) commit 848cd2d Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:58:52 2022 -0400 Automatic changelog generation #15504 [ci skip] commit e4e0a7f Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Sun Sep 4 08:58:50 2022 -0400 mmstamina (#15504) commit 6be9e28 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:58:28 2022 -0400 Automatic changelog generation #15503 [ci skip] commit 7e6e169 Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Sun Sep 4 08:58:27 2022 -0400 +bonk (#15503) commit 03f922f Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:57:21 2022 -0400 Automatic changelog generation #15493 [ci skip] commit 4f29133 Author: CMOisLing <40966850+CMOisLing@users.noreply.github.com> Date: Sun Sep 4 08:57:19 2022 -0400 Removes threshold (#15493) It didnt do anything anyway commit 80c8e07 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:56:05 2022 -0400 Automatic changelog generation #15490 [ci skip] commit 2247dc2 Author: ChesterTheCheesy <71487903+ChesterTheCheesy@users.noreply.github.com> Date: Sun Sep 4 14:56:04 2022 +0200 Horror Balance Patch 1.1 (#15490) * Update horror.dm * Update horror_abilities_and_upgrades.dm commit 4cc07c9 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:52:58 2022 -0400 Automatic changelog generation #15476 [ci skip] commit 7f62e8a Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Sun Sep 4 07:52:55 2022 -0500 Renables & Improves Stalwart + Fixes Stalwart's Loot Drop & Improves It + Adds New Stalwart Drops (#15476) * readds stalwart to the megafauna list big metal man returns * holy shit big fixes * Update energy.dmi * Update plasma.dm * big changes * Update stalwart.dm * Update necropolis_chests.dm * why dont you go wield some bitches stalwart staff wield changes in prep for new sprites * Update stalwart.ogg * Update stalwart.ogg * Update machine_vending.dm * Revert "Update machine_vending.dm" This reverts commit 20dd3c5. * Update stalwart.ogg * Update stalwart.ogg * Update stalwart.ogg * shazam! * Update gems.dm * 1 * Update stalwart.dm * forgor the bounty * oops * Update plasma.dm commit 6d2903e Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:50:17 2022 -0400 Automatic changelog generation #15454 [ci skip] commit 7fbd516 Author: Photoshoot <69369461+Lichton@users.noreply.github.com> Date: Sun Sep 4 08:50:15 2022 -0400 Adds a new wizard spell, Mimicry (#15454) * Includes new wizard spell in yogstation.dme * Adds the sprite for the Mimicry spell. * Add files via upload * Add files via upload * Update disguise.dm * Makes disguise compatible with SHAPESHIFTING BS Shapeshift makes your mob unseen, and then for some reason spawns a new mob, sends your brain into it, and buckles your regular mob to the new mob. Why? Makes shitcode to detect when the host is turned monster during disguise commit cdaffb1 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:49:51 2022 -0400 Automatic changelog generation #15443 [ci skip] commit 73d0927 Author: Redmoogle <dakotamew@gmail.com> Date: Sun Sep 4 08:49:49 2022 -0400 Makes Autolathe less laggy, Cleans Code, Fixes Bugs (#15443) * Makes autolathe designs use static data instead of updating every second * Update autolathe.dm * Autodoc + Remove unused variables * ui fixes * maybe works * Prank Em VSCode * bogos binted * probably works * fixes * MY SANITY * there we go it works now * Check if make_item succeeded * add cm3 to amounts * Kick design["disabled"] = disabled due to being redundant * futureproofing * UI Improvements * fix commit 4ca5465 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:48:00 2022 -0400 Automatic changelog generation #15428 [ci skip] commit c5497e0 Author: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com> Date: Sun Sep 4 15:47:58 2022 +0300 Adds Toreador bloodsucker clan (#15428) * new clan * fix * e * e * debuff * Apply suggestions from code review Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> commit 0d50260 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:41:08 2022 -0400 Automatic changelog generation #15406 [ci skip] commit 2d656ef Author: GraveHat <107460718+GraveHat@users.noreply.github.com> Date: Sun Sep 4 20:41:06 2022 +0800 Adds in a Ninja NoGun Implant and Katana shock if user is not ninja or has no insulation (#15406) * No guns No sword *with exceptions * Katana actually shocks people and Description change Budget insuls die * Apply suggestions from code review Desc update and hopefully those 5 seconds work Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Reverts seconds to 0 It did not in fact work Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> commit 82c02dd Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:39:35 2022 -0400 Automatic changelog generation #15390 [ci skip] commit 1f53802 Author: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun Sep 4 07:39:33 2022 -0500 shields no longer have 100% guaranteed chance to block everything (#15390) * STUPID * Update yogstation.dme * FUCC commit 1311d82 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Sep 4 08:36:56 2022 -0400 Automatic changelog generation #15355 [ci skip] commit 30ea933 Author: ynot01 <ynot000001@gmail.com> Date: Sun Sep 4 08:36:54 2022 -0400 [ADMIN] NT uplinks for ERT (#15355) * ERT uplink init * add oxy tank to ert backpack * add ds hardsuits & fix m1911 mag * set to just "Commander" * adds eshield, teleshield, and ds mask to uplink * add medbeam gun, remove duplicate * restrict discounts & limit stock * fix wt dupe * makes the tommygun wildly inaccurate * tommy cheaper cause inaccurate also desc * lets you have two tommy guns miss me with that ‘weapon accuracy’ shit. im shooting everything. im laying down cover fire. im shooting the walls. im shooting my teammates. im shooting myself. my accuracy is 100% yall just dont know what im aiming at * makes toolbelt 1 wc * makes tommy actually inaccurate * poke turdis * fixes * adds ap and incen saber ammo * add laser rifle, cap eguns * ds get a little more * reduce industrial RCD price to 5WC * reduce RCD to 2 and combat RCD to 4 * reduce medbeam by 1 and limit stock * ERT leader gets 5 extra WC * leader gets fancy hat * Update ert.dm * fix laser rifle overwriting tac eguns * set default uplink type * add mini e gun * add nt mantis blades * fix nt mantis * efficiency or something * actually mini * lower mantis to 7 * add armors * update teleshield desc * add bowman * fix paths * add poster box * Update uplink_items.dm * lower recharger cost to 2 WC * add exclusivity to ert commander hardsuit * fixes stupid tommygun code * Update smg.dm commit 2d546bb Author: Changelogs <action@github.com> Date: Sat Sep 3 06:11:37 2022 +0000 Automatic changelog compile [ci skip] commit 145ac82 Author: Yogbot-13 <admin@yogstation.net> Date: Fri Sep 2 23:40:47 2022 -0400 Automatic changelog generation #15557 [ci skip] commit b2feb68 Author: Vaelophis Nyx <vaelophisnyx@gmail.com> Date: Fri Sep 2 22:40:44 2022 -0500 Update GaxStation.dmm (#15557) commit edcef7f Author: Yogbot-13 <admin@yogstation.net> Date: Fri Sep 2 19:18:15 2022 -0400 Automatic changelog generation #15422 [ci skip] commit 75f68b9 Author: GraveHat <107460718+GraveHat@users.noreply.github.com> Date: Sat Sep 3 07:18:13 2022 +0800 Ashwalker Asteroid Loot Rebalance (#15422) * Loot Rebalance * Adds Magmite Parts back commit f05f390 Author: Yogbot-13 <admin@yogstation.net> Date: Fri Sep 2 19:17:36 2022 -0400 Automatic changelog generation #15501 [ci skip] commit fa52552 Author: GraveHat <107460718+GraveHat@users.noreply.github.com> Date: Sat Sep 3 07:17:34 2022 +0800 Adds new Lavaland ruin: Survival Research Capsule (#15501) * Lavaland ruin 2 research at the pod That's a cold spider... * Replaced scanner with resonator Only nerds use the resonator >:] commit 5a2efc6 Author: Changelogs <action@github.com> Date: Fri Sep 2 06:33:13 2022 +0000 Automatic changelog compile [ci skip] commit 07c7ff5 Author: Yogbot-13 <admin@yogstation.net> Date: Thu Sep 1 22:28:15 2022 -0400 Automatic changelog generation #15562 [ci skip] commit 7a51eb2 Author: GraveHat <107460718+GraveHat@users.noreply.github.com> Date: Fri Sep 2 10:28:13 2022 +0800 They have some style, they have some grace. (#15562) This moff has a funny face. * Update changelog.html * what * Apply suggestions from code review Co-authored-by: Redmoogle <dakotamew@gmail.com> * help me * Update changelog.html Co-authored-by: Redmoogle <dakotamew@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Document the changes in your pull request
Adds five new .357 variants for usage with the Syndicate revolver, though any .357 revolver can technically use them.
Standard .357 does 40 damage with -70 wound bonus. Simple enough. Its cost has been reduced to 1 TC from 2 TC.
.357 Ironfeather is less damaging buckshot, a total of 8.5 damage per pellet over six pellets (51 damage) with the same spread. Its wound bonuses are slightly higher than buckshot to try and make it capable of dishing out wounds, and it loses just slightly less damage and wound chance over distance. It costs 1 TC per loader.
.357 Nutcracker is effectively an upgraded breaching slug, a 20 damage -60 wound bonus bullet that does massive damage to airlocks and windows, moreso than the breaching slug. It costs 2 TC per loader.
.357 Metalshock deals 30 brute damage and also attempts to shock any target hit. If the shock occurs, the target takes 10 burn damage internally (ignores armor) and 5 confusion stacks. For comparison, Shock Touch deals 15/15. It costs 2 TC per loader.
.357 Heartpiercer deals 35 damage with 35 AP, but also penetrates through exactly one target. It costs 3 TC per loader.
.357 Wallstake deals 25 damage with -50 wound bonus. It is not sharp. However, it throws targets two tiles with a force of two. Impacting a wall resolves 10 damage against melee armor for whichever limb is chosen to take damage. It is also a hardstun if this occurs, which can be easily chained. It costs 4 TC per loader.
Overall lethality:
*Note that the direction and reliability of the throw in knocking someone against a wall is IFFY at best. It's using meteorslug code.
Why is this good for the game?
Variations and fun, different ammo types are what I believe can firmly elevate ballistics above energy weapons regarding their fun to use. As the .357 is more comparable to the stechkin in its costs and values now, I thought it would be appropriate to give it alternative ammunition to try and differentiate it a bit more. As revolver alternative ammo tends to be a bit on the quirky side, I wanted to make ammunition that reflected this general trend.
It's all stuff that's been seen in ballistics before, but not really in a replicable or easily accessed format. Some of these could certainly use number or intellectual passovers, especially regarding cost, damage, and effect. I'm more than willing to get some people who are better at balance on hand.
Specific justifications for...
Default .357: Having four times the cost of ammunition of the stechkin just hurts, you're firing away TC like it's nothing, and compared to the stechkin and its ability to buy AP ammunition, you're just not as economical, even going against normal targets. It is universally a lot safer and better to just buy a stechkin and load up on AP magazines.
Ironfeather: Shotgun revolver is something that hasn't existed up to now. It's basically like buying buckshot over the default slug round that is standard .357.
Nutcracker: This round type was requested, plus it's a badass alternative to using C4 or whatever else to break airlocks. Loud, fast, and cool.
Metalshock: Its shots-to-crit only matter against bulletproof, which give it a ghetto-AP effect. The confusion stacks are light for the sake of not going overkill with RNG you-move-randomly effects, which is just absurd if you're already being shot multiple times. It's also completely countered by insuls, meaning it won't work on the captain or anyone else that's immune to shocks for whatever reason.
Heartpiercer: It's on the pricier side, you get to down a normal secoff in one fewer bullet, AND you get to down bulletproof vests for one bullet fewer than AP stechkin. The piercing is what makes it so much more expensive, it won't always come into play, but it's scary to go up against. 3 TC per loader hurts, but you're paying for what you get.
Wallstake: By far the iffiest of all these ammo types, you can quite literally just spam hardstun at range with this. Some would say this is absurd. I would like to point to the ebow which also costs 10 TC (rev + wallstake = 10), but it infinitely recharges, is more compact, more stealthy, and doesn't require the target to hit a wall in order to stun them. All you might need are those few seconds of stun to really dig into someone. If spam hardstun into a wall was a huge issue before, then it seems unlikely that the baseball bat would be slept on as much. Realistically, it's hard to get people to slam into walls, especially with how finicky throw code is on projectiles (testing it was... unstable at best). You also have to catch someone very close to a wall in order to actually stun them with it. It's certainly something to keep an eye on, but I think it's worth the test to see just how good it is.
Spriting
Base sprite for comparison:

.357 Ironfeather:

.357 Nutcracker:

.357 Metalshock:

.357 Heartpiercer:

.357 Wallstake:

Wiki Documentation
Images and values to be uploaded to Guide to Combat and Syndicate Items
Could maybe use a mention on Detective page
Changelog
🆑
rscadd: Adds .357 Ironfeather for 1 TC, a round type that fires a weaker buckshot clump, but has slightly more favorable damage and wound dropoff.
rscadd: Adds .357 Nutcracker for 2 TC, a round type that's effectively an upgraded breaching slug, doing half the damage of a normal round but massive damage to airlocks and windows.
rscadd: Adds .357 Metalshock for 2 TC, a round type that converts some brute damage into a shock that confuses targets. Insuls prevent the damage and the effect, making it a weaker bullet if you have immunity.
rscadd: Adds .357 Heartpiercer for 3 TC, a round type comparable to a standard AP round, but has the ability to penetrate through one target to hit a total of two.
rscadd: Adds .357 Wallstake for 4 TC, a round type which does lessened, blunt damage, but throws targets like the baseball bat or meteorshot. Will only stun if a target hits a wall.
tweak: Normal .357 speedloader costs 1 TC from 2 TC
imageadd: Adds sprites for the three new ammo types
experimental: Who said ballistics can't be quirky?
/:cl: