cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-30 03:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise

Browse Source
This commit is contained in:
Fordoxia
2024-04-30 03:45:45 +01:00
parent 8b0ff64cc0 ec2c5638fc
commit afd185773a
206 changed files with 4734 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.github/assets/book-dark.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
.github/assets/book-light.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

1
.github/assets/compiles-sometimes.svg vendored Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="218.06666564941406" height="35" viewBox="0 0 218.06666564941406 35"><rect width="103" height="35" fill="#31C4F3"/><rect x="103" width="115.06666564941406" height="35" fill="#389AD5"/><text x="51.5" y="21.5" font-size="12" font-family="'Roboto', sans-serif" fill="#FFFFFF" text-anchor="middle" letter-spacing="2">COMPILES</text><text x="160.53333282470703" y="21.5" font-size="12" font-family="'Montserrat', sans-serif" fill="#FFFFFF" text-anchor="middle" font-weight="900" letter-spacing="2">SOMETIMES</text></svg>
Side by Side

After

Width:  |  Height:  |  Size: 561 B

BIN
.github/assets/discord-dark.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
.github/assets/discord-light.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
.github/assets/light-dark template.psd vendored Normal file
View File

Binary file not shown.

BIN
.github/assets/made-in-byond.gif vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

31
.github/assets/made-with-crayons.svg vendored Normal file
View File

@@ -0,0 +1,31 @@
<svg xmlns="http://www.w3.org/2000/svg" width="258.708" height="35.059" viewBox="0 0 258.708 35.059">
<title>made-with-crayons</title>
<g>
<rect x="72.75" width="185.958" height="35" style="fill: #5593c8"/>
<rect y="0.029" width="112.375" height="35" style="fill: #a7bfc1"/>
<g>
<path d="M131.225,15.814a2.168,2.168,0,0,0-1.062-.306,1.871,1.871,0,0,0-1.02.288,2.014,2.014,0,0,0-.72.8,2.621,2.621,0,0,0,0,2.292,2.057,2.057,0,0,0,.72.8,1.839,1.839,0,0,0,1.02.294,2.371,2.371,0,0,0,1.026-.264,3.351,3.351,0,0,0,.978-.72l1.44,1.536a5.109,5.109,0,0,1-1.65,1.188,4.591,4.591,0,0,1-4.188-.126,4.125,4.125,0,0,1-1.59-1.578,4.461,4.461,0,0,1-.576-2.255,4.254,4.254,0,0,1,.588-2.214A4.178,4.178,0,0,1,127.811,14a4.838,4.838,0,0,1,4.212-.156,4.631,4.631,0,0,1,1.584,1.092l-1.44,1.716A3.017,3.017,0,0,0,131.225,15.814Z" style="fill: #fff"/>
<path d="M141.935,22l-1.116-2.269H139.5V22H137V13.588h3.924a3.967,3.967,0,0,1,2.622.78,2.721,2.721,0,0,1,.93,2.208,3.324,3.324,0,0,1-.366,1.6,2.716,2.716,0,0,1-1.05,1.074l1.7,2.748ZM139.5,17.812h1.428a1.192,1.192,0,0,0,.87-.3,1.157,1.157,0,0,0,.306-.864,1.12,1.12,0,0,0-.306-.846,1.207,1.207,0,0,0-.87-.294H139.5Z" style="fill: #fff"/>
<path d="M154.5,22l-.492-1.345h-3.4l-.5,1.345h-2.568l3.588-8.412h2.568L157.163,22Zm-3.192-3.168h2.04l-1.008-2.748Z" style="fill: #fff"/>
<path d="M167.519,13.588l-3.024,5.748V22H162V19.384l-3.084-5.8h2.5l1.836,3.432,1.788-3.432Z" style="fill: #fff"/>
<path d="M177.161,14A4.188,4.188,0,0,1,178.8,15.55a4.239,4.239,0,0,1,.594,2.226,4.323,4.323,0,0,1-.594,2.25,4.2,4.2,0,0,1-1.644,1.572,5.123,5.123,0,0,1-4.7,0,4.214,4.214,0,0,1-1.638-1.572,4.327,4.327,0,0,1-.594-2.25,4.244,4.244,0,0,1,.594-2.226A4.2,4.2,0,0,1,172.463,14a5.174,5.174,0,0,1,4.7,0Zm-3.336,1.812a2.178,2.178,0,0,0-.756.822,2.4,2.4,0,0,0-.282,1.158,2.434,2.434,0,0,0,.282,1.164,2.215,2.215,0,0,0,.756.834,1.855,1.855,0,0,0,1.026.306,1.778,1.778,0,0,0,1-.306,2.126,2.126,0,0,0,.726-.828,2.559,2.559,0,0,0,.264-1.17,2.533,2.533,0,0,0-.264-1.158,2.094,2.094,0,0,0-.72-.822,1.8,1.8,0,0,0-1.008-.3A1.882,1.882,0,0,0,173.825,15.808Z" style="fill: #fff"/>
<path d="M188.675,13.588h2.28V22h-2.124l-3.564-4.68V22h-2.292V13.588h2.136l3.564,4.692Z" style="fill: #fff"/>
<path d="M199.582,15.628a4.26,4.26,0,0,0-1.32-.276.9.9,0,0,0-.51.126.414.414,0,0,0-.186.366.573.573,0,0,0,.36.522,6.372,6.372,0,0,0,1.14.4,11.024,11.024,0,0,1,1.464.51,2.7,2.7,0,0,1,1,.786,2.151,2.151,0,0,1,.426,1.392,2.369,2.369,0,0,1-.462,1.481,2.769,2.769,0,0,1-1.248.906,4.892,4.892,0,0,1-1.758.3,6.744,6.744,0,0,1-2.166-.366,6.019,6.019,0,0,1-1.878-1l.936-1.9a5.6,5.6,0,0,0,1.554.93,4.277,4.277,0,0,0,1.578.378,1.121,1.121,0,0,0,.636-.155.508.508,0,0,0,.228-.444.581.581,0,0,0-.372-.534,6.335,6.335,0,0,0-1.152-.39,10.531,10.531,0,0,1-1.452-.474,2.575,2.575,0,0,1-1-.762,2.081,2.081,0,0,1-.42-1.356,2.386,2.386,0,0,1,.432-1.422,2.724,2.724,0,0,1,1.218-.93,4.77,4.77,0,0,1,1.83-.324,6.76,6.76,0,0,1,1.884.27,6.245,6.245,0,0,1,1.632.714l-.924,1.92A8.056,8.056,0,0,0,199.582,15.628Z" style="fill: #fff"/>
</g>
<g>
<path d="M15.789,13.469l2.461,6.539,2.455-6.539h1.916V22H21.145V19.188l.146-3.762L18.771,22H17.711L15.2,15.432l.146,3.756V22H13.867V13.469Z" style="fill: #fff"/>
<path d="M31.894,20.014h-3.3L27.9,22H26.357l3.223-8.531h1.33L34.138,22H32.591Zm-2.889-1.2h2.473l-1.236-3.539Z" style="fill: #fff"/>
<path d="M37.745,22V13.469h2.52a3.952,3.952,0,0,1,2.007.5,3.436,3.436,0,0,1,1.356,1.43,4.538,4.538,0,0,1,.48,2.121v.428a4.519,4.519,0,0,1-.483,2.133A3.4,3.4,0,0,1,42.248,21.5,4.135,4.135,0,0,1,40.2,22Zm1.482-7.336V20.8h.967a2.229,2.229,0,0,0,1.79-.729,3.165,3.165,0,0,0,.636-2.09v-.475a3.251,3.251,0,0,0-.6-2.117,2.142,2.142,0,0,0-1.752-.731Z" style="fill: #fff"/>
<path d="M53.211,18.191h-3.5V20.8h4.1V22H48.225V13.469h5.537v1.2H49.707V17.02h3.5Z" style="fill: #fff"/>
<path d="M69.97,19.891l1.313-6.422h1.471L70.784,22H69.366l-1.623-6.229L66.085,22H64.661l-1.969-8.531h1.471l1.324,6.41,1.629-6.41h1.242Z" style="fill: #fff"/>
<path d="M78.041,22H76.564V13.469h1.477Z" style="fill: #fff"/>
<path d="M88.5,14.664h-2.66V22H84.367V14.664H81.73v-1.2H88.5Z" style="fill: #fff"/>
<path d="M99.03,22H97.554V18.215H93.739V22H92.257V13.469h1.482V17.02h3.814V13.469H99.03Z" style="fill: #fff"/>
</g>
<g>
<polygon points="229.048 13.138 245.607 13.138 245.607 21.862 229.031 21.862 229.048 13.138" style="fill: #fff"/>
<rect x="223.736" y="13.138" width="3.472" height="8.725" style="fill: #fff"/>
<polygon points="221.628 21.602 215.375 17.502 221.626 13.4 221.628 21.602" style="fill: #fff"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
.github/assets/paradise.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
.github/assets/web-dark.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
.github/assets/web-light.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
.github/assets/wiki-dark.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
.github/assets/wiki-light.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

5
.github/workflows/render_nanomaps.yml vendored
View File

@@ -43,4 +43,7 @@ jobs:
git pull origin master
git commit -m "NanoMap Auto-Update (`date`)" -a || true
git push -f -u origin nanomap-render
gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master"
result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master")
if echo "$result" | grep -q "No commits between master and nanomap-render"
echo "No NanoMaps update required, skipping."
exit 78

19
COPYING
View File

@@ -1,19 +0,0 @@
Paradise
Copyright (C) 2010-2016 Paradise, Baystation12, Goonstation and tgstation13.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Any files located in the Paradise/goon, Paradise/icons/goonstation, or Paradise/sound/goonstation directories, or any subdirectories of mentioned directories are licensed under the Creative Commons 3.0 BY-NC-SA license (https://creativecommons.org/licenses/by-nc-sa/3.0) from Goonstation.

0
LICENSE-AGPL3.txt → LICENSE-AGPLv3.txt
View File

361
LICENSE-CC-BY-NC-SA-3.0.txt Normal file
View File

@@ -0,0 +1,361 @@
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/.

60
LICENSE-CC-BY-NC-SA.txt
View File

@@ -1,60 +0,0 @@
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
"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.
"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.
"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.
"License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, Noncommercial, ShareAlike.
"Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
"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.
"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.
"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.
"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.
"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:
to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
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.";
to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
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:
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.
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.
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.
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.
For the avoidance of doubt:
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;
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,
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).
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
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.
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
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.
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.
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.
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.
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.
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.

359
LICENSE-CC-BY-SA-3.0.txt Normal file
View File

@@ -0,0 +1,359 @@
Creative Commons Legal Code
Attribution-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(f) 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 below) for the purposes of this
License.
c. "Creative Commons Compatible License" means a license that is listed
at https://creativecommons.org/compatiblelicenses that has been
approved by Creative Commons as being essentially equivalent to this
License, including, at a minimum, because that license: (i) contains
terms that have the same purpose, meaning and effect as the License
Elements of this License; and, (ii) explicitly permits the relicensing
of adaptations of works made available under that license under this
License or a Creative Commons jurisdiction license with the same
License Elements as this License.
d. "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.
e. "License Elements" means the following high-level license attributes
as selected by Licensor and indicated in the title of this License:
Attribution, ShareAlike.
f. "Licensor" means the individual, individuals, entity or entities that
offer(s) the Work under the terms of this License.
g. "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.
h. "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.
i. "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.
j. "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.
k. "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.
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 waives the
exclusive right to collect such royalties for any exercise by You
of the rights granted under this License; and,
iii. Voluntary License Schemes. The Licensor waives 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.
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.
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(c), 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(c), as requested.
b. You may Distribute or Publicly Perform an Adaptation only under the
terms of: (i) 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-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
License. If you license the Adaptation under one of the licenses
mentioned in (iv), you must comply with the terms of that license. If
you license the Adaptation under the terms of any of the licenses
mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
comply with the terms of the Applicable License generally and the
following provisions: (I) You must include a copy of, or the URI for,
the Applicable License with every copy of each Adaptation You
Distribute or Publicly Perform; (II) 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; (III) 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; (IV) 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. 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 Ssection 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(c) 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.
d. 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, 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, MERCHANTIBILITY,
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 SUCH 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 the License.
Creative Commons may be contacted at https://creativecommons.org/.

4
LICENSE-GPL3.txt → LICENSE-GPLv3.txt
View File

@@ -1,7 +1,3 @@
Note: New submissions as of 5th January 2015 now fall under AGPL v3, prior code is
still licensed GPL v3, see README.md for details.
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

171
README.md
View File

@@ -1,51 +1,146 @@
# Paradise
[![CI](https://github.com/ParadiseSS13/Paradise/workflows/CI/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI)
[![Render Nanomaps](https://github.com/ParadiseSS13/Paradise/workflows/Render%20Nanomaps/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/paradisess13/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/paradisess13/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Percentage of issues still open")
<a href="#"><img src=".github/assets/paradise.png" alt="Paradise Station"></a>
[![forthebadge](http://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](http://forthebadge.com)
[![forthebadge](http://forthebadge.com/images/badges/contains-technical-debt.svg)](http://forthebadge.com)
[![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com)
## <p align="center">Welcome to the main repository for the Paradise Station version of [Space Station 13](https://spacestation13.com/).</p>
# Useful Links
<p align="center">
<a href="https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI"><img src="https://github.com/ParadiseSS13/Paradise/workflows/CI/badge.svg" alt="CI"></a>
<a href="https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22"><img src="https://github.com/ParadiseSS13/Paradise/workflows/Render%20Nanomaps/badge.svg" alt="Render Nanomaps"></a>
<a href="http://isitmaintained.com/project/paradisess13/paradise"><img src="http://isitmaintained.com/badge/resolution/paradisess13/paradise.svg" alt="Average time to resolve an issue"></a>
<a href="http://isitmaintained.com/project/paradisess13/paradise"><img src="http://isitmaintained.com/badge/open/paradisess13/paradise.svg" alt="Percentage of issues still open"></a>
</p>
- [Discord](https://discordapp.com/invite/YJDsXFE)
- [Documentation](https://codedocs.paradisestation.org)
- [Website](https://www.paradisestation.org/)
# Useful Documents
<p align="center">
<a href="https://xkcd.com/371/"><img src=".github/assets/compiles-sometimes.svg" alt="Compiles sometimes"></a>
<a href="https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a/"><img src=".github/assets/made-in-byond.gif" alt="Made in BYOND"></a>
<a href="https://xkcd.com/1811/"><img src=".github/assets/made-with-crayons.svg" alt="Made with crayons"></a>
</p>
- [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)
- [Code of Conduct](./CODE_OF_CONDUCT.md)
- [Contribution Guide](.github/CONTRIBUTING.md)
- [Installation Guide](.github/DOWNLOADING.md)
<p align="center">
<a href="https://discord.gg/paradisess13">
<picture>
<source media="(prefers-color-scheme: dark)" srcset=".github/assets/discord-light.png">
<source media="(prefers-color-scheme: light)" srcset=".github/assets/discord-dark.png">
<img width="15%" alt="Discord" hspace="3%" src=".github/assets/discord-dark.png">
</picture>
</a>
<a href="https://codedocs.paradisestation.org">
<picture>
<source media="(prefers-color-scheme: dark)" srcset=".github/assets/book-light.png">
<source media="(prefers-color-scheme: light)" srcset=".github/assets/book-dark.png">
<img alt="Code docs" width="15%" hspace="3%" src=".github/assets/book-dark.png">
</picture>
</a>
<a href="https://www.paradisestation.org/">
<picture>
<source media="(prefers-color-scheme: dark)" srcset=".github/assets/web-light.png">
<source media="(prefers-color-scheme: light)" srcset=".github/assets/web-dark.png">
<img width="15%" alt="Website" hspace="3%" src=".github/assets/web-dark.png">
</picture>
</a>
<a href="https://paradisestation.org/wiki">
<picture>
<source media="(prefers-color-scheme: dark)" srcset=".github/assets/wiki-light.png">
<source media="(prefers-color-scheme: light)" srcset=".github/assets/wiki-dark.png">
<img width="15%" alt="Game Wiki" hspace="3%" src=".github/assets/wiki-dark.png">
</picture>
</a>
</p>
> [!TIP]
> Want to contribute for the first time but unsure where to start?<br>
> Join our Discord and check out the [#coding_chat](https://discord.com/channels/145533722026967040/145700319819464704) channel for helpful links and advice!<br>
> Alternatively, have a look at our community maintained [Guide to Contributing](https://paradisestation.org/wiki/index.php?title=Guide_to_Contributing)
# Useful Documents and Links
- ### [Dream Maker (DM) Reference](https://www.byond.com/docs/ref/)
This reference site by the creators of BYOND details information on the DM language, the syntax used, functionality of native procs, and a lot more. This is always useful to have on hand when contributing.
- ### [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)
This guide shows you how to leave code comments that comply with "autodocumentation", a system designed to make everyone's lives easier when reading or reviewing code!
- ### [Code of Conduct](./CODE_OF_CONDUCT.md)
All contributors are expected to read our Code of Conduct before they take part in our community.
- ### [Contribution Guide](.github/CONTRIBUTING.md)
Not sure how to take part and contribute? This guide gives an overview of how to make comments, pull requests, and open issues.
This guide also sets out our code standards that we expect all submitted code to adhere to.
- ### [Community Maintained Guide to Contributing](https://paradisestation.org/wiki/index.php?title=Guide_to_Contributing)
This community maintained guide covers how to set yourself up for success when attempting to contribute to Paracode.
> [!IMPORTANT]
> Paradise does not provide precompiled binaries, requiring you to build from source to host a local server.<br>
> Building Paradise is quick and simple, all you need to install is [BYOND](https://www.byond.com/download/).<br>
> You can learn more in our [Installation Guide](.github/DOWNLOADING.md).
- ### [Paradise Station Development Team Structure](https://www.paradisestation.org/dev/policy/)
A detailed policy document that governs how the Paradise Station Development Team functions, from the various roles that help keep things running to the process each PR goes through depending on the content.
- ### [TGUI Tutorial](tgui/docs/tutorial-and-examples.md)
TGUI is a user interface framework, built on InfernoJS, for all new player-facing UIs.
TGUI is very different to most other BYOND user interfaces as it is written entirely in JavaScript with some data passed to and from DreamMaker. If you are looking to get to grips with TGUI, this tutorial is a good starting point. Additional information can also be found [here.](tgui)
- ### [Mapping Guide](https://hackmd.io/@tgstation/SyVma0dS5#san7890s-A-Z-Guide-to-Mapping)
Mapping for Paradise station can be daunting to new contributors. Here's a comprehensive quick-start put together by a community member that takes you from A-Z.
---
### LICENSE
# LICENSES
Paradise is licensed under the GNU Affero General Public License version 3.
As of 5th January 2015 any new contributions are licensed under the AGPL as well,
if you wish to submit code under the GPL v3 then commits and files must be marked as such
in comments. If you wish to use our code in a closed source manner you may use anything
before commit 445615b8439bf606ff204a42c8e7b6b69d983255,
which is licensed under GPL v3.
The major change here is that if you host a server using any code licensed under AGPL you
are required to provide full source code for your servers users as well,
including addons and modifications you have made.
> [!CAUTION]
> If you wish to use our code in a closed source manner (i.e. not make it available to the public and/or those who connect to services you offer using this code) you must **only** use code prior to commit [1af3ddef2af85937251e24384c2173c4b6c3222b on 2015/01/05 22:04 GMT](https://github.com/ParadiseSS13/Paradise/commit/1af3ddef2af85937251e24384c2173c4b6c3222b), which is licenced under GPLv3.
See [this](https://www.gnu.org/licenses/why-affero-gpl.html) for more information.
### Click each banner for further information
Any files located in the
`Paradise/goon`,
`Paradise/icons/goonstation`, or
`Paradise/sound/goonstation`
directories, or any subdirectories of mentioned directories are licensed under the
Creative Commons 3.0 BY-NC-SA license
(https://creativecommons.org/licenses/by-nc-sa/3.0)
---
All other assets including icons and sound files are licensed under the
Creative Commons 3.0 BY-SA license (https://creativecommons.org/licenses/by-sa/3.0/),
unless otherwise indicated.
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-AGPL_3-red?style=for-the-badge" alt="AGPLv3 license"></a></summary>
>All code after and including commit [1af3ddef2af85937251e24384c2173c4b6c3222b on 2015/01/05 22:04 GMT](https://github.com/ParadiseSS13/Paradise/commit/1af3ddef2af85937251e24384c2173c4b6c3222b) is licensed under the [GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.en.html) unless otherwise specified within the folder or file.
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-GPL_3-orange?style=for-the-badge" alt="GPLv3 license"></a></summary>
>All code prior to commit [1af3ddef2af85937251e24384c2173c4b6c3222b on 2015/01/05 22:04 GMT](https://github.com/ParadiseSS13/Paradise/commit/1af3ddef2af85937251e24384c2173c4b6c3222b) is licensed under the [GPL General Public License version 3](https://www.gnu.org/licenses/gpl-3.0.en.html)
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-MIT-green?style=for-the-badge" alt="MIT license"></a></summary>
>Some files are licenced under the [MIT license](https://opensource.org/license/MIT), these files will clearly specify this licence at the head of each file.
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-CC_3.0_BY--NC--SA-blue?style=for-the-badge" alt="Creative Commons 3.0 BY-NC-SA" align="centre"></a></summary>
>Any files with the ancestor directories [`Paradise/icons/goonstation`](icons/goonstation) or [`Paradise/sound/goonstation`](sound/goonstation) are licensed under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0).
>
>Further files or folders may also fall under this licence, and any such instances will be specified within the folder or file.
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-CC_3.0_BY--SA-lightblue?style=for-the-badge" alt="Creative Commons 3.0 BY-SA"></a></summary>
>All other non-code assets, including icons and sound files, are licensed under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/), unless otherwise specified within the folder or file.
</details>

110
_maps/map_files/generic/centcomm.dmm
View File

@@ -377,6 +377,10 @@
},
/turf/simulated/floor/plasteel/dark,
/area/ninja/outpost)
"bA" = (
/obj/effect/landmark/spawner/tradergearminor,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"bB" = (
/obj/effect/landmark/abductor/scientist,
/turf/simulated/floor/plating/abductor,
@@ -2878,12 +2882,12 @@
"kf" = (
/obj/docking_port/stationary{
area_type = /area/syndicate_mothership;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_syndicate";
name = "404 Not Found";
turf_type = /turf/simulated/floor/plating/asteroid/snow/airless;
width = 33
width = 41
},
/turf/simulated/floor/plating/asteroid/snow/airless,
/area/syndicate_mothership)
@@ -4489,11 +4493,11 @@
"pf" = (
/obj/docking_port/stationary/transit{
dir = 4;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_transit";
name = "emergency in transit";
width = 33
width = 41
},
/turf/space/transit,
/area/space/centcomm)
@@ -6181,7 +6185,7 @@
/turf/simulated/floor/carpet/green,
/area/ghost_bar)
"vf" = (
/obj/effect/landmark/spawner/soltrader,
/obj/effect/landmark/spawner/trader,
/obj/structure/chair/comfy/brown,
/turf/simulated/floor/wood,
/area/trader_station/sol)
@@ -6281,7 +6285,7 @@
/area/centcom/control)
"vu" = (
/obj/structure/railing,
/obj/effect/landmark/spawner/soltrader,
/obj/effect/landmark/spawner/trader,
/obj/structure/chair/comfy/brown{
dir = 4
},
@@ -6331,7 +6335,7 @@
/area/trader_station/sol)
"vD" = (
/obj/structure/railing,
/obj/effect/landmark/spawner/soltrader,
/obj/effect/landmark/spawner/trader,
/obj/structure/chair/comfy/brown{
dir = 8
},
@@ -12184,11 +12188,11 @@
},
/obj/docking_port/stationary{
dir = 4;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_away";
name = "emergency centcom";
width = 33
width = 41
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
@@ -12756,6 +12760,10 @@
icon_state = "bot"
},
/area/shuttle/escape)
"SU" = (
/obj/effect/landmark/spawner/tradergearmajor,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/trade/sol)
"SV" = (
/turf/simulated/wall/indestructible/fakeglass,
/area/tdome/tdomeadmin)
@@ -48808,9 +48816,9 @@ vG
of
oI
pc
rK
bA
pc
uP
SU
pc
vY
of
@@ -49322,9 +49330,9 @@ vG
of
oS
pc
pa
rK
pc
pa
uP
pc
wa
of
@@ -49336,11 +49344,11 @@ aN
aN
aN
aN
aN
Db
aN
aN
aN
aN
Db
aN
aN
@@ -49375,10 +49383,10 @@ Db
aN
aN
aN
Db
aN
aN
aN
aN
Db
aN
aN
aN
@@ -50621,12 +50629,12 @@ aN
aN
aN
aN
aN
Db
aN
aN
aN
aN
aN
od
od
vy
@@ -50656,6 +50664,13 @@ XB
od
ux
ux
aN
aN
aN
aN
aN
aN
aN
Db
aN
aN
@@ -50746,13 +50761,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
"}
(141,1,1) = {"
aN
@@ -51906,12 +51914,12 @@ aN
aN
aN
aN
aN
Db
aN
aN
aN
aN
aN
vy
Ez
Fq
@@ -51941,6 +51949,13 @@ Pb
vy
Iv
Zp
aN
aN
aN
aN
aN
aN
aN
Db
aN
aN
@@ -52031,13 +52046,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
"}
(146,1,1) = {"
aN
@@ -52420,12 +52428,12 @@ aN
aN
aN
aN
aN
Db
aN
aN
aN
aN
aN
vy
EE
Fo
@@ -52455,6 +52463,13 @@ JC
vy
Iv
Zp
aN
aN
aN
aN
aN
aN
aN
Db
aN
aN
@@ -52545,13 +52560,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
"}
(148,1,1) = {"
aN
@@ -53705,7 +53713,6 @@ aN
aN
aN
aN
aN
Db
aN
aN
@@ -53716,6 +53723,7 @@ aN
aN
aN
aN
aN
od
JC
Mc
@@ -53740,6 +53748,13 @@ qF
od
Iv
Zp
aN
aN
aN
aN
aN
aN
aN
Db
aN
aN
@@ -53830,13 +53845,6 @@ aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
aN
"}
(153,1,1) = {"
aN
@@ -54990,11 +54998,11 @@ aN
aN
aN
aN
aN
Db
aN
aN
aN
aN
Db
aN
aN
@@ -55029,10 +55037,10 @@ Db
aN
aN
aN
Db
aN
aN
aN
aN
Db
aN
aN
aN

1871
_maps/map_files/shuttles/emergency_shadow.dmm Normal file
View File

File diff suppressed because it is too large Load Diff

119
_maps/map_files/stations/boxstation.dmm
View File

@@ -22947,11 +22947,11 @@
"brK" = (
/obj/docking_port/stationary{
dir = 4;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_home";
name = "emergency evac bay";
width = 33
width = 41
},
/turf/space,
/area/space)
@@ -40410,6 +40410,7 @@
d2 = 4;
icon_state = "1-4"
},
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
"cDL" = (
@@ -67422,13 +67423,6 @@
icon_state = "darkyellow"
},
/area/station/science/robotics/chargebay)
"kOa" = (
/obj/structure/closet/emcloset,
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
"kOt" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
@@ -73862,6 +73856,15 @@
icon_state = "arrival"
},
/area/station/hallway/secondary/entry/north)
"oao" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plasteel/airless,
/area/station/science/toxins/test)
"oap" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -76502,6 +76505,13 @@
icon_state = "dark"
},
/area/station/medical/morgue)
"pkf" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plasteel/airless,
/area/station/science/toxins/test)
"pko" = (
/obj/structure/chair/stool{
dir = 8
@@ -79640,6 +79650,11 @@
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
"qES" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plasteel/airless,
/area/station/science/toxins/test)
"qFg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -152677,9 +152692,9 @@ aaa
aaa
aaa
aaa
doE
doE
doE
aaa
aaa
aaa
aaa
aaa
aab
@@ -152932,15 +152947,15 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aab
gnU
ldS
clB
cnk
cid
cie
cie
cie
cij
cvs
cie
cie
@@ -153189,18 +153204,18 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aab
aab
ldS
cjZ
cjZ
cjZ
cie
cie
ckb
cdK
pkf
cjZ
udq
ckb
oao
cie
cie
cie
clA
@@ -153446,19 +153461,19 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aab
ldS
cjZ
cjZ
cjZ
clB
ckb
ckb
aab
cie
cie
cdK
cjZ
udq
ckb
ckb
cie
cie
jgm
cjZ
@@ -153703,13 +153718,13 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aab
aab
ldS
clA
kOa
jgm
cie
ckb
cie
ckb
cdK
cjZ
@@ -153961,9 +153976,9 @@ aaa
aaa
aaa
aaa
cid
cid
cie
aaa
aab
aab
cie
cie
ckb
@@ -154218,13 +154233,13 @@ aaa
aaa
aaa
aaa
cid
aab
aab
cie
cie
ckb
ckb
ckb
ckb
cdK
cjZ
udq
@@ -154474,10 +154489,10 @@ aaa
aaa
aaa
aaa
aaa
cij
aab
aab
cie
cie
ckb
ckb
ckb
ckb
@@ -154731,9 +154746,9 @@ aaa
aaa
aaa
aaa
aaa
aab
cie
cie
ckb
ckb
ckb
ckb
@@ -155247,7 +155262,7 @@ aaa
aaa
aab
cie
ckb
qES
ckb
ckb
ckb

4
_maps/map_files/stations/cerestation.dmm
View File

@@ -60296,11 +60296,11 @@
"mgu" = (
/obj/docking_port/stationary{
dir = 4;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_home";
name = "emergency evac bay";
width = 33
width = 41
},
/turf/space,
/area/space)

212
_maps/map_files/stations/deltastation.dmm
View File

@@ -13792,6 +13792,10 @@
icon_state = "bar"
},
/area/station/service/bar)
"aTq" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/hallway/secondary/exit)
"aTr" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -61705,21 +61709,13 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
"dHO" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
"dHQ" = (
@@ -62698,11 +62694,11 @@
"dNS" = (
/obj/docking_port/stationary{
dir = 4;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_home";
name = "emergency evac bay";
width = 33
width = 41
},
/turf/space,
/area/space)
@@ -63953,6 +63949,16 @@
/obj/item/crowbar/red,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/apmaint)
"dSB" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dSD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -64687,8 +64693,8 @@
/area/station/hallway/primary/central)
"dUY" = (
/obj/machinery/light,
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dUZ" = (
@@ -66426,16 +66432,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall,
/area/station/legal/lawoffice)
"evE" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
"evX" = (
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
@@ -66570,22 +66566,6 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/port/east)
"ezr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plasteel/white,
/area/station/medical/virology)
"ezR" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -71043,16 +71023,6 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/rd)
"hli" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"hly" = (
/obj/structure/table/wood,
/turf/simulated/floor/plasteel/dark,
@@ -73770,10 +73740,6 @@
icon_state = "bar"
},
/area/station/service/kitchen)
"iVe" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/service/chapel/office)
"iVg" = (
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
@@ -75594,6 +75560,15 @@
icon_state = "whiteblue"
},
/area/station/medical/storage)
"kdg" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kdm" = (
/obj/machinery/power/apc/critical/directional/north,
/obj/machinery/firealarm{
@@ -75694,15 +75669,6 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/medical/morgue)
"kfC" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kfT" = (
/obj/structure/cable{
d2 = 4;
@@ -82388,6 +82354,22 @@
icon_state = "red"
},
/area/station/security/permabrig)
"ogR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plasteel/white,
/area/station/medical/virology)
"ogX" = (
/obj/machinery/camera{
c_tag = "Experimentation Lab Office";
@@ -91325,21 +91307,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/research)
"tjT" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tkb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -91872,6 +91839,24 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/port/west)
"tEp" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
"tEw" = (
/obj/structure/showcase{
density = 0;
@@ -92369,6 +92354,21 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block)
"tSp" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tSt" = (
/obj/structure/table,
/obj/item/reagent_containers/drinks/drinkingglass{
@@ -136431,7 +136431,7 @@ dUQ
dYU
dIx
abj
aaa
abj
aaa
aaa
aaa
@@ -136686,7 +136686,8 @@ dIx
dIx
dIx
dIx
iVe
dIx
aTq
abj
aaa
aaa
@@ -136730,7 +136731,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(145,1,1) = {"
aaa
@@ -136931,6 +136931,7 @@ dLA
dMo
dKP
dKP
dKP
dOv
dPb
eBl
@@ -136987,7 +136988,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(146,1,1) = {"
aaa
@@ -137189,6 +137189,7 @@ sZI
dPM
dPM
dPM
dPM
rCw
dPM
dPM
@@ -137197,7 +137198,7 @@ dPM
dkq
dSs
dSP
hli
dSB
dIH
dIH
dIH
@@ -137244,7 +137245,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(147,1,1) = {"
aaa
@@ -137446,6 +137446,7 @@ hVf
dKo
dKo
dKo
dKo
rvx
dKo
dKo
@@ -137455,8 +137456,8 @@ dNa
dXJ
dKo
dUj
kfC
tjT
kdg
tSp
dIH
abj
aaa
@@ -137501,7 +137502,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(148,1,1) = {"
aaa
@@ -137700,6 +137700,7 @@ cYk
cYk
cYk
dbR
cYk
dbV
ddw
dNa
@@ -137758,7 +137759,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(149,1,1) = {"
aaa
@@ -137957,6 +137957,7 @@ dKo
dKo
dKo
hVf
dKo
dNb
dNN
dOw
@@ -138015,7 +138016,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(150,1,1) = {"
aaa
@@ -138214,6 +138214,7 @@ dKo
gkk
dKo
hVf
dKo
dNc
dNO
dXF
@@ -138272,7 +138273,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(151,1,1) = {"
aaa
@@ -138471,6 +138471,7 @@ dKo
dKo
dKo
hVf
dKo
dNb
dNP
dOw
@@ -138529,7 +138530,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(152,1,1) = {"
aaa
@@ -138728,6 +138728,7 @@ dKp
dKp
dKp
dIh
dKo
dOu
dNQ
dOx
@@ -138786,7 +138787,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(153,1,1) = {"
aaa
@@ -138985,6 +138985,7 @@ wgY
rIb
rIb
pJE
dKo
dNb
bGr
dOw
@@ -139043,7 +139044,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(154,1,1) = {"
aaa
@@ -139245,6 +139245,7 @@ iFB
iqq
iqq
iqq
iqq
uFa
sbt
sDb
@@ -139268,7 +139269,6 @@ aaa
aaa
aaa
aaa
aaa
aaZ
aaa
aaa
@@ -139501,6 +139501,7 @@ nIs
ngE
kuJ
kuJ
kuJ
tJT
dXn
dXn
@@ -139557,7 +139558,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(156,1,1) = {"
aaa
@@ -139758,6 +139758,7 @@ dTJ
dMs
jac
jac
jac
vSW
scA
ajq
@@ -139814,7 +139815,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(157,1,1) = {"
aaa
@@ -140016,6 +140016,7 @@ dVp
dKp
dKp
dKp
dKp
pGr
rev
vJu
@@ -140071,7 +140072,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(158,1,1) = {"
aaa
@@ -140273,6 +140273,7 @@ ulH
dTy
dTy
dTy
dTy
rmq
msT
dKP
@@ -140328,7 +140329,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(159,1,1) = {"
aaa
@@ -140526,9 +140526,10 @@ pIY
kuJ
kpd
kpd
tEp
dHO
dHO
dHO
evE
evE
tJT
dKQ
jpk
@@ -140585,7 +140586,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(160,1,1) = {"
aaa
@@ -140786,6 +140786,7 @@ abj
abj
abj
abj
abj
pjC
dKP
pjC
@@ -140842,7 +140843,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(161,1,1) = {"
aaa
@@ -141043,6 +141043,7 @@ aaa
aaa
aaa
aaa
aaa
pjC
dKQ
pjC
@@ -141099,7 +141100,6 @@ aaa
aaa
aaa
aaa
aaa
"}
(162,1,1) = {"
aaa
@@ -141303,8 +141303,8 @@ aaa
aaa
aaa
aaa
dNS
aaa
dNS
aaa
aaa
aaa
@@ -149011,7 +149011,7 @@ dGw
dGw
hGZ
qgr
ezr
ogR
wWW
qfH
sRk

4
_maps/map_files/stations/metastation.dmm
View File

@@ -42602,11 +42602,11 @@
"cZp" = (
/obj/docking_port/stationary{
dir = 2;
dwidth = 15;
dwidth = 16;
height = 21;
id = "emergency_home";
name = "emergency evac bay";
width = 33
width = 41
},
/turf/space,
/area/space)

9
code/__DEFINES/antag_defines.dm
View File

@@ -47,7 +47,7 @@ GLOBAL_LIST(contractors)
/// Denotes that this power can not be obtained normally. Primarily used for base types such as [/datum/action/changeling/weapon].
#define CHANGELING_UNOBTAINABLE_POWER 3
#define CHANGELING_FAKEDEATH_TIME 50 SECONDS
#define CHANGELING_FAKEDEATH_TIME 50 SECONDS
#define CHANGELING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob
/**
@@ -62,9 +62,6 @@ GLOBAL_LIST(contractors)
*/
#define PULSEDEMON_SOURCE_DRAIN_INVALID (-1)
/proc/ischangeling(mob/M) // TODO: Someone please convert these to proper defines some day.
return M.mind?.has_antag_datum(/datum/antagonist/changeling)
#define IS_CHANGELING(mob) (isliving(mob) && mob?:mind?:has_antag_datum(/datum/antagonist/changeling))
// Helper proc that determines if a mob is a mindslave.
/proc/ismindslave(mob/living/carbon/human/H)
return istype(H) && H.mind.has_antag_datum(/datum/antagonist/mindslave, FALSE)
#define IS_MINDSLAVE(mob) (ishuman(mob) && mob?:mind?:has_antag_datum(/datum/antagonist/mindslave, FALSE))

1
code/__DEFINES/genetics_defines.dm
View File

@@ -42,6 +42,7 @@
#define BLOOD_VOLUME_MAXIMUM 2000
#define BLOOD_VOLUME_NORMAL 560
#define BLOOD_VOLUME_SAFE 501
#define BLOOD_VOLUME_STABLE 357
#define BLOOD_VOLUME_OKAY 336
#define BLOOD_VOLUME_BAD 224
#define BLOOD_VOLUME_SURVIVE 122

1
code/__DEFINES/hud_locations.dm
View File

@@ -107,6 +107,7 @@
#define ui_healthdoll "EAST-1:28,CENTER-1:15"
#define ui_health "EAST-1:28,CENTER:17"
#define ui_internal "EAST-1:28,CENTER+1:19"
#define ui_stamina "EAST-1:28,CENTER-2:15"
//borgs
#define ui_borg_health "EAST-1:28,CENTER-1:15" //borgs have the health display where humans have the pressure damage indicator.

12
code/__HELPERS/type2type.dm
View File

@@ -73,18 +73,6 @@
/proc/file2list(filename, seperator="\n")
return splittext(return_file_text(filename),seperator)
//Turns a direction into text
/proc/num2dir(direction)
switch(direction)
if(1.0) return NORTH
if(2.0) return SOUTH
if(4.0) return EAST
if(8.0) return WEST
else
stack_trace("UNKNOWN DIRECTION: [direction]")
/proc/dir2text(direction)
switch(direction)
if(1.0)

34
code/__HELPERS/unsorted.dm
View File

@@ -262,40 +262,6 @@
/proc/format_frequency(f)
return "[round(f / 10)].[f % 10]"
/obj/proc/atmosanalyzer_scan(datum/gas_mixture/air_contents, mob/user, obj/target = src)
var/obj/icon = target
if(isliving(user))
user.visible_message("<span class='notice'>[user] uses the analyzer on [target].</span>", "<span class='notice'>You use the analyzer on [target].</span>")
var/pressure = air_contents.return_pressure()
var/total_moles = air_contents.total_moles()
var/volume = air_contents.return_volume()
user.show_message("<span class='notice'>Results of analysis of [bicon(icon)] [target].</span>", 1)
if(total_moles>0)
var/o2_concentration = air_contents.oxygen/total_moles
var/n2_concentration = air_contents.nitrogen/total_moles
var/co2_concentration = air_contents.carbon_dioxide/total_moles
var/plasma_concentration = air_contents.toxins/total_moles
var/n2o_concentration = air_contents.sleeping_agent/total_moles
var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration+n2o_concentration)
user.show_message("<span class='notice'>Pressure: [round(pressure,0.1)] kPa</span>", 1)
user.show_message("<span class='notice'>Nitrogen: [round(n2_concentration*100)] % ([round(air_contents.nitrogen,0.01)] moles)</span>", 1)
user.show_message("<span class='notice'>Oxygen: [round(o2_concentration*100)] % ([round(air_contents.oxygen,0.01)] moles)</span>", 1)
user.show_message("<span class='notice'>CO2: [round(co2_concentration*100)] % ([round(air_contents.carbon_dioxide,0.01)] moles)</span>", 1)
user.show_message("<span class='notice'>Plasma: [round(plasma_concentration*100)] % ([round(air_contents.toxins,0.01)] moles)</span>", 1)
user.show_message("<span class='notice'>Nitrous Oxide: [round(n2o_concentration*100)] % ([round(air_contents.sleeping_agent,0.01)] moles)</span>", 1)
if(unknown_concentration>0.01)
user.show_message("<span class='danger'>Unknown: [round(unknown_concentration*100)] % ([round(unknown_concentration*total_moles,0.01)] moles)</span>", 1)
user.show_message("<span class='notice'>Total: [round(total_moles,0.01)] moles</span>", 1)
user.show_message("<span class='notice'>Temperature: [round(air_contents.temperature-T0C)] &deg;C</span>", 1)
user.show_message("<span class='notice'>Volume: [round(volume)] Liters</span>", 1)
else
user.show_message("<span class='notice'>[target] is empty!</span>", 1)
user.show_message("<span class='notice'>Volume: [round(volume)] Liters</span>", 1)
return
//Picks a string of symbols to display as the law number for hacked or ion laws
/proc/ionnum()
return "[pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")][pick("!","@","#","$","%","^","&","*")]"

3
code/_onclick/hud/human_hud.dm
View File

@@ -329,6 +329,9 @@
mymob.healths = new /atom/movable/screen/healths()
infodisplay += mymob.healths
mymob.staminas = new /atom/movable/screen/healths/stamina()
infodisplay += mymob.staminas
mymob.healthdoll = new()
infodisplay += mymob.healthdoll

4
code/_onclick/hud/screen_objects.dm
View File

@@ -562,3 +562,7 @@
/atom/movable/screen/component_button/Click(params)
if(parent)
parent.component_click(src, params)
/atom/movable/screen/healths/stamina
icon_state = "stamina_0"
screen_loc = ui_stamina

16
code/_onclick/observer_onclick.dm
View File

@@ -77,9 +77,12 @@
/mob/dead/observer/MiddleShiftControlClickOn(atom/A)
return
/atom/proc/attack_ghost(mob/user)
/atom/proc/attack_ghost(mob/dead/observer/user)
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_GHOST, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
return TRUE
if(user.client)
if(user.gas_scan && atmos_scan(user=user, target=src, silent=TRUE))
return TRUE
// health + machine analyzer for ghosts
/mob/living/attack_ghost(mob/dead/observer/user)
@@ -106,14 +109,3 @@
/obj/effect/portal/attack_ghost(mob/user as mob)
if(target)
user.forceMove(get_turf(target))
/obj/machinery/atmospherics/attack_ghost(mob/dead/observer/user)
if(!istype(user)) // Make sure user is actually an observer. Revenents also use attack_ghost, but do not have the toggle gas analyzer var.
return
if(user.gas_analyzer)
if(istype(src, /obj/machinery/atmospherics/pipe))
var/obj/machinery/atmospherics/pipe/T = src
atmosanalyzer_scan(T.parent.air, user, T)
else if(istype(src, /obj/machinery/atmospherics/unary))
var/obj/machinery/atmospherics/unary/T = src
atmosanalyzer_scan(T.air_contents, user, T)

1
code/controllers/subsystem/non_firing/SSmapping.dm
View File

@@ -49,6 +49,7 @@ SUBSYSTEM_DEF(mapping)
log_startup_progress("We feel like [cave_theme] today...")
// Load all Z level templates
preloadTemplates()
preloadTemplates(path = "code/modules/unit_tests/atmos/")
// Load the station
loadStation()

10
code/datums/emote.dm
View File

@@ -209,11 +209,11 @@
if(!ghost.client)
continue
if((ghost.client.prefs.toggles & PREFTOGGLE_CHAT_GHOSTSIGHT) && !(ghost in viewers(user_turf, null)))
ghost.show_message("<span class='emote'>[user] ([ghost_follow_link(user, ghost)]) [msg]</span>")
ghost.show_message("<span class='emote'>[user] ([ghost_follow_link(user, ghost)]) [msg]</span>", chat_message_type = MESSAGE_TYPE_LOCALCHAT)
if(isobserver(user))
for(var/mob/dead/observer/ghost in viewers(user))
ghost.show_message("<span class=deadsay>[displayed_msg]</span>", EMOTE_VISIBLE)
ghost.show_message("<span class=deadsay>[displayed_msg]</span>", EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT)
else if((emote_type & EMOTE_AUDIBLE) && !user.mind?.miming)
user.audible_message(displayed_msg, deaf_message = "<span class='emote'>You see how <b>[user]</b> [msg]</span>")
@@ -283,10 +283,10 @@
for(var/mob/O as anything in can_see)
if(O.status_flags & PASSEMOTES)
for(var/obj/item/holder/H in O.contents)
H.show_message(text, EMOTE_VISIBLE)
H.show_message(text, EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT)
for(var/mob/living/M in O.contents)
M.show_message(text, EMOTE_VISIBLE)
M.show_message(text, EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT)
if(O.client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT)
O.create_chat_message(user, runechat_text, symbol = RUNECHAT_SYMBOL_EMOTE)
@@ -636,7 +636,7 @@
if(!ghost.client)
continue
if(ghost.client.prefs.toggles & PREFTOGGLE_CHAT_GHOSTSIGHT && !(ghost in viewers(origin_turf, null)))
ghost.show_message("[ghost_follow_link(src, ghost)] [ghost_text]")
ghost.show_message("[ghost_follow_link(src, ghost)] [ghost_text]", chat_message_type = MESSAGE_TYPE_LOCALCHAT)
visible_message(text)

4
code/datums/mind.dm
View File

@@ -962,12 +962,12 @@
else if(href_list["changeling"])
switch(href_list["changeling"])
if("clear")
if(ischangeling(current))
if(IS_CHANGELING(current))
remove_antag_datum(/datum/antagonist/changeling)
log_admin("[key_name(usr)] has de-changelinged [key_name(current)]")
message_admins("[key_name_admin(usr)] has de-changelinged [key_name_admin(current)]")
if("changeling")
if(!ischangeling(current))
if(!IS_CHANGELING(current))
add_antag_datum(/datum/antagonist/changeling)
to_chat(current, "<span class='biggerdanger'>Your powers have awoken. A flash of memory returns to us... we are a changeling!</span>")
log_admin("[key_name(usr)] has changelinged [key_name(current)]")

84
code/datums/outfits/outfit_admin.dm
View File

@@ -834,25 +834,23 @@
)
is_solgov_lieutenant = TRUE
/datum/outfit/admin/sol_trader
name = "Sol Trader"
/datum/outfit/admin/trader
name = "Trader"
uniform = /obj/item/clothing/under/rank/cargo/tech
back = /obj/item/storage/backpack/industrial
belt = /obj/item/melee/classic_baton
head = /obj/item/clothing/head/soft
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
id = /obj/item/card/id/supply
pda = /obj/item/pda
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/hand_labeler = 1,
/obj/item/hand_labeler_refill = 1
/obj/item/hand_labeler_refill = 2
)
box = /obj/item/storage/box/survival
/datum/outfit/admin/sol_trader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/admin/trader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
@@ -862,6 +860,78 @@
apply_to_card(I, H, list(ACCESS_TRADE_SOL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS), name)
H.sec_hud_set_ID()
/datum/outfit/admin/trader/sol
name = "Trans-Solar Federation Trader"
suit = /obj/item/clothing/suit/jacket/cargobomber
head = /obj/item/clothing/head/soft
/datum/outfit/admin/trader/cyber
name = "Cybersun Industries Trader"
uniform = /obj/item/clothing/under/syndicate/tacticool
suit = /obj/item/clothing/suit/jacket/syndicatebomber
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/combat
belt = /obj/item/melee/classic_baton/telescopic
back = /obj/item/storage/backpack/security
box = /obj/item/storage/box/survival
/datum/outfit/admin/trader/commie
name = "USSP Trader"
uniform = /obj/item/clothing/under/new_soviet
suit = /obj/item/clothing/suit/sovietcoat
head = /obj/item/clothing/head/ushanka
box = /obj/item/storage/box/soviet
/datum/outfit/admin/trader/unathi
name = "Glint-Scales Trader"
uniform = /obj/item/clothing/under/rank/cargo/qm
suit = /obj/item/clothing/suit/unathi/robe
shoes = /obj/item/clothing/shoes/footwraps
/datum/outfit/admin/trader/vulp
name = "Steadfast Trading Co. Trader"
uniform = /obj/item/clothing/under/rank/cargo/qm/formal
suit = /obj/item/clothing/suit/jacket/leather/overcoat
belt = /obj/item/melee/classic_baton/telescopic
/datum/outfit/admin/trader/ipc
name = "Synthetic Union Trader"
uniform = /obj/item/clothing/under/misc/vice
suit = /obj/item/clothing/suit/storage/iaa/blackjacket/armored
belt = /obj/item/melee/classic_baton/telescopic
back = /obj/item/storage/backpack/robotics
/datum/outfit/admin/trader/vox
name = "Skipjack Trader"
uniform = /obj/item/clothing/under/vox/vox_casual
suit = /obj/item/clothing/suit/hooded/vox_robes
gloves = /obj/item/clothing/gloves/color/yellow/vox
shoes = /obj/item/clothing/shoes/magboots/vox
belt = /obj/item/melee/classic_baton/telescopic
mask = /obj/item/clothing/mask/breath/vox/respirator
suit_store = /obj/item/tank/internals/emergency_oxygen/double/vox
box = /obj/item/storage/box/survival_vox
/datum/outfit/admin/trader/skrell
name = "Solar-Central Compact Trader"
uniform = /obj/item/clothing/under/misc/durathread
suit = /obj/item/clothing/suit/space/skrell/white
belt = /obj/item/melee/classic_baton/telescopic
/datum/outfit/admin/trader/grey
name = "Technocracy Trader"
uniform = /obj/item/clothing/under/costume/psyjump
suit = /obj/item/clothing/suit/jacket/robobomber
belt = /obj/item/melee/classic_baton/telescopic
back = /obj/item/storage/backpack/robotics
/datum/outfit/admin/trader/nian
name = "Merchant Guild Trader"
uniform = /obj/item/clothing/under/suit/really_black
suit = /obj/item/clothing/suit/pimpcoat
shoes = /obj/item/clothing/shoes/fluff/noble_boot
belt = /obj/item/melee/classic_baton/ntcane
/datum/outfit/admin/chrono
name = "Chrono Legionnaire"

6
code/datums/shuttles.dm
View File

@@ -119,6 +119,12 @@
This escape shuttle boasts shields and numerous anti-personnel turrets guarding its perimeter to fend off meteors and enemy boarding attempts."
admin_notes = "Comes with turrets that will target simple mobs."
/datum/map_template/shuttle/emergency/shadow
suffix = "shadow"
name = "The NTSS Shadow"
description = "Guaranteed to get you somewhere FAST. With a custom-built plasma engine, this bad boy will put more distance between you and certain danger than any other!"
admin_notes = "The aft of the ship has a plasma tank that starts ignited. May get released by crew. The plasma windows next to the engine heaters will also erupt into flame, and also risk getting released by crew."
/datum/map_template/shuttle/ferry/base
suffix = "base"
name = "transport ferry"

2
code/datums/uplink_items/uplink_traitor.dm
View File

@@ -587,7 +587,7 @@
else if(!AT)
to_chat(usr, "<span class='warning'>Error: Embedded Syndicate credentials not found.</span>")
return
else if(ischangeling(usr) || mind.has_antag_datum(/datum/antagonist/vampire))
else if(IS_CHANGELING(usr) || mind.has_antag_datum(/datum/antagonist/vampire))
to_chat(usr, "<span class='warning'>Error: Embedded Syndicate credentials contain an abnormal signature. Aborting.</span>")
return

4
code/defines/procs/announcer_datum.dm
View File

@@ -101,9 +101,9 @@ GLOBAL_DATUM_INIT(major_announcement, /datum/announcer, new(config_type = /datum
/datum/announcer/proc/Message(message, garbled_message, receivers, garbled_receivers)
for(var/mob/M in receivers)
to_chat(M, message)
to_chat(M, message, MESSAGE_TYPE_WARNING)
for(var/mob/M in garbled_receivers)
to_chat(M, garbled_message)
to_chat(M, garbled_message, MESSAGE_TYPE_WARNING)
/datum/announcer/proc/Format(message, title, subtitle = null)
var/formatted_message

4
code/game/atoms.dm
View File

@@ -288,6 +288,10 @@
else
return null
///Return the air if we can analyze it
/atom/proc/return_analyzable_air()
return null
/atom/proc/check_eye(mob/user)
return

2
code/game/gamemodes/miniantags/abduction/abduction_gear.dm
View File

@@ -532,7 +532,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
if(ishuman(L))
var/mob/living/carbon/human/H = L
species = "<span clas=='notice'>[H.dna.species.name]</span>"
if(ischangeling(L))
if(IS_CHANGELING(L))
species = "<span class='warning'>Changeling lifeform</span>"
var/obj/item/organ/internal/heart/gland/temp = locate() in H.internal_organs
if(temp)

2
code/game/gamemodes/miniantags/guardian/guardian.dm
View File

@@ -276,7 +276,7 @@
if(has_guardian(user))
to_chat(user, "You already have a [mob_name]!")
return
if(user.mind && (ischangeling(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)))
if(user.mind && (IS_CHANGELING(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)))
to_chat(user, "[ling_failure]")
return
if(used)

2
code/game/gamemodes/miniantags/morph/morph.dm
View File

@@ -113,7 +113,7 @@
var/obj/item/clothing/under/U = H.w_uniform
U.turn_sensors_off()
A.pulledby.stop_pulling()
A.pulledby?.stop_pulling()
A.extinguish_light()
A.forceMove(src)
var/food_value = calc_food_gained(A)

4
code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
View File

@@ -585,7 +585,7 @@
else
return ..()
/mob/living/simple_animal/demon/pulse_demon/visible_message(message, self_message, blind_message)
/mob/living/simple_animal/demon/pulse_demon/visible_message(message, self_message, blind_message, chat_message_type)
// overriden because pulse demon is quite often in non-turf locs, and /mob/visible_message acts differently there
for(var/mob/M as anything in get_mobs_in_view(7, src))
if(M.see_invisible < invisibility)
@@ -593,7 +593,7 @@
var/msg = message
if(self_message && M == src)
msg = self_message
M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE)
M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT)
/mob/living/simple_animal/demon/pulse_demon/has_internal_radio_channel_access(mob/user, list/req_one_accesses)
return has_access(list(), req_one_accesses, get_all_accesses())

9
code/game/gamemodes/nuclear/nuclearbomb.dm
View File

@@ -55,6 +55,8 @@ GLOBAL_VAR(bomb_set)
var/core_stage = NUKE_CORE_EVERYTHING_FINE
///How many sheets of various metals we need to fix it
var/sheets_to_fix = 5
///Bombs Internal Radio
var/obj/item/radio/radio
/obj/machinery/nuclearbomb/syndicate
is_syndicate = TRUE
@@ -74,11 +76,16 @@ GLOBAL_VAR(bomb_set)
core = new /obj/item/nuke_core/plutonium(src)
STOP_PROCESSING(SSobj, core) //Let us not irradiate the vault by default.
update_icon(UPDATE_OVERLAYS)
radio = new(src)
radio.listening = FALSE
radio.follow_target = src
radio.config(list("Special Ops" = 0))
/obj/machinery/nuclearbomb/Destroy()
SStgui.close_uis(wires)
QDEL_NULL(wires)
QDEL_NULL(core)
QDEL_NULL(radio)
GLOB.poi_list.Remove(src)
return ..()
@@ -507,6 +514,8 @@ GLOBAL_VAR(bomb_set)
if(!is_syndicate && SSsecurity_level.get_current_level_as_number() != SEC_LEVEL_EPSILON)
SSsecurity_level.set_level(SEC_LEVEL_DELTA)
GLOB.bomb_set = TRUE // There can still be issues with this resetting when there are multiple bombs. Not a big deal though for Nuke
if(SSsecurity_level.get_current_level_as_number() == SEC_LEVEL_EPSILON)
radio.autosay("<span class='reallybig'>The Nuclear Bomb has been armed, retreat from the station immediately!</span>", name, "Special Ops")
else
GLOB.bomb_set = TRUE
else

2
code/game/gamemodes/objective.dm
View File

@@ -276,7 +276,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(.)
return
// If the target is a changeling, then it's an invalid target. Since changelings can not be debrained.
if(ischangeling(possible_target.current))
if(IS_CHANGELING(possible_target.current))
return TARGET_INVALID_CHANGELING
/datum/objective/debrain/update_explanation_text()

2
code/game/machinery/clonescanner.dm
View File

@@ -109,7 +109,7 @@
return SCANNER_HUSKED
if(NO_CLONESCAN in scanned.dna.species.species_traits)
return SCANNER_UNCLONEABLE_SPECIES
if(!scanned.ckey || !scanned.client || ischangeling(scanned))
if(!scanned.ckey || !scanned.client || IS_CHANGELING(scanned))
return SCANNER_NO_SOUL
if(scanned.suiciding || !scanned.get_int_organ(/obj/item/organ/internal/brain))
return SCANNER_BRAIN_ISSUE

4
code/game/machinery/computer/HolodeckControl.dm
View File

@@ -233,7 +233,6 @@
icon_state = "carpet-255"
base_icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET)
canSmoothWith = list(SMOOTH_GROUP_CARPET)
@@ -252,6 +251,9 @@
if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
QUEUE_SMOOTH(src)
/turf/simulated/floor/holofloor/carpet/get_broken_states()
return list("damaged")
/turf/simulated/floor/holofloor/grass
name = "Lush Grass"
icon = 'icons/turf/floors/grass.dmi'

1
code/game/machinery/doors/firedoor.dm
View File

@@ -338,7 +338,6 @@
name = "heavy firelock"
icon = 'icons/obj/doors/doorfire.dmi'
glass = FALSE
opacity = TRUE
explosion_block = 2
assemblytype = /obj/structure/firelock_frame/heavy
max_integrity = 550

3
code/game/machinery/portable_turret.dm
View File

@@ -531,7 +531,8 @@ GLOBAL_LIST_EMPTY(turret_icons)
if(ismecha(A))
var/obj/mecha/ME = A
assess_and_assign(ME.occupant, targets, secondarytargets)
if(isliving(ME.occupant))
assess_and_assign(ME.occupant, targets, secondarytargets)
else if(istype(A, /obj/vehicle))
var/obj/vehicle/T = A

3
code/game/mecha/combat/gygax.dm
View File

@@ -50,6 +50,9 @@
starting_voice = /obj/item/mecha_modkit/voice/syndicate
destruction_sleep_duration = 2 SECONDS
/obj/mecha/combat/gygax/dark/trader
operation_req_access = list() //Jailbroken mech
/obj/mecha/combat/gygax/dark/loaded/Initialize(mapload)
. = ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot

3
code/game/mecha/combat/marauder.dm
View File

@@ -120,6 +120,9 @@
starting_voice = /obj/item/mecha_modkit/voice/syndicate
emag_proof = FALSE //The crew can steal a syndicate mech. As a treat.
/obj/mecha/combat/marauder/mauler/trader
operation_req_access = list() //Jailbroken mech
/obj/mecha/combat/marauder/mauler/loaded/Initialize(mapload)
. = ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src)

5
code/game/mecha/mecha.dm
View File

@@ -1046,6 +1046,11 @@
return cabin_air
return get_turf_air()
/obj/mecha/return_analyzable_air()
if(use_internal_tank)
return cabin_air
return null
/obj/mecha/proc/return_pressure()
var/datum/gas_mixture/t_air = return_air()
if(t_air)

12
code/game/objects/effects/landmarks.dm
View File

@@ -36,10 +36,18 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
spawner_list += loc
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/spawner/soltrader
name = "traderstart_sol"
/obj/effect/landmark/spawner/trader
name = "traderstart"
icon_state = "Trader"
/obj/effect/landmark/spawner/tradergearminor
name = "traderstart_specificgear_minor"
icon_state = "questionmark"
/obj/effect/landmark/spawner/tradergearmajor
name = "traderstart_specificgear_major"
icon_state = "questionmark"
/obj/effect/landmark/spawner/ert
name = "Response Team"
icon_state = "ERT"

325
code/game/objects/effects/spawners/lootdrop.dm
View File

@@ -218,7 +218,6 @@
/obj/item/soap = 50,
/obj/item/clothing/under/syndicate/combat = 50,
/obj/item/soap/syndie = 50,
/obj/item/lighter/zippo/gonzofist = 50,
/obj/item/clothing/under/costume/psyjump = 50,
/obj/item/immortality_talisman = 50,
/obj/item/clothing/mask/holo_cigar = 100,
@@ -338,8 +337,7 @@
// Ranged weapons
/obj/item/storage/box/enforcer_rubber = 50, //Lethal ammo can be printed at an autolathe, so no need for the lethal subtype
/obj/item/gun/projectile/shotgun/automatic/dual_tube = 100, // cycler shotgun, not normally available to crew
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 50, //Weapon crafting, lets officers experiment however lets not have it be C class
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 20
)
/obj/effect/spawner/lootdrop/trade_sol/eng
@@ -417,7 +415,328 @@
/obj/structure/constructshell = 50 //Fuck it we ball what could go wrong
)
/obj/effect/spawner/lootdrop/trade_sol/federation_minor
name = "11. trans-solar federation small gear"
loot = list(
/obj/item/storage/box/enforcer_rubber = 50,
/obj/item/lighter/zippo/gonzofist = 50,
/obj/item/clothing/glasses/welding/superior = 50,
/obj/item/clothing/suit/armor/bulletproof = 50,
/obj/item/clothing/mask/gas/explorer/marines = 50,
/obj/item/clothing/gloves/combat = 50,
/obj/item/storage/belt/military/assault = 50,
/obj/item/clothing/under/solgov = 50,
/obj/item/mod/module/dispenser = 50,
/obj/item/flag/solgov = 30
)
/obj/effect/spawner/lootdrop/trade_sol/federation_major
name = "12. trans-solar federation large gear"
lootcount = 3
loot = list(
/obj/item/storage/box/deagle = 20, //One mag
/obj/item/gun/projectile/automatic/pistol/m1911 = 30, //Again, one mag. Don't lose it.
/obj/item/melee/baseball_bat/homerun = 50,
/obj/item/rcd/combat = 50,
/obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov = 50,
/obj/item/storage/box/buck = 30, //Only seven shots, make them count
/obj/item/mod/module/noslip = 40,
/obj/item/clothing/mask/holo_cigar = 50
)
/obj/effect/spawner/lootdrop/trade_sol/cybersun_minor
name = "11. cybersun industries small gear"
loot = list(
/obj/item/storage/box/syndidonkpockets = 50,
/obj/item/clothing/suit/jacket/syndicatebomber = 50,
/obj/item/storage/box/syndie_kit/space = 50,
/obj/item/clothing/glasses/meson/sunglasses = 50,
/obj/item/storage/pill_bottle/zoom = 50,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 50,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 30,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine = 30,
/obj/item/flag/syndi = 30
)
// Damn near all of this is illegal. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/lootdrop/trade_sol/cybersun_major
name = "12. cybersun industries large gear"
lootcount = 3
loot = list(
/obj/item/shield/energy = 20,
/obj/item/gun/projectile/automatic/pistol = 50,
/obj/item/bio_chip/storage = 50,
/obj/item/melee/knuckleduster/syndie = 50,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
/obj/item/toy/syndicateballoon = 60,
/obj/item/organ/internal/cyberimp/arm/razorwire = 30,
/obj/item/organ/internal/cyberimp/arm/shell_launcher = 30,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual = 30,
/obj/item/clothing/mask/holo_cigar = 50,
/obj/mecha/combat/marauder/mauler/trader = 3 //Extremely rare, unloaded so crew need to arm it for it to have any use. Also most definitely needs one helluva permit.
)
lootdoubles = FALSE //No double mechs.
/obj/effect/spawner/lootdrop/trade_sol/ussp_minor
name = "11. USSP small gear"
lootcount = 8 //Mostly flavor items
loot = list(
/obj/item/clothing/under/new_soviet = 50,
/obj/item/clothing/suit/sovietcoat = 50,
/obj/item/clothing/head/ushanka = 50,
/obj/item/food/snacks/grown/potato = 50,
/obj/item/reagent_containers/drinks/bottle/vodka/badminka = 50,
/obj/item/clothing/head/sovietsidecap = 50,
/obj/item/flag/ussp = 30,
/obj/item/ammo_box/magazine/apsm10mm = 15, //Spare mags for APS pistol. Sometimes you don't get the APS, in which case, soviet logistics.
/obj/item/ammo_box/a762 = 15
)
// Lots of things to write permits for. Gives officers something to do on a shift quiet enough to spawn traders.
/obj/effect/spawner/lootdrop/trade_sol/ussp_major
name = "12. USSP large gear"
lootcount = 2 //Lots of dangerous stuff here - reduced amount
loot = list(
/obj/item/gun/projectile/revolver/nagant = 50,
/obj/item/gun/projectile/automatic/pistol/APS = 30,
/obj/item/gun/projectile/shotgun/boltaction = 50,
/obj/item/clothing/suit/space/hardsuit/soviet = 40,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
/obj/item/clothing/mask/holo_cigar = 10
)
/obj/effect/spawner/lootdrop/trade_sol/glintscale_minor
name = "11. glint-scale small gear"
loot = list(
/obj/item/clothing/suit/armor/vest/combat = 50,
/obj/item/clothing/under/syndicate/combat = 50,
/obj/item/claymore/ceremonial = 50,
/obj/item/harpoon = 50,
/obj/item/nullrod/claymore/chainsaw_sword = 50,
/obj/item/whetstone = 50,
/obj/item/flag/species/unathi = 20,
/obj/item/clothing/suit/armor/riot/knight/templar = 40,
/obj/item/clothing/head/helmet/riot/knight/templar = 40,
/obj/item/clothing/suit/unathi/robe = 20
)
/obj/effect/spawner/lootdrop/trade_sol/glintscale_major
name = "12. glint-scale large gear"
lootcount = 3
loot = list(
/obj/item/melee/energy/sword/pirate = 30,
/obj/item/storage/box/breacher = 30,
/obj/item/fireaxe = 50,
/obj/item/fireaxe/boneaxe = 50,
/obj/item/gun/energy/kinetic_accelerator/crossbow/large = 10 //Big ebow.
)
/obj/effect/spawner/lootdrop/trade_sol/steadfast_minor
name = "11. steadfast trading co. small gear"
lootcount = 8 //Since it's a lot of seeds, boosted amount
loot = list(
/obj/item/storage/box/botany_labelled_seeds = 50,
/obj/item/seeds/chili/ice = 20,
/obj/item/seeds/chili/ghost = 20,
/obj/item/seeds/cannabis/ultimate = 10,
/obj/item/seeds/cannabis/white = 20,
/obj/item/seeds/wheat/meat = 20,
/obj/item/seeds/glowshroom = 20,
/obj/item/seeds/glowshroom/glowcap = 20,
/obj/item/seeds/tobacco/space = 20,
/obj/item/storage/box/hydroponics_starter = 40,
/obj/item/mod/module/thermal_regulator = 20,
/obj/item/flag/species/vulp = 20
)
/obj/effect/spawner/lootdrop/trade_sol/steadfast_major
name = "12. steadfast trading co. large gear"
lootcount = 3
loot = list(
/obj/item/mod/construction/plating/research = 30,
/obj/item/assembly/signaler/anomaly/random = 20,
/obj/item/gun/energy/gun = 50,
/obj/item/storage/box/dragonsbreath = 30,
/obj/item/storage/box/turbine_kit = 20,
/obj/item/mod/module/firefighting_tank = 40,
/obj/item/mod/module/jetpack/advanced = 40
)
/obj/effect/spawner/lootdrop/trade_sol/syntheticunion_minor
name = "11. synthetic union small gear"
lootcount = 8 //A lot of these are available on station, so the amount of items spawned here is increased
loot = list(
/obj/item/clothing/glasses/meson/sunglasses = 50,
/obj/item/clothing/glasses/thermal/monocle = 50,
/obj/item/organ/internal/cyberimp/arm/toolset = 50,
/obj/item/organ/internal/cyberimp/arm/surgery = 50,
/obj/item/organ/internal/cyberimp/arm/janitorial = 50,
/obj/item/organ/internal/cyberimp/brain/anti_stam = 50,
/obj/item/organ/internal/cyberimp/brain/anti_sleep = 50,
/obj/item/organ/internal/cyberimp/brain/clown_voice = 40,
/obj/item/organ/internal/cyberimp/mouth/breathing_tube = 50,
/obj/item/organ/internal/cyberimp/chest/ipc_repair = 50,
/obj/item/organ/internal/cyberimp/chest/ipc_joints/magnetic_joints = 50,
/obj/item/organ/internal/cyberimp/chest/ipc_joints/sealed = 50,
/obj/item/autosurgeon/organ = 10,
/obj/item/flag/species/machine = 20
)
/obj/effect/spawner/lootdrop/trade_sol/syntheticunion_major
name = "12. synthetic union large gear"
lootcount = 4
loot = list(
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 20,
/obj/item/organ/internal/cyberimp/arm/esword = 10,
/obj/item/organ/internal/cyberimp/arm/flash = 50,
/obj/item/organ/internal/cyberimp/chest/nutriment/plus/hardened = 50,
/obj/item/organ/internal/cyberimp/arm/telebaton = 25, //Security'll love this one
/obj/item/organ/internal/cyberimp/arm/razorwire = 30,
/obj/item/organ/internal/cyberimp/arm/shell_launcher = 30,
/obj/item/organ/internal/cyberimp/brain/anti_drop/hardened = 20,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 30,
/obj/item/surveillance_upgrade = 35
)
/obj/effect/spawner/lootdrop/trade_sol/skipjack_minor
name = "11. skipjack small gear"
loot = list(
/obj/item/clothing/glasses/meson/gar = 50,
/obj/item/clothing/glasses/thermal/eyepatch = 50,
/obj/item/melee/energy/sword/pirate = 50,
/obj/item/clothing/suit/hooded/vox_robes = 30,
/obj/item/clothing/under/vox/vox_casual = 30,
/obj/item/clothing/gloves/color/yellow/vox = 10, //Species limited - rare item
/obj/item/clothing/shoes/magboots/vox = 10, //Species limited - rare item
/obj/item/organ/internal/cyberimp/mouth/breathing_tube = 50,
/obj/item/mod/module/jetpack/advanced = 50,
/obj/item/gun/energy/plasma_pistol = 50,
/obj/item/mod/control/pre_equipped/standard = 40,
/obj/item/flag/species/vox = 20
)
/obj/effect/spawner/lootdrop/trade_sol/skipjack_major //contains a variety of things - raider loot
name = "12. skipjack large gear"
lootcount = 3
loot = list(
/obj/item/storage/box/vox_spacesuit = 20,
/obj/item/storage/box/syndie_kit/chameleon = 50,
/obj/item/organ/internal/cyberimp/arm/esword = 10,
/obj/item/gun/energy/spikethrower = 20,
/obj/item/organ/internal/cyberimp/arm/medibeam = 50,
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 50,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 10,
/obj/item/organ/internal/cyberimp/arm/gun/laser = 10,
/obj/item/fireaxe = 10,
/obj/item/gun/projectile/revolver/nagant = 10,
/obj/item/bio_chip/storage = 10,
/obj/item/rcd/combat = 10
)
/obj/effect/spawner/lootdrop/trade_sol/solarcentral_minor
name = "11. skrellian central authority small gear" //Medical and protection theme - shields, mods, meds, and love
loot = list(
/obj/item/mod/control/pre_equipped/rescue = 60,
/obj/item/pen/sleepy/love = 50,
/obj/item/reagent_containers/glass/bottle/reagent/omnizine = 50,
/obj/item/reagent_containers/glass/bottle/love = 50,
/obj/item/reagent_containers/glass/bottle/reagent/lazarus_reagent = 50,
/obj/item/reagent_containers/applicator/dual = 50,
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium = 30,
/obj/item/storage/firstaid/surgery = 40,
/obj/item/dnainjector/nobreath = 50,
/obj/item/dnainjector/regenerate = 50,
/obj/item/dnainjector/insulation = 50,
/obj/item/flag/species/skrell = 20
)
/obj/effect/spawner/lootdrop/trade_sol/solarcentral_major
name = "12. skrellian central authority large gear"
lootcount = 3
loot = list(
/obj/item/mod/module/energy_shield = 40,
/obj/item/shield/energy = 40,
/obj/item/reagent_containers/applicator/dual/syndi = 50, //Same as the above but comes emagged
/obj/item/gun/medbeam = 30,
/obj/item/gun/syringe/syndicate = 50,
/obj/item/storage/box/skrell_suit/black = 30,
/obj/item/storage/box/skrell_suit/white = 30,
/obj/item/rod_of_asclepius = 20
)
/obj/effect/spawner/lootdrop/trade_sol/technocracy_minor
name = "11. technocracy small gear"
loot = list(
/obj/item/paper/researchnotes = 150, //More research from the smart ones
/obj/item/storage/box/beakers/bluespace = 50,
/obj/item/storage/box/stockparts/deluxe = 50,
/obj/item/clothing/glasses/thermal/monocle = 50,
/obj/item/organ/internal/cyberimp/arm/toolset_abductor = 30,
/obj/item/organ/internal/cyberimp/arm/surgery = 40,
/obj/item/organ/internal/cyberimp/arm/advmop = 30,
/obj/item/organ/internal/cyberimp/brain/anti_stam = 50,
/obj/item/organ/internal/cyberimp/brain/anti_sleep = 50,
/obj/item/organ/internal/cyberimp/brain/anti_drop = 50,
/obj/item/autosurgeon/organ = 10,
/obj/item/flag/species/greys = 20
)
/obj/effect/spawner/lootdrop/trade_sol/technocracy_major
name = "12. technocracy large gear"
lootcount = 3
loot = list(
/obj/item/storage/box/syndie_kit/prescan = 30,
/obj/item/gun/energy/decloner = 50,
/obj/item/organ/internal/cyberimp/brain/anti_drop/hardened = 20,
/obj/item/organ/internal/cyberimp/brain/anti_stam/hardened = 30,
/obj/item/assembly/signaler/anomaly/random = 50,
/obj/item/surveillance_upgrade = 35,
/obj/item/mod/module/storage/bluespace = 40
)
/obj/effect/spawner/lootdrop/trade_sol/merchantguild_minor
name = "11. merchant guild small gear"
lootcount = 12 //Much larger selection due to it being almost all clothes.
loot = list(
/obj/item/flag/species/nian = 20,
/obj/item/clothing/under/suit/really_black = 50,
/obj/item/clothing/under/syndicate/combat = 50,
/obj/item/clothing/under/syndicate/sniper = 50,
/obj/item/clothing/under/new_soviet/sovietofficer = 50,
/obj/item/clothing/under/solgov/elite = 50,
/obj/item/clothing/under/solgov/command = 50,
/obj/item/clothing/under/retro/security = 50,
/obj/item/clothing/under/misc/gimmick/rank/captain/suit = 50,
/obj/item/clothing/under/misc/durathread = 50,
/obj/item/clothing/under/psysuit = 50,
/obj/item/clothing/under/costume/cuban_suit = 50,
/obj/item/clothing/suit/armor/vest/jacket = 50,
/obj/item/clothing/head/collectable/petehat = 20,
/obj/item/clothing/head/collectable/tophat = 50,
/obj/item/clothing/head/collectable/police = 50,
/obj/item/clothing/head/collectable/kitty = 50,
/obj/item/clothing/under/costume/janimaid = 50,
/obj/item/clothing/under/costume/maid = 50,
/obj/item/storage/box/syndie_kit/chameleon = 60
)
/obj/effect/spawner/lootdrop/trade_sol/merchantguild_major
name = "12. merchant guild large gear"
lootcount = 6 //Low-risk items, flavorful knick knacks - higher stock
loot = list(
/obj/item/clothing/suit/pimpcoat = 50,
/obj/item/dualsaber/toy = 50,
/obj/item/toy/sword = 50,
/obj/item/toy/plushie/carpplushie/dragon = 50,
/obj/item/toy/plushie/carpplushie/void = 50,
/obj/item/toy/plushie/ipcplushie = 30,
/obj/item/toy/plushie/nukeplushie = 30,
/obj/item/toy/plushie/nianplushie = 50, //*buzz
/obj/item/toy/windup_toolbox = 50,
/obj/item/toy/AI = 50,
/obj/item/clothing/mask/gas/voice_modulator/chameleon = 50,
/obj/item/storage/box/syndie_kit/chameleon = 50
)
/obj/effect/spawner/lootdrop/three_course_meal
name = "three course meal spawner"

111
code/game/objects/items/devices/scanners.dm
View File

@@ -520,50 +520,7 @@ SLIME SCANNER
if(!isturf(location))
return
var/datum/gas_mixture/environment = location.return_air()
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles()
to_chat(user, "<span class='info'><B>Results:</B></span>")
if(abs(pressure - ONE_ATMOSPHERE) < 10)
to_chat(user, "<span class='info'>Pressure: [round(pressure,0.1)] kPa</span>")
else
to_chat(user, "<span class='alert'>Pressure: [round(pressure,0.1)] kPa</span>")
if(total_moles)
var/o2_concentration = environment.oxygen/total_moles
var/n2_concentration = environment.nitrogen/total_moles
var/co2_concentration = environment.carbon_dioxide/total_moles
var/plasma_concentration = environment.toxins/total_moles
var/n2o_concentration = environment.sleeping_agent/total_moles
var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration+n2o_concentration)
if(abs(n2_concentration - N2STANDARD) < 20)
to_chat(user, "<span class='info'>Nitrogen: [round(n2_concentration*100)] %</span>")
else
to_chat(user, "<span class='alert'>Nitrogen: [round(n2_concentration*100)] %</span>")
if(abs(o2_concentration - O2STANDARD) < 2)
to_chat(user, "<span class='info'>Oxygen: [round(o2_concentration*100)] %</span>")
else
to_chat(user, "<span class='alert'>Oxygen: [round(o2_concentration*100)] %</span>")
if(co2_concentration > 0.01)
to_chat(user, "<span class='alert'>CO2: [round(co2_concentration*100)] %</span>")
else
to_chat(user, "<span class='info'>CO2: [round(co2_concentration*100)] %</span>")
if(plasma_concentration > 0.01)
to_chat(user, "<span class='info'>Plasma: [round(plasma_concentration*100)] %</span>")
if(n2o_concentration > 0.01)
to_chat(user, "<span class='info'>Nitrous Oxide: [round(n2o_concentration*100)] %</span>")
if(unknown_concentration > 0.01)
to_chat(user, "<span class='alert'>Unknown: [round(unknown_concentration*100)] %</span>")
to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")
atmos_scan(user, location)
add_fingerprint(user)
/obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
@@ -629,6 +586,72 @@ SLIME SCANNER
amount += inaccurate
return DisplayTimeText(max(1, amount))
/obj/item/analyzer/afterattack(atom/target, mob/user, proximity, params)
. = ..()
if(!can_see(user, target, 1))
return
if(target.return_analyzable_air())
atmos_scan(user, target)
else
atmos_scan(user, get_turf(target))
/**
* Outputs a message to the user describing the target's gasmixes.
* Used in chat-based gas scans.
*/
/proc/atmos_scan(mob/user, atom/target, silent = FALSE, print = TRUE)
var/mixture = target.return_analyzable_air()
if(!mixture)
return FALSE
var/list/message = list()
if(!silent && isliving(user))
user.visible_message("<span class='notice'>[user] uses the analyzer on [target].</span>", "<span class='notice'>You use the analyzer on [target].</span>")
message += "<span class='boldnotice'>Results of analysis of [bicon(target)] [target].</span>"
if(!print)
return TRUE
var/list/airs = islist(mixture) ? mixture : list(mixture)
for(var/datum/gas_mixture/air as anything in airs)
var/mix_name = capitalize(lowertext(target.name))
if(length(air) > 1) //not a unary gas mixture
var/mix_number = airs.Find(air)
message += "<span class='boldnotice'>Node [mix_number]</span>"
mix_name += " - Node [mix_number]"
var/total_moles = air.total_moles()
var/pressure = air.return_pressure()
var/volume = air.return_volume() //could just do mixture.volume... but safety, I guess?
var/heat_capacity = air.heat_capacity()
var/thermal_energy = air.thermal_energy()
if(total_moles)
message += "<span class='info'>Total: [round(total_moles, 0.01)] moles</span>"
if(air.oxygen && air.oxygen / total_moles > 0.01)
message += " <span class='oxygen'>Oxygen: [round(air.oxygen, 0.01)] moles ([round(air.oxygen / total_moles * 100, 0.01)] %)</span>"
if(air.nitrogen && air.nitrogen / total_moles > 0.01)
message += " <span class='nitrogen'>Nitrogen: [round(air.nitrogen, 0.01)] moles ([round(air.nitrogen / total_moles * 100, 0.01)] %)</span>"
if(air.carbon_dioxide && air.carbon_dioxide / total_moles > 0.01)
message += " <span class='carbon_dioxide'>Carbon Dioxide: [round(air.carbon_dioxide, 0.01)] moles ([round(air.carbon_dioxide / total_moles * 100, 0.01)] %)</span>"
if(air.toxins && air.toxins / total_moles > 0.01)
message += " <span class='plasma'>Plasma: [round(air.toxins, 0.01)] moles ([round(air.toxins / total_moles * 100, 0.01)] %)</span>"
if(air.sleeping_agent && air.sleeping_agent / total_moles > 0.01)
message += " <span class='sleeping_agent'>Nitrous Oxide: [round(air.sleeping_agent, 0.01)] moles ([round(air.sleeping_agent / total_moles * 100, 0.01)] %)</span>"
if(air.agent_b && air.agent_b / total_moles > 0.01)
message += " <span class='agent_b'>Agent B: [round(air.agent_b, 0.01)] moles ([round(air.agent_b / total_moles * 100, 0.01)] %)</span>"
message += "<span class='info'>Temperature: [round(air.temperature-T0C)] &deg;C ([round(air.temperature)] K)</span>"
message += "<span class='info'>Volume: [round(volume)] Liters</span>"
message += "<span class='info'>Pressure: [round(pressure, 0.1)] kPa</span>"
message += "<span class='info'>Heat Capacity: [DisplayJoules(heat_capacity)] / K</span>"
message += "<span class='info'>Thermal Energy: [DisplayJoules(thermal_energy)]</span>"
else
message += length(airs) > 1 ? "<span class='info'>This node is empty!</span>" : "<span class='info'>[target] is empty!</span>"
message += "<span class='info'>Volume: [round(volume)] Liters</span>" // don't want to change the order volume appears in, suck it
to_chat(user, chat_box_examine(message.Join("\n")))
return TRUE
/******************************/
/*** REAGENT SCANNERS ***/
/******************************/

2
code/game/objects/items/devices/traitordevices.dm
View File

@@ -271,7 +271,7 @@
if(HAS_TRAIT(user, TRAIT_RESISTHEAT))
to_chat(user, "<span class='warning'>You are already fireproof!</span>")
return
if(user.mind && (ischangeling(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)) || (user.dna && user.dna.species.name != "Plasmaman"))
if(user.mind && (IS_CHANGELING(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)) || (user.dna && user.dna.species.name != "Plasmaman"))
to_chat(user, "<span class='warning'>The injector is not compatable with your biology!</span>")
return
if(used)

2
code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm
View File

@@ -20,7 +20,7 @@
return FALSE
// Fails if they're already a mindslave of someone, or if they're mindshielded.
if(ismindslave(mindslave_target) || ismindshielded(mindslave_target))
if(IS_MINDSLAVE(mindslave_target) || ismindshielded(mindslave_target))
mindslave_target.visible_message(
"<span class='warning'>[mindslave_target] seems to resist the bio-chip!</span>", \
"<span class='warning'>You feel a strange sensation in your head that quickly dissipates.</span>")

2
code/game/objects/items/weapons/caution.dm
View File

@@ -24,7 +24,7 @@
/obj/item/caution/proximity_sign/attack_self(mob/user as mob)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(!H.mind.has_antag_datum(/datum/antagonist/traitor) && !ismindslave(H))
if(!H.mind.has_antag_datum(/datum/antagonist/traitor) && !IS_MINDSLAVE(H))
return
if(armed)
armed = FALSE

7
code/game/objects/items/weapons/flamethrower.dm
View File

@@ -122,8 +122,6 @@
update_icon()
return
else if(istype(I, /obj/item/analyzer) && ptank)
atmosanalyzer_scan(ptank.air_contents, user)
else
return ..()
@@ -156,6 +154,11 @@
to_chat(user, "<span class='notice'>[igniter] is now [status ? "secured" : "unsecured"]!</span>")
update_icon()
/obj/item/flamethrower/return_analyzable_air()
if(ptank)
return ptank.return_analyzable_air()
return null
/obj/item/flamethrower/attack_self(mob/user)
toggle_igniter(user)

2
code/game/objects/items/weapons/holy_weapons.dm
View File

@@ -757,7 +757,7 @@
if(!target || !ishuman(target) || !missionary || !ishuman(missionary))
return
if(ismindslave(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
if(IS_MINDSLAVE(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
to_chat(missionary, "<span class='warning'>Your faith is strong, but [target.p_their()] mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...</span>")
faith -= 25 //same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
return

4
code/game/objects/items/weapons/powerfist.dm
View File

@@ -31,8 +31,8 @@
/obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/tank/internals))
if(!iscarbon(loc))
to_chat(user, "<span class='warning'>You have to hold the powerfist in your hand!</span>")
if(!user.is_holding(src))
to_chat(user, "<span class='warning'>You have to hold [src] in your hand!</span>")
return
if(!tank)
var/obj/item/tank/internals/IT = W

72
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -777,6 +777,78 @@
new /obj/item/ammo_box/magazine/enforcer/lethal(src)
new /obj/item/ammo_box/magazine/enforcer/lethal(src)
/obj/item/storage/box/hydroponics_starter
name = "hydroponics starter kit"
desc = "Everything you need to start your own botany lab."
/obj/item/storage/box/hydroponics_starter/populate_contents()
for(var/I in 1 to 2)
new /obj/item/circuitboard/hydroponics(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/matter_bin(src)
new /obj/item/stock_parts/manipulator(src)
new /obj/item/reagent_containers/glass/bucket(src)
/obj/item/storage/box/turbine_kit
name = "turbine kit"
desc = "Somehow, they managed to fit almost an entire turbine assembly into this box."
/obj/item/storage/box/turbine_kit/populate_contents()
new /obj/item/circuitboard/turbine_computer(src)
new /obj/item/circuitboard/power_compressor(src)
new /obj/item/circuitboard/power_turbine(src)
for(var/I in 1 to 6)
new /obj/item/stock_parts/capacitor(src)
new /obj/item/stock_parts/manipulator(src)
/obj/item/storage/box/deagle
name = "desert eagle handcannon kit"
desc = "A box marked with pictures of the iconic Desert Eagle pistol, one ammo clip, and the word 'LETHAL'."
icon_state = "doom_box"
/obj/item/storage/box/deagle/populate_contents()
new /obj/item/gun/projectile/automatic/pistol/deagle(src)
new /obj/item/ammo_box/magazine/m50(src)
/obj/item/storage/box/skrell_suit
name = "skrellian suit box"
desc = "A box containing a skrell-designed medical spacesuit."
icon_state = "doom_box"
/obj/item/storage/box/skrell_suit/white
name = "white skrellian suit box"
desc = "A box containing a skrell-designed medical spacesuit. This one is white."
/obj/item/storage/box/skrell_suit/white/populate_contents()
new /obj/item/clothing/head/helmet/space/skrell/white(src)
new /obj/item/clothing/suit/space/skrell/white(src)
/obj/item/storage/box/skrell_suit/black
name = "black skrellian suit box"
desc = "A box containing a skrell-designed medical spacesuit. This one is black."
/obj/item/storage/box/skrell_suit/black/populate_contents()
new /obj/item/clothing/head/helmet/space/skrell/black(src)
new /obj/item/clothing/suit/space/skrell/black(src)
/obj/item/storage/box/breacher
name = "unathi breacher suit box"
desc = "A box containing a bulky unathi battlesuit."
icon_state = "doom_box"
/obj/item/storage/box/breacher/populate_contents()
new /obj/item/clothing/suit/space/unathi/breacher(src)
new /obj/item/clothing/head/helmet/space/unathi/breacher(src)
/obj/item/storage/box/vox_spacesuit
name = "vox voidsuit box"
desc = "A box containing an old, dusty voidsuit fit for vox."
icon_state = "doom_box"
/obj/item/storage/box/vox_spacesuit/populate_contents()
new /obj/item/clothing/head/helmet/space/vox/pressure(src)
new /obj/item/clothing/suit/space/vox/pressure(src)
/obj/item/storage/box/telescience
name = "babies first telescience kit"
desc = "A now restricted kit for those who want to learn about telescience!"

6
code/game/objects/items/weapons/tanks/tanks.dm
View File

@@ -145,9 +145,6 @@
if(istype(loc, /obj/item/assembly))
icon = loc
if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1)
atmosanalyzer_scan(air_contents, user)
if(istype(W, /obj/item/assembly_holder))
bomb_assemble(W,user)
@@ -215,6 +212,9 @@
RETURN_TYPE(/datum/gas_mixture)
return air_contents
/obj/item/tank/return_analyzable_air()
return air_contents
/obj/item/tank/assume_air(datum/gas_mixture/giver)
air_contents.merge(giver)

2
code/game/objects/structures.dm
View File

@@ -8,6 +8,8 @@
var/creates_cover = FALSE
var/mob/living/climber
var/broken = FALSE
/// How long this takes to unbuckle yourself from.
var/unbuckle_time = 0 SECONDS
/obj/structure/New()
..()

74
code/game/objects/structures/displaycase.dm
View File

@@ -9,13 +9,22 @@
armor = list(MELEE = 30, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, RAD = 0, FIRE = 70, ACID = 100)
max_integrity = 200
integrity_failure = 50
var/obj/item/showpiece = null
var/alert = FALSE //Basic display cases have no alarms
/// The object stored inside.
var/obj/item/showpiece
/// If true, this is alarmed and will set off a siren when opened without proper access.
var/alert = FALSE
/// If this is currently unlocked
var/open = FALSE
/// If false, this can never be opened, and the item inside should be inaccessible. Good for showcases.
var/openable = TRUE
/// The electronics currently installed in this showpiece.
var/obj/item/airlock_electronics/electronics
var/start_showpiece_type = null //add type for items on display
var/list/start_showpieces = list() //Takes sublists in the form of list("type" = /obj/item/bikehorn, "trophy_message" = "henk")
/// The type that should be instantiated to fill the showpiece.
var/start_showpiece_type
/// A list of random items that could possibly fill the case, as well as a flavor message for them.
/// Takes sublists in the form of list("type" = /obj/item/bikehorn, "trophy_message" = "henk")
var/list/start_showpieces = list()
/// A flavor message to show with this item.
var/trophy_message = ""
/obj/structure/displaycase/Initialize(mapload)
@@ -46,18 +55,29 @@
/obj/structure/displaycase/examine(mob/user)
. = ..()
if(alert)
. += "<span class='notice'>Hooked up with an anti-theft system.</span>"
if(emagged)
. += "<span class='warning'>The ID lock has been shorted out.</span>"
if(showpiece)
. += "<span class='notice'>There's [showpiece] inside.</span>"
. += "<span class='notice'>There's \a [showpiece] displayed inside.</span>"
else
. += "<span class='notice'>It's empty.</span>"
if(trophy_message)
. += "The plaque reads:\n [trophy_message]"
if(!openable)
. += "<span class='notice'>It seems to be sealed shut, there's no way you're getting that open.</span>"
else
if(!open)
. += "<span class='notice'>The ID lock is active, you need to swipe an ID to open it.</span>"
else if((broken || open) && showpiece)
. += "<span class='notice'>[showpiece] is held in a loose low gravity suspension field. You can take [showpiece] out[broken ? "." : ", or lock [src] with an ID"].</span>"
/obj/structure/displaycase/proc/dump()
if(alert)
. += "<span class='notice'>It is hooked up with an anti-theft system.</span>"
if(emagged)
. += "<span class='warning'>The ID lock has been shorted out.</span>"
/obj/structure/displaycase/proc/dump(mob/user)
if(showpiece)
showpiece.forceMove(loc)
if(!user || !user.put_in_hands(showpiece))
showpiece.forceMove(loc)
showpiece = null
/obj/structure/displaycase/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
@@ -109,9 +129,15 @@
. += "glassbox_closed"
/obj/structure/displaycase/attackby(obj/item/I, mob/user, params)
if(I.GetID() && !broken && openable)
if(I.GetID())
if(!openable)
to_chat(user, "<span class='warning'>There is no ID scanner, looks like this one is sealed shut.</span>")
return
if(broken)
to_chat(user, "<span class='warning'>[src] is broken, the ID lock won't do anything.</span>")
return
if(allowed(user) || emagged)
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
to_chat(user, "<span class='notice'>You use [I] to [open ? "close" : "open"] [src].</span>")
toggle_lock()
else
to_chat(user, "<span class='warning'>Access denied.</span>")
@@ -181,17 +207,19 @@
user.changeNext_move(CLICK_CD_MELEE)
if(showpiece && (broken || open))
to_chat(user, "<span class='notice'>You deactivate the hover field built into the case.</span>")
dump()
dump(user)
add_fingerprint(user)
update_icon(UPDATE_OVERLAYS)
return
else
//prevents remote "kicks" with TK
if(!Adjacent(user))
return
user.visible_message("<span class='danger'>[user] kicks the display case.</span>")
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
take_damage(2)
if(!open && openable)
to_chat(user, "<span class='notice'>The ID lock is active, you'll need to unlock it first.</span>")
return
//prevents remote "kicks" with TK
if(!Adjacent(user))
return
user.visible_message("<span class='danger'>[user] kicks the display case.</span>")
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
take_damage(2)
/obj/structure/displaycase_chassis
anchored = TRUE
@@ -205,9 +233,9 @@
/obj/structure/displaycase_chassis/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/airlock_electronics))
to_chat(user, "<span class='notice'>You start installing the electronics into [src]...</span>")
playsound(loc, I.usesound, 50, 1)
playsound(loc, I.usesound, 50, TRUE)
if(do_after(user, 30, target = src))
var/obj/item/airlock_electronics/new_electronics = I
var/obj/item/airlock_electronics/new_electronics = I
if(user.drop_item() && !new_electronics.is_installed)
new_electronics.forceMove(src)
electronics = new_electronics

2
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View File

@@ -129,7 +129,7 @@
handle_rotation(newdir)
/obj/structure/chair/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || is_ventcrawling(user))
return
rotate()

2
code/game/objects/structures/tables_racks.dm
View File

@@ -326,7 +326,7 @@
return T.straight_table_check(direction)
/obj/structure/table/AltShiftClick(mob/living/carbon/human/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || !can_be_flipped)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || !can_be_flipped || is_ventcrawling(user))
return
if(!flipped)

18
code/game/turfs/simulated/floor.dm
View File

@@ -23,9 +23,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
var/burnt = FALSE
var/current_overlay = null
var/floor_tile = null //tile that this floor drops
var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
var/list/burnt_states = list("floorscorched1", "floorscorched2")
var/list/prying_tool_list = list(TOOL_CROWBAR) //What tool/s can we use to pry up the tile?
var/keep_dir = TRUE //When false, resets dir to default on changeturf()
var/footstep = FOOTSTEP_FLOOR
@@ -114,14 +111,14 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
/turf/simulated/floor/break_tile()
if(broken)
return
current_overlay = pick(broken_states)
current_overlay = pick(get_broken_states())
broken = TRUE
update_icon()
/turf/simulated/floor/burn_tile()
if(burnt)
return
current_overlay = pick(burnt_states)
current_overlay = pick(get_burnt_states())
burnt = TRUE
update_icon()
@@ -209,7 +206,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
if(T.turf_type == type)
return
var/obj/item/thing = user.get_inactive_hand()
if(!thing || !prying_tool_list.Find(thing.tool_behaviour))
if(!thing || !(thing.tool_behaviour in get_prying_tools()))
return
var/turf/simulated/floor/plating/P = pry_tile(thing, user, TRUE)
if(!istype(P))
@@ -264,3 +261,12 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
/turf/simulated/floor/can_have_cabling()
return !burnt && !broken
/turf/simulated/floor/proc/get_broken_states()
return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
/turf/simulated/floor/proc/get_burnt_states()
return list("floorscorched1", "floorscorched2")
/turf/simulated/floor/proc/get_prying_tools()
return list(TOOL_CROWBAR)

4
code/game/turfs/simulated/floor/asteroid_floors.dm
View File

@@ -446,7 +446,6 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
slowdown = 2
environment_type = "snow"
planetary_atmos = TRUE
burnt_states = list("snow_dug")
digResult = /obj/item/stack/sheet/mineral/snow
/turf/simulated/floor/plating/asteroid/snow/burn_tile()
@@ -458,6 +457,9 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
return TRUE
return FALSE
/turf/simulated/floor/plating/asteroid/snow/get_burnt_states()
return list("snow_dug")
/turf/simulated/floor/plating/asteroid/snow/airless
temperature = TCMB
oxygen = 0

32
code/game/turfs/simulated/floor/fancy_floor.dm
View File

@@ -1,8 +1,6 @@
/turf/simulated/floor/wood
icon_state = "wood"
floor_tile = /obj/item/stack/tile/wood
prying_tool_list = list(TOOL_SCREWDRIVER)
broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7")
footstep = FOOTSTEP_WOOD
barefootstep = FOOTSTEP_WOOD_BAREFOOT
clawfootstep = FOOTSTEP_WOOD_CLAW
@@ -19,6 +17,12 @@
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
remove_tile(user, FALSE, FALSE)
/turf/simulated/floor/wood/get_broken_states()
return list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7")
/turf/simulated/floor/wood/get_prying_tools()
return list(TOOL_SCREWDRIVER)
/turf/simulated/floor/wood/remove_tile(mob/user, silent = FALSE, make_tile = TRUE)
if(broken || burnt)
@@ -63,7 +67,6 @@
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS)
canSmoothWith = list(SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS)
layer = ABOVE_OPEN_TURF_LAYER
broken_states = list("damaged")
floor_tile = /obj/item/stack/tile/grass
footstep = FOOTSTEP_GRASS
barefootstep = FOOTSTEP_GRASS
@@ -71,6 +74,9 @@
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
transform = matrix(1, 0, -9, 0, 1, -9) //Yes, these sprites are 50x50px, big grass control the industry
/turf/simulated/floor/grass/get_broken_states()
return list("damaged")
/turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params)
if(..())
return
@@ -109,7 +115,6 @@
icon_state = "carpet-255"
base_icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_CARPET)
canSmoothWith = list(SMOOTH_GROUP_CARPET)
@@ -146,6 +151,9 @@
/turf/simulated/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
return FALSE
/turf/simulated/floor/carpet/get_broken_states()
return list("damaged")
/turf/simulated/floor/carpet/black
icon = 'icons/turf/floors/carpet_black.dmi'
floor_tile = /obj/item/stack/tile/carpet/black
@@ -213,8 +221,6 @@
icon_state = "mat-0"
base_icon_state = "mat"
floor_tile = /obj/item/stack/tile/bamboo
prying_tool_list = list(TOOL_SCREWDRIVER)
broken_states = list("bamboo-damaged")
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_BAMBOO)
canSmoothWith = list(SMOOTH_GROUP_BAMBOO)
@@ -247,6 +253,12 @@
/turf/simulated/floor/bamboo/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
return FALSE
/turf/simulated/floor/bamboo/get_broken_states()
return list("bamboo-damaged")
/turf/simulated/floor/bamboo/get_prying_tools()
return list(TOOL_SCREWDRIVER)
/turf/simulated/floor/bamboo/airless
oxygen = 0
nitrogen = 0
@@ -256,10 +268,12 @@
/turf/simulated/floor/bamboo/tatami
desc = "A traditional Japanese floor mat."
icon_state = "bamboo-green"
broken_states = list("tatami-damaged")
floor_tile = /obj/item/stack/tile/bamboo/tatami
smoothing_flags = NONE
/turf/simulated/floor/bamboo/tatami/get_broken_states()
return list("tatami-damaged")
/turf/simulated/floor/bamboo/tatami/purple
icon_state = "bamboo-purple"
floor_tile = /obj/item/stack/tile/bamboo/tatami/purple
@@ -273,7 +287,6 @@
icon = 'icons/turf/space.dmi'
icon_state = "0"
floor_tile = /obj/item/stack/tile/fakespace
broken_states = list("damaged")
smoothing_flags = NONE
plane = PLANE_SPACE
@@ -281,6 +294,9 @@
. = ..()
icon_state = SPACE_ICON_STATE
/turf/simulated/floor/fakespace/get_broken_states()
return list("damaged")
/turf/simulated/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/space.dmi'
underlay_appearance.icon_state = SPACE_ICON_STATE

4
code/game/turfs/simulated/floor/light_floor.dm
View File

@@ -3,7 +3,6 @@
light_range = 0
icon_state = "light_off"
floor_tile = /obj/item/stack/tile/light
broken_states = list("light_off")
/// Are we on
var/on = FALSE
/// Are we broken
@@ -114,6 +113,9 @@
..()
color = color_save
/turf/simulated/floor/light/get_broken_states()
return list("light_off")
// These tiles change color every now and then
/turf/simulated/floor/light/disco
floor_tile = /obj/item/stack/tile/disco_light

13
code/game/turfs/simulated/floor/mineral_floors.dm
View File

@@ -14,9 +14,8 @@
icon_state = ""
var/list/icons = list()
/turf/simulated/floor/mineral/Initialize(mapload)
. = ..()
broken_states = list("[initial(icon_state)]_dam")
/turf/simulated/floor/mineral/get_broken_states()
return list("[initial(icon_state)]_dam")
/turf/simulated/floor/mineral/update_icon_state()
if(!broken && !burnt)
@@ -95,7 +94,9 @@
name = "shuttle floor"
icon_state = "titanium"
floor_tile = /obj/item/stack/tile/mineral/titanium
broken_states = list("titanium_dam1","titanium_dam2","titanium_dam3","titanium_dam4","titanium_dam5")
/turf/simulated/floor/mineral/titanium/get_broken_states()
return list("titanium_dam1", "titanium_dam2", "titanium_dam3", "titanium_dam4", "titanium_dam5")
/turf/simulated/floor/mineral/titanium/airless
oxygen = 0
@@ -132,7 +133,9 @@
name = "shuttle floor"
icon_state = "plastitanium"
floor_tile = /obj/item/stack/tile/mineral/plastitanium
broken_states = list("plastitanium_dam1","plastitanium_dam2","plastitanium_dam3","plastitanium_dam4","plastitanium_dam5")
/turf/simulated/floor/mineral/plastitanium/get_broken_states()
return list("plastitanium_dam1", "plastitanium_dam2", "plastitanium_dam3", "plastitanium_dam4", "plastitanium_dam5")
/turf/simulated/floor/mineral/plastitanium/red
icon_state = "plastitanium_red"

8
code/game/turfs/simulated/floor/misc_floor.dm
View File

@@ -134,10 +134,14 @@
name = "high-traction floor"
icon_state = "noslip"
floor_tile = /obj/item/stack/tile/noslip
broken_states = list("noslip-damaged1","noslip-damaged2","noslip-damaged3")
burnt_states = list("noslip-scorched1","noslip-scorched2")
slowdown = -0.3
/turf/simulated/floor/noslip/get_broken_states()
return list("noslip-damaged1", "noslip-damaged2", "noslip-damaged3")
/turf/simulated/floor/plating/asteroid/snow/get_burnt_states()
return list("noslip-scorched1", "noslip-scorched2")
/turf/simulated/floor/noslip/MakeSlippery()
return

5
code/game/turfs/simulated/floor/plasteel_floor.dm
View File

@@ -1,13 +1,14 @@
/turf/simulated/floor/plasteel
icon_state = "floor"
floor_tile = /obj/item/stack/tile/plasteel
broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
burnt_states = list("floorscorched1", "floorscorched2")
/turf/simulated/floor/plasteel/update_icon_state()
if(!broken && !burnt)
icon_state = icon_regular_floor
/turf/simulated/floor/plasteel/get_broken_states()
return list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
/turf/simulated/floor/plasteel/airless
name = "airless floor"
oxygen = 0

5
code/game/turfs/simulated/floor/plating.dm
View File

@@ -4,8 +4,6 @@
icon = 'icons/turf/floors/plating.dmi'
intact = FALSE
floor_tile = null
broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
burnt_states = list("floorscorched1", "floorscorched2")
var/unfastened = FALSE
footstep = FOOTSTEP_PLATING
barefootstep = FOOTSTEP_HARD_BAREFOOT
@@ -19,6 +17,9 @@
icon_plating = icon_state
update_icon()
/turf/simulated/floor/plating/get_broken_states()
return list("floorscorched1", "floorscorched2")
/turf/simulated/floor/plating/damaged/Initialize(mapload)
. = ..()
break_tile()

2
code/game/turfs/simulated/floor/transparent.dm
View File

@@ -123,7 +123,7 @@
/turf/simulated/floor/transparent/glass/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
var/obj/item/thing = user.get_inactive_hand()
if(!thing || !prying_tool_list.Find(thing.tool_behaviour))
if(!thing || !(thing.tool_behaviour in get_prying_tools()))
return
to_chat(user, "<span class='danger'>You need to hold two sheets of metal to dismantle \the [src]!</span>")

2
code/game/verbs/ooc.dm
View File

@@ -192,7 +192,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00")
prefix = "(R)"
if(send)
to_chat(target, "<span class='ooc'><span class='looc'>LOOC<span class='prefix'>[prefix]: </span><EM>[display_name][admin_stuff]:</EM> <span class='message'>[msg]</span></span></span>")
to_chat(target, "<span class='ooc'><span class='looc'>LOOC<span class='prefix'>[prefix]: </span><em>[display_name][admin_stuff]:</em> <span class='message'>[msg]</span></span></span>", MESSAGE_TYPE_OOC)
// Ported from /tg/, full credit to SpaceManiac and Timberpoes.

2
code/game/verbs/suicide.dm
View File

@@ -19,7 +19,7 @@
var/confirm = null
if(!forced)
if(ischangeling(src))
if(IS_CHANGELING(src))
// the alternative is to allow clings to commit suicide, but then you'd probably have them
// killing themselves as soon as they're in cuffs
to_chat(src, "<span class='warning'>We refuse to take the coward's way out.</span>")

6
code/modules/admin/misc_admin_procs.dm
View File

@@ -27,7 +27,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
for(var/client/C in GLOB.admins)
if(R_ADMIN & C.holder.rights)
if(important || (C.prefs && !(C.prefs.toggles & PREFTOGGLE_CHAT_NO_TICKETLOGS)))
to_chat(C, msg, MESSAGE_TYPE_ADMINPM, confidential = TRUE)
to_chat(C, msg, MESSAGE_TYPE_ADMINCHAT, confidential = TRUE)
if(important)
if(C.prefs?.sound & SOUND_ADMINHELP)
SEND_SOUND(C, sound('sound/effects/adminhelp.ogg'))
@@ -660,7 +660,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
antag_list += "Nuclear Operative"
if(iswizard(M))
antag_list += "Wizard"
if(ischangeling(M))
if(IS_CHANGELING(M))
antag_list += "Changeling"
if(M.mind in SSticker.mode.abductors)
antag_list += "Abductor"
@@ -670,7 +670,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
antag_list += "Vampire Thrall"
if(M.mind.has_antag_datum(/datum/antagonist/traitor))
antag_list += "Traitor"
if(M.mind.has_antag_datum(/datum/antagonist/mindslave, FALSE))
if(IS_MINDSLAVE(M))
antag_list += "Mindslave"
if(isrobot(M))
var/mob/living/silicon/robot/R = M

4
code/modules/admin/verbs/adminpm.dm
View File

@@ -223,10 +223,10 @@
if(X.key != key && X.key != C.key)
if(message_type == MESSAGE_TYPE_MENTORPM)
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob))
to_chat(X, third_party_message)
to_chat(X, third_party_message, MESSAGE_TYPE_ADMINPM)
else
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
to_chat(X, third_party_message)
to_chat(X, third_party_message, MESSAGE_TYPE_ADMINPM)
//Check if the mob being PM'd has any open tickets.
var/list/tickets = tickets_system.checkForTicket(C, ticket_id)

2
code/modules/admin/verbs/pray.dm
View File

@@ -34,7 +34,7 @@
for(var/client/X in GLOB.admins)
if(check_rights(R_EVENT,0,X.mob))
to_chat(X, msg)
to_chat(X, msg, MESSAGE_TYPE_ADMINPM)
if(X.prefs.sound & SOUND_PRAYERNOTIFY)
SEND_SOUND(X, sound('sound/items/PDA/ambicha4-short.ogg'))
to_chat(usr, "Your prayers have been received by the gods.")

2
code/modules/antagonists/changeling/powers/mutations.dm
View File

@@ -40,7 +40,7 @@
/datum/action/changeling/weapon/proc/retract(atom/target, any_hand = FALSE)
SIGNAL_HANDLER
if(!ischangeling(owner))
if(!IS_CHANGELING(owner))
return
if(!any_hand && !istype(owner.get_active_hand(), weapon_type))
return

2
code/modules/antagonists/changeling/powers/shriek.dm
View File

@@ -19,7 +19,7 @@
var/mob/living/carbon/human/H = M
if(H.check_ear_prot() >= HEARING_PROTECTION_TOTAL)
continue
if(!M.mind || !ischangeling(M))
if(!M.mind || !IS_CHANGELING(M))
M.Deaf(30 SECONDS)
M.AdjustConfused(40 SECONDS)
M.Jitter(100 SECONDS)

2
code/modules/antagonists/changeling/powers/swap_form.dm
View File

@@ -23,7 +23,7 @@
if(!istype(target) || !target.mind || issmall(target) || HAS_TRAIT(target, TRAIT_GENELESS))
to_chat(user, "<span class='warning'>[target] is not compatible with this ability.</span>")
return FALSE
if(ischangeling(target))
if(IS_CHANGELING(target))
to_chat(user, "<span class='warning'>We are unable to swap forms with another changeling!</span>")
return FALSE
return TRUE

4
code/modules/antagonists/changeling/powers/tiny_prick.dm
View File

@@ -57,7 +57,7 @@
if(ismachineperson(target))
to_chat(user, "<span class='warning'>This won't work on synthetics.</span>")
return FALSE
if(ischangeling(target))
if(IS_CHANGELING(target))
sting_feedback(user, target)
take_chemical_cost()
return FALSE
@@ -67,7 +67,7 @@
if(!target)
return
to_chat(user, "<span class='notice'>We stealthily sting [target.name].</span>")
if(ischangeling(target))
if(IS_CHANGELING(target))
to_chat(target, "<span class='warning'>You feel a tiny prick.</span>")
add_attack_logs(user, target, "Unsuccessful sting (changeling)")
return TRUE

27
code/modules/antagonists/cult/team_cult.dm
View File

@@ -28,6 +28,9 @@ RESTRICT_TYPE(/datum/team/cult)
// Disables the station-wide announcements, unused except for admin editing.
var/no_announcements = FALSE
/// Boolean that prevents all_members_timer from being called multiple times
var/is_in_transition = FALSE
/datum/team/cult/create_team(list/starting_members)
cult_threshold_check() // Set this ALWAYS before any check_cult_size check, or
. = ..()
@@ -145,6 +148,9 @@ RESTRICT_TYPE(/datum/team/cult)
INVOKE_ASYNC(src, PROC_REF(remove_member), deleting_cultist.mind)
/datum/team/cult/proc/check_cult_size()
if(is_in_transition)
return
if(!ascend_percent)
stack_trace("[src]'s check_cult_size was called before cult_threshold_check, which leads to weird logic! This should be fixed ASAP.")
cult_threshold_check()
@@ -165,36 +171,36 @@ RESTRICT_TYPE(/datum/team/cult)
cult_ascend()
/datum/team/cult/proc/cult_rise()
cult_risen = TRUE
is_in_transition = TRUE
for(var/datum/mind/M in members)
if(!ishuman(M.current))
continue
SEND_SOUND(M.current, sound('sound/hallucinations/i_see_you2.ogg'))
to_chat(M.current, "<span class='cultlarge'>The veil weakens as your cult grows, your eyes begin to glow...</span>")
addtimer(CALLBACK(src, PROC_REF(all_members_timer), TYPE_PROC_REF(/datum/antagonist/cultist, rise)), 20 SECONDS)
addtimer(CALLBACK(src, PROC_REF(all_members_timer), TYPE_PROC_REF(/datum/antagonist/cultist, rise), VARSET_CALLBACK(src, cult_risen, TRUE)), 20 SECONDS)
/datum/team/cult/proc/cult_ascend()
cult_ascendant = TRUE
is_in_transition = TRUE
for(var/datum/mind/M in members)
if(!ishuman(M.current))
continue
SEND_SOUND(M.current, sound('sound/hallucinations/im_here1.ogg'))
to_chat(M.current, "<span class='cultlarge'>Your cult is ascendant and the red harvest approaches - you cannot hide your true nature for much longer!</span>")
addtimer(CALLBACK(src, PROC_REF(all_members_timer), TYPE_PROC_REF(/datum/antagonist/cultist, ascend)), 20 SECONDS)
addtimer(CALLBACK(src, PROC_REF(all_members_timer), TYPE_PROC_REF(/datum/antagonist/cultist, ascend), VARSET_CALLBACK(src, cult_ascendant, TRUE)), 20 SECONDS)
if(!no_announcements)
GLOB.major_announcement.Announce("Picking up extradimensional activity related to the Cult of [GET_CULT_DATA(entity_name, "Nar'Sie")] from your station. Data suggests that about [ascend_percent * 100]% of the station has been converted. Security staff are authorized to use lethal force freely against cultists. Non-security staff should be prepared to defend themselves and their work areas from hostile cultists. Self defense permits non-security staff to use lethal force as a last resort, but non-security staff should be defending their work areas, not hunting down cultists. Dead crewmembers must be revived and deconverted once the situation is under control.", "Central Command Higher Dimensional Affairs", 'sound/AI/commandreport.ogg')
/datum/team/cult/proc/cult_fall()
cult_ascendant = FALSE
is_in_transition = TRUE
for(var/datum/mind/M in members)
if(!ishuman(M.current))
continue
SEND_SOUND(M.current, sound('sound/hallucinations/wail.ogg'))
to_chat(M.current, "<span class='cultlarge'>The veil repairs itself, your power grows weaker...</span>")
addtimer(CALLBACK(src, PROC_REF(all_members_timer), TYPE_PROC_REF(/datum/antagonist/cultist, descend)), 20 SECONDS)
addtimer(CALLBACK(src, PROC_REF(all_members_timer), TYPE_PROC_REF(/datum/antagonist/cultist, descend), VARSET_CALLBACK(src, cult_ascendant, FALSE)), 20 SECONDS)
if(!no_announcements)
GLOB.major_announcement.Announce("Paranormal activity has returned to minimal levels. \
Security staff should minimize lethal force against cultists, using non-lethals where possible. \
@@ -209,13 +215,18 @@ RESTRICT_TYPE(/datum/team/cult)
* Created so that we don't make 1000 timers, and I'm too lazy to make a proc for all of these.
* Used in callbacks for some *magic bullshit*.
*/
/datum/team/cult/proc/all_members_timer(proc_ref_to_call)
/datum/team/cult/proc/all_members_timer(cultist_proc_ref, datum/callback/varset_callback)
if(istype(varset_callback))
varset_callback.Invoke()
for(var/datum/mind/M in members)
if(!ishuman(M.current))
continue
var/datum/antagonist/cultist/cultist = M.has_antag_datum(/datum/antagonist/cultist)
if(cultist)
call(cultist, proc_ref_to_call)() // yes this is a type proc ref passed by a callback, i know its deranged
call(cultist, cultist_proc_ref)() // yes this is a type proc ref passed by a callback, i know its deranged
is_in_transition = FALSE
/datum/team/cult/proc/is_convertable_to_cult(datum/mind/mind)
if(!mind)

2
code/modules/antagonists/vampire/vamp_datum.dm
View File

@@ -125,7 +125,7 @@ RESTRICT_TYPE(/datum/antagonist/vampire)
if(H.blood_volume)
if(H.blood_volume <= BLOOD_VOLUME_BAD && blood_volume_warning > BLOOD_VOLUME_BAD)
to_chat(owner.current, "<span class='danger'>Your victim's blood volume is dangerously low.</span>")
else if(H.blood_volume <= BLOOD_VOLUME_OKAY && blood_volume_warning > BLOOD_VOLUME_OKAY)
else if(H.blood_volume <= BLOOD_VOLUME_STABLE && blood_volume_warning > BLOOD_VOLUME_STABLE)
to_chat(owner.current, "<span class='warning'>Your victim's blood is at an unsafe level.</span>")
blood_volume_warning = H.blood_volume //Set to blood volume, so that you only get the message once
else

2
code/modules/antagonists/vampire/vampire_powers/dantalion_powers.dm
View File

@@ -55,7 +55,7 @@
if(V.subclass.thrall_cap <= length(user.mind.som.serv))
to_chat(user, "<span class='warning'>You don't have enough power to enthrall any more people!</span>")
return
if(ismindshielded(C) || C.mind.has_antag_datum(/datum/antagonist/vampire) || C.mind.has_antag_datum(/datum/antagonist/mindslave))
if(ismindshielded(C) || C.mind.has_antag_datum(/datum/antagonist/vampire) || IS_MINDSLAVE(C))
C.visible_message("<span class='warning'>[C] seems to resist the takeover!</span>", "<span class='notice'>You feel a familiar sensation in your skull that quickly dissipates.</span>")
return
if(HAS_MIND_TRAIT(C, TRAIT_HOLY))

3
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
View File

@@ -18,6 +18,9 @@
return GM
/turf/return_analyzable_air()
return return_air()
/turf/remove_air(amount)
var/datum/gas_mixture/GM = new

1
code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
View File

@@ -21,7 +21,6 @@
/obj/machinery/atmospherics/unary/passive_vent/process_atmos()
..()
if(!node)
return 0

10
code/modules/atmospherics/machinery/components/unary_devices/tank.dm
View File

@@ -7,7 +7,7 @@
max_integrity = 800
density = TRUE
/// in liters, 1 meters by 1 meters by 2 meters
var/volume = 10000
var/volume = 10000
/obj/machinery/atmospherics/unary/tank/update_underlays()
if(..())
@@ -17,12 +17,8 @@
return
add_underlay(T, node, dir)
/obj/machinery/atmospherics/unary/tank/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/analyzer))
atmosanalyzer_scan(air_contents, user)
return
return ..()
/obj/machinery/atmospherics/unary/tank/return_analyzable_air()
return air_contents
/obj/machinery/atmospherics/unary/tank/air
name = "Pressure Tank (Air)"

11
code/modules/atmospherics/machinery/pipes/pipe.dm
View File

@@ -46,12 +46,6 @@
. = ..()
. += "<span class='notice'>This pipe can be disconnected from a pipenet using a wrench. If the pipe's pressure is too high, you'll end up flying.</span>"
/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/analyzer))
atmosanalyzer_scan(parent.air, user)
return
return ..()
/obj/machinery/atmospherics/proc/pipeline_expansion()
return null
@@ -67,6 +61,11 @@
return 0
return parent.air
/obj/machinery/atmospherics/pipe/return_analyzable_air()
if(!parent)
return null
return parent.air
/obj/machinery/atmospherics/pipe/build_network(remove_deferral = FALSE)
if(!parent)
parent = new /datum/pipeline()

2
code/modules/atmospherics/machinery/portable/canister.dm
View File

@@ -302,6 +302,8 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
return attack_hand(user)
/obj/machinery/atmospherics/portable/canister/attack_ghost(mob/user)
if(..())
return
return ui_interact(user)
/obj/machinery/atmospherics/portable/canister/attack_hand(mob/user)

6
code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
View File

@@ -103,6 +103,9 @@
if(holding_tank)
. += "<span class='notice'>\The [src] contains [holding_tank]. Alt-click [src] to remove it.</span>"
/obj/machinery/atmospherics/portable/return_analyzable_air()
return air_contents
/obj/machinery/atmospherics/portable/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank)
if(holding_tank)
holding_tank.forceMove(drop_location())
@@ -129,9 +132,6 @@
holding_tank = T
update_icon()
return
if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1)
atmosanalyzer_scan(air_contents, user)
return
return ..()
/obj/machinery/atmospherics/portable/wrench_act(mob/user, obj/item/I)

2
code/modules/atmospherics/machinery/portable/portable_pump.dm
View File

@@ -114,6 +114,8 @@
return attack_hand(user)
/obj/machinery/atmospherics/portable/pump/attack_ghost(mob/user)
if(..())
return
return attack_hand(user)
/obj/machinery/atmospherics/portable/pump/attack_hand(mob/user)

8
code/modules/atmospherics/machinery/portable/scrubber.dm
View File

@@ -108,6 +108,8 @@
return attack_hand(user)
/obj/machinery/atmospherics/portable/scrubber/attack_ghost(mob/user)
if(..())
return
return attack_hand(user)
/obj/machinery/atmospherics/portable/scrubber/attack_hand(mob/user)
@@ -189,12 +191,6 @@
/obj/machinery/atmospherics/portable/scrubber/huge/update_icon_state()
icon_state = "scrubber:[on]"
/obj/machinery/atmospherics/portable/scrubber/huge/attackby(obj/item/W, mob/user, params)
if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1)
atmosanalyzer_scan(air_contents, user)
return
return ..()
/obj/machinery/atmospherics/portable/scrubber/huge/wrench_act(mob/user, obj/item/I)
. = TRUE
if(stationary)

Some files were not shown because too many files have changed in this diff Show More