mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
* first bow powercreep edition * first patch * description updates * added the stuff * follow-up edits * very mild voicebox updates * all the stuff * some value/wording changes + shifts shadow cloak to nukies * halve bow slowdown * aaaa * uhoh * cloak charge rate changes * remove redundant line * upgrades break bow damage to middle finger * spellbook adjustments * tribal armor tweaks (I'm looking at you pathfinder cloak and you're gonna get slapped soon) * aaa * more stuff * agh * done? * minor tweaks + craftable gloves * adds bone crossbow crafting recipe * maybe fix cornflakes * Squashed commit of the following: commit414af05928Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 18 22:05:17 2023 -0500 Automatic changelog generation #17965 [ci skip] commit4dbd995239Author: adamsong <adamsong@users.noreply.github.com> Date: Sat Feb 18 22:05:15 2023 -0500 Fix apply_innate_effects not getting mob refs like its supposed to, fixes veil health not being modified (#17965) commit8f9f915f69Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 18 22:04:08 2023 -0500 Automatic changelog generation #17970 [ci skip] commit50ed5323a5Author: ynot01 <ynot000001@gmail.com> Date: Sat Feb 18 22:04:06 2023 -0500 Easier wounds on unclosed surgery sites (#17970) * Update _bodyparts.dm * Update code/modules/surgery/bodyparts/_bodyparts.dm commit9c4d0652dbAuthor: Changelogs <action@github.com> Date: Sat Feb 18 14:07:01 2023 +0000 Automatic changelog compile [ci skip] commit03aae8b4cfAuthor: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 18 01:58:51 2023 -0500 Automatic changelog generation #17934 [ci skip] commit2761924c1bAuthor: ynot01 <ynot000001@gmail.com> Date: Sat Feb 18 01:58:49 2023 -0500 pvp enabled (#17934) commitcfe754a9a5Author: Changelogs <action@github.com> Date: Sat Feb 18 06:10:32 2023 +0000 Automatic changelog compile [ci skip] commit491ba04913Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 17 18:08:00 2023 -0500 Automatic changelog generation #17949 [ci skip] commita65d885b53Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 17 18:07:57 2023 -0500 Fixes energy sword dupe exploit (#17949) * Update SuperBeepsky.dm * Update code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> * Update SuperBeepsky.dm --------- Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> commit7a8a6689b6Author: Changelogs <action@github.com> Date: Fri Feb 17 22:17:32 2023 +0000 Automatic changelog compile [ci skip] commite43f06f61cAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 17 15:41:43 2023 -0500 Automatic changelog generation #17924 [ci skip] commita4229d8acbAuthor: ynot01 <ynot000001@gmail.com> Date: Fri Feb 17 15:41:40 2023 -0500 [BOUNTY] Holy Light sect, dedicated to healing (#17924) * you defy the light * revive and be less bad flavor * Update code/modules/religion/religion_sects.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --------- Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> commitad64a89f0aAuthor: ktlwjec <122807629+ktlwjec0@users.noreply.github.com> Date: Fri Feb 17 18:04:42 2023 +0000 removes plate from greeneggsandham (#17883) commitb0c3ca40a8Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 17 10:59:34 2023 -0500 Automatic changelog generation #17969 [ci skip] commiteefceef5edAuthor: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Fri Feb 17 16:59:31 2023 +0100 [box] fixes opacity on psych doors (#17969) * windows * opac commit4b75b528eeAuthor: Changelogs <action@github.com> Date: Fri Feb 17 14:07:57 2023 +0000 Automatic changelog compile [ci skip] commit0a5d72beafAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 17 01:56:41 2023 -0500 Automatic changelog generation #17880 [ci skip] commitf6ed8e4b0bAuthor: adamsong <adamsong@users.noreply.github.com> Date: Fri Feb 17 01:56:39 2023 -0500 Makes vote weight and preferred map actually work (#17880) commit22657a9023Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 17 01:50:20 2023 -0500 Automatic changelog generation #17901 [ci skip] commit783f444541Author: Aquizit <70451213+Aquizit@users.noreply.github.com> Date: Fri Feb 17 00:50:17 2023 -0600 Adds new access define for Secure Tech Storage (#17901) * creates secure tech storage define, gives it to CE and adds it to appropriate lists * sets new access to secure tech storage doors * added secure tech storage to ID modification access * reverting map changes, will be changed in another pr per wej commitb306a6f4c3Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 17 01:33:16 2023 -0500 Automatic changelog generation #17935 [ci skip] commit32cdd383e4Author: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Date: Fri Feb 17 01:33:14 2023 -0500 Malfunctioning AIs no longer need to kill androids or synthetics (#17935) * Update objective.dm * Update Malf_Modules.dm commitd83cc04e94Author: Changelogs <action@github.com> Date: Fri Feb 17 06:11:59 2023 +0000 Automatic changelog compile [ci skip] commitb89713fa7cAuthor: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 22:40:04 2023 -0500 Automatic changelog generation #17861 [ci skip] commit818973e1e9Author: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Fri Feb 17 04:40:02 2023 +0100 fixes some issues in infiltrator base (#17861) * huh * man * adds griddle * that's really funny but fuck you --------- Co-authored-by: Byemoh <baiomurang@gmail.com> commitaf417335c1Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 22:32:01 2023 -0500 Automatic changelog generation #17942 [ci skip] commit4e6037ec58Author: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Fri Feb 17 04:31:58 2023 +0100 [box] Fixes some map issues (#17942) * eo * more * more fixes * damn * cargo double lights * rogue cable and wrong id on ai core door * derwalls a random rwall * tile commit2e52265500Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 20:08:21 2023 -0500 Automatic changelog generation #17917 [ci skip] commit6ebf0318d9Author: Theos <theubernyan@gmail.com> Date: Thu Feb 16 20:08:18 2023 -0500 Removes the knockout from high level bloodsucker mesmerize since it makes the ability weaker (#17917) * Removes the knockout from high level bloodsucker mesmerize since it makes the ability weaker * Update mesmerize.dm * killing you commit7d664d3af5Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 20:06:53 2023 -0500 Automatic changelog generation #17918 [ci skip] commitdc8148dcb1Author: ynot01 <ynot000001@gmail.com> Date: Thu Feb 16 20:06:51 2023 -0500 Update roundend.dm (#17918) commita46d618224Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 20:06:21 2023 -0500 Automatic changelog generation #17928 [ci skip] commitf04bc81f0cAuthor: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu Feb 16 17:06:18 2023 -0800 Update kinetic_crusher.dm (#17928) commit18fa2ae7afAuthor: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 20:05:51 2023 -0500 Automatic changelog generation #17946 [ci skip] commit6857bacb76Author: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Date: Thu Feb 16 20:05:48 2023 -0500 Update mousetrap.dm (#17946) commit1751af026cAuthor: Changelogs <action@github.com> Date: Thu Feb 16 22:17:07 2023 +0000 Automatic changelog compile [ci skip] commite005525535Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 12:19:45 2023 -0500 Automatic changelog generation #17922 [ci skip] commitbc8ae716abAuthor: Ling <lingbleed@gmail.com> Date: Thu Feb 16 18:19:42 2023 +0100 Fixes Atmos fire fighting backpack (#17922) commite04fc1b6a8Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 12:18:03 2023 -0500 Automatic changelog generation #17939 [ci skip] commit93daa6c361Author: ynot01 <ynot000001@gmail.com> Date: Thu Feb 16 12:18:00 2023 -0500 Bloodsucker Brawn knockdown patch (#17939) * Update brawn.dm * Update brawn.dm * Update brawn.dm commit1ef9484767Author: Changelogs <action@github.com> Date: Thu Feb 16 14:09:56 2023 +0000 Automatic changelog compile [ci skip] commiteaff1fdb1bAuthor: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 05:52:39 2023 -0500 Automatic changelog generation #17936 [ci skip] commit3d42d664bcAuthor: adamsong <adamsong@users.noreply.github.com> Date: Thu Feb 16 05:52:36 2023 -0500 Fixes editing bans in game (#17936) * Fixes editing bans in game * Fixes other error commit69ea8d6ca9Author: Changelogs <action@github.com> Date: Thu Feb 16 06:11:47 2023 +0000 Automatic changelog compile [ci skip] commit4e6a16b426Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 16 00:37:02 2023 -0500 Automatic changelog generation #17923 [ci skip] commit2a7da8c107Author: ynot01 <ynot000001@gmail.com> Date: Thu Feb 16 00:37:00 2023 -0500 fixes clown sect not healing (#17923) commit890bc91805Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 20:56:34 2023 -0500 Automatic changelog generation #17945 [ci skip] commitb2b39d3ed8Author: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Wed Feb 15 20:56:32 2023 -0500 Update revolution.dm (#17945) commitec2cbd2c89Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 20:48:13 2023 -0500 Automatic changelog generation #17864 [ci skip] commitcd14d86ed6Author: Theos <theubernyan@gmail.com> Date: Wed Feb 15 20:48:10 2023 -0500 Buffs the ebow to be faster (#17864) * ebow buff?? * obliterate ebow polonium * reduced cooldown commitdf7f9bc020Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 20:47:28 2023 -0500 Automatic changelog generation #17870 [ci skip] commit232aa3fa55Author: ynot01 <ynot000001@gmail.com> Date: Wed Feb 15 20:47:26 2023 -0500 Update bloodsuckers.dm (#17870) commitd679caad3cAuthor: Changelogs <action@github.com> Date: Wed Feb 15 22:17:39 2023 +0000 Automatic changelog compile [ci skip] commit9678f1f65aAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 14:58:11 2023 -0500 Automatic changelog generation #17930 [ci skip] commit039792ea37Author: Byemoh <baiomurang@gmail.com> Date: Wed Feb 15 13:58:09 2023 -0600 NVS Gax Incinerator Expansion (#17930) commita0fe3e174cAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 11:04:14 2023 -0500 Automatic changelog generation #17941 [ci skip] commita263586d88Author: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Wed Feb 15 17:04:08 2023 +0100 eee (#17941) commitf8b90faa17Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 10:11:12 2023 -0500 Automatic changelog generation #17721 [ci skip] commit1d22d7da18Author: ynot01 <ynot000001@gmail.com> Date: Wed Feb 15 10:11:07 2023 -0500 Long Awaited Psychiatrist Rework (#17721) * PART FIVE * Update brain_trauma.dm * Update examine.dm * Update mild.dm * Update brain_trauma.dm * Update brain_trauma.dm * anomalous floating lightswitch * undo unintended map changes I am sorry I don't know what happened to asteroid station I don't know what changed on the AI satellite I am sorry mapper man * can no longer cure things u shouldnt wound traumas traumas that require the aheal staff traumas that come from quirks * wej * wej 2 * Update YogStation.dmm * Update brain_trauma.dm * Update brain_trauma.dm * Update brain_trauma.dm commit85de433d2dAuthor: Changelogs <action@github.com> Date: Wed Feb 15 14:08:21 2023 +0000 Automatic changelog compile [ci skip] commita8bd8c2280Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 07:32:49 2023 -0500 Automatic changelog generation #17916 [ci skip] commit3b587559a5Author: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Wed Feb 15 06:32:46 2023 -0600 Who approved this (#17916) commit6828c4758dAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 06:58:56 2023 -0500 Automatic changelog generation #17914 [ci skip] commit3e3ab2b4d6Author: ktlwjec <122807629+ktlwjec0@users.noreply.github.com> Date: Wed Feb 15 11:58:53 2023 +0000 fixes processor recipes (#17914) commit601ce3f675Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 06:41:26 2023 -0500 Automatic changelog generation #17888 [ci skip] commitbf8867a331Author: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Wed Feb 15 05:41:24 2023 -0600 no hardcritdamage (#17888) commite1a500ec62Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 05:28:58 2023 -0500 Automatic changelog generation #17781 [ci skip] commit874db73a73Author: ynot01 <ynot000001@gmail.com> Date: Wed Feb 15 05:28:55 2023 -0500 Revert commit64a6c3a(#17781) This reverts64a6c3ac21commit734d6ec0fcAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 15 05:28:03 2023 -0500 Automatic changelog generation #17772 [ci skip] commit30d564c8dcAuthor: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Wed Feb 15 04:28:00 2023 -0600 A vain attempt to make the minigun more viable (#17772) * mmm minigun * Update minigun.dm commite7542e1f55Author: Changelogs <action@github.com> Date: Wed Feb 15 06:11:58 2023 +0000 Automatic changelog compile [ci skip] commitb5ed98fe7cAuthor: Ling <lingbleed@gmail.com> Date: Wed Feb 15 02:18:53 2023 +0100 Fix crew monitor runtime (#17921) commit4c7b5535b6Author: Changelogs <action@github.com> Date: Tue Feb 14 14:08:13 2023 +0000 Automatic changelog compile [ci skip] commitcfb81a4b91Author: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 14 04:06:15 2023 -0500 Automatic changelog generation #17919 [ci skip] commit5268119ca6Author: ynot01 <ynot000001@gmail.com> Date: Tue Feb 14 04:06:12 2023 -0500 Update recharger.dm (#17919) commit06acbae28dAuthor: Changelogs <action@github.com> Date: Tue Feb 14 06:12:20 2023 +0000 Automatic changelog compile [ci skip] commit369dba9990Author: Changelogs <action@github.com> Date: Mon Feb 13 22:17:26 2023 +0000 Automatic changelog compile [ci skip] commita8b8df1868Author: Yogbot-13 <admin@yogstation.net> Date: Mon Feb 13 16:51:13 2023 -0500 Automatic changelog generation #17887 [ci skip] commit991c54d7e3Author: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Mon Feb 13 22:51:10 2023 +0100 yeah (#17887) commitd9aec4444dAuthor: Changelogs <action@github.com> Date: Mon Feb 13 06:12:20 2023 +0000 Automatic changelog compile [ci skip] commitbad039c45fAuthor: Yogbot-13 <admin@yogstation.net> Date: Sun Feb 12 17:52:39 2023 -0500 Automatic changelog generation #17897 [ci skip] commitf251ff8187Author: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Sun Feb 12 17:52:36 2023 -0500 better metashield (#17897) commit1c7d28f658Author: Yogbot-13 <admin@yogstation.net> Date: Sun Feb 12 17:51:22 2023 -0500 Automatic changelog generation #17889 [ci skip] commit4f4d2d8bbbAuthor: LazennG <58535870+LazennG@users.noreply.github.com> Date: Sun Feb 12 14:51:19 2023 -0800 cooldown actions isavailable now calls parent pro (#17889) commit5e3f4b08a7Author: Yogbot-13 <admin@yogstation.net> Date: Sun Feb 12 17:50:40 2023 -0500 Automatic changelog generation #17894 [ci skip] commit062f0a2fd5Author: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Sun Feb 12 16:50:37 2023 -0600 augh (#17894) commit494bbd1982Author: ynot01 <ynot000001@gmail.com> Date: Sun Feb 12 07:41:24 2023 -0500 Update yogstation.dme (#17903) commit596b836652Author: Changelogs <action@github.com> Date: Sun Feb 12 06:10:28 2023 +0000 Automatic changelog compile [ci skip] commitdc689f3715Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Sun Feb 12 01:30:21 2023 +0100 Moves some config settings around which should make debug builds from github run faster (#17900) * config update * opos commit80284d7ca0Author: Changelogs <action@github.com> Date: Sat Feb 11 22:15:52 2023 +0000 Automatic changelog compile [ci skip] commit56e85c55c3Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 13:38:04 2023 -0500 Automatic changelog generation #17833 [ci skip] commit80afe50f46Author: ynot01 <ynot000001@gmail.com> Date: Sat Feb 11 13:38:01 2023 -0500 Darkspawn is now a midround instead of a gamemode (#17833) * dspawn midround * disable * performance * move sec counting down * disable nightmare * changes S to H * runtime safety * H and D to var names commit435823b827Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 12:49:50 2023 -0500 Automatic changelog generation #17878 [ci skip] commitfa4b2b98a3Author: ynot01 <ynot000001@gmail.com> Date: Sat Feb 11 12:49:47 2023 -0500 You can no longer change directions while dead (#17878) * Update bindings_atom.dm * Update bindings_atom.dm * Update bindings_atom.dm commit75cfed640fAuthor: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 12:17:44 2023 -0500 Automatic changelog generation #17842 [ci skip] commit291a70fb8fAuthor: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sat Feb 11 11:17:42 2023 -0600 Removes appendix from darkspawn (#17842) * no appendix please * just uses nohunger * thing * might as well remove it from shadowpeople they have enough going against them as is commit1cc076d57aAuthor: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 12:14:44 2023 -0500 Automatic changelog generation #17828 [ci skip] commitfef1aed09bAuthor: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sat Feb 11 11:14:42 2023 -0600 IPC martial buffs (#17828) * IPC martial tweak * update the movespeed * it's the mob that does it * bit more uplink stuff * no other guns commitbf62a065f5Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 12:01:19 2023 -0500 Automatic changelog generation #17824 [ci skip] commit20c67e451bAuthor: ynot01 <ynot000001@gmail.com> Date: Sat Feb 11 12:01:16 2023 -0500 Antag Reputation Redux (#17824) * antag repwork * check centcom specifically * GLOB.player_list * Update antag_rep.txt * Update antag_rep.txt * better loop * set miner to 6 * set AI to 6 * cook 5 * psyfch 5 commit866c4f0e97Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:39:29 2023 -0500 Automatic changelog generation #17814 [ci skip] commit64726b0798Author: Redd <36747151+ReddicusDragon@users.noreply.github.com> Date: Sat Feb 11 11:39:26 2023 -0500 Changes lizard hiss and increases staff, mentor, and donor retention by allowing felinids to hiss. (#17814) * adds sound * felinids can hiss * felinids can purr * You can no longer purr at people NanoTrasen has noticed an increase in harassment complaints from stations that employ felinids. The reports indicate that felinids would purr at people. NanoTrasen has since banned workplace purring at people. * removes purring * update lizard hiss commitb956f2caaeAuthor: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:36:59 2023 -0500 Automatic changelog generation #17809 [ci skip] commit00769859a2Author: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sat Feb 11 10:36:57 2023 -0600 Nanite heart buff (#17809) commit87bd1794dbAuthor: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:36:15 2023 -0500 Automatic changelog generation #17805 [ci skip] commitf286bdb997Author: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Date: Sat Feb 11 11:36:12 2023 -0500 you are a good (#17805) commita737b7291eAuthor: Ling <lingbleed@gmail.com> Date: Sat Feb 11 17:35:33 2023 +0100 Fix a ton of harddels (#17803) * Fix a ton of harddels * Out of scope * Stupid commitf77eb885d9Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:34:47 2023 -0500 Automatic changelog generation #17724 [ci skip] commit8f4993ae0bAuthor: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sat Feb 11 10:34:45 2023 -0600 Miners wormhole jaunter location shuffle (#17724) * Gives mining medic a jaunter * in the outfit rather than the locker --------- Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> commita6779b3a77Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:27:41 2023 -0500 Automatic changelog generation #17778 [ci skip] commit402e2d775aAuthor: Xander3359 <66163761+Xander3359@users.noreply.github.com> Date: Sat Feb 11 11:27:38 2023 -0500 One handed crusher (With new sprites) (#17778) * 1-Handed Crusher The crusher can now be held in 1 hand, wield it to use it. * one-handed crusher one-handed crusher * Update dynamic.json commitfa67c930d0Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat Feb 11 16:23:06 2023 +0000 Update dynamic_rulesets_roundstart.dm commit0e05a643a6Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:20:01 2023 -0500 Automatic changelog generation #17720 [ci skip] commit738aac2d74Author: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Sat Feb 11 10:19:59 2023 -0600 Revert "replaces chasm spawn from tendrils with lava (#17340)" (#17720) This reverts commitd0abdd2d33. commit0679f56ea6Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 11:19:12 2023 -0500 Automatic changelog generation #17609 [ci skip] commita5660a07e6Author: Theos <theubernyan@gmail.com> Date: Sat Feb 11 11:19:10 2023 -0500 Increase wizard playercount from 27 to 34 so its not syndicate station 2 (the second one) (#17609) * Increase wizard playercount from 27 to 37 so its not syndicate station 2 (the second one) * Update wizard.dm * Update dynamic_rulesets_roundstart.dm commitd1ec159cf3Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 10:50:38 2023 -0500 Automatic changelog generation #17610 [ci skip] commitf49b009b1dAuthor: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Sat Feb 11 07:50:35 2023 -0800 Increase nuke op from 27 to 37 so its not syndicate station 3 (the third one) (#17610) commit75b0447f82Author: Changelogs <action@github.com> Date: Sat Feb 11 14:07:34 2023 +0000 Automatic changelog compile [ci skip] commitab07a0c5caAuthor: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 04:18:21 2023 -0500 Automatic changelog generation #17739 [ci skip] commited09aa658dAuthor: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Sat Feb 11 03:18:18 2023 -0600 Removes mod disks from loot pool, and makes them orderable from cargo. Also adds a KA crate. (#17739) * fug * no more disks commitf6cd327077Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 04:07:17 2023 -0500 Automatic changelog generation #17873 [ci skip] commit09a038e850Author: LazennG <58535870+LazennG@users.noreply.github.com> Date: Sat Feb 11 01:07:15 2023 -0800 no more curveballs (#17873) commit186fedce46Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 04:05:05 2023 -0500 Automatic changelog generation #17865 [ci skip] commit422a595d6cAuthor: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Sat Feb 11 04:05:02 2023 -0500 makes darkspawn mindshield text a little less cringe (#17865) * makes this text a little less cringe * i love repetition of sound commitc4217e2080Author: Yogbot-13 <admin@yogstation.net> Date: Sat Feb 11 04:04:45 2023 -0500 Automatic changelog generation #17867 [ci skip] commit20fc9d7f33Author: Theos <theubernyan@gmail.com> Date: Sat Feb 11 04:04:42 2023 -0500 Reduces drakeling attack cooldowns slightly to match the mining equipment they are meant to upgrade (#17867) commitfdf31d11a7Author: Changelogs <action@github.com> Date: Sat Feb 11 06:10:17 2023 +0000 Automatic changelog compile [ci skip] commit6b0ddaf194Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 20:45:30 2023 -0500 Automatic changelog generation #17863 [ci skip] commit484a70bdc6Author: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Fri Feb 10 20:45:27 2023 -0500 hammer fix (#17863) commitc3f4bee6a9Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 20:43:51 2023 -0500 Automatic changelog generation #17866 [ci skip] commit44d935e116Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Fri Feb 10 20:43:49 2023 -0500 Unfucks darkspawn veils but they're still weaker (#17866) * brtuh * Update yogstation/code/game/gamemodes/darkspawn/veil.dm whoops Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --------- Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> commit80045a2877Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 19:56:54 2023 -0500 Automatic changelog generation #17770 [ci skip] commit40564ae7f4Author: githubuser4141 <61243846+githubuser4141@users.noreply.github.com> Date: Sat Feb 11 13:56:51 2023 +1300 Buffs the MK-II Ripley's speed (#17770) * dir * Update mecha_defense.dm * Update uplink_items.dm * Update uplink_items.dm * Update uplink_items.dm * Update ripley.dm * Update ripley.dm * Update uplink_items.dm commitbece519a8bAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 18:45:30 2023 -0500 Automatic changelog generation #17784 [ci skip] commit4a499be90fAuthor: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Fri Feb 10 18:45:27 2023 -0500 True semi-auto shotguns + racking medium/heavy ballistics requires both hands + removes outdated stechkin animations (#17784) * shotguns actually semi-auto now * updates desc * removes stechkin animations * fixes rack sound * Update code/modules/projectiles/guns/ballistic.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * slight fixes --------- Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> commit24ad52b6bdAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 18:22:35 2023 -0500 Automatic changelog generation #17835 [ci skip] commit053f8bf856Author: Redd <36747151+ReddicusDragon@users.noreply.github.com> Date: Fri Feb 10 18:22:32 2023 -0500 Typo fix (#17835) * Update swarmer.dm * Update scripture_scripts.dm * Update golems.dm * Update pen.dm * Update touch_attacks.dm * Update uplink_items.dm * Update explosive_fist.dm * Update garden_warfare.dm * Update stealth.dm * Update uplink_item.dm * Update code/modules/mob/living/carbon/human/species_types/golems.dm Co-authored-by: ynot01 <ynot000001@gmail.com> * Update scripture_scripts.dm --------- Co-authored-by: ynot01 <ynot000001@gmail.com> commitd0e1c6f1f9Author: Ling <lingbleed@gmail.com> Date: Sat Feb 11 00:09:14 2023 +0100 Actually fixes gas mixer sprite for real this time (#17840) commit66545d3beeAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 18:07:46 2023 -0500 Automatic changelog generation #17847 [ci skip] commitb04412e57eAuthor: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Fri Feb 10 17:07:42 2023 -0600 Removes #1 cause of suicide in Lizards (#17847) * CarkFetishContent * 20 minutes and chat message * no dead lizards * optimization commitc6ab8818ffAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 18:01:32 2023 -0500 Automatic changelog generation #17854 [ci skip] commit0c13569569Author: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Fri Feb 10 17:01:20 2023 -0600 Gives mining medic a laptop to keep track of bodycams (#17854) * Gives mining medic a laptop * upgraded network card commit9a3512a44bAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:59:29 2023 -0500 Automatic changelog generation #17836 [ci skip] commit606c9ced8fAuthor: Aquizit <70451213+Aquizit@users.noreply.github.com> Date: Fri Feb 10 16:59:27 2023 -0600 Adds Personnel HUD Type, gives HoP and Cap a pair of sunglasses with it (#17836) * adds personnel hud type, sunglasses for HoP and Cap with it * renames CMO shades for HoP/Cap, made new shades for CMO * forgot to make the sunglasses tint blue commitfc4a64ed52Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:58:53 2023 -0500 Automatic changelog generation #17871 [ci skip] commitab089cfae7Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 10 17:58:51 2023 -0500 Cult tiles now block atmos like everyone though it did (#17871) * Update reinf_floor.dm * Update cult_structures.dm * Update cult_structures.dm commit20af730457Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:58:27 2023 -0500 Automatic changelog generation #17819 [ci skip] commit3e918a5658Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Fri Feb 10 17:58:25 2023 -0500 Unstupidify (#17819) commit411c213dcdAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:58:11 2023 -0500 Automatic changelog generation #17818 [ci skip] commit919a2686b6Author: Ling <lingbleed@gmail.com> Date: Fri Feb 10 23:58:08 2023 +0100 Prevents wormholes from spawning in syndicate shuttles (#17818) commitb66d0720bbAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:56:47 2023 -0500 Automatic changelog generation #17811 [ci skip] commitb9eb469042Author: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Fri Feb 10 16:56:44 2023 -0600 Reduces body temp increase from being on fire (#17811) * Greatly reduces heat from being on fire * even less commitcdb38b84fdAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:49:43 2023 -0500 Automatic changelog generation #17804 [ci skip] commit1f02d82d27Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 10 17:49:41 2023 -0500 from fortnite (#17804) do the thing commit0c64a222c8Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:47:18 2023 -0500 Automatic changelog generation #17801 [ci skip] commitf6bf19009fAuthor: Ezhan <39889035+Ethan4303@users.noreply.github.com> Date: Fri Feb 10 17:47:15 2023 -0500 rotates the gas simulator in yogstation turbine (#17801) commit7c9b4054a0Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 10 17:46:46 2023 -0500 Protects events from being faked random by admins (#17790) * Update _event.dm * Update _event.dm commitcf793830ecAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:46:06 2023 -0500 Automatic changelog generation #17785 [ci skip] commit15bb9f53b7Author: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Fri Feb 10 17:46:03 2023 -0500 adds a spare mag to oddjob kit (#17785) commitc69563273bAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:45:23 2023 -0500 Automatic changelog generation #17769 [ci skip] commit367cf38f16Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 10 17:45:20 2023 -0500 Purchasable autosurgeon for 5TC (#17769) * syndi cat * Update uplink_items.dm commit247a50bc9fAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:43:58 2023 -0500 Automatic changelog generation #17735 [ci skip] commit167ab6af2bAuthor: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Date: Fri Feb 10 17:43:55 2023 -0500 Multilingual quirk can no longer give you centcom encrypted language and costs 2 points instead of 3 (#17735) * guh * Update good.dm commitbb77f2d6a3Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 17:22:33 2023 -0500 Automatic changelog generation #17856 [ci skip] commitf13f241426Author: Redd <36747151+ReddicusDragon@users.noreply.github.com> Date: Fri Feb 10 17:22:31 2023 -0500 Revert "Removes felinid language (#17825)" (#17856) This reverts commite75cb0ad00. commitc53b3bc784Author: Changelogs <action@github.com> Date: Fri Feb 10 22:17:13 2023 +0000 Automatic changelog compile [ci skip] commitbf214dad30Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 15:57:59 2023 -0500 Automatic changelog generation #17832 [ci skip] commit0144098f5cAuthor: Addust <80979251+Addust@users.noreply.github.com> Date: Fri Feb 10 20:57:56 2023 +0000 Gives onehalf a blue oxygen tank instead of a red one inside the safe (#17832) yes commit84c1ff3331Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 13:08:39 2023 -0500 Automatic changelog generation #17881 [ci skip] commite2ce0336ffAuthor: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Fri Feb 10 19:08:36 2023 +0100 ye (#17881) commit596ac490f7Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 12:29:57 2023 -0500 Automatic changelog generation #17812 [ci skip] commit2047871e5bAuthor: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Fri Feb 10 11:29:53 2023 -0600 Adds a chemical that purges nanites (#17812) * NaniteRemovalChemical * rename * Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm Co-authored-by: Ling <lingbleed@gmail.com> --------- Co-authored-by: Ling <lingbleed@gmail.com> commitbb0d420b09Author: wejengin2 <48154165+wejengin2@users.noreply.github.com> Date: Fri Feb 10 16:04:20 2023 +0100 Massacres the unused maps. (#17764) * someone has to do it * camels * order * ok no commit0424f5f5e4Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 09:40:37 2023 -0500 Automatic changelog generation #17823 [ci skip] commit611fc49e0bAuthor: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Fri Feb 10 14:40:33 2023 +0000 e (#17823) commitadda8bc9a0Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Fri Feb 10 15:17:47 2023 +0100 Update unique_donator_items.dm (#17874) commit3a8ad081f9Author: Changelogs <action@github.com> Date: Fri Feb 10 14:08:30 2023 +0000 Automatic changelog compile [ci skip] commitff2f15a395Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 05:01:24 2023 -0500 Automatic changelog generation #17848 [ci skip] commit58a00ef32dAuthor: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Fri Feb 10 11:01:21 2023 +0100 Adds barricading of airlocks and doors (#17848) * I like wood 😩 * Makes them faster to remove * 😩 * I hate molti Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> --------- Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> commit726c31fd2fAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 04:29:51 2023 -0500 Automatic changelog generation #17807 [ci skip] commit9d4d28edd3Author: Redd <36747151+ReddicusDragon@users.noreply.github.com> Date: Fri Feb 10 04:29:48 2023 -0500 Removes corn syrup from catsip (#17807) commita995a0e6fdAuthor: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 04:28:25 2023 -0500 Automatic changelog generation #17831 [ci skip] commitd35292c3d4Author: Ling <lingbleed@gmail.com> Date: Fri Feb 10 10:28:20 2023 +0100 RPD now builds even when clicked on another pipe (#17831) commit51fd6de808Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 03:53:48 2023 -0500 Automatic changelog generation #17852 [ci skip] commit9f91e2edf7Author: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Fri Feb 10 02:53:45 2023 -0600 les go (#17852) commita55a6d4297Author: Changelogs <action@github.com> Date: Fri Feb 10 06:11:39 2023 +0000 Automatic changelog compile [ci skip] commit380e400cb3Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 01:04:58 2023 -0500 Automatic changelog generation #17837 [ci skip] commit861567f4dbAuthor: Byemoh <baiomurang@gmail.com> Date: Fri Feb 10 00:04:56 2023 -0600 Update airlock.dm (#17837) commit08cec4a012Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 01:01:14 2023 -0500 Automatic changelog generation #17813 [ci skip] commit5cf47b2580Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 10 01:01:12 2023 -0500 Update hologram.dm (#17813) commitef783cb856Author: Yogbot-13 <admin@yogstation.net> Date: Fri Feb 10 00:58:35 2023 -0500 Automatic changelog generation #17834 [ci skip] commita00b6ce757Author: ynot01 <ynot000001@gmail.com> Date: Fri Feb 10 00:58:33 2023 -0500 Update medbeam.dm (#17834) commitd5b72b2259Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 9 20:22:06 2023 -0500 Automatic changelog generation #17723 [ci skip] commit4a6973a465Author: Byemoh <baiomurang@gmail.com> Date: Thu Feb 9 19:22:03 2023 -0600 Falling into a chasm doesn't delete your body and someone can fish you up (#17723) * eeeee * e * map * break * eeeee * cope * Update chasm.dm commit229d6664efAuthor: Changelogs <action@github.com> Date: Thu Feb 9 22:17:48 2023 +0000 Automatic changelog compile [ci skip] commitf606eaac8eAuthor: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 9 10:41:20 2023 -0500 Automatic changelog generation #17670 [ci skip] commit26ad93fd58Author: ynot01 <ynot000001@gmail.com> Date: Thu Feb 9 10:41:17 2023 -0500 Big Heretic revamp (finally) (#17670) * heresy * Update eldritch_book.dm * heat resistant lizards * 5 tile range only! * delete the shield dummy! * Update eldritch_items.dm * new sounds * Update eldritch_antag.dm * Update eldritch_items.dm * sanity * Update code/modules/antagonists/eldritch_cult/eldritch_book.dm Co-authored-by: Ling <lingbleed@gmail.com> --------- Co-authored-by: Ling <lingbleed@gmail.com> commit2264d7e6bcAuthor: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 9 10:36:18 2023 -0500 Automatic changelog generation #17795 [ci skip] commit6e401075bdAuthor: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Thu Feb 9 16:36:15 2023 +0100 It now takes 6 seconds to cremate someone, and 3 seconds to break out if they're conscious (#17795) * Update morgue.dm * Update morgue.dm * Update code/game/objects/structures/morgue.dm * Update code/game/objects/structures/morgue.dm commitc28d359784Author: Yogbot-13 <admin@yogstation.net> Date: Thu Feb 9 10:27:17 2023 -0500 Automatic changelog generation #17766 [ci skip] commita0c31d2aeeAuthor: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Thu Feb 9 10:27:13 2023 -0500 brrrt (#17766) commit9ff2bc445aAuthor: Changelogs <action@github.com> Date: Thu Feb 9 06:11:19 2023 +0000 Automatic changelog compile [ci skip] commitd268cadedaAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 8 18:44:13 2023 -0500 Automatic changelog generation #17806 [ci skip] commitc223e28c9dAuthor: Ling <lingbleed@gmail.com> Date: Thu Feb 9 00:44:11 2023 +0100 Fix 'id in pda' pref (#17806) commit44decca884Author: Changelogs <action@github.com> Date: Wed Feb 8 22:16:57 2023 +0000 Automatic changelog compile [ci skip] commitd750b905ddAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 8 13:17:57 2023 -0500 Automatic changelog generation #17777 [ci skip] commit00a527192bAuthor: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Wed Feb 8 12:17:54 2023 -0600 More snowflake items - Boxta (#17777) * all non spritework * Quirky first hat * mmm sprites commitf028dd3418Author: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 8 12:31:26 2023 -0500 Automatic changelog generation #17825 [ci skip] commite75cb0ad00Author: Redd <36747151+ReddicusDragon@users.noreply.github.com> Date: Wed Feb 8 12:31:23 2023 -0500 Removes felinid language (#17825) * Removes felinid language from silicons * Removes multilingual (felinid) trait * Removes felinid from being granted upon using cat ears * Redd moment * removes felinid from tongue's possible language base. * removes felinid from telecomms * removes felinid from language holders * removes the felinid language as it provides a material benefit to donors * gives felinids the english language holder * removes felinid language icon commit060c415b04Author: Changelogs <action@github.com> Date: Wed Feb 8 14:08:15 2023 +0000 Automatic changelog compile [ci skip] commit7345f0e82dAuthor: Yogbot-13 <admin@yogstation.net> Date: Wed Feb 8 05:39:07 2023 -0500 Automatic changelog generation #17846 [ci skip] commit3e51ef4f8bAuthor: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Wed Feb 8 04:39:03 2023 -0600 Update lavaland_surface_maze.dmm (#17846) commite7823cfc39Author: Changelogs <action@github.com> Date: Wed Feb 8 06:11:43 2023 +0000 Automatic changelog compile [ci skip] commitd927ebc03dAuthor: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 20:39:04 2023 -0500 Automatic changelog generation #17802 [ci skip] commit0fd7dcfc9dAuthor: cuackles <68789204+cuackles@users.noreply.github.com> Date: Tue Feb 7 22:39:01 2023 -0300 monkey energy no longer becomes invisible when crushed (#17802) * Update janitor.dmi * Update janitor.dmi * Update janitor.dmi commit61601d937eAuthor: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 19:57:01 2023 -0500 Automatic changelog generation #17791 [ci skip] commit902e743274Author: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Tue Feb 7 16:56:58 2023 -0800 MALF is no longer continuous (#17791) commit81c0963f74Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Wed Feb 8 01:56:07 2023 +0100 Update adminhelp.dm (#17783) commit95947d2fe2Author: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 19:53:00 2023 -0500 Automatic changelog generation #17742 [ci skip] commitf83723c389Author: Ling <lingbleed@gmail.com> Date: Wed Feb 8 01:52:57 2023 +0100 Ports SSfoam and SSsmoke (#17742) * Ports SSfoam and SSsmoke * Remove dupe define commit9bb63a7577Author: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 19:52:22 2023 -0500 Automatic changelog generation #17738 [ci skip] commit0cf7ecf050Author: Ling <lingbleed@gmail.com> Date: Wed Feb 8 01:52:19 2023 +0100 Actually adds passive vent to RPD (#17738) * Actually adds passive vent to RPD * Fixed and re-added passive vents commit5b9d198f6fAuthor: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 18:37:58 2023 -0500 Automatic changelog generation #17816 [ci skip] commit148e80f8ecAuthor: ynot01 <ynot000001@gmail.com> Date: Tue Feb 7 18:37:55 2023 -0500 Fixes foam darts not doing any stamina damage (#17816) * Update foam_dart.dm * Update foam_dart.dm commit42165a9806Author: Changelogs <action@github.com> Date: Tue Feb 7 22:17:04 2023 +0000 Automatic changelog compile [ci skip] commitb9f7613d59Author: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 14:59:58 2023 -0500 Automatic changelog generation #17748 [ci skip] commit1cfbe0fd48Author: Byemoh <baiomurang@gmail.com> Date: Tue Feb 7 13:59:54 2023 -0600 adds det's sunglasses and shit on his desk on gax and other misc stuff (#17748) * eeeeeeeeee * shudders * readds stuff commit3947b4ac5aAuthor: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 11:46:17 2023 -0500 Automatic changelog generation #17799 [ci skip] commitc3cfad4913Author: ynot01 <ynot000001@gmail.com> Date: Tue Feb 7 11:46:14 2023 -0500 weird (#17799) commit8de1275a99Author: Changelogs <action@github.com> Date: Tue Feb 7 14:08:44 2023 +0000 Automatic changelog compile [ci skip] commit198c9f89aaAuthor: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 06:52:05 2023 -0500 Automatic changelog generation #17822 [ci skip] commit63928e7f87Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Tue Feb 7 11:52:02 2023 +0000 Update game_options.txt (#17822) commit7daad46a71Author: Yogbot-13 <admin@yogstation.net> Date: Tue Feb 7 05:15:44 2023 -0500 Automatic changelog generation #17776 [ci skip] commitb01613407aAuthor: Byemoh <baiomurang@gmail.com> Date: Tue Feb 7 04:15:40 2023 -0600 Alternate Gax Arrivals design for free miner ship (#17776) * Update GaxStation.dmm * Update GaxStation.dmm * e commit23abc5abd2Author: Changelogs <action@github.com> Date: Tue Feb 7 06:11:41 2023 +0000 Automatic changelog compile [ci skip] commitd170eab0aaAuthor: Yogbot-13 <admin@yogstation.net> Date: Mon Feb 6 19:03:32 2023 -0500 Automatic changelog generation #17797 [ci skip] commit1aac303800Author: Redd <36747151+ReddicusDragon@users.noreply.github.com> Date: Mon Feb 6 19:03:29 2023 -0500 Updates inventory procs to allow silent pickup (#17797) * adds make_sound parameter to put_in_hands, first step to making items able to be picked up with or without sound * adds make_sound parameter to put_in_active_hand, second step in allowing items to be picked up with or without sound * adds make_sound parameter to put_in_hand, third step * redd moment * weeeeeeee * NukeOps nuke code papers spawning are now silent commit57283fa900Author: Yogbot-13 <admin@yogstation.net> Date: Mon Feb 6 18:17:08 2023 -0500 Automatic changelog generation #17712 [ci skip] commitb2c06b0866Author: Byemoh <baiomurang@gmail.com> Date: Mon Feb 6 17:17:05 2023 -0600 Lavaland Corn Maze Ruin (#17712) * eeee * yep * Update lavaruinblacklist.txt --------- Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com> commit0d00d7457cAuthor: Changelogs <action@github.com> Date: Mon Feb 6 22:16:37 2023 +0000 Automatic changelog compile [ci skip] commit7955f64f79Author: Yogbot-13 <admin@yogstation.net> Date: Mon Feb 6 10:52:52 2023 -0500 Automatic changelog generation #17582 [ci skip] commit8df29b5392Author: 00ze-cyclone <96987868+00ze-cyclone@users.noreply.github.com> Date: Mon Feb 6 16:52:48 2023 +0100 Uranium eating aegun, second try (#17582) * new aegun * it just work * Update code/modules/projectiles/guns/energy/energy_gun.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * Add files via upload * dfuisqbdusq --------- Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> commit498e4e6ae4Author: Changelogs <action@github.com> Date: Mon Feb 6 14:09:30 2023 +0000 Automatic changelog compile [ci skip] commite37654707eAuthor: Yogbot-13 <admin@yogstation.net> Date: Mon Feb 6 07:43:42 2023 -0500 Automatic changelog generation #17768 [ci skip] commit5725a33174Author: ynot01 <ynot000001@gmail.com> Date: Mon Feb 6 07:43:39 2023 -0500 Foam darts now deal stamina damage if you're holding a toy foam gun (#17768) * Update foam_dart.dm * Update foam_dart.dm commitd7f3ee4734Author: Yogbot-13 <admin@yogstation.net> Date: Mon Feb 6 06:38:11 2023 -0500 Automatic changelog generation #17707 [ci skip] commita6c0573423Author: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Mon Feb 6 06:38:08 2023 -0500 Shimmyjimmies ion bolts to be less "why are they like that" and more "hey that kinda makes sense" (#17707) * NEW IONS * forgor * hos gun shooty commitcc868113c1Author: Changelogs <action@github.com> Date: Sun Feb 5 22:15:50 2023 +0000 Automatic changelog compile [ci skip] commit0343eb61c8Author: Yogbot-13 <admin@yogstation.net> Date: Sun Feb 5 14:37:43 2023 -0500 Automatic changelog generation #17749 [ci skip] commite9bb5b6679Author: ynot01 <ynot000001@gmail.com> Date: Sun Feb 5 14:37:41 2023 -0500 Adds the rest of the roundstart race languages to multilingual quirks (#17749) * Update good.dm * Update code/datums/traits/good.dm Co-authored-by: 00ze-cyclone <96987868+00ze-cyclone@users.noreply.github.com> --------- Co-authored-by: 00ze-cyclone <96987868+00ze-cyclone@users.noreply.github.com> commit00d55013b1Author: Yogbot-13 <admin@yogstation.net> Date: Sun Feb 5 12:14:21 2023 -0500 Automatic changelog generation #17779 [ci skip] commit85661c5d71Author: LazennG <58535870+LazennG@users.noreply.github.com> Date: Sun Feb 5 09:14:18 2023 -0800 buster arm patch (#17779) commit20b3adaae3Author: Changelogs <action@github.com> Date: Sun Feb 5 14:07:35 2023 +0000 Automatic changelog compile [ci skip] commit123638a50eAuthor: Yogbot-13 <admin@yogstation.net> Date: Sun Feb 5 01:21:47 2023 -0500 Automatic changelog generation #17774 [ci skip] commit707b8379f9Author: ktlwjec <122807629+ktlwjec0@users.noreply.github.com> Date: Sun Feb 5 06:21:45 2023 +0000 blue burger uses patty (#17774) commit6ba5dd3f5fAuthor: Changelogs <action@github.com> Date: Sun Feb 5 06:10:13 2023 +0000 Automatic changelog compile [ci skip] * Revert "Squashed commit of the following:" This reverts commit294dc43cff. * makes anomaly quiver printable * running it back * DIE ICON CORNFLAKES DIE * Revert "DIE ICON CORNFLAKES DIE" This reverts commita5294ffab4. * if this does not work I will scream * i forgor lazenn redid this * linter fixes? * weh * adds returning variable to break bow * fixes quiver/hardlight outlines * resets dmi files * hello? * indentation my beloathed * icons? please don't github * fixes gumballs/lollipops * fixes foam force shotguns * Revert "fixes foam force shotguns" This reverts commit37d079dc91. * fixes foam force for real * tidies up some sprites * agh * fixes bone-tipped nocked sprite * makes it so beanbag "slugs" don't look like syringes * fixes in-hand bone-tipped * removes message_admins from debugging (oops) * fixes an oversight with bone crossbow crafting * aaa * agh * Agh x2 * should fix icon cornflakes * killing * holy shit i think i learned something today * a g h --------- Co-authored-by: nmajask <nmajask@gmail.com>
673 lines
25 KiB
Plaintext
673 lines
25 KiB
Plaintext
///Subtype for any kind of ballistic gun
|
|
///This has a shitload of vars on it, and I'm sorry for that, but it does make making new subtypes really easy
|
|
/obj/item/gun/ballistic
|
|
desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason."
|
|
name = "projectile gun"
|
|
icon_state = "pistol"
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
|
|
///sound when inserting magazine
|
|
var/load_sound = "gun_insert_full_magazine"
|
|
///sound when inserting an empty magazine
|
|
var/load_empty_sound = "gun_insert_empty_magazine"
|
|
///volume of loading sound
|
|
var/load_sound_volume = 40
|
|
///whether loading sound should vary
|
|
var/load_sound_vary = TRUE
|
|
///sound of racking
|
|
var/rack_sound = "gun_slide_lock"
|
|
///volume of racking
|
|
var/rack_sound_volume = 60
|
|
///whether racking sound should vary
|
|
var/rack_sound_vary = TRUE
|
|
///sound of when the bolt is locked back manually
|
|
var/lock_back_sound = "sound/weapons/pistollock.ogg"
|
|
///volume of lock back
|
|
var/lock_back_sound_volume = 60
|
|
///whether lock back varies
|
|
var/lock_back_sound_vary = TRUE
|
|
///Sound of ejecting a magazine
|
|
var/eject_sound = "gun_remove_empty_magazine"
|
|
///sound of ejecting an empty magazine
|
|
var/eject_empty_sound = "gun_remove_full_magazine"
|
|
///volume of ejecting a magazine
|
|
var/eject_sound_volume = 40
|
|
///whether eject sound should vary
|
|
var/eject_sound_vary = TRUE
|
|
///sound of dropping the bolt or releasing a slide
|
|
var/bolt_drop_sound = 'sound/weapons/gun_chamber_round.ogg'
|
|
///volume of bolt drop/slide release
|
|
var/bolt_drop_sound_volume = 60
|
|
///empty alarm sound (if enabled)
|
|
var/empty_alarm_sound = 'sound/weapons/smg_empty_alarm.ogg'
|
|
///empty alarm volume sound
|
|
var/empty_alarm_volume = 70
|
|
///whether empty alarm sound varies
|
|
var/empty_alarm_vary = TRUE
|
|
|
|
///Whether the gun will spawn loaded with a magazine
|
|
var/spawnwithmagazine = TRUE
|
|
///Compatible magazines with the gun
|
|
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
|
|
///What magazine this gun starts with, if null it will just use mag_type
|
|
var/starting_mag_type
|
|
///Whether the sprite has a visible magazine or not
|
|
var/mag_display = FALSE
|
|
///Whether the sprite has a visible ammo display or not
|
|
var/mag_display_ammo = FALSE
|
|
///Whether the sprite has a visible indicator for being empty or not.
|
|
var/empty_indicator = FALSE
|
|
///Whether the gun alarms when empty or not.
|
|
var/empty_alarm = FALSE
|
|
///Whether the gun supports multiple special mag types
|
|
var/special_mags = FALSE
|
|
///Whether the gun is currently alarmed to prevent it from spamming sounds
|
|
var/alarmed = FALSE
|
|
///The bolt type of the gun, affects quite a bit of functionality, see combat.dm defines for bolt types: BOLT_TYPE_STANDARD; BOLT_TYPE_LOCKING; BOLT_TYPE_OPEN; BOLT_TYPE_NO_BOLT
|
|
var/bolt_type = BOLT_TYPE_STANDARD
|
|
///Used for locking bolt and open bolt guns. Set a bit differently for the two but prevents firing when true for both.
|
|
var/bolt_locked = FALSE
|
|
///Whether the gun has to be racked each shot or not.
|
|
var/semi_auto = TRUE
|
|
///Actual magazine currently contained within the gun
|
|
var/obj/item/ammo_box/magazine/magazine
|
|
///whether the gun ejects the chambered casing
|
|
var/casing_ejector = TRUE
|
|
///Whether the gun has an internal magazine or a detatchable one. Overridden by BOLT_TYPE_NO_BOLT.
|
|
var/internal_magazine = FALSE
|
|
///Phrasing of the bolt in examine and notification messages; ex: bolt, slide, etc.
|
|
var/bolt_wording = "bolt"
|
|
///Phrasing of the magazine in examine and notification messages; ex: magazine, box, etx
|
|
var/magazine_wording = "magazine"
|
|
///Phrasing of the cartridge in examine and notification messages; ex: bullet, shell, dart, etc.
|
|
var/cartridge_wording = "bullet"
|
|
///length between individual racks
|
|
var/rack_delay = 5
|
|
///time of the most recent rack, used for cooldown purposes
|
|
var/recent_rack = 0
|
|
///Whether the gun can be tacloaded by slapping a fresh magazine directly on it
|
|
var/tac_reloads = TRUE //Snowflake mechanic no more.
|
|
///Whether the gun can be sawn off by sawing tools
|
|
var/can_be_sawn_off = FALSE
|
|
var/reload_say = null
|
|
|
|
// stores all types of feedback. Name of feedback + the amount of frames in the animation (must be more than 0) . Add to this list as more feedback is added.
|
|
var/list/feedback_types = list(
|
|
"fire" = 0,
|
|
"slide_open" = 0,
|
|
"slide_close" = 0,
|
|
"mag_out" = 0,
|
|
"mag_in" = 0
|
|
)
|
|
var/feedback_original_icon = null // stores original slide position icon for feedback system
|
|
var/feedback_firing_icon = null // stores icon of gun while firing
|
|
var/feedback_original_icon_base = null // original base icon without the slide
|
|
var/feedback_fire_slide = FALSE // does the gun slide move back when firing?
|
|
var/feedback_has_recoil = TRUE
|
|
var/feedback_recoil_amount = 1 // angle of recoil .decimal numbers are okay for less recoil as long as its more than 0
|
|
var/feedback_recoil_hold = 0 // the amount the recoil holds before going back. best to set this to 1/4th of the fire time.
|
|
var/feedback_recoil_speed = 2 // the time from recoil to recovery. full time = *4
|
|
var/feedback_recoil_reverse = FALSE // TRUE for clockwise , FALSE for anti-clockwise
|
|
var/feedback_slide_close_move = TRUE // does the slide closing cause the gun to twist clockwise?
|
|
|
|
available_attachments = list(
|
|
/obj/item/attachment/scope/simple,
|
|
/obj/item/attachment/scope/holo,
|
|
/obj/item/attachment/scope/infrared,
|
|
/obj/item/attachment/laser_sight,
|
|
/obj/item/attachment/grip/vertical,
|
|
)
|
|
max_attachments = 4
|
|
recoil = 0.3
|
|
|
|
/obj/item/gun/ballistic/proc/feedback(type) // checks to see if gun has that feedback type enabled then commences the animation
|
|
if(feedback_types[type])
|
|
feedback_commence(type, feedback_types[type])
|
|
|
|
/obj/item/gun/ballistic/proc/feedback_commence(type,frames)
|
|
if(type && frames)
|
|
cut_overlays()
|
|
if (suppressed)
|
|
add_overlay("[icon_state]_[suppressed.icon_state]")
|
|
if(type == "fire")
|
|
if(!chambered)
|
|
return
|
|
if (magazine)
|
|
if (special_mags)
|
|
add_overlay("[icon_state]_mag_[initial(magazine.icon_state)]")
|
|
if (!magazine.ammo_count())
|
|
add_overlay("[icon_state]_mag_empty")
|
|
else
|
|
add_overlay("[icon_state]_mag")
|
|
var/capacity_number = 0
|
|
switch(get_ammo() / magazine.max_ammo)
|
|
if(0.2 to 0.39)
|
|
capacity_number = 20
|
|
if(0.4 to 0.59)
|
|
capacity_number = 40
|
|
if(0.6 to 0.79)
|
|
capacity_number = 60
|
|
if(0.8 to 0.99)
|
|
capacity_number = 80
|
|
if(1.0)
|
|
capacity_number = 100
|
|
if (capacity_number)
|
|
add_overlay("[icon_state]_mag_[capacity_number]")
|
|
feedback_fire_slide ? add_overlay(feedback_firing_icon) : add_overlay(feedback_original_icon)
|
|
DabAnimation(speed = feedback_recoil_speed, angle = ((rand(25,50)) * feedback_recoil_amount), direction = (feedback_recoil_reverse ? 2 : 3), hold_seconds = feedback_recoil_hold)
|
|
sleep(frames)
|
|
update_icon()
|
|
return
|
|
if (bolt_type == BOLT_TYPE_LOCKING)
|
|
if(type != "slide*")
|
|
add_overlay("[icon_state]_bolt[bolt_locked ? "_locked" : ""]")
|
|
if(type == "slide_close") // cause the gun to move clockwise if slide is closed
|
|
DabAnimation(speed = feedback_recoil_speed, angle = ((rand(20,25)) * feedback_recoil_amount), direction = 2)
|
|
add_overlay("[feedback_original_icon_base]_[type]") // actual animation
|
|
sleep(frames)
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/Initialize()
|
|
. = ..()
|
|
feedback_original_icon_base = icon_state
|
|
if (bolt_type == BOLT_TYPE_LOCKING)
|
|
feedback_original_icon = "[icon_state]_bolt"
|
|
feedback_firing_icon = "[feedback_original_icon]_locked"
|
|
else if(!feedback_firing_icon)
|
|
feedback_firing_icon = feedback_original_icon_base
|
|
if (!spawnwithmagazine)
|
|
bolt_locked = TRUE
|
|
update_icon()
|
|
return
|
|
if (!magazine)
|
|
if (!starting_mag_type)
|
|
magazine = new mag_type(src)
|
|
else
|
|
magazine = new starting_mag_type(src)
|
|
chamber_round()
|
|
update_icon()
|
|
|
|
|
|
/obj/item/gun/ballistic/update_icon()
|
|
if (QDELETED(src))
|
|
return
|
|
..()
|
|
if(current_skin)
|
|
icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""]"
|
|
else
|
|
icon_state = "[initial(icon_state)][sawn_off ? "_sawn" : ""]"
|
|
cut_overlays()
|
|
if (bolt_type == BOLT_TYPE_LOCKING)
|
|
add_overlay("[icon_state]_bolt[bolt_locked ? "_locked" : ""]")
|
|
if (bolt_type == BOLT_TYPE_OPEN && bolt_locked)
|
|
add_overlay("[icon_state]_bolt")
|
|
if (suppressed)
|
|
add_overlay("[icon_state]_[suppressed.icon_state]")
|
|
if (enloudened)
|
|
add_overlay("[icon_state]_[enloudened.icon_state]")
|
|
if(!chambered && empty_indicator)
|
|
add_overlay("[icon_state]_empty")
|
|
if (magazine)
|
|
if (special_mags)
|
|
add_overlay("[icon_state]_mag_[initial(magazine.icon_state)]")
|
|
if (!magazine.ammo_count())
|
|
add_overlay("[icon_state]_mag_empty")
|
|
else
|
|
add_overlay("[icon_state]_mag")
|
|
var/capacity_number = 0
|
|
switch(get_ammo() / magazine.max_ammo)
|
|
if(0.2 to 0.39)
|
|
capacity_number = 20
|
|
if(0.4 to 0.59)
|
|
capacity_number = 40
|
|
if(0.6 to 0.79)
|
|
capacity_number = 60
|
|
if(0.8 to 0.99)
|
|
capacity_number = 80
|
|
if(1.0)
|
|
capacity_number = 100
|
|
if (capacity_number)
|
|
add_overlay("[icon_state]_mag_[capacity_number]")
|
|
|
|
|
|
/obj/item/gun/ballistic/process_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
|
|
var/obj/item/ammo_casing/AC = chambered //Find chambered round
|
|
if(!semi_auto && from_firing)
|
|
if(istype(AC) && CHECK_BITFIELD(AC.casing_flags, CASINGFLAG_FORCE_CLEAR_CHAMBER))
|
|
chambered = null
|
|
return
|
|
if(istype(AC)) //there's a chambered round
|
|
if(CHECK_BITFIELD(AC.casing_flags, CASINGFLAG_FORCE_CLEAR_CHAMBER) && from_firing)
|
|
chambered = null
|
|
else if(casing_ejector || !from_firing)
|
|
AC.forceMove(drop_location()) //Eject casing onto ground.
|
|
AC.bounce_away(TRUE)
|
|
chambered = null
|
|
else if(empty_chamber)
|
|
chambered = null
|
|
if (chamber_next_round && (magazine?.max_ammo > 1))
|
|
chamber_round()
|
|
|
|
///Used to chamber a new round and eject the old one
|
|
/obj/item/gun/ballistic/proc/chamber_round(keep_bullet = FALSE)
|
|
if (chambered || !magazine)
|
|
return
|
|
if (magazine.ammo_count())
|
|
chambered = magazine.get_round(keep_bullet || bolt_type == BOLT_TYPE_NO_BOLT)
|
|
if (bolt_type != BOLT_TYPE_OPEN)
|
|
chambered.forceMove(src)
|
|
|
|
///updates a bunch of racking related stuff and also handles the sound effects and the like
|
|
/obj/item/gun/ballistic/proc/rack(mob/user = null)
|
|
if (bolt_type == BOLT_TYPE_NO_BOLT) //If there's no bolt, nothing to rack
|
|
return
|
|
if (weapon_weight != WEAPON_LIGHT) //Can't rack it if the weapon doesn't permit dual-wielding and your off-hand is full
|
|
if (user.get_inactive_held_item())
|
|
to_chat(user, span_warning("You cannot rack the [bolt_wording] of \the [src] while your other hand is full!"))
|
|
return
|
|
if (bolt_type == BOLT_TYPE_OPEN)
|
|
if(!bolt_locked) //If it's an open bolt, racking again would do nothing
|
|
if (user)
|
|
to_chat(user, span_notice("\The [src]'s [bolt_wording] is already cocked!"))
|
|
return
|
|
bolt_locked = FALSE
|
|
if (user)
|
|
to_chat(user, span_notice("You rack the [bolt_wording] of \the [src]."))
|
|
process_chamber(!chambered, FALSE)
|
|
if (bolt_type == BOLT_TYPE_LOCKING && !chambered)
|
|
bolt_locked = TRUE
|
|
playsound(src, lock_back_sound, lock_back_sound_volume, lock_back_sound_vary)
|
|
feedback("slide_open")
|
|
else
|
|
playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
|
|
feedback("slide_close")
|
|
update_icon()
|
|
|
|
///Drops the bolt from a locked position
|
|
/obj/item/gun/ballistic/proc/drop_bolt(mob/user = null)
|
|
playsound(src, bolt_drop_sound, bolt_drop_sound_volume, FALSE)
|
|
if (user)
|
|
to_chat(user, span_notice("You drop the [bolt_wording] of \the [src]."))
|
|
bolt_locked = FALSE
|
|
feedback("slide_close")
|
|
chamber_round()
|
|
update_icon()
|
|
|
|
///Handles all the logic needed for magazine insertion
|
|
/obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/AM, display_message = TRUE)
|
|
if(!istype(AM, mag_type))
|
|
to_chat(user, span_warning("\The [AM] doesn't seem to fit into \the [src]..."))
|
|
return FALSE
|
|
if(user.transferItemToLoc(AM, src))
|
|
if(reload_say && AM.ammo_count() && !get_ammo(FALSE, FALSE))
|
|
user.say(reload_say, forced = "reloading")
|
|
magazine = AM
|
|
if (display_message)
|
|
to_chat(user, span_notice("You load a new [magazine_wording] into \the [src]."))
|
|
playsound(src, load_empty_sound, load_sound_volume, load_sound_vary)
|
|
feedback("mag_in")
|
|
if (bolt_type == BOLT_TYPE_OPEN && !bolt_locked)
|
|
chamber_round(TRUE)
|
|
update_icon()
|
|
return TRUE
|
|
else
|
|
to_chat(user, span_warning("You cannot seem to get \the [src] out of your hands!"))
|
|
return FALSE
|
|
|
|
///Handles all the logic of magazine ejection, if tac_load is set that magazine will be tacloaded in the place of the old eject
|
|
/obj/item/gun/ballistic/proc/eject_magazine(mob/user, display_message = TRUE, obj/item/ammo_box/magazine/tac_load = null)
|
|
if(bolt_type == BOLT_TYPE_OPEN)
|
|
chambered = null
|
|
if(!tac_load)
|
|
if (magazine.ammo_count())
|
|
playsound(src, load_sound, load_sound_volume, load_sound_vary)
|
|
else
|
|
playsound(src, load_empty_sound, load_sound_volume, load_sound_vary)
|
|
feedback("mag_out")
|
|
magazine.forceMove(drop_location())
|
|
var/obj/item/ammo_box/magazine/old_mag = magazine
|
|
if (tac_load)
|
|
if (insert_magazine(user, tac_load, FALSE))
|
|
to_chat(user, span_notice("You perform a tactical reload on \the [src]."))
|
|
playsound(src, load_empty_sound, load_sound_volume, load_sound_vary)
|
|
feedback("mag_out")
|
|
playsound(src, load_sound, load_sound_volume, load_sound_vary)
|
|
feedback("mag_in")
|
|
else
|
|
feedback("mag_out")
|
|
to_chat(user, span_warning("You dropped the old [magazine_wording], but the new one doesn't fit. How embarassing."))
|
|
magazine = null
|
|
else
|
|
magazine = null
|
|
user.put_in_hands(old_mag)
|
|
old_mag.update_icon()
|
|
if (display_message)
|
|
to_chat(user, span_notice("You pull the [magazine_wording] out of \the [src]."))
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/can_shoot()
|
|
return chambered
|
|
|
|
/obj/item/gun/ballistic/attackby(obj/item/A, mob/user, params)
|
|
. = ..()
|
|
if (.)
|
|
return
|
|
if (!internal_magazine && istype(A, /obj/item/ammo_box/magazine))
|
|
var/obj/item/ammo_box/magazine/AM = A
|
|
if (!magazine)
|
|
insert_magazine(user, AM)
|
|
else
|
|
if (tac_reloads)
|
|
eject_magazine(user, FALSE, AM)
|
|
else
|
|
to_chat(user, span_notice("There's already a [magazine_wording] in \the [src]."))
|
|
return
|
|
if ((istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box)) && !istype(A, /obj/item/ammo_box/no_direct))
|
|
if (bolt_type == BOLT_TYPE_NO_BOLT || internal_magazine)
|
|
if (chambered && !chambered.BB)
|
|
chambered.forceMove(drop_location())
|
|
chambered = null
|
|
var/can_reload_say = !get_ammo(FALSE, FALSE)
|
|
var/num_loaded = magazine.attempt_load(A, user, params, TRUE)
|
|
if (num_loaded)
|
|
to_chat(user, span_notice("You load [num_loaded] [cartridge_wording]\s into \the [src]."))
|
|
playsound(src, load_sound, load_sound_volume, load_sound_vary)
|
|
if(can_reload_say)
|
|
user.say(reload_say, forced = "reloading")
|
|
if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT)
|
|
chamber_round()
|
|
A.update_icon()
|
|
update_icon()
|
|
return
|
|
if(istype(A, /obj/item/suppressor))
|
|
var/obj/item/suppressor/S = A
|
|
if(!can_suppress)
|
|
to_chat(user, span_warning("You can't seem to figure out how to fit [S] on [src]!"))
|
|
return
|
|
if(!user.is_holding(src))
|
|
to_chat(user, span_notice("You need be holding [src] to fit [S] to it!"))
|
|
return
|
|
if(suppressed || enloudened)
|
|
to_chat(user, span_warning("[src] already has a barrel attachment!"))
|
|
return
|
|
if(user.transferItemToLoc(A, src))
|
|
to_chat(user, span_notice("You screw \the [S] onto \the [src]."))
|
|
install_suppressor(A)
|
|
return
|
|
if(istype(A, /obj/item/enloudener))
|
|
var/obj/item/enloudener/E = A
|
|
if(!user.is_holding(src))
|
|
to_chat(user, span_notice("You need be holding [src] to fit [E] to it!"))
|
|
return
|
|
if(suppressed || enloudened)
|
|
to_chat(user, span_warning("[src] already has a barrel attachment!"))
|
|
return
|
|
if(user.transferItemToLoc(A, src))
|
|
to_chat(user, span_notice("You screw \the [E] onto \the [src]."))
|
|
install_enloudener(A)
|
|
return
|
|
if (can_be_sawn_off)
|
|
if (sawoff(user, A))
|
|
return
|
|
return FALSE
|
|
|
|
/obj/item/gun/ballistic/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
|
|
if (sawn_off)
|
|
bonus_spread += SAWN_OFF_ACC_PENALTY
|
|
. = ..()
|
|
|
|
///Installs a new suppressor, assumes that the suppressor is already in the contents of src
|
|
/obj/item/gun/ballistic/proc/install_suppressor(obj/item/suppressor/S)
|
|
suppressed = S
|
|
w_class += S.w_class //so pistols do not fit in pockets when suppressed
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/proc/install_enloudener(obj/item/enloudener/E)
|
|
enloudened = E
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/AltClick(mob/user)
|
|
if (unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
|
|
reskin_obj(user)
|
|
return
|
|
if(loc == user)
|
|
if(suppressed && can_unsuppress)
|
|
if(!user.is_holding(src))
|
|
return ..()
|
|
to_chat(user, span_notice("You unscrew \the [suppressed.name] from \the [src]."))
|
|
user.put_in_hands(suppressed)
|
|
w_class -= suppressed.w_class
|
|
suppressed = null
|
|
update_icon()
|
|
return
|
|
if(enloudened && can_unsuppress)
|
|
if(!user.is_holding(src))
|
|
return ..()
|
|
to_chat(user, span_notice("You unscrew \the [enloudened.name] from \the [src]."))
|
|
user.put_in_hands(enloudened)
|
|
w_class -= enloudened.w_class
|
|
enloudened = null
|
|
update_icon()
|
|
return
|
|
|
|
///Prefire empty checks for the bolt drop
|
|
/obj/item/gun/ballistic/proc/prefire_empty_checks()
|
|
if (!chambered && !get_ammo())
|
|
if (bolt_type == BOLT_TYPE_OPEN && !bolt_locked)
|
|
bolt_locked = TRUE
|
|
playsound(src, bolt_drop_sound, bolt_drop_sound_volume)
|
|
update_icon()
|
|
|
|
///postfire empty checks for bolt locking and sound alarms
|
|
/obj/item/gun/ballistic/proc/postfire_empty_checks()
|
|
if (!chambered && !get_ammo())
|
|
if (!alarmed && empty_alarm)
|
|
playsound(src, empty_alarm_sound, empty_alarm_volume, empty_alarm_vary)
|
|
alarmed = TRUE
|
|
update_icon()
|
|
if (bolt_type == BOLT_TYPE_LOCKING)
|
|
if(!bolt_locked)
|
|
feedback("slide_open")
|
|
bolt_locked = TRUE
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/afterattack()
|
|
prefire_empty_checks()
|
|
. = ..() //The gun actually firing
|
|
if(can_shoot() && recent_shoot + 5 > world.time)
|
|
feedback("fire")
|
|
postfire_empty_checks()
|
|
|
|
//ATTACK HAND IGNORING PARENT RETURN VALUE
|
|
/obj/item/gun/ballistic/attack_hand(mob/user)
|
|
if(!internal_magazine && loc == user && user.is_holding(src) && magazine)
|
|
eject_magazine(user)
|
|
return
|
|
return ..()
|
|
|
|
/obj/item/gun/ballistic/attack_self(mob/living/user)
|
|
if(!internal_magazine && magazine)
|
|
if(!magazine.ammo_count())
|
|
eject_magazine(user)
|
|
return
|
|
if(bolt_type == BOLT_TYPE_NO_BOLT)
|
|
chambered = null
|
|
var/num_unloaded = 0
|
|
for(var/obj/item/ammo_casing/CB in get_ammo_list(FALSE, TRUE))
|
|
CB.forceMove(drop_location())
|
|
CB.bounce_away(FALSE, NONE)
|
|
num_unloaded++
|
|
if (num_unloaded)
|
|
to_chat(user, span_notice("You unload [num_unloaded] [cartridge_wording]\s from [src]."))
|
|
playsound(user, eject_sound, eject_sound_volume, eject_sound_vary)
|
|
update_icon()
|
|
else
|
|
to_chat(user, span_warning("[src] is empty!"))
|
|
return
|
|
if(bolt_type == BOLT_TYPE_LOCKING && bolt_locked)
|
|
drop_bolt(user)
|
|
return
|
|
if (recent_rack > world.time)
|
|
return
|
|
recent_rack = world.time + rack_delay
|
|
rack(user)
|
|
return
|
|
|
|
|
|
/obj/item/gun/ballistic/examine(mob/user)
|
|
. = ..()
|
|
var/count_chambered = !(bolt_type == BOLT_TYPE_NO_BOLT || bolt_type == BOLT_TYPE_OPEN)
|
|
. += "It has [get_ammo(count_chambered)] round\s remaining."
|
|
if (!chambered)
|
|
. += "It does not seem to have a round chambered."
|
|
if (bolt_locked)
|
|
. += "The [bolt_wording] is locked back and needs to be released before firing."
|
|
if (suppressed)
|
|
if(can_unsuppress)
|
|
. += "It has a [suppressed.name] attached that can be removed with <b>alt+click</b>."
|
|
else
|
|
. += "It has a <b>suppressor</b> built into the barrel."
|
|
if (enloudened)
|
|
if(can_unsuppress)
|
|
. += "It has a [enloudened.name] attached that can be removed with <b>alt+click</b>."
|
|
else
|
|
. += "It has a <b>enloudener</b> built into the barrel."
|
|
|
|
|
|
/obj/item/gun/ballistic/verb/set_reload()
|
|
set name = "Set Reload Speech"
|
|
set category = "Object"
|
|
set desc = "Activate to set what is said with the gun when tactically reloading."
|
|
if(usr.incapacitated())
|
|
return
|
|
var/input = stripped_input(usr,"What do you want to say when reloading with [src]? Cancel to disable reload speech.", ,reload_say, MAX_NAME_LEN)
|
|
input = replacetext(input, "*", "")
|
|
if(input)
|
|
reload_say = input
|
|
log_game("[usr] has set the reload speech on [src] to [reload_say]")
|
|
|
|
/obj/item/gun/ballistic/proc/get_ammo(countchambered = TRUE, countempties = TRUE)
|
|
var/boolets = 0 //mature var names for mature people
|
|
if (chambered && countchambered)
|
|
boolets++
|
|
if (magazine)
|
|
boolets += magazine.ammo_count(countempties)
|
|
return boolets
|
|
|
|
///gets a list of every bullet in the gun
|
|
/obj/item/gun/ballistic/proc/get_ammo_list(countchambered = TRUE, drop_all = FALSE)
|
|
var/list/rounds = list()
|
|
if(chambered && countchambered)
|
|
rounds.Add(chambered)
|
|
if(drop_all)
|
|
chambered = null
|
|
rounds.Add(magazine.ammo_list(drop_all))
|
|
return rounds
|
|
|
|
#define BRAINS_BLOWN_THROW_RANGE 3
|
|
#define BRAINS_BLOWN_THROW_SPEED 1
|
|
/obj/item/gun/ballistic/suicide_act(mob/user)
|
|
var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
|
|
if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
|
|
user.visible_message(span_suicide("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
sleep(2.5 SECONDS)
|
|
if(user.is_holding(src))
|
|
var/turf/T = get_turf(user)
|
|
process_fire(user, user, FALSE, null, BODY_ZONE_HEAD)
|
|
user.visible_message(span_suicide("[user] blows [user.p_their()] brain[user.p_s()] out with [src]!"))
|
|
var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE)
|
|
B.Remove(user)
|
|
B.forceMove(T)
|
|
var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, user)
|
|
B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner)
|
|
return(BRUTELOSS)
|
|
else
|
|
user.visible_message(span_suicide("[user] panics and starts choking to death!"))
|
|
return(OXYLOSS)
|
|
else
|
|
user.visible_message(span_suicide("[user] is pretending to blow [user.p_their()] brain[user.p_s()] out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b>"))
|
|
playsound(src, dry_fire_sound, 30, TRUE)
|
|
return (OXYLOSS)
|
|
#undef BRAINS_BLOWN_THROW_SPEED
|
|
#undef BRAINS_BLOWN_THROW_RANGE
|
|
|
|
GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
|
|
/obj/item/circular_saw,
|
|
/obj/item/gun/energy/plasmacutter,
|
|
/obj/item/melee/transforming/energy,
|
|
/obj/item/twohanded/required/chainsaw,
|
|
/obj/item/nullrod/claymore/chainsaw_sword,
|
|
/obj/item/nullrod/chainsaw,
|
|
/obj/item/mounted_chainsaw)))
|
|
|
|
///Handles all the logic of sawing off guns,
|
|
/obj/item/gun/ballistic/proc/sawoff(mob/user, obj/item/saw)
|
|
if(!saw.is_sharp() || !is_type_in_typecache(saw, GLOB.gun_saw_types)) //needs to be sharp. Otherwise turned off eswords can cut this.
|
|
return
|
|
if(sawn_off)
|
|
to_chat(user, span_warning("\The [src] is already shortened!"))
|
|
return
|
|
if(bayonet)
|
|
to_chat(user, span_warning("You cannot saw-off \the [src] with \the [bayonet] attached!"))
|
|
return
|
|
user.changeNext_move(CLICK_CD_MELEE)
|
|
user.visible_message("[user] begins to shorten \the [src].", span_notice("You begin to shorten \the [src]..."))
|
|
|
|
//if there's any live ammo inside the gun, makes it go off
|
|
if(blow_up(user))
|
|
user.visible_message(span_danger("\The [src] goes off!"), span_danger("\The [src] goes off in your face!"))
|
|
return
|
|
|
|
if(do_after(user, 3 SECONDS, src))
|
|
if(sawn_off)
|
|
return
|
|
user.visible_message("[user] shortens \the [src]!", span_notice("You shorten \the [src]."))
|
|
name = "sawn-off [src.name]"
|
|
desc = sawn_desc
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
item_state = "gun"
|
|
slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
|
|
slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
|
|
recoil = SAWN_OFF_RECOIL
|
|
sawn_off = TRUE
|
|
update_icon()
|
|
return TRUE
|
|
|
|
///used for sawing guns, causes the gun to fire without the input of the user
|
|
/obj/item/gun/ballistic/proc/blow_up(mob/user)
|
|
. = FALSE
|
|
for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
|
|
if(AC.BB)
|
|
process_fire(user, user, FALSE)
|
|
. = TRUE
|
|
|
|
|
|
/obj/item/suppressor
|
|
name = "suppressor"
|
|
desc = "A syndicate small-arms suppressor for maximum espionage."
|
|
icon = 'icons/obj/guns/projectile.dmi'
|
|
icon_state = "suppressor"
|
|
w_class = WEIGHT_CLASS_TINY
|
|
var/break_chance = 0 // Chance per shot for the suppressor to fall apart
|
|
|
|
/obj/item/suppressor/makeshift
|
|
name = "makeshift suppressor"
|
|
desc = "A poorly made small-arms suppressor for above average espionage on a budget."
|
|
icon_state = "suppressor_makeshift"
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
break_chance = 10
|
|
|
|
/obj/item/suppressor/specialoffer
|
|
name = "cheap suppressor"
|
|
desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits most weapons."
|
|
icon = 'icons/obj/guns/projectile.dmi'
|
|
icon_state = "suppressor"
|
|
|
|
/obj/item/enloudener
|
|
name = "bikehorn \"suppressor\""
|
|
desc = "Advanced clown research has found that guns that honk shoot harder, faster and more accurately. (They don't)"
|
|
icon = 'icons/obj/guns/projectile.dmi'
|
|
icon_state = "bikehorn"
|
|
w_class = WEIGHT_CLASS_TINY
|
|
var/enloudened_sound = 'sound/items/bikehorn.ogg'
|