diff --git a/.github/assets/discord-dark.png b/.github/assets/discord-dark.png new file mode 100644 index 000000000000..cd5fc2aadb22 Binary files /dev/null and b/.github/assets/discord-dark.png differ diff --git a/.github/assets/discord-light.png b/.github/assets/discord-light.png new file mode 100644 index 000000000000..2094d01a4757 Binary files /dev/null and b/.github/assets/discord-light.png differ diff --git a/.github/assets/docs-dark.png b/.github/assets/docs-dark.png new file mode 100644 index 000000000000..8efc14d0ba02 Binary files /dev/null and b/.github/assets/docs-dark.png differ diff --git a/.github/assets/docs-light.png b/.github/assets/docs-light.png new file mode 100644 index 000000000000..25ad91545a85 Binary files /dev/null and b/.github/assets/docs-light.png differ diff --git a/.github/assets/logo.png b/.github/assets/logo.png new file mode 100644 index 000000000000..78036c2601b7 Binary files /dev/null and b/.github/assets/logo.png differ diff --git a/.github/assets/website-dark.png b/.github/assets/website-dark.png new file mode 100644 index 000000000000..c80cd0e90fcd Binary files /dev/null and b/.github/assets/website-dark.png differ diff --git a/.github/assets/website-light.png b/.github/assets/website-light.png new file mode 100644 index 000000000000..96dee1b838ee Binary files /dev/null and b/.github/assets/website-light.png differ diff --git a/.github/assets/wiki-dark.png b/.github/assets/wiki-dark.png new file mode 100644 index 000000000000..a1438c4d1b67 Binary files /dev/null and b/.github/assets/wiki-dark.png differ diff --git a/.github/assets/wiki-light.png b/.github/assets/wiki-light.png new file mode 100644 index 000000000000..89e6972fd6aa Binary files /dev/null and b/.github/assets/wiki-light.png differ diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 6b3d081017db..000000000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - ColonialMarines - Copyright (C) 2020 CM Devs - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/LICENSE-AGPL3 b/LICENSE-AGPLv3.txt similarity index 100% rename from LICENSE-AGPL3 rename to LICENSE-AGPLv3.txt diff --git a/LICENSE-CC-BY-NC-SA-3.0.txt b/LICENSE-CC-BY-NC-SA-3.0.txt new file mode 100644 index 000000000000..a50eacf98c56 --- /dev/null +++ b/LICENSE-CC-BY-NC-SA-3.0.txt @@ -0,0 +1,360 @@ +Creative Commons Legal Code + +Attribution-NonCommercial-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(g) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined above) for the purposes of this + License. + c. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + d. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, Noncommercial, ShareAlike. + e. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + f. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + g. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + h. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + i. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + j. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved, including but not limited to the +rights described in Section 4(e). + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(d), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(d), as requested. + b. You may Distribute or Publicly Perform an Adaptation only under: (i) + the terms of this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-NonCommercial-ShareAlike 3.0 US) ("Applicable License"). + You must include a copy of, or the URI, for Applicable License with + every copy of each Adaptation You Distribute or Publicly Perform. You + may not offer or impose any terms on the Adaptation that restrict the + terms of the Applicable License or the ability of the recipient of the + Adaptation to exercise the rights granted to that recipient under the + terms of the Applicable License. You must keep intact all notices that + refer to the Applicable License and to the disclaimer of warranties + with every copy of the Work as included in the Adaptation You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Adaptation, You may not impose any effective technological + measures on the Adaptation that restrict the ability of a recipient of + the Adaptation from You to exercise the rights granted to that + recipient under the terms of the Applicable License. This Section 4(b) + applies to the Adaptation as incorporated in a Collection, but this + does not require the Collection apart from the Adaptation itself to be + made subject to the terms of the Applicable License. + c. You may not exercise any of the rights granted to You in Section 3 + above in any manner that is primarily intended for or directed toward + commercial advantage or private monetary compensation. The exchange of + the Work for other copyrighted works by means of digital file-sharing + or otherwise shall not be considered to be intended for or directed + toward commercial advantage or private monetary compensation, provided + there is no payment of any monetary compensation in con-nection with + the exchange of copyrighted works. + d. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and, (iv) consistent with Section 3(b), in the case of an Adaptation, + a credit identifying the use of the Work in the Adaptation (e.g., + "French translation of the Work by Original Author," or "Screenplay + based on original Work by Original Author"). The credit required by + this Section 4(d) may be implemented in any reasonable manner; + provided, however, that in the case of a Adaptation or Collection, at + a minimum such credit will appear, if a credit for all contributing + authors of the Adaptation or Collection appears, then as part of these + credits and in a manner at least as prominent as the credits for the + other contributing authors. For the avoidance of doubt, You may only + use the credit required by this Section for the purpose of attribution + in the manner set out above and, by exercising Your rights under this + License, You may not implicitly or explicitly assert or imply any + connection with, sponsorship or endorsement by the Original Author, + Licensor and/or Attribution Parties, as appropriate, of You or Your + use of the Work, without the separate, express prior written + permission of the Original Author, Licensor and/or Attribution + Parties. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor reserves + the exclusive right to collect such royalties for any exercise by + You of the rights granted under this License if Your exercise of + such rights is for a purpose or use which is otherwise than + noncommercial as permitted under Section 4(c) and otherwise waives + the right to collect royalties through any statutory or compulsory + licensing scheme; and, + iii. Voluntary License Schemes. The Licensor reserves the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License that is for a + purpose or use which is otherwise than noncommercial as permitted + under Section 4(c). + f. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO THE +FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE WORK AS-IS +AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE +WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT +LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, +ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT +DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED +WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of this License. + + Creative Commons may be contacted at https://creativecommons.org/. diff --git a/LICENSE-GPL3 b/LICENSE-GPLv3.txt similarity index 100% rename from LICENSE-GPL3 rename to LICENSE-GPLv3.txt diff --git a/README.md b/README.md index abac21f624f0..b364589d7ce1 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,85 @@ -## CM-SS13 codebase - - [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) - -[![Build Status](https://github.com/cmss13-devs/cmss13/workflows/CI%20Suite/badge.svg)](https://github.com/cmss13-devs/cmss13/actions?query=workflow%3A%22CI+Suite%22) -* **Website:** https://forum.cm-ss13.com/ -* **Code:** https://github.com/cmss13-devs/cmss13 -* **Wiki:** https://cm-ss13.com/wiki/Main_Page - -This is the codebase for the CM-SS13 flavoured fork of SpaceStation 13 - -Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive! CM-SS13 has wildly adapted this idea into a strategic roleplay-based team deathmatch game. - -## :exclamation: How to compile :exclamation: - -On **2022-04-06** we have changed the way to compile the codebase. - -**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337. - -**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `colonialmarines.dmb` in DreamDaemon. - -**Building colonialmarines in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`. - -**[How to compile in VSCode and other build options](tools/build/README.md).** - -## Contributors -[Guides for Contributors](.github/CONTRIBUTING.md) - -[Setting up a Development Environment](https://cm-ss13.com/wiki/Guide_to_Git) - -## LICENSE - -The code for CM-SS13 is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html), which can be found in full in [/LICENSE-AGPL3](/LICENSE-AGPL3). - -Assets including icons and sound are under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated. Authorship for assets including art and sound under the CC BY-SA license is defined as the active development team of CM-SS13 unless stated otherwise (by author of the commit). - -All code is assumed to be licensed under AGPL v3 unless stated otherwise by file header. Commits before 9a001bf520f889b434acd295253a1052420860af are assumed to be licensed under GPLv3 and can be used in closed source repo. +

+ CM-SS13 +

+
+ +

+ + +

+ +

+ + + +

+ +

+ + + + + Discord + + + + + + + Code docs + + + + + + + Website + + + + + + + Game Wiki + + +

+
+ +> [!IMPORTANT] +> CM-SS13 cannot be compiled exclusively using BYOND - **you must use our build tool**. +> Firstly, you need to install [BYOND](https://www.byond.com/download/), and run the `bin/server.cmd` file to start the server. +> You can learn more in our [Installation Guide](tools/build/README.md). **Building colonialmarines in DreamMaker directly is now deprecated and will cause errors.** + +CM-SS13 is a game based on [Space Station 13](https://spacestation13.com), made in [BYOND](https://www.byond.com). CM-SS13 has wildly adapted the SS13 model into a strategic roleplay-based team deathmatch game. + +# Useful Links + +- ## [Setting up a Development Environment](https://cm-ss13.com/wiki/Guide_to_Git) +> [!TIP] +> Want to contribute for the first time but unsure where to start? Take a look at our community maintained [Guide to Contributing](https://cm-ss13.com/wiki/Contributing_to_the_Game)! + +This guide will get you set up with a Visual Studio Code development environment, complete with BYOND debugger, which will allow you to contribute back to this repository. + +- ## [Contributing Rules](.github/CONTRIBUTING.md) +This is our canonical, maintainer-maintained contributing guide, which contains information on our maintainer team structure and pull request rules. + +- ## [Code Standards](github/guides/STANDARDS.md) +Our standards documents details how to structure your code to comply with CM-SS13 code standards, and provides some information on DreamMaker quirks. + +- ## [Code Style](github/guides/STYLES.md) +The styles document tells you how to style your code to match the rest of the code in our codebase. + +- ## [tgui README](tgui/README.md) +All new interfaces in CM must be created using tgui - this document will help get you set up for tgui development. + +# Licenses + +### AGPLv3 license +> The code for CM-SS13 is licensed under the [GNU Affero General Public License v3](http://www.gnu.org/licenses/agpl.html). All code is assumed to be licensed under AGPL v3 unless stated otherwise by file header, or this document. + +### Creative Commons 3.0 BY-SA +> Assets including icons and sound are under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated. Authorship for assets including art and sound under the CC BY-SA license is defined as the active development team of CM-SS13 unless stated otherwise (by author of the commit). + +### GPLv3 license +> Commits before [9a001bf520f889b434acd295253a1052420860af on Mon, 14 Sep 2020 09:13:32 +0000](https://github.com/cmss13-devs/cmss13/commit/9a001bf520f889b434acd295253a1052420860af) are assumed to be licensed under [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html) and can be used in closed source repositories. diff --git a/code/__DEFINES/tgui.dm b/code/__DEFINES/tgui.dm index ca6408961eab..cf04ef686bf9 100644 --- a/code/__DEFINES/tgui.dm +++ b/code/__DEFINES/tgui.dm @@ -37,6 +37,12 @@ "%7b%22type%22%3a%22[type]%22%2c%22payload%22%3a[url_encode(json_encode(payload))]%7d" \ ) +/// Creates a message packet for sending via output() specifically for opening tgsay using an embedded winget +// This is {"type":"open","payload":{"channel":channel,"mapfocus":[[map.focus]]}}, but pre-encoded. +#define TGUI_CREATE_OPEN_MESSAGE(channel) ( \ + "%7b%22type%22%3a%22open%22%2c%22payload%22%3a%7B%22channel%22%3a%22[channel]%22%2c%22mapfocus%22%3a\[\[map.focus\]\]%7d%7d" \ +) + /* *Defines for the TGUI health analyser interface *The higher the level, the more information you can see diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index c60f7ceed628..678c5373fe67 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -25,7 +25,7 @@ * If you are diagonally adjacent, ensure you can pass through at least one of the mutually adjacent square. * Passing through in this case ignores anything with the throwpass flag, such as tables, racks, and morgue trays. */ -/turf/Adjacent(atom/neighbor, atom/target = null) +/turf/Adjacent(atom/neighbor, atom/target = null, list/ignore_list) var/turf/T0 = get_turf(neighbor) if(T0 == src) return TRUE @@ -34,7 +34,7 @@ if(T0.x == x || T0.y == y) // Check for border blockages - return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target) + return T0.ClickCross(get_dir(T0,src), border_only = 1, ignore_list = ignore_list) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target, ignore_list = ignore_list) // Not orthagonal var/in_dir = get_dir(neighbor,src) // eg. northwest (1+8) @@ -42,14 +42,14 @@ var/d2 = in_dir - d1 // eg north (1+8) - 8 = 1 for(var/d in list(d1,d2)) - if(!T0.ClickCross(d, border_only = 1)) + if(!T0.ClickCross(d, border_only = 1, ignore_list = ignore_list)) continue // could not leave T0 in that direction var/turf/T1 = get_step(T0,d) - if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0)|get_dir(T1,src), border_only = 0)) + if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0)|get_dir(T1,src), border_only = 0, ignore_list = ignore_list)) continue // couldn't enter or couldn't leave T1 - if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target)) + if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target, ignore_list = ignore_list)) continue // could not enter src return TRUE // we don't care about our own density @@ -131,8 +131,11 @@ Quick adjacency (to turf): This is defined as any dense ON_BORDER object, or any dense object without throwpass. The border_only flag allows you to not objects (for source and destination squares) */ -/turf/proc/ClickCross(target_dir, border_only, target_atom = null) +/turf/proc/ClickCross(target_dir, border_only, target_atom = null, list/ignore_list) for(var/obj/O in src) + if(O in ignore_list) + continue + if(!O.density || O == target_atom || O.throwpass) continue // throwpass is used for anything you can click through diff --git a/code/datums/ammo/bullet/sniper.dm b/code/datums/ammo/bullet/sniper.dm index 6d0f0792ec53..fa45b269d810 100644 --- a/code/datums/ammo/bullet/sniper.dm +++ b/code/datums/ammo/bullet/sniper.dm @@ -132,10 +132,10 @@ old_target = amr.focused_fire_target if(target_mob == (amr.focused_fire_target?.resolve())) - if(amr.focused_fire_counter < 2) // Can stack up to twice. + if(amr.focused_fire_counter < 3) // Can stack up to twice. amr.focused_fire_counter += 1 else - amr.focused_fire_counter = 2 + amr.focused_fire_counter = 0 else // If it's a new target amr.focused_fire_counter = 0 // Stacks to 0 if(human_firer && !(target_mob.is_dead())) @@ -144,7 +144,7 @@ human_firer.focused_fire_marker = focused_fire_marker_temp // Store new marker ref human_firer.client?.images += focused_fire_marker_temp // Add new marker - amr_counter = amr.focused_fire_counter + 1 + amr_counter = min(amr.focused_fire_counter + 1, 3) amr.focused_fire_target = WEAKREF(target_mob) var/size_damage_mod = 0.8 // 1.8x vs Non-Xenos (225) @@ -194,7 +194,7 @@ if(2) to_chat(aimed_projectile.firer, SPAN_WARNING("Two hits! You're starting to get a good read on the target's patterns.")) if(3) - to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye! You're fully focused on the target.")) + to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye! You're fully focused on the target. You notice they are starting to change their patterns.")) else to_chat(aimed_projectile.firer, SPAN_WARNING("Bullseye!")) else diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index bcb9673548db..a482d2686055 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -51,6 +51,8 @@ /datum/ammo/flamethrower/tank_flamer flamer_reagent_id = "napalmx" + max_range = 8 + /datum/ammo/flamethrower/sentry_flamer flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME flamer_reagent_id = "napalmx" @@ -267,6 +269,9 @@ nade_type = /obj/item/explosive/grenade/smokebomb icon_state = "smoke_shell" +/datum/ammo/grenade_container/tank_glauncher + max_range = 8 + /datum/ammo/hugger_container name = "hugger shell" ping = null diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index 722602cada69..83a94b2d8c5f 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -144,6 +144,8 @@ return return ..() +/datum/ammo/rocket/ap/tank_towlauncher + max_range = 8 /datum/ammo/rocket/ltb name = "cannon round" diff --git a/code/datums/keybinding/communication.dm b/code/datums/keybinding/communication.dm index d77aa9a8096b..e1ba0ab5a31e 100644 --- a/code/datums/keybinding/communication.dm +++ b/code/datums/keybinding/communication.dm @@ -8,15 +8,6 @@ full_name = "IC Say" keybind_signal = COMSIG_KB_CLIENT_SAY_DOWN -/datum/keybinding/client/communication/say/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - winset(user, null, "command=[user.tgui_say_create_open_command(SAY_CHANNEL)]") - return TRUE - /datum/keybinding/client/communication/ooc hotkey_keys = list("O") classic_keys = list("F2") @@ -24,15 +15,6 @@ full_name = "Out Of Character Say (OOC)" keybind_signal = COMSIG_KB_CLIENT_OOC_DOWN -/datum/keybinding/client/communication/ooc/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - winset(user, null, "command=[user.tgui_say_create_open_command(OOC_CHANNEL)]") - return TRUE - /datum/keybinding/client/communication/looc hotkey_keys = list("L") classic_keys = list("Unbound") @@ -40,15 +22,6 @@ full_name = "Local Out Of Character Say (OOC)" keybind_signal = COMSIG_KB_CLIENT_LOOC_DOWN -/datum/keybinding/client/communication/looc/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - winset(user, null, "command=[user.tgui_say_create_open_command(LOOC_CHANNEL)]") - return TRUE - /datum/keybinding/client/communication/me hotkey_keys = list("M") classic_keys = list("F4") @@ -56,15 +29,6 @@ full_name = "Custom Emote (/Me)" keybind_signal = COMSIG_KB_CLIENT_ME_DOWN -/datum/keybinding/client/communication/me/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - winset(user, null, "command=[user.tgui_say_create_open_command(ME_CHANNEL)]") - return TRUE - /datum/keybinding/client/communication/whisper hotkey_keys = list("Unbound") classic_keys = list("Unbound") @@ -78,15 +42,6 @@ full_name = "IC Comms (;)" keybind_signal = COMSIG_KG_CLIENT_RADIO_DOWN -/datum/keybinding/client/communication/radiochannels/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - winset(user, null, "command=[user.tgui_say_create_open_command(COMMS_CHANNEL)]") - return TRUE - /datum/keybinding/client/communication/asay hotkey_keys = list("F3") classic_keys = list("F5") @@ -95,17 +50,6 @@ description = "Talk with other admins." keybind_signal = COMSIG_KB_ADMIN_ASAY_DOWN -/datum/keybinding/client/communication/asay/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - if(!user.admin_holder?.check_for_rights(R_MOD)) - return - winset(user, null, "command=[user.tgui_say_create_open_command(ADMIN_CHANNEL)]") - return TRUE - /datum/keybinding/client/communication/mentor_say hotkey_keys = list("Unbound") classic_keys = list("Unbound") @@ -113,14 +57,3 @@ full_name = "Mentor Say" description = "Talk with other mentors." keybind_signal = COMSIG_KB_ADMIN_MENTORSAY_DOWN - -/datum/keybinding/client/communication/mentor_say/down(client/user) - . = ..() - if(.) - return - if(!user.prefs.tgui_say) - return - if(!user.admin_holder?.check_for_rights(R_MENTOR)) - return - winset(user, null, "command=[user.tgui_say_create_open_command(MENTOR_CHANNEL)]") - return TRUE diff --git a/code/game/area/shiva.dm b/code/game/area/shiva.dm index e4939cd67e1e..89d8074030ac 100644 --- a/code/game/area/shiva.dm +++ b/code/game/area/shiva.dm @@ -262,3 +262,7 @@ /area/shiva/interior/lz2_habs name = "Shiva's Snowball - Argentinian Research Headquarters" icon_state = "bar1" + +/area/shiva/interior/aux_power + name = "Shiva's Snowball - Auxiliary Generator Station" + icon_state = "hangars0" diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 96e2db4f3b38..ae6cdf10c64e 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -176,43 +176,46 @@ Additional game mode variables. if(pred_candidate) pred_candidate.moveToNullspace() //Nullspace it for garbage collection later. -#define calculate_pred_max (floor(length(GLOB.player_list) / pred_per_players) + pred_additional_max + pred_start_count) - -/datum/game_mode/proc/check_predator_late_join(mob/pred_candidate, show_warning = 1) +/datum/game_mode/proc/calculate_pred_max() + return floor(length(GLOB.player_list) / pred_per_players) + pred_additional_max + pred_start_count +/datum/game_mode/proc/check_predator_late_join(mob/pred_candidate, show_warning = TRUE) if(!pred_candidate.client) return - var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_PREDATOR] + var/datum/job/pred_job = GLOB.RoleAuthority.roles_by_name[JOB_PREDATOR] - if(!J) - if(show_warning) to_chat(pred_candidate, SPAN_WARNING("Something went wrong!")) - return + if(!pred_job) + if(show_warning) + to_chat(pred_candidate, SPAN_WARNING("Something went wrong!")) + return FALSE if(!(pred_candidate?.client.check_whitelist_status(WHITELIST_PREDATOR))) - if(show_warning) to_chat(pred_candidate, SPAN_WARNING("You are not whitelisted! You may apply on the forums to be whitelisted as a predator.")) - return + if(show_warning) + to_chat(pred_candidate, SPAN_WARNING("You are not whitelisted! You may apply on the forums to be whitelisted as a predator.")) + return FALSE if(!(flags_round_type & MODE_PREDATOR)) - if(show_warning) to_chat(pred_candidate, SPAN_WARNING("There is no Hunt this round! Maybe the next one.")) - return + if(show_warning) + to_chat(pred_candidate, SPAN_WARNING("There is no Hunt this round! Maybe the next one.")) + return FALSE if(pred_candidate.ckey in predators) if(show_warning) to_chat(pred_candidate, SPAN_WARNING("You already were a Yautja! Give someone else a chance.")) - return + return FALSE - if(show_warning && tgui_alert(pred_candidate, "Confirm joining the hunt. You will join as \a [lowertext(J.get_whitelist_status(pred_candidate.client))] predator", "Confirmation", list("Yes", "No"), 10 SECONDS) != "Yes") - return - if(J.get_whitelist_status(pred_candidate.client) == WHITELIST_NORMAL) - var/pred_max = calculate_pred_max - if(pred_current_num >= pred_max) - if(show_warning) to_chat(pred_candidate, SPAN_WARNING("Only [pred_max] predators may spawn this round, but Councillors and Ancients do not count.")) - return + if(show_warning && tgui_alert(pred_candidate, "Confirm joining the hunt. You will join as \a [lowertext(pred_job.get_whitelist_status(pred_candidate.client))] predator", "Confirmation", list("Yes", "No"), 10 SECONDS) != "Yes") + return FALSE - return 1 + if(pred_job.get_whitelist_status(pred_candidate.client) == WHITELIST_NORMAL) + var/pred_max = calculate_pred_max() + if(pred_current_num >= pred_max) + if(show_warning) + to_chat(pred_candidate, SPAN_WARNING("Only [pred_max] predators may spawn this round, but Councillors and Ancients do not count.")) + return FALSE -#undef calculate_pred_max + return TRUE /datum/game_mode/proc/transform_predator(mob/pred_candidate) set waitfor = FALSE diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 97c393e06556..87bfcd466766 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -160,7 +160,7 @@ dat += "" temp = "" show_browser(user, dat, "[src] Access", "tcommachine", "size=520x500;can_resize=0") - onclose(user, "dormitory") + onclose(user, "tcommachine") // Off-Site Relays diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 899bb2a8266e..a5e166451457 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -387,4 +387,5 @@ GLOBAL_LIST_INIT(cm_vending_synth_tools, list( /obj/item/weapon/gun/smg/nailgun/compact, /obj/item/ammo_magazine/smg/nailgun, /obj/item/ammo_magazine/smg/nailgun, + /obj/item/storage/belt/gun/m4a3/nailgun, ) diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index 4de97a8e20f3..cc6a8e95af0e 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -58,7 +58,7 @@ t1 += text("

Close

\n", src) show_browser(user, t1, "Access Control", "airlock_electronics") - onclose(user, "airlock") + onclose(user, "airlock_electronics") /obj/item/circuitboard/airlock/Topic(href, href_list) diff --git a/code/game/objects/items/devices/dummy_tablet.dm b/code/game/objects/items/devices/dummy_tablet.dm index 3ce5f933ab94..4996daf5366e 100644 --- a/code/game/objects/items/devices/dummy_tablet.dm +++ b/code/game/objects/items/devices/dummy_tablet.dm @@ -87,8 +87,8 @@ dat += "
\[ Reset \]" dat += "
" - show_browser(user, dat, "Professor DUMMY Control Tablet", window_options="size=400x500") - onclose(user, "communications") + show_browser(user, dat, "Professor DUMMY Control Tablet", "dummytablet", window_options="size=400x500") + onclose(user, "dummytablet") updateDialog() return diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 385c22d3a713..23f8c884f41c 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -1209,6 +1209,22 @@ for(var/i = 1 to storage_slots - 1) new /obj/item/ammo_magazine/pistol/highpower/black(src) +/obj/item/storage/belt/gun/m4a3/nailgun + name = "customized nailgun holster" + desc = "Combination of a M276 pistol holster and engineering toolbelt that have been cannibalized into a unique belt that can holster a compact nailgun and two spare nailgun magazines." + icon_state = "nailgun_holster" + storage_slots = 3 + can_hold = list( + /obj/item/weapon/gun/smg/nailgun/compact, + /obj/item/ammo_magazine/smg/nailgun, + ) + has_gamemode_skin = FALSE + +/obj/item/storage/belt/gun/m4a3/nailgun/prefilled/fill_preset_inventory() + handle_item_insertion(new /obj/item/weapon/gun/smg/nailgun/compact()) + for(var/i = 1 to storage_slots - 1) + new /obj/item/ammo_magazine/smg/nailgun(src) + /obj/item/storage/belt/gun/m39 name = "\improper M276 pattern M39 holster rig" desc = "Special issue variant of the M276 designed to holster a M39 submachine gun and two spare magazines. Uncommonly issued to USCM support and specialist personnel." diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 58db10080fbd..d6b637366f55 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -316,6 +316,10 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new()) to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The landing zone appears to be obstructed or out of bounds. Package would be lost on drop.")]") return + if(crate.opened) + to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The crate is not secure on the drop pad. Please close it!")]") + return + crate.visible_message(SPAN_WARNING("\The [crate] loads into a launch tube. Stand clear!")) current_squad.send_message("'[crate.name]' supply drop incoming. Heads up!") current_squad.send_maptext(crate.name, "Incoming Supply Drop:") diff --git a/code/modules/admin/tabs/round_tab.dm b/code/modules/admin/tabs/round_tab.dm index 4a993459e7d1..bc154e6ee1c3 100644 --- a/code/modules/admin/tabs/round_tab.dm +++ b/code/modules/admin/tabs/round_tab.dm @@ -1,22 +1,37 @@ /client/proc/adjust_predator_round() - set name = "Adjust Predator Round" - set desc = "Adjust the number of predators present in a predator round." + set name = "Adjust Predator Slots" + set desc = "Adjust the extra slots for predators." set category = "Server.Round" - if(admin_holder) - if(!SSticker || !SSticker.mode) - to_chat(src, SPAN_WARNING("The game hasn't started yet!")) - return + if(!admin_holder) + return - var/value = tgui_input_number(src,"How many additional predators can join? Decreasing the value is not recommended. Current predator count: [SSticker.mode.pred_current_num]","Input:", 0, (SSticker.mode.pred_additional_max - SSticker.mode.pred_current_num)) + if(!SSticker?.mode) + to_chat(src, SPAN_WARNING("The game hasn't started yet!")) + return - if(value < SSticker.mode.pred_current_num) - to_chat(src, SPAN_NOTICE("Aborting. Number cannot be lower than the current pred count. (current: [SSticker.mode.pred_current_num], attempted: [value])")) - return + var/cur_extra = SSticker.mode.pred_additional_max + var/cur_count = SSticker.mode.pred_current_num + var/cur_max = SSticker.mode.calculate_pred_max() + var/value = tgui_input_number(src, "How many additional predators can join? Current predator count: [cur_count]/[cur_max] Current setting: [cur_extra]", "Input:", default = cur_extra, min_value = 0, integer_only = TRUE) + + if(isnull(value)) + return + + if(value == cur_extra) + return + + cur_count = SSticker.mode.pred_current_num // values could have changed since asking + cur_max = SSticker.mode.calculate_pred_max() + var/free_extra = max(min(cur_extra, cur_max - cur_count), 0) // how much we could potentionally reduce pred_additional_max + + // If we are reducing the count and that exceeds how much we could reduce it by + if(value < cur_extra && (cur_extra - value) > free_extra) + to_chat(src, SPAN_NOTICE("Aborting. Number cannot result in a max less than current pred count. (current: [cur_count]/[cur_max], current extra: [cur_extra], attempted: [value])")) + return - if(value) - SSticker.mode.pred_additional_max = abs(value) - message_admins("[key_name_admin(usr)] adjusted the additional pred amount to [abs(value)].") + SSticker.mode.pred_additional_max = value + message_admins("[key_name_admin(usr)] adjusted the additional pred amount from [cur_extra] to [value].") /datum/admins/proc/force_predator_round() set name = "Toggle Predator Round" @@ -42,6 +57,7 @@ if(istype(PJ) && !PJ.spawn_positions) PJ.set_spawn_positions(GLOB.players_preassigned) predator_round.flags_round_type |= MODE_PREDATOR + REDIS_PUBLISH("byond.round", "type" = "predator-round", "map" = SSmapping.configs[GROUND_MAP].map_name) else predator_round.flags_round_type &= ~MODE_PREDATOR diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 59d7764c4193..cd70f62a80d6 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -684,33 +684,39 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( movement_keys[key] = SOUTH if(SAY_CHANNEL) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/say = tgui_say_create_open_command(SAY_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[say]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=\"say\\n.typing\"") if(COMMS_CHANNEL) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/radio = tgui_say_create_open_command(COMMS_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[radio]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=\"say\\n.typing\"") if(ME_CHANNEL) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/me = tgui_say_create_open_command(ME_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[me]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=\"me\\n.typing\"") if(OOC_CHANNEL) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/ooc = tgui_say_create_open_command(OOC_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[ooc]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=ooc") if(LOOC_CHANNEL) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/looc = tgui_say_create_open_command(LOOC_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[looc]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=looc") if(ADMIN_CHANNEL) if(admin_holder?.check_for_rights(R_MOD)) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/asay = tgui_say_create_open_command(ADMIN_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[asay]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=asay") else @@ -718,7 +724,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if(MENTOR_CHANNEL) if(admin_holder?.check_for_rights(R_MENTOR)) if(prefs.tgui_say) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") + var/mentor = tgui_say_create_open_command(MENTOR_CHANNEL) + winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[mentor]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=mentorsay") else diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index cd89cfe027f3..2fa3fd720059 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -651,7 +651,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( dat += "" winshow(user, "preferencewindow", TRUE) - show_browser(user, dat, "Preferences", "preferencebrowser") + show_browser(user, dat, "Preferences", "preferencewindow") onclose(user, "preferencewindow", src) /** diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 500d575c053f..031e464b3f82 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -843,6 +843,10 @@ to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The landing zone appears to be obstructed or out of bounds. Package would be lost on drop.")]") return + if(crate.opened) + to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The crate is not secure on the drop pad. Get Requisitions to close the crate!")]") + return + busy = TRUE crate.visible_message(SPAN_WARNING("\The [crate] loads into a launch tube. Stand clear!")) SEND_SIGNAL(crate, COMSIG_STRUCTURE_CRATE_SQUAD_LAUNCHED, current_squad) diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index 4c5a4fb129cd..fe79d995d1a6 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -128,7 +128,7 @@ if(istype(sniper_rifle, /obj/item/weapon/gun/rifle/sniper/XM43E1)) var/obj/item/weapon/gun/rifle/sniper/XM43E1/amr = sniper_rifle - if((amr.focused_fire_counter >= 1) && (target == amr.focused_fire_target?.resolve())) + if((amr.focused_fire_counter >= 1 && amr.focused_fire_counter < 3) && (target == amr.focused_fire_target?.resolve())) sniper_rifle.enable_aimed_shot_icon_alt = TRUE else sniper_rifle.enable_aimed_shot_icon_alt = FALSE diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9026a3e849e6..c1a43bda0ae8 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -211,8 +211,8 @@ if(F && !(projectile_flags & PROJECTILE_SHRAPNEL)) permutated |= F //Don't hit the shooter (firer) - else if (S && (projectile_flags & PROJECTILE_SHRAPNEL)) - permutated |= S + if (S) + permutated |= get_atom_on_turf(S) //Don't hit the originating object permutated |= src //Don't try to hit self. shot_from = S @@ -357,8 +357,14 @@ if((speed * world.tick_lag) >= get_dist(current_turf, target_turf)) SEND_SIGNAL(src, COMSIG_BULLET_TERMINAL) + + var/list/ignore_list + var/obj/item/hardpoint/hardpoint = shot_from + if(istype(hardpoint)) + LAZYOR(ignore_list, hardpoint.owner) //if fired from a vehicle, exclude the vehicle's body from the adjacency check + // Check we can reach the turf at all based on pathed grid - if(check_canhit(current_turf, next_turf)) + if(check_canhit(current_turf, next_turf, ignore_list)) return TRUE // Actually move @@ -594,9 +600,9 @@ if(SEND_SIGNAL(src, COMSIG_BULLET_POST_HANDLE_MOB, L, .) & COMPONENT_BULLET_PASS_THROUGH) return FALSE -/obj/projectile/proc/check_canhit(turf/current_turf, turf/next_turf) +/obj/projectile/proc/check_canhit(turf/current_turf, turf/next_turf, list/ignore_list) var/proj_dir = get_dir(current_turf, next_turf) - if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf)) + if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf, ignore_list = ignore_list)) ammo.on_hit_turf(current_turf, src) current_turf.bullet_act(src) return TRUE diff --git a/code/modules/shuttle/computers/escape_pod_computer.dm b/code/modules/shuttle/computers/escape_pod_computer.dm index 2af71fadaddb..b72d9fef5110 100644 --- a/code/modules/shuttle/computers/escape_pod_computer.dm +++ b/code/modules/shuttle/computers/escape_pod_computer.dm @@ -22,6 +22,9 @@ /obj/structure/machinery/computer/shuttle/escape_pod_panel/attack_hand(mob/user) if(..()) return + if(!allowed(user)) + to_chat(user, SPAN_WARNING("Access denied!")) + return tgui_interact(user) /obj/structure/machinery/computer/shuttle/escape_pod_panel/tgui_interact(mob/user, datum/tgui/ui) @@ -86,6 +89,7 @@ . = TRUE /obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison + req_access = list(ACCESS_WY_GENERAL) launch_without_evac = TRUE //========================================================================================= diff --git a/code/modules/tgui/tgui-say/modal.dm b/code/modules/tgui/tgui-say/modal.dm index 52625ab98741..a57b907499fb 100644 --- a/code/modules/tgui/tgui-say/modal.dm +++ b/code/modules/tgui/tgui-say/modal.dm @@ -10,9 +10,7 @@ * string - A JSON encoded message to open the modal. */ /client/proc/tgui_say_create_open_command(channel) - var/message = TGUI_CREATE_MESSAGE("open", list( - channel = channel, - )) + var/message = TGUI_CREATE_OPEN_MESSAGE(channel) return "\".output tgui_say.browser:update [message]\"" /** diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index 24b137a6804a..78219e439832 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) V.add_hardpoint(FPW) FPW.dir = turn(V.dir, 90) FPW.name = "Left "+ initial(FPW.name) - FPW.origins = list(2, 0) + FPW.origins = list(1, 0) FPW.muzzle_flash_pos = list( "1" = list(-18, 14), "2" = list(18, -42), @@ -191,7 +191,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) V.add_hardpoint(FPW) FPW.dir = turn(V.dir, -90) FPW.name = "Right "+ initial(FPW.name) - FPW.origins = list(-2, 0) + FPW.origins = list(-1, 0) FPW.muzzle_flash_pos = list( "1" = list(16, 14), "2" = list(-18, -42), diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm index 485b03573414..3aaa81daf19f 100644 --- a/code/modules/vehicles/hardpoints/hardpoint.dm +++ b/code/modules/vehicles/hardpoints/hardpoint.dm @@ -314,45 +314,6 @@ return data -/// Traces backwards from the gun origin to the vehicle to check for obstacles between the vehicle and the muzzle. -/obj/item/hardpoint/proc/clear_los() - if(origins[1] == 0 && origins[2] == 0) //skipping check for modules we don't need this - return TRUE - - var/turf/muzzle_turf = get_origin_turf() - - var/turf/checking_turf = muzzle_turf - while(!(owner in checking_turf)) - // Dense turfs block LoS - if(checking_turf.density) - return FALSE - - // Ensure that we can pass over all objects in the turf - for(var/obj/object in checking_turf) - // Since vehicles are multitile the - if(object == owner) - continue - - // Non-dense objects are irrelevant - if(!object.density) - continue - - // Make sure we can pass object from all directions - if(!HAS_FLAG(object.pass_flags.flags_can_pass_all, PASS_OVER_THROW_ITEM)) - if(!HAS_FLAG(object.flags_atom, ON_BORDER)) - return FALSE - //If we're behind the object, check the behind pass flags - else if(dir == object.dir && !HAS_FLAG(object.pass_flags.flags_can_pass_behind, PASS_OVER_THROW_ITEM)) - return FALSE - //If we're in front, check front pass flags - else if(dir == turn(object.dir, 180) && !HAS_FLAG(object.pass_flags.flags_can_pass_front, PASS_OVER_THROW_ITEM)) - return FALSE - - // Trace back towards the vehicle - checking_turf = get_step(checking_turf, turn(dir,180)) - - return TRUE - //----------------------------- //------INTERACTION PROCS---------- //----------------------------- @@ -613,10 +574,6 @@ to_chat(user, SPAN_WARNING("The target is not within your firing arc!")) return NONE - if(!clear_los()) - to_chat(user, SPAN_WARNING("The muzzle is obstructed!")) - return NONE - return handle_fire(target, user, params) /// Actually fires the gun, sets up the projectile and fires it. diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm index 2ab0c3f828fb..bce002de1e36 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm @@ -4,7 +4,7 @@ caliber = "grenade" icon_state = "glauncher_2" w_class = SIZE_LARGE - default_ammo = /datum/ammo/grenade_container + default_ammo = /datum/ammo/grenade_container/tank_glauncher max_rounds = 10 gun_type = /obj/item/hardpoint/secondary/grenade_launcher diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm index 59a5a18bb1fa..4e509211c6f6 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm @@ -5,6 +5,6 @@ caliber = "rocket" //correlates to any rocket mags icon_state = "quad_rocket" w_class = SIZE_LARGE - default_ammo = /datum/ammo/rocket/ap + default_ammo = /datum/ammo/rocket/ap/tank_towlauncher max_rounds = 5 gun_type = /obj/item/hardpoint/secondary/towlauncher diff --git a/code/modules/vehicles/hardpoints/holder/tank_turret.dm b/code/modules/vehicles/hardpoints/holder/tank_turret.dm index 403c5871f36b..bdf106aecac3 100644 --- a/code/modules/vehicles/hardpoints/holder/tank_turret.dm +++ b/code/modules/vehicles/hardpoints/holder/tank_turret.dm @@ -212,8 +212,3 @@ target = L return ..() - -/obj/item/hardpoint/holder/tank_turret/get_origin_turf() - var/origin_turf = ..() - origin_turf = get_step(get_step(origin_turf, owner.dir), owner.dir) //this should get us tile in front of tank to prevent grenade being stuck under us. - return origin_turf diff --git a/code/modules/vehicles/hardpoints/primary/arc_sentry.dm b/code/modules/vehicles/hardpoints/primary/arc_sentry.dm index 4b5087b2e608..30efdbcfd0e9 100644 --- a/code/modules/vehicles/hardpoints/primary/arc_sentry.dm +++ b/code/modules/vehicles/hardpoints/primary/arc_sentry.dm @@ -33,7 +33,6 @@ ) burst_delay = 2 burst_amount = 3 - projectile_type = /obj/projectile/arc_sentry /// Potential targets the turret can shoot at var/list/targets = list() @@ -97,12 +96,6 @@ return try_fire(target, null, params) - -/obj/item/hardpoint/primary/arc_sentry/generate_bullet(mob/user, turf/origin_turf) - var/obj/projectile/arc_sentry/made_projectile = ..() - made_projectile.permutated += owner - return made_projectile - /obj/item/hardpoint/primary/arc_sentry/start_fire(datum/source, atom/object, turf/location, control, params) if(QDELETED(object)) return @@ -199,31 +192,3 @@ return FALSE return ..() - -/obj/projectile/arc_sentry/Initialize(mapload, datum/cause_data/cause_data) - . = ..() - RegisterSignal(src, COMSIG_BULLET_POST_HANDLE_OBJ, PROC_REF(check_passthrough)) - -/obj/projectile/arc_sentry/check_canhit(turf/current_turf, turf/next_turf) - var/proj_dir = get_dir(current_turf, next_turf) - var/obj/item/hardpoint/arc_sentry = shot_from - if(!(arc_sentry.owner in current_turf) && !(arc_sentry.owner in next_turf) && (proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf)) - ammo.on_hit_turf(current_turf, src) - current_turf.bullet_act(src) - return TRUE - - // Check for hits that would occur when moving to turf, such as a blocking cade - if(scan_a_turf(next_turf, proj_dir)) - return TRUE - - return FALSE - -/obj/projectile/arc_sentry/proc/check_passthrough(datum/source, obj/hit_obj, bool) - SIGNAL_HANDLER - - if(!istype(shot_from, /obj/item/hardpoint)) - return - - var/obj/item/hardpoint/sentry = shot_from - if(sentry.owner == hit_obj) - return COMPONENT_BULLET_PASS_THROUGH diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm index b6dc2cedc674..fa865f40daa1 100644 --- a/code/modules/vehicles/hardpoints/primary/autocannon.dm +++ b/code/modules/vehicles/hardpoints/primary/autocannon.dm @@ -10,8 +10,6 @@ health = 500 firing_arc = 60 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/ace_autocannon max_clips = 2 diff --git a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm index 4033a4bffb2a..7cb4b9a621bb 100644 --- a/code/modules/vehicles/hardpoints/primary/dual_cannon.dm +++ b/code/modules/vehicles/hardpoints/primary/dual_cannon.dm @@ -14,7 +14,7 @@ health = 500 firing_arc = 60 - origins = list(0, -2) + origins = list(0, 1) ammo = new /obj/item/ammo_magazine/hardpoint/boyars_dualcannon max_clips = 2 diff --git a/code/modules/vehicles/hardpoints/primary/flamer.dm b/code/modules/vehicles/hardpoints/primary/flamer.dm index 13beee9dd2c2..d0e0596c141d 100644 --- a/code/modules/vehicles/hardpoints/primary/flamer.dm +++ b/code/modules/vehicles/hardpoints/primary/flamer.dm @@ -10,8 +10,6 @@ health = 400 firing_arc = 90 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/primary_flamer max_clips = 1 @@ -33,9 +31,8 @@ BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) )) -/obj/item/hardpoint/primary/flamer/try_fire(target, user, params) - var/turf/origin_turf = get_origin_turf() - if(origin_turf == get_turf(target)) +/obj/item/hardpoint/primary/flamer/try_fire(atom/target, mob/living/user, params) + if(get_turf(target) in owner.locs) to_chat(user, SPAN_WARNING("The target is too close.")) return NONE diff --git a/code/modules/vehicles/hardpoints/primary/ltb.dm b/code/modules/vehicles/hardpoints/primary/ltb.dm index 19b5c7e7b9b4..6cb84cf453da 100644 --- a/code/modules/vehicles/hardpoints/primary/ltb.dm +++ b/code/modules/vehicles/hardpoints/primary/ltb.dm @@ -10,8 +10,6 @@ health = 500 firing_arc = 60 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/ltb_cannon max_clips = 3 diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm index 81b383b3fbc2..7ae7c20c9870 100644 --- a/code/modules/vehicles/hardpoints/primary/minigun.dm +++ b/code/modules/vehicles/hardpoints/primary/minigun.dm @@ -9,8 +9,6 @@ health = 350 firing_arc = 90 - origins = list(0, -3) - ammo = new /obj/item/ammo_magazine/hardpoint/ltaaap_minigun max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm index f259d6ea2623..c1336eb05739 100644 --- a/code/modules/vehicles/hardpoints/secondary/cupola.dm +++ b/code/modules/vehicles/hardpoints/secondary/cupola.dm @@ -10,8 +10,6 @@ health = 350 firing_arc = 120 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/m56_cupola max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/secondary/flamer.dm b/code/modules/vehicles/hardpoints/secondary/flamer.dm index 5557cfb24e17..4bdc9e602974 100644 --- a/code/modules/vehicles/hardpoints/secondary/flamer.dm +++ b/code/modules/vehicles/hardpoints/secondary/flamer.dm @@ -10,8 +10,6 @@ health = 300 firing_arc = 120 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/secondary_flamer max_clips = 1 @@ -29,14 +27,28 @@ scatter = 6 fire_delay = 3.0 SECONDS +/obj/item/hardpoint/secondary/small_flamer/try_fire(atom/target, mob/living/user, params) + if(get_turf(target) in owner.locs) + to_chat(user, SPAN_WARNING("The target is too close.")) + return NONE + + return ..() + /obj/item/hardpoint/secondary/small_flamer/handle_fire(atom/target, mob/living/user, params) - var/turf/origin_turf = get_origin_turf() + //step forward along path so flame starts outside hull + var/list/turfs = get_line(get_origin_turf(), get_turf(target)) + var/turf/origin_turf + for(var/turf/turf as anything in turfs) + if(turf in owner.locs) + continue + origin_turf = turf + break var/distance = get_dist(origin_turf, get_turf(target)) var/fire_amount = min(ammo.current_rounds, distance+1, max_range) ammo.current_rounds -= fire_amount - new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target, CALLBACK(src, PROC_REF(display_ammo), user)) + new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target) play_firing_sounds() diff --git a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm index 536b5742cfcd..d0df1d295ffc 100644 --- a/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm +++ b/code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm @@ -13,7 +13,7 @@ health = 350 firing_arc = 120 - origins = list(0, -2) + origins = list(0, -1) ammo = new /obj/item/ammo_magazine/hardpoint/m56_cupola/frontal_cannon max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm index efd151e93cb3..ecaf36213d34 100644 --- a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm +++ b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm @@ -9,9 +9,6 @@ health = 500 firing_arc = 90 - var/max_range = 7 - - origins = list(0, -2) ammo = new /obj/item/ammo_magazine/hardpoint/tank_glauncher max_clips = 3 @@ -34,9 +31,8 @@ BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff) )) -/obj/item/hardpoint/secondary/grenade_launcher/try_fire(mob/user, atom/A) - var/turf/origin_turf = get_origin_turf() - if(origin_turf == get_turf(A)) +/obj/item/hardpoint/secondary/grenade_launcher/try_fire(atom/target, mob/living/user, params) + if(get_turf(target) in owner.locs) to_chat(user, SPAN_WARNING("The target is too close.")) return NONE diff --git a/code/modules/vehicles/hardpoints/secondary/tow.dm b/code/modules/vehicles/hardpoints/secondary/tow.dm index 7c58f7970c7b..30eadf224bda 100644 --- a/code/modules/vehicles/hardpoints/secondary/tow.dm +++ b/code/modules/vehicles/hardpoints/secondary/tow.dm @@ -9,8 +9,6 @@ health = 500 firing_arc = 60 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/towlauncher max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm index 780c195f00be..f051d9a21bb5 100644 --- a/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm +++ b/code/modules/vehicles/hardpoints/special/firing_port_weapon.dm @@ -20,8 +20,6 @@ allowed_seat = VEHICLE_SUPPORT_GUNNER_ONE - origins = list(0, 0) - ammo = new /obj/item/ammo_magazine/hardpoint/firing_port_weapon max_clips = 1 diff --git a/code/modules/vehicles/hardpoints/support/flare.dm b/code/modules/vehicles/hardpoints/support/flare.dm index 432c9636dadd..da1390b861d4 100644 --- a/code/modules/vehicles/hardpoints/support/flare.dm +++ b/code/modules/vehicles/hardpoints/support/flare.dm @@ -15,8 +15,6 @@ health = 500 firing_arc = 120 - origins = list(0, -2) - ammo = new /obj/item/ammo_magazine/hardpoint/flare_launcher max_clips = 3 diff --git a/html/changelogs/AutoChangeLog-pr-6244.yml b/html/changelogs/AutoChangeLog-pr-6244.yml deleted file mode 100644 index 8214c4f8e099..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6244.yml +++ /dev/null @@ -1,19 +0,0 @@ -author: "Drathek, mullenpaul" -delete-after: True -changes: - - ui: "Finalizes the TGUI React port and brings us back into parity again with TG's interface components" - - ui: "Strip panel is now larger with sprites at 64x64 instead of 48 because as an Image component now they didn't alias the same." - - ui: "VOX panel's second tab now doesn't overlap the other buttons" - - ui: "Wiring panel for some machines is now restored to use circular indicators again" - - ui: "Smart fridge interface is more in line with sorted inventories as far as layout & tooltips" - - ui: "Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + clicking the tab is now disabled again until the tacmap is ready (It needs minimap subsystem to fire to have icons when flattening the map to be up to date)" - - ui: "Reworks RestrictedInput number handling" - - ui: "Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, and Checkbox TGUI components (but nothing uses them yet)" - - ui: "Chat: Adds a clear chat button clearing the current tab, mute button to disable unread notifications for a tab, and updates the word highlight regex for case sensitivity" - - ui: "Updates the ship manipulator window to allow replacing any Shuttle" - - ui: "Fixes the supply pod panel not displaying its byondui map correctly" - - ui: "Fixes the research terminal duplicating papers in display old mode." - - ui: "Updates the tgui_input_list to for new features like hotkey selection, duplicate key handling, etc" - - bugfix: "Fixes thinking runtimes when quickly switching between tgsay categories" - - code_imp: "Shuttle subsystem now is less aggressive with reservations (skipping deletion if below a threshold, delaying reservation if above a threshold)" - - bugfix: "Fixes F5 key still refreshing a TGUI window even if default was set to be prevented (e.g. Hotkey interface)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6251.yml b/html/changelogs/AutoChangeLog-pr-6251.yml deleted file mode 100644 index 1ccb100b5d5b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6251.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "vero5123" -delete-after: True -changes: - - qol: "Toggleable ammo counter, can now cycle between displaying every fifth or single bullet." - - bugfix: "Light attachments will no longer automatically turn on when the weapon is equipped from suit storage" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6291.yml b/html/changelogs/AutoChangeLog-pr-6291.yml deleted file mode 100644 index 2436dfbc8094..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6291.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - balance: "Latejoin marines to larva ratio changed to 1:4 for the first 15 minutes, going back to 1:2.5 afterwards." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6297.yml b/html/changelogs/AutoChangeLog-pr-6297.yml deleted file mode 100644 index dea586c0acf7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6297.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "HeresKozmos" -delete-after: True -changes: - - mapadd: "Added three new tunnels to New Varadero." - - maptweak: "Adjusts placement of some existing tunnels on New Varadero." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6300.yml b/html/changelogs/AutoChangeLog-pr-6300.yml deleted file mode 100644 index 21c74020de61..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6300.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Nomoresolvalou" -delete-after: True -changes: - - balance: "unpowered doors are now opened instantly in maintenance jack crowbar mode instead of in three seconds." - - balance: "crowbar mode can now pry doors closed when unpowered." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6302.yml b/html/changelogs/AutoChangeLog-pr-6302.yml deleted file mode 100644 index 300948e5ccdf..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6302.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Git-Nivrak" -delete-after: True -changes: - - qol: "Changed the Queen's pointing color to purple" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6303.yml b/html/changelogs/AutoChangeLog-pr-6303.yml deleted file mode 100644 index 1810854997f4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6303.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "doganesi" -delete-after: True -changes: - - bugfix: "Fixed some oversights with custom loadout provided weapon boxes" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6305.yml b/html/changelogs/AutoChangeLog-pr-6305.yml deleted file mode 100644 index cba43318a117..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6305.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Doubleumc" -delete-after: True -changes: - - qol: "squad/queen/leader trackers can find targets in interiors" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6306.yml b/html/changelogs/AutoChangeLog-pr-6306.yml deleted file mode 100644 index 2956a6f40ca2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6306.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Nomoresolvalou" -delete-after: True -changes: - - bugfix: "fixed cats not specifically defined in code displaying wrong info when held or stored in a container. This should also fix any other mob capable of being picked up that is not defined in code as well." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-6307.yml b/html/changelogs/AutoChangeLog-pr-6307.yml deleted file mode 100644 index 45016fd925d6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-6307.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Doubleumc" -delete-after: True -changes: - - qol: "ghost \"Scan Health\" works at any range" \ No newline at end of file diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml index cb3bb1eec1ce..ac777fecd5cc 100644 --- a/html/changelogs/archive/2024-05.yml +++ b/html/changelogs/archive/2024-05.yml @@ -214,3 +214,85 @@ medhud visor iloveloopers: - spellcheck: Custom rocket description now looks nicer +2024-05-20: + Doubleumc: + - qol: ghost "Scan Health" works at any range + - qol: squad/queen/leader trackers can find targets in interiors + Drathek, mullenpaul: + - ui: Finalizes the TGUI React port and brings us back into parity again with TG's + interface components + - ui: Strip panel is now larger with sprites at 64x64 instead of 48 because as an + Image component now they didn't alias the same. + - ui: VOX panel's second tab now doesn't overlap the other buttons + - ui: Wiring panel for some machines is now restored to use circular indicators + again + - ui: Smart fridge interface is more in line with sorted inventories as far as layout + & tooltips + - ui: Tacmap drawing interface is tweaked a little to deal with the changes to dropdowns + + clicking the tab is now disabled again until the tacmap is ready (It needs + minimap subsystem to fire to have icons when flattening the map to be up to + date) + - ui: Reworks RestrictedInput number handling + - ui: Adds the DMIcon, VirtualList (deferred lazy list), Dialogue, MenuBar, StyleableSection, + and Checkbox TGUI components (but nothing uses them yet) + - ui: 'Chat: Adds a clear chat button clearing the current tab, mute button to disable + unread notifications for a tab, and updates the word highlight regex for case + sensitivity' + - ui: Updates the ship manipulator window to allow replacing any Shuttle + - ui: Fixes the supply pod panel not displaying its byondui map correctly + - ui: Fixes the research terminal duplicating papers in display old mode. + - ui: Updates the tgui_input_list to for new features like hotkey selection, duplicate + key handling, etc + - bugfix: Fixes thinking runtimes when quickly switching between tgsay categories + - code_imp: Shuttle subsystem now is less aggressive with reservations (skipping + deletion if below a threshold, delaying reservation if above a threshold) + - bugfix: Fixes F5 key still refreshing a TGUI window even if default was set to + be prevented (e.g. Hotkey interface) + Git-Nivrak: + - qol: Changed the Queen's pointing color to purple + - balance: Latejoin marines to larva ratio changed to 1:4 for the first 15 minutes, + going back to 1:2.5 afterwards. + HeresKozmos: + - mapadd: Added three new tunnels to New Varadero. + - maptweak: Adjusts placement of some existing tunnels on New Varadero. + Nomoresolvalou: + - balance: unpowered doors are now opened instantly in maintenance jack crowbar + mode instead of in three seconds. + - balance: crowbar mode can now pry doors closed when unpowered. + - bugfix: fixed cats not specifically defined in code displaying wrong info when + held or stored in a container. This should also fix any other mob capable of + being picked up that is not defined in code as well. + doganesi: + - bugfix: Fixed some oversights with custom loadout provided weapon boxes + vero5123: + - qol: Toggleable ammo counter, can now cycle between displaying every fifth or + single bullet. + - bugfix: Light attachments will no longer automatically turn on when the weapon + is equipped from suit storage +2024-05-23: + Drathek: + - ui: TGSay is now opened the same way it used to for more responsiveness +2024-05-24: + Drathek: + - bugfix: Fixed some winset errors with some nanoui windows + - admin: Fixed the adjust_predator_round verb + TheGamerdk: + - rscadd: Adds a sensor tower to the far East of Shivas, between Med-Sec and the + Research labs +2024-05-25: + Doubleumc: + - qol: vehicle weapon projectiles start from the weapon + Git-Nivrak: + - balance: AMR will now reset its focus after two fully charged aimed shots on the + same target. + JackieEstegado: + - qol: Requisition drop pads will now no longer launch open crates + Steelpoint: + - rscadd: The Compact Nailgun that the USCM Synthetic can vend now comes with a + unique nailgun holster, capable of holding the nailgun and two spare magazines. + Tyranicranger4: + - bugfix: Fixes improperly placed APCs on Shivas Snowball + realforest2001: + - bugfix: Fixed ARES remote interface UI crash relating to flight logs. + - rscadd: Added access check for use of escape pod consoles, and access requirement + on the CLs pod. diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index 2506ee0eb48d..978479eecaa0 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index b1ce353976c2..7cd4120ce4a4 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -2618,7 +2618,7 @@ /area/shiva/interior/colony/medseceng) "anc" = ( /turf/closed/wall/shiva/prefabricated/white, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "anm" = ( /obj/structure/bed/chair/comfy/blue{ dir = 1 @@ -4775,7 +4775,7 @@ pixel_y = -1 }, /turf/closed/wall/shiva/prefabricated/white, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "aEq" = ( /obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, @@ -5080,7 +5080,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "aIG" = ( /obj/item/weapon/wirerod, /turf/open/shuttle/elevator/grating, @@ -7051,7 +7051,7 @@ dir = 4; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "bwP" = ( /obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, @@ -7895,6 +7895,11 @@ icon_state = "redfull" }, /area/shiva/interior/colony/research_hab) +"ctz" = ( +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/aux_power) "ctC" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva{ @@ -7932,6 +7937,12 @@ }, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_lz2) +"cwU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "cwZ" = ( /turf/open/auto_turf/snow/layer0, /area/shiva/interior/warehouse/caves) @@ -8150,6 +8161,11 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/cp_camp) +"cJu" = ( +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/interior/aux_power) "cJy" = ( /obj/structure/surface/table, /turf/open/floor/shiva{ @@ -8389,6 +8405,15 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) +"cWG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S-corner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "cWN" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -8889,7 +8914,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "dxS" = ( /turf/open/auto_turf/ice/layer2, /area/shiva/interior/caves/right_spiders) @@ -9077,6 +9102,15 @@ "dOD" = ( /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/colony/botany) +"dPW" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "dQp" = ( /obj/structure/reagent_dispensers/water_cooler{ density = 0; @@ -9139,7 +9173,7 @@ dir = 1; start_charge = 0 }, -/turf/open/auto_turf/ice/layer1, +/turf/open/floor/plating, /area/shiva/interior/caves/research_caves) "dWp" = ( /turf/open/floor/shiva{ @@ -9321,7 +9355,7 @@ dir = 1; start_charge = 0 }, -/turf/open/auto_turf/snow/layer3, +/turf/open/floor/plating, /area/shiva/exterior/cp_colony_grounds) "eep" = ( /obj/effect/landmark/hunter_primary, @@ -9446,7 +9480,7 @@ /turf/open/floor/shiva{ dir = 1 }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "enc" = ( /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/ice/layer0, @@ -10115,7 +10149,7 @@ dir = 8; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "ffo" = ( /obj/structure/surface/rack, /obj/item/fuel_cell, @@ -10302,6 +10336,10 @@ /obj/item/storage/toolbox/electrical, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) +"foc" = ( +/obj/structure/platform_decoration/shiva/catwalk, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/valley) "fof" = ( /obj/structure/prop/invuln{ desc = "The mounting points are ground down from heavy use. They'll need some maintenance work before they can be used again."; @@ -10336,7 +10374,7 @@ icon_state = "pink_trim" }, /turf/closed/wall/shiva/prefabricated/white, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "fse" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/box/lightstick/red{ @@ -10427,7 +10465,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "fyC" = ( /obj/structure/prop/ice_colony/dense/planter_box/hydro{ pixel_x = -17; @@ -11700,6 +11738,12 @@ icon_state = "multi_tiles" }, /area/shiva/interior/colony/central) +"gNJ" = ( +/obj/structure/platform/shiva/catwalk{ + dir = 1 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "gNM" = ( /obj/item/lightstick/red/spoke/planted{ layer = 2.99; @@ -11927,7 +11971,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "gYu" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, @@ -12672,7 +12716,7 @@ /turf/open/floor/shiva{ dir = 1 }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "hLf" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/interior/colony/n_admin) @@ -13433,6 +13477,15 @@ icon_state = "redfull" }, /area/shiva/interior/colony/n_admin) +"ivU" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "iwn" = ( /obj/structure/surface/table, /obj/item/storage/box/bodybags, @@ -13812,7 +13865,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "iQe" = ( /obj/structure/barricade/handrail/wire{ dir = 8; @@ -13977,7 +14030,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "iXE" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/good_item, @@ -14078,6 +14131,9 @@ icon_state = "floor3" }, /area/shiva/interior/colony/medseceng) +"jbK" = ( +/turf/open/floor/plating, +/area/shiva/exterior/valley) "jbY" = ( /obj/structure/platform/strata{ dir = 4 @@ -14167,6 +14223,12 @@ dir = 1 }, /area/shiva/interior/colony/s_admin) +"jjX" = ( +/obj/structure/platform/shiva/catwalk{ + dir = 4 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "jkH" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -14814,7 +14876,7 @@ dir = 8; icon_state = "yellowfull" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "jXD" = ( /obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, @@ -14889,7 +14951,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "kbJ" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -15367,6 +15429,12 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) +"kxN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "kys" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15677,7 +15745,7 @@ /turf/open/floor/shiva{ dir = 1 }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "kLG" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /obj/structure/flora/grass/tallgrass/ice, @@ -15829,6 +15897,13 @@ icon_state = "chapel" }, /area/shiva/interior/colony/central) +"kRR" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/interior/aux_power) "kRV" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp/green, @@ -15928,7 +16003,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "kXs" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 11; @@ -16011,6 +16086,12 @@ icon_state = "yellow" }, /area/shiva/interior/colony/medseceng) +"laL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "lbF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -16183,7 +16264,7 @@ dir = 8; icon_state = "yellowfull" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "lnH" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_2" @@ -16455,6 +16536,12 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) +"lCB" = ( +/obj/structure/platform/shiva/catwalk{ + dir = 8 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "lDv" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/shiva{ @@ -16570,7 +16657,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "lHX" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/bottle/holywater, @@ -16960,7 +17047,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "mah" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; @@ -17065,6 +17152,12 @@ icon_state = "yellowcorners" }, /area/shiva/interior/colony/medseceng) +"mgt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "mgA" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -17408,7 +17501,7 @@ /turf/open/floor/shiva{ icon_state = "radiator_tile2" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "mCo" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassall_1" @@ -17741,6 +17834,12 @@ icon_state = "darkgreen2" }, /area/shiva/interior/colony/botany) +"mRa" = ( +/obj/structure/platform_decoration/shiva/catwalk{ + dir = 1 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "mRc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -17890,7 +17989,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "mYK" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -18048,7 +18147,7 @@ dir = 5; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "nhB" = ( /obj/structure/surface/rack, /obj/item/weapon/ice_axe, @@ -18188,6 +18287,10 @@ icon_state = "snow_mat" }, /area/shiva/interior/colony/central) +"nqK" = ( +/obj/structure/platform/shiva/catwalk, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "nrf" = ( /obj/structure/machinery/reagentgrinder{ pixel_y = 12 @@ -18213,7 +18316,7 @@ /turf/open/floor/shiva{ dir = 1 }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "nrN" = ( /obj/structure/prop/invuln/ice_prefab/standalone, /turf/open/auto_turf/snow/layer2, @@ -18225,7 +18328,7 @@ dir = 4; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "nsI" = ( /obj/structure/surface/table, /obj/item/paper/research_notes, @@ -18439,7 +18542,7 @@ dir = 8; icon_state = "yellowfull" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "nEH" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/decal/warning_stripes{ @@ -18732,7 +18835,7 @@ dir = 8; icon_state = "yellowfull" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "nUa" = ( /obj/structure/bed/chair{ dir = 8 @@ -20126,6 +20229,12 @@ "pzJ" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/exterior/cp_colony_grounds) +"pAx" = ( +/obj/structure/platform/shiva/catwalk{ + dir = 1 + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/valley) "pAE" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -20171,6 +20280,9 @@ dir = 1 }, /area/shiva/interior/colony/botany) +"pBL" = ( +/turf/open/floor/plating/plating_catwalk/shiva, +/area/shiva/interior/aux_power) "pCe" = ( /obj/structure/stairs/perspective/ice{ dir = 1; @@ -20303,7 +20415,7 @@ dir = 8; icon_state = "yellowfull" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "pGf" = ( /turf/open/floor/shiva{ dir = 10; @@ -20887,7 +20999,7 @@ /turf/open/floor/shiva{ icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "qid" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -20933,7 +21045,7 @@ "qkt" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "qkC" = ( /turf/open/shuttle/elevator, /area/shiva/interior/aerodrome) @@ -21315,7 +21427,7 @@ dir = 1; start_charge = 0 }, -/turf/open/auto_turf/snow/layer2, +/turf/open/floor/plating, /area/shiva/exterior/junkyard) "qEB" = ( /obj/structure/flora/grass/tallgrass/ice/corner, @@ -21614,6 +21726,15 @@ icon_state = "greenfull" }, /area/shiva/interior/colony/n_admin) +"qXx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N-corner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "qXS" = ( /turf/open/floor/shiva, /area/shiva/interior/bar) @@ -21634,7 +21755,7 @@ dir = 6; icon_state = "multi_tiles" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "rad" = ( /obj/structure/inflatable/popped, /turf/open/auto_turf/ice/layer1, @@ -21644,7 +21765,7 @@ dir = 1; start_charge = 0 }, -/turf/open/auto_turf/snow/layer2, +/turf/open/floor/plating, /area/shiva/exterior/junkyard/cp_bar) "rbc" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ @@ -22002,7 +22123,7 @@ dir = 10; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "rzw" = ( /obj/structure/platform_decoration/strata, /turf/open/auto_turf/snow/layer3, @@ -22318,7 +22439,7 @@ dir = 6; icon_state = "multi_tiles" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "rSL" = ( /obj/item/weapon/gun/boltaction{ pixel_x = -6 @@ -22367,7 +22488,7 @@ dir = 8; icon_state = "yellowfull" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "rUW" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/snow/layer3, @@ -22460,7 +22581,7 @@ dir = 6; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "rZq" = ( /obj/structure/surface/table/reinforced/prison{ dir = 4; @@ -23677,7 +23798,7 @@ dir = 8; start_charge = 0 }, -/turf/open/auto_turf/snow/layer2, +/turf/open/floor/plating, /area/shiva/exterior/cp_lz2) "too" = ( /obj/structure/prop/ice_colony/soil_net, @@ -23792,6 +23913,12 @@ dir = 1 }, /area/shiva/exterior/cp_colony_grounds) +"ttN" = ( +/obj/structure/machinery/sensortower{ + pixel_x = 6 + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "tuz" = ( /obj/structure/platform_decoration/strata{ dir = 1 @@ -23861,7 +23988,7 @@ /turf/open/floor/shiva{ icon_state = "multi_tiles" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "txU" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ @@ -23913,7 +24040,7 @@ dir = 6; icon_state = "multi_tiles" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "tzH" = ( /turf/open/floor/shiva{ dir = 4; @@ -23936,6 +24063,10 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"tDb" = ( +/obj/structure/platform/shiva/catwalk, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/valley) "tDg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -24443,7 +24574,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "tYw" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/junkyard) @@ -24771,7 +24902,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "ulm" = ( /obj/structure/machinery/disposal, /turf/open/floor/shiva{ @@ -24829,7 +24960,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "uoI" = ( /obj/structure/prop/invuln/ice_prefab/standalone/trim{ icon_state = "white_trim" @@ -25051,7 +25182,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "uCp" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -25134,7 +25265,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "uHa" = ( /obj/structure/morgue, /obj/structure/machinery/light/double{ @@ -25398,7 +25529,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "uRn" = ( /obj/item/weapon/gun/boltaction, /turf/open/floor/shiva{ @@ -25737,6 +25868,12 @@ dir = 1 }, /area/shiva/interior/garage) +"vip" = ( +/obj/structure/platform_decoration/shiva/catwalk{ + dir = 8 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "viy" = ( /obj/structure/machinery/disposal, /turf/open/floor/shiva{ @@ -26296,6 +26433,15 @@ /obj/structure/platform/strata, /turf/open/gm/river, /area/shiva/exterior/cp_lz2) +"vRW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N-corner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "vSL" = ( /obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, @@ -26398,7 +26544,7 @@ dir = 4; start_charge = 0 }, -/turf/open/auto_turf/ice/layer1, +/turf/open/floor/plating, /area/shiva/interior/caves/cp_camp) "vYm" = ( /turf/open/auto_turf/snow/layer0, @@ -26624,7 +26770,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "wlJ" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/telecomm/lz2_northeast) @@ -27066,6 +27212,15 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) +"wQr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S-corner" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/valley) "wQR" = ( /obj/structure/morgue{ dir = 8 @@ -27083,7 +27238,7 @@ dir = 9; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "wRm" = ( /turf/open/floor/plating, /area/shiva/interior/aerodrome) @@ -27162,6 +27317,12 @@ icon_state = "floor3" }, /area/shiva/interior/aerodrome) +"wVJ" = ( +/obj/structure/platform_decoration/shiva/catwalk{ + dir = 4 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "wWu" = ( /turf/open/floor/shiva{ dir = 9; @@ -27299,7 +27460,7 @@ dir = 8; icon_state = "yellow" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "xeq" = ( /obj/structure/prop/ice_colony/surveying_device/measuring_device{ dir = 4; @@ -27381,7 +27542,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/shiva/interior/lz2_habs) +/area/shiva/interior/aux_power) "xlg" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 10 @@ -36458,10 +36619,10 @@ puZ puZ anc tYm -xQJ -xQJ +cJu +cJu nTC -odz +pBL bsM edw edw @@ -36620,10 +36781,10 @@ puZ puZ anc uot -xQJ -xQJ +cJu +cJu nTC -odz +pBL uCO bsM edw @@ -36782,12 +36943,12 @@ puZ anc anc wls -xQJ +cJu emy nTC qkt -odz -odz +pBL +pBL anc anc anc @@ -37107,11 +37268,11 @@ anc nED mCn uRi -xQJ +cJu qZa -xQJ +cJu qZa -xQJ +cJu nTC tzu mae @@ -37276,7 +37437,7 @@ ffn xdT ryZ txS -pth +kRR anc gJI aEJ @@ -37430,8 +37591,8 @@ puZ anc nED mCn -cce -xQJ +ctz +cJu qZa hKS qZa @@ -37600,7 +37761,7 @@ bwJ nrU rZj txS -pth +kRR aEd ayc qta @@ -37754,12 +37915,12 @@ puZ anc nED mCn -cce -xQJ +ctz +cJu qZa -xQJ +cJu qZa -xQJ +cJu nTC rSr aIv @@ -38077,13 +38238,13 @@ puZ puZ anc anc -cce -xQJ -xQJ +ctz +cJu +cJu nTC -odz -odz -odz +pBL +pBL +pBL anc anc anc @@ -38240,10 +38401,10 @@ puZ puZ anc kbl -xQJ +cJu nrB nTC -odz +pBL bsM edw iVj @@ -38402,10 +38563,10 @@ puZ puZ anc dxh -xQJ -xQJ +cJu +cJu nTC -odz +pBL edw bsM iVj @@ -58569,7 +58730,7 @@ iMb iMb iMb aDH -iMb +pqj iMb iMb iMb @@ -58724,15 +58885,15 @@ oQl oQl jAL iMb +foc +jjX +jjX +jjX +vip iMb -iMb -fQX -fQX -iMb -iMb -iMb -iMb -fQX +pqj +pqj +pqj iMb iMb fQX @@ -58886,14 +59047,14 @@ iMb iMb iMb iMb -fQX -fQX -fQX -iMb -iMb +nqK +vRW +cwU +wQr +pAx +pqj +pqj iMb -fQX -fQX iMb iMb jAL @@ -59048,16 +59209,16 @@ iMb iMb jAL jAL -fQX -jAL -jAL +nqK +kxN +ttN +mgt +ivU +pqj +pqj iMb -fQX iMb -fQX -fQX aiz -iMb fQX iMb pQE @@ -59210,14 +59371,14 @@ jAL jAL jAL jAL -jAL -iMb -jAL -iMb -jAL -iMb -iMb -iMb +nqK +kxN +jbK +mgt +dPW +pqj +pqj +pqj iMb iMb iMb @@ -59372,12 +59533,12 @@ iMb jAL jAL iMb -iMb -iMb -jAL -jAL -jAL -iMb +tDb +qXx +laL +cWG +gNJ +pqj iMb iMb iMb @@ -59533,12 +59694,12 @@ iMb iMb iMb iMb -iMb -iMb -iMb -iMb -iMb -iMb +aiz +mRa +lCB +lCB +lCB +wVJ iMb iMb iMb diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm index bb1a8e543218..a002ca0bc0dd 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/cleared.dmm @@ -48,7 +48,7 @@ /obj/structure/machinery/power/apc{ dir = 8 }, -/turf/open/auto_turf/snow/layer2, +/turf/open/floor/plating, /area/shiva/exterior/cp_lz2) "r" = ( /obj/effect/decal/cleanable/ash, diff --git a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm index 5ecd5cf734f5..d7f25ee2a3de 100644 --- a/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm +++ b/maps/map_files/Ice_Colony_v3/lz2-variations/southeast-gate/closed.dmm @@ -35,7 +35,7 @@ /obj/structure/machinery/power/apc{ dir = 8 }, -/turf/open/auto_turf/snow/layer2, +/turf/open/floor/plating, /area/shiva/exterior/cp_lz2) "o" = ( /obj/structure/machinery/door_control{ diff --git a/tgui/packages/tgui-say/TguiSay.tsx b/tgui/packages/tgui-say/TguiSay.tsx index 4cc07a6e257c..c37f4272235e 100644 --- a/tgui/packages/tgui-say/TguiSay.tsx +++ b/tgui/packages/tgui-say/TguiSay.tsx @@ -11,6 +11,7 @@ import { byondMessages } from './timers'; type ByondOpen = { channel: Channel; + mapfocus: BooleanLike; }; type ByondProps = { @@ -246,11 +247,15 @@ export class TguiSay extends Component<{}, State> { } handleOpen = (data: ByondOpen) => { + const { channel, mapfocus } = data; + if (!mapfocus) { + return; + } + setTimeout(() => { this.innerRef.current?.focus(); }, 0); - const { channel } = data; // Catches the case where the modal is already open if (this.channelIterator.isSay()) { this.channelIterator.set(channel);