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>
631 lines
21 KiB
Plaintext
631 lines
21 KiB
Plaintext
/obj/item/gun/ballistic/bow
|
|
name = "wooden bow"
|
|
desc = "A well-made weapon capable of firing arrows. Mostly outdated, but still dependable."
|
|
icon_state = "bow"
|
|
item_state = "bow"
|
|
icon = 'icons/obj/guns/bows.dmi'
|
|
w_class = WEIGHT_CLASS_BULKY
|
|
weapon_weight = WEAPON_HEAVY //need both hands to fire
|
|
force = 5
|
|
spread = 1
|
|
mag_type = /obj/item/ammo_box/magazine/internal/bow
|
|
fire_sound = 'sound/weapons/sound_weapons_bowfire.ogg'
|
|
slot_flags = ITEM_SLOT_BACK
|
|
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
|
|
casing_ejector = FALSE
|
|
internal_magazine = TRUE
|
|
pin = null
|
|
no_pin_required = TRUE
|
|
trigger_guard = TRIGGER_GUARD_ALLOW_ALL //so ashwalkers can use it
|
|
|
|
// No vertical grip on a bow
|
|
available_attachments = list(
|
|
/obj/item/attachment/scope/simple,
|
|
/obj/item/attachment/scope/holo,
|
|
/obj/item/attachment/scope/infrared,
|
|
/obj/item/attachment/laser_sight,
|
|
)
|
|
|
|
// Drawing vars //
|
|
var/drawing = FALSE
|
|
var/drop_release_draw = TRUE
|
|
var/move_drawing = TRUE
|
|
var/draw_time = 0.5 SECONDS
|
|
var/draw_slowdown = 0.75
|
|
var/draw_sound = 'sound/weapons/sound_weapons_bowdraw.ogg'
|
|
var/mutable_appearance/arrow_overlay
|
|
/// If the bow can be equipped when an arrow is loaded
|
|
var/equip_when_loaded = FALSE
|
|
/// If the last loaded arrow was a toy arrow or not, used to see if foam darts / arrows should do stamina damage
|
|
var/nerfed = FALSE
|
|
|
|
/obj/item/gun/ballistic/bow/shoot_with_empty_chamber()
|
|
return
|
|
|
|
/obj/item/gun/ballistic/bow/chamber_round()
|
|
chambered = magazine.get_round(1)
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/dropped()
|
|
. = ..()
|
|
if(!QDELING(src))
|
|
addtimer(CALLBACK(src, .proc/release_draw_if_not_held))
|
|
|
|
/obj/item/gun/ballistic/bow/proc/release_draw_if_not_held()
|
|
if(!ismob(loc))
|
|
if(drop_release_draw)
|
|
release_draw()
|
|
nerfed = initial(nerfed) // So you can't meta if the last arrow loaded by a dropped bow was a toy arrow or not
|
|
|
|
/obj/item/gun/ballistic/bow/proc/release_draw()
|
|
var/old_chambered = chambered
|
|
chambered = null
|
|
magazine.give_round(old_chambered)
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/equipped(mob/user, slot)
|
|
..()
|
|
nerfed = initial(nerfed)
|
|
|
|
/obj/item/gun/ballistic/bow/process_chamber()
|
|
chambered = null
|
|
magazine.get_round(FALSE)
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/attack_self(mob/living/user)
|
|
if(drawing)
|
|
to_chat(user, span_notice("You are already drawing the bowstring!"))
|
|
return TRUE
|
|
if(chambered)
|
|
release_draw()
|
|
to_chat(user, span_notice("You gently release the bowstring."))
|
|
return TRUE
|
|
else if(get_ammo())
|
|
drawing = TRUE
|
|
update_slowdown()
|
|
if (!do_after(user, draw_time, src, TRUE, stayStill = !move_drawing))
|
|
drawing = FALSE
|
|
update_slowdown()
|
|
return TRUE
|
|
drawing = FALSE
|
|
to_chat(user, span_notice("You draw back the bowstring."))
|
|
playsound(src, draw_sound, 75, 0, falloff = 3) //gets way too high pitched if the freq varies
|
|
chamber_round()
|
|
return TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/AltClick(mob/user)
|
|
if(chambered || get_ammo())
|
|
var/obj/item/ammo_casing/AC = chambered ? chambered : magazine.get_round(TRUE)
|
|
AC.attack_self(user)
|
|
return
|
|
..()
|
|
|
|
/obj/item/gun/ballistic/bow/attack_hand(mob/user)
|
|
if(internal_magazine && loc == user && user.is_holding(src) && (chambered || get_ammo()))
|
|
remove_arrow(user)
|
|
return
|
|
return ..()
|
|
|
|
/obj/item/gun/ballistic/bow/proc/remove_arrow(mob/user)
|
|
if(!chambered && !get_ammo())
|
|
return
|
|
var/obj/item/ammo_casing/AC = magazine.get_round(FALSE)
|
|
chambered = null
|
|
if(CHECK_BITFIELD(AC.item_flags, DROPDEL))
|
|
// Shouldn't be put into someone's hand
|
|
qdel(AC)
|
|
if(user)
|
|
to_chat(user, span_notice("You disperse [AC]."))
|
|
else if(user)
|
|
user.put_in_hands(AC)
|
|
to_chat(user, span_notice("You remove [AC]."))
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/attackby(obj/item/I, mob/user, params)
|
|
if(istype(I, /obj/item/ammo_casing))
|
|
if(!user.is_holding(src))
|
|
to_chat(user, span_notice("You need to hold [src] to load \the [I]."))
|
|
else if (magazine.attackby(I, user, params, 1))
|
|
to_chat(user, span_notice("You notch [I]."))
|
|
nerfed = istype(I, /obj/item/ammo_casing/reusable/arrow/toy)
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/update_icon()
|
|
cut_overlay(arrow_overlay, TRUE)
|
|
icon_state = "[initial(icon_state)][chambered ? "_firing" : ""]"
|
|
if(get_ammo())
|
|
var/obj/item/ammo_casing/reusable/arrow/energy/E = magazine.get_round(TRUE)
|
|
arrow_overlay = mutable_appearance(icon, "[initial(E.item_state)][chambered ? "_firing" : ""]")
|
|
add_overlay(arrow_overlay, TRUE)
|
|
|
|
/obj/item/gun/ballistic/bow/proc/update_slowdown()
|
|
if(chambered || drawing)
|
|
slowdown = draw_slowdown
|
|
else
|
|
slowdown = initial(slowdown)
|
|
if(equip_when_loaded)
|
|
return
|
|
if(get_ammo())
|
|
slot_flags = ITEM_SLOT_DENY_S_STORE // So you can't put a drawn bow in your suit storage slot
|
|
else
|
|
slot_flags = initial(slot_flags)
|
|
|
|
/obj/item/gun/ballistic/bow/can_shoot()
|
|
return chambered
|
|
|
|
/obj/item/gun/ballistic/bow/ashen
|
|
name = "bone bow"
|
|
desc = "A primitive bow with a sinew bowstring. Typically used by tribal hunters and warriors."
|
|
icon_state = "ashenbow"
|
|
item_state = "ashenbow"
|
|
force = 10
|
|
spread = 3
|
|
|
|
/obj/item/gun/ballistic/bow/pipe
|
|
name = "pipe bow"
|
|
desc = "A variety of pipes and plastic bent together with a silk bowstring. Cumbersome and inaccurate."
|
|
icon_state = "pipebow"
|
|
item_state = "pipebow"
|
|
force = 12
|
|
spread = 5
|
|
draw_time = 1 SECONDS
|
|
|
|
/obj/item/gun/ballistic/bow/maint
|
|
name = "makeshift bow"
|
|
desc = "A crude contraption of rods, tape, and cable; this bow is servicable, but of poor quality."
|
|
icon_state = "makeshift_bow"
|
|
item_state = "makeshift_bow"
|
|
force = 8
|
|
spread = 7
|
|
draw_time = 1 SECONDS
|
|
|
|
/obj/item/gun/ballistic/bow/crossbow
|
|
name = "wooden crossbow"
|
|
desc = "A handcrafted version of a typical medieval crossbow. The stock is heavy and loading it takes time, but it can be quickly fired once ready."
|
|
icon_state = "crossbow"
|
|
item_state = "crossbow"
|
|
force = 15 //Beating someone with a goddamned stock are we
|
|
spread = 0
|
|
weapon_weight = WEAPON_MEDIUM // You only need one hand to pull the trigger, though good luck reloading it with one hand
|
|
draw_time = 2 SECONDS
|
|
draw_slowdown = FALSE
|
|
drop_release_draw = FALSE
|
|
move_drawing = FALSE
|
|
equip_when_loaded = TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/crossbow/ashen
|
|
name = "bone crossbow"
|
|
desc = "An advanced, primitive bow that is designed to function similar to a crossbow. The stock is heavy and loading it takes time, but it can be quickly fired once ready."
|
|
icon_state = "ashencrossbow"
|
|
item_state = "ashencrossbow"
|
|
spread = 1
|
|
|
|
/obj/item/gun/ballistic/bow/crossbow/magfed
|
|
name = "wooden magfed crossbow"
|
|
desc = "A bow with a locking mechanism that more closely resembles a modern gun. This one seems to be outfitted with an automatic loading mechanism."
|
|
mag_type = /obj/item/ammo_box/magazine/arrow
|
|
internal_magazine = FALSE
|
|
|
|
/obj/item/gun/ballistic/bow/crossbow/magfed/attackby(obj/item/I, mob/user, params)
|
|
if (!internal_magazine && istype(I, /obj/item/ammo_box/magazine))
|
|
var/obj/item/ammo_box/magazine/AM = I
|
|
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
|
|
..()
|
|
|
|
|
|
// Toy //
|
|
|
|
/obj/item/gun/ballistic/bow/toy
|
|
name = "toy bow"
|
|
desc = "A plastic bow that can fire arrows. Features real voice action!"
|
|
force = 0
|
|
spread = 10
|
|
draw_time = 2 SECONDS
|
|
nerfed = TRUE
|
|
|
|
var/obj/item/assembly/assembly = /obj/item/assembly/voice_box/bow
|
|
|
|
/obj/item/gun/ballistic/bow/toy/Initialize()
|
|
. = ..()
|
|
if(ispath(assembly))
|
|
assembly = new assembly(src)
|
|
|
|
/obj/item/gun/ballistic/bow/toy/screwdriver_act(mob/living/user, obj/item/I)
|
|
. = ..()
|
|
if(!assembly)
|
|
to_chat(user, span_warning("[src] doesn't have a device inside!"))
|
|
return TRUE
|
|
I.play_tool_sound(src)
|
|
to_chat(user, span_notice("You remove [assembly] from [src]."))
|
|
user.put_in_hands(assembly)
|
|
assembly = null
|
|
return TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/toy/process_chamber()
|
|
..()
|
|
if(assembly)
|
|
assembly.pulsed()
|
|
|
|
/obj/item/gun/ballistic/bow/toy/attackby(obj/item/I, mob/user)
|
|
if(istype(I, /obj/item/assembly))
|
|
if(assembly)
|
|
to_chat(user, span_warning("[src] already has a device inside!"))
|
|
return
|
|
if(!user.transferItemToLoc(I, src))
|
|
return
|
|
assembly = I
|
|
return
|
|
return ..()
|
|
|
|
/obj/item/gun/ballistic/bow/toy/white
|
|
name = "white toy bow"
|
|
icon_state = "bow_toy_white"
|
|
item_state = "bow_hardlight_arrow_disable"
|
|
|
|
/obj/item/gun/ballistic/bow/toy/blue
|
|
name = "blue toy bow"
|
|
desc = "A toy bow equipped with a screeching voice box, themed after Nanotrasen."
|
|
icon_state = "bow_toy_blue"
|
|
item_state = "bow_ert_arrow_pulse"
|
|
assembly = /obj/item/assembly/voice_box/bow/nanotrasen
|
|
|
|
/obj/item/gun/ballistic/bow/toy/red
|
|
name = "red toy bow"
|
|
desc = "A red toy boy meant to replicate the hardlight bow used by Syndicate operatives. Comes equipped with a loud voice box."
|
|
icon_state = "bow_toy_red"
|
|
item_state = "bow_syndicate_arrow_energy"
|
|
assembly = /obj/item/assembly/voice_box/bow/syndie
|
|
|
|
/obj/item/gun/ballistic/bow/toy/clockwork
|
|
name = "clockwork toy bow"
|
|
desc = "A plastic, Ratvarian-based toy bow. Sounds a gnarly, obnoxious voice box when fired."
|
|
icon_state = "bow_toy_clockwork"
|
|
item_state = "bow_clockwork_arrow_energy"
|
|
assembly = /obj/item/assembly/voice_box/bow/clockwork
|
|
|
|
|
|
// Wizard //
|
|
|
|
/obj/item/gun/ballistic/bow/break_bow
|
|
name = "break bow"
|
|
desc = "A finely-crafted bow consisting of two blades combined at the hilt and a magical, semi-transparent bowstring. Can be taken apart to use the blades individually."
|
|
icon_state = "breakbow"
|
|
item_state = "breakbow"
|
|
hitsound = 'sound/weapons/bladeslice.ogg'
|
|
force = 40 // You can still hit them with both of the blades (better)
|
|
throwforce = 40 //Last ditch screaming
|
|
armour_penetration = 50 //Bro this shit's MAGIC
|
|
sharpness = SHARP_EDGED
|
|
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
|
|
wound_bonus = 10
|
|
draw_time = 0.25 SECONDS
|
|
draw_slowdown = 0 //They're a wizard they need to zoom around
|
|
var/bladetype = /obj/item/break_blade
|
|
|
|
/obj/item/gun/ballistic/bow/break_bow/Initialize()
|
|
. = ..()
|
|
AddComponent(/datum/component/butchering, 80 - force, 100, force - 10)
|
|
|
|
/obj/item/gun/ballistic/bow/break_bow/attack_self(mob/living/user)
|
|
if(get_ammo())
|
|
return ..()
|
|
form_blades(user)
|
|
|
|
/obj/item/gun/ballistic/bow/break_bow/proc/form_blades(mob/living/user)
|
|
moveToNullspace()
|
|
user.put_in_hands(new bladetype())
|
|
user.put_in_hands(new bladetype())
|
|
playsound(user, 'sound/weapons/batonextend.ogg', 50, 1)
|
|
to_chat(user, span_notice("You detach the two blades of [src]."))
|
|
qdel(src)
|
|
|
|
/obj/item/break_blade
|
|
name = "break bow blade"
|
|
desc = "One of two blades used to form a break bow. Can attack with both blades at the same time or combine them into a bow."
|
|
icon_state = "brakebow_blade"
|
|
item_state = "brakebow_blade"
|
|
icon = 'icons/obj/weapons/swords.dmi'
|
|
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
|
hitsound = 'sound/weapons/bladeslice.ogg'
|
|
embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 10, "embedded_fall_chance" = 10, "embedded_ignore_throwspeed_threshold" = TRUE)
|
|
force = 27 //Total of 54 damage = death in two clicks (probably) PLUS it doesn't care about anti-magic
|
|
throwforce = 45 //Can't return if it hits anti-magic
|
|
armour_penetration = 50 //Enchanted blade of fuck you
|
|
sharpness = SHARP_EDGED
|
|
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
|
|
wound_bonus = 10
|
|
var/bowtype = /obj/item/gun/ballistic/bow/break_bow
|
|
var/returning = FALSE
|
|
|
|
/obj/item/break_blade/Initialize()
|
|
. = ..()
|
|
AddComponent(/datum/component/butchering, 80 - force, 100, force - 10)
|
|
|
|
/obj/item/break_blade/attack_self(mob/living/user)
|
|
var/obj/item/break_blade/secondblade = user.get_inactive_held_item()
|
|
if(istype(secondblade))
|
|
form_bow(user, secondblade)
|
|
else
|
|
to_chat(user, span_warning("You need two of [src] to combine them!"))
|
|
|
|
/obj/item/break_blade/proc/form_bow(mob/living/user, var/obj/item/break_blade/other_blade)
|
|
if(!istype(other_blade))
|
|
return
|
|
moveToNullspace()
|
|
other_blade.moveToNullspace()
|
|
user.put_in_hands(new bowtype())
|
|
playsound(user, 'sound/weapons/batonextend.ogg', 50, 1)
|
|
to_chat(user, span_notice("You combine the two [src]."))
|
|
qdel(other_blade)
|
|
qdel(src)
|
|
|
|
/obj/item/break_blade/pre_attack(atom/A, mob/living/user, params)
|
|
if(istype(A, /obj/item/break_blade))
|
|
form_bow(user, A)
|
|
return FALSE
|
|
. = ..()
|
|
|
|
/obj/item/break_blade/attack(mob/living/M, mob/living/user, secondattack = FALSE)
|
|
. = ..()
|
|
var/obj/item/break_blade/secondblade = user.get_inactive_held_item()
|
|
if(istype(secondblade) && !secondattack)
|
|
sleep(0.2 SECONDS)
|
|
secondblade.attack(M, user, TRUE)
|
|
|
|
/obj/item/break_blade/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, quickstart)
|
|
. = ..()
|
|
if(!thrower)
|
|
return
|
|
if(!returning)
|
|
addtimer(CALLBACK(src, .proc/return_to, thrower), 3 SECONDS)
|
|
returning = TRUE
|
|
var/obj/item/break_blade/secondblade = thrower.get_inactive_held_item()
|
|
if(istype(secondblade))
|
|
sleep(0.2 SECONDS)
|
|
thrower.dropItemToGround(secondblade, silent = TRUE)
|
|
secondblade.throw_at(target, range, speed, thrower, spin, diagonals_first, callback, force, quickstart)
|
|
|
|
/obj/item/break_blade/proc/return_to(mob/living/user)
|
|
if(!istype(user))
|
|
return
|
|
|
|
var/mob/holder = loc
|
|
if(istype(holder) && holder.anti_magic_check(TRUE, FALSE, FALSE, 0))
|
|
to_chat(holder, span_notice("You feel [src] tugging on you."))
|
|
return
|
|
|
|
var/mob/living/carbon/carbon = loc
|
|
if(istype(carbon))
|
|
var/obj/item/bodypart/part = carbon.get_embedded_part(src)
|
|
if(part)
|
|
if(!carbon.remove_embedded_object(src, unsafe = TRUE))
|
|
to_chat(carbon, span_notice("You feel [src] tugging on you."))
|
|
return
|
|
to_chat(carbon, span_userdanger("[src] suddenly rips out of you!"))
|
|
|
|
if(!user.put_in_hands(src))
|
|
return
|
|
playsound(user, 'sound/magic/blink.ogg', 50, 1)
|
|
returning = FALSE
|
|
to_chat(user, span_notice("[src] suddenly returns to you!"))
|
|
|
|
|
|
// Hardlight //
|
|
|
|
/obj/item/gun/ballistic/bow/energy
|
|
name = "hardlight bow"
|
|
desc = "A modern bow that can fabricate hardlight arrows using an internal energy."
|
|
icon_state = "bow_hardlight"
|
|
item_state = "bow_hardlight"
|
|
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy
|
|
no_pin_required = FALSE
|
|
draw_slowdown = 0
|
|
var/recharge_time = 1 SECONDS
|
|
|
|
var/can_fold = FALSE
|
|
var/folded_w_class = WEIGHT_CLASS_NORMAL
|
|
var/folded = FALSE
|
|
//var/stored_ammo ///what was stored in the magazine before being folded?
|
|
var/fold_sound = 'sound/weapons/batonextend.ogg'
|
|
|
|
/obj/item/gun/ballistic/bow/energy/Initialize()
|
|
if(folded)
|
|
toggle_folded(TRUE)
|
|
. = ..()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/examine(mob/user)
|
|
. = ..()
|
|
var/obj/item/ammo_box/magazine/internal/bow/energy/M = magazine
|
|
if(magazine.ammo_type)
|
|
var/obj/item/arrow_type = magazine.ammo_type
|
|
. += "It is current firing mode is \"[initial(arrow_type.name)]\"[M.selectable_types.len > 1 ? ", you can select firing modes by using ALT + CLICK" : ""]."
|
|
if(can_fold)
|
|
. += "[folded ? "It is currently folded, you can unfold it" : "It can be folded into a compact form"] by using CTRL + CLICK."
|
|
if(TIMER_COOLDOWN_CHECK(src, "arrow_recharge"))
|
|
. += span_warning("It is currently recharging!")
|
|
|
|
/obj/item/gun/ballistic/bow/energy/update_icon()
|
|
cut_overlay(arrow_overlay, TRUE)
|
|
|
|
if(folded)
|
|
icon_state = "[initial(icon_state)]_folded"
|
|
item_state = "[initial(item_state)]_folded"
|
|
else
|
|
icon_state = initial(icon_state)
|
|
item_state = initial(item_state)
|
|
|
|
if(get_ammo())
|
|
var/obj/item/ammo_casing/reusable/arrow/energy/E = magazine.get_round(TRUE)
|
|
arrow_overlay = mutable_appearance(icon, "[initial(E.icon_state)][chambered ? "_firing" : ""]")
|
|
add_overlay(arrow_overlay, TRUE)
|
|
item_state = "[item_state]_[E.icon_state]"
|
|
|
|
if(ismob(loc))
|
|
var/mob/M = loc
|
|
M.update_inv_hands()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/shoot_live_shot(mob/living/user, pointblank, atom/pbtarget, message)
|
|
if(folded)
|
|
to_chat(user, span_notice("You must unfold [src] before firing it!"))
|
|
return FALSE
|
|
. = ..()
|
|
if(recharge_time)
|
|
TIMER_COOLDOWN_START(src, "arrow_recharge", recharge_time)
|
|
addtimer(CALLBACK(src, .proc/end_cooldown), recharge_time)
|
|
|
|
/obj/item/gun/ballistic/bow/energy/proc/end_cooldown()
|
|
playsound(src, 'sound/effects/sparks4.ogg', 25, 0)
|
|
|
|
/obj/item/gun/ballistic/bow/energy/attack_self(mob/living/user)
|
|
if(folded)
|
|
toggle_folded(FALSE, user)
|
|
if(..())
|
|
return TRUE
|
|
if(!chambered && !get_ammo() && (!recharge_time || !TIMER_COOLDOWN_CHECK(src, "arrow_recharge")))
|
|
to_chat(user, span_notice("You fabricate an arrow."))
|
|
recharge_arrow()
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/proc/recharge_arrow()
|
|
if(folded || magazine.get_round(TRUE))
|
|
return
|
|
var/ammo_type = magazine.ammo_type
|
|
magazine.give_round(new ammo_type())
|
|
update_slowdown()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/attackby(obj/item/I, mob/user, params)
|
|
return
|
|
|
|
/obj/item/gun/ballistic/bow/energy/AltClick(mob/living/user)
|
|
select_projectile(user)
|
|
var/current_round = magazine.get_round(TRUE)
|
|
if(current_round)
|
|
QDEL_NULL(current_round)
|
|
if(!TIMER_COOLDOWN_CHECK(src, "arrow_recharge"))
|
|
recharge_arrow()
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/proc/select_projectile(mob/living/user)
|
|
var/obj/item/ammo_box/magazine/internal/bow/energy/M = magazine
|
|
if(!istype(M) || !M.selectable_types)
|
|
return
|
|
var/list/selectable_types = M.selectable_types
|
|
|
|
switch(selectable_types.len)
|
|
if(1)
|
|
M.ammo_type = selectable_types[1]
|
|
to_chat(user, span_notice("\The [src] doesn't have any other firing modes."))
|
|
if(2)
|
|
selectable_types = selectable_types - M.ammo_type
|
|
var/obj/item/ammo_casing/reusable/arrow/energy/new_ammo_type = selectable_types[1]
|
|
M.ammo_type = new_ammo_type
|
|
to_chat(user, span_notice("You switch \the [src]'s firing mode to \"[initial(new_ammo_type.name)]\"."))
|
|
else
|
|
var/list/choice_list = list()
|
|
var/list/radial_list = list()
|
|
for(var/type in M.selectable_types)
|
|
var/obj/item/arrow_type = type
|
|
var/datum/radial_menu_choice/choice = new
|
|
choice.image = image(initial(arrow_type.icon), icon_state = initial(arrow_type.icon_state))
|
|
choice.info = initial(arrow_type.desc)
|
|
choice.active = M.ammo_type == type
|
|
choice_list[initial(arrow_type.name)] = arrow_type
|
|
radial_list[initial(arrow_type.name)] = choice
|
|
var/raw_choice = show_radial_menu(user, user, radial_list, tooltips = TRUE)
|
|
if(!raw_choice || !(raw_choice in radial_list))
|
|
return
|
|
var/obj/item/ammo_casing/reusable/arrow/energy/choice = choice_list[raw_choice]
|
|
if(!choice || !(choice in M.selectable_types))
|
|
return
|
|
M.ammo_type = choice
|
|
to_chat(user, span_notice("You switch \the [src]'s firing mode to \"[initial(choice.name)]\"."))
|
|
QDEL_NULL(choice_list)
|
|
QDEL_NULL(radial_list)
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/CtrlClick(mob/living/user)
|
|
if(!can_fold || !user.is_holding(src))
|
|
return ..()
|
|
if(drawing)
|
|
to_chat(user, span_notice("You can't fold \the [src] while drawing the bowstring."))
|
|
toggle_folded(!folded, user)
|
|
|
|
/obj/item/gun/ballistic/bow/energy/proc/toggle_folded(new_folded, mob/living/user)
|
|
if(!can_fold)
|
|
return
|
|
|
|
if(folded != new_folded)
|
|
playsound(src.loc, fold_sound, 50, 1)
|
|
|
|
folded = new_folded
|
|
|
|
if(folded)
|
|
w_class = folded_w_class
|
|
chambered = null
|
|
//stored_ammo = magazine.ammo_list()
|
|
//magazine.stored_ammo = null
|
|
if(user)
|
|
to_chat(user, span_notice("You fold [src]."))
|
|
else
|
|
w_class = initial(w_class)
|
|
//magazine.stored_ammo = stored_ammo
|
|
if(user)
|
|
to_chat(user, span_notice("You extend [src], allowing it to be fired."))
|
|
update_icon()
|
|
|
|
/obj/item/gun/ballistic/bow/energy/advanced
|
|
name = "advanced hardlight bow"
|
|
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy/advanced
|
|
recharge_time = 0
|
|
pin = /obj/item/firing_pin
|
|
can_fold = TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/energy/ert
|
|
name = "\improper HL-P1 Multipurpose Combat Bow"
|
|
desc = "An expensive hardlight bow designed by Nanotrasen and often sold to the SIC's espionage branch. Capable of firing disabler, energy, pulse, and taser bolts."
|
|
icon_state = "bow_ert"
|
|
item_state = "bow_ert"
|
|
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy/ert
|
|
pin = /obj/item/firing_pin
|
|
can_fold = TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/energy/syndicate
|
|
name = "syndicate hardlight bow"
|
|
desc = "A modern bow that can fabricate hardlight arrows using an internal energy. This one is designed by the Syndicate for silent takedowns of targets."
|
|
icon_state = "bow_syndicate"
|
|
item_state = "bow_syndicate"
|
|
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy/syndicate
|
|
zoomable = TRUE
|
|
zoom_amt = 10
|
|
zoom_out_amt = 5
|
|
pin = /obj/item/firing_pin
|
|
fire_sound = null
|
|
draw_sound = null
|
|
can_fold = TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/energy/syndicate/folded
|
|
folded = TRUE
|
|
|
|
/obj/item/gun/ballistic/bow/energy/clockwork
|
|
name = "brass bow"
|
|
desc = "A bow made from brass and other components that you can't quite understand. It glows with a deep energy and fabricates arrows by itself."
|
|
icon_state = "bow_clockwork"
|
|
item_state = "bow_clockwork"
|
|
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy/clockcult
|
|
pin = /obj/item/firing_pin/clockie
|