Skip to content

QRYAAAAAAAAAAAAAAAAAAA #16

Open
wants to merge 1 commit into
base: experimental
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
61 changes: 61 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Code of Conduct
In order to foster a more healthy, productive and friendly contributing environment, the following code is in effect.


## Rules
The following conduct may result in a warning being logged against your account:
* Low-effort comments. ('No.')
* Derogatory comments.
* Trolling.
* Inappropriate content.
* Issuing commits, editing wiki pages, commenting, or opening bug reports in bad faith.
* The Head Developer and Developers are obligated to assume good faith until evidence otherwise surfaces.
* Examples:
* Opening a PR you do not personally want merged.
* Exceptions exist on a case-by-case basis for opening PRs on behalf of other people, but they MUST sponsor the PR and be willing to argue in its defense as would any other contributor)
* Opening a PR changing, removing or adding features as a political statement to protest a change you do not like.
* Repeatedly attempting to compel Developers to block a PR you do not agree with.
* This includes over the course of several PRs.
* Disobeying development team members' instructions to cease a line of discussion or move discussion elsewhere.
* Any other conduct deemed unhealthy or unhelpful as discussed on a case-by-case basis among the development team.

The following conduct is unacceptable and will result in up to three strikes, depending on severity as determined by the Head Developer:
* Derogatory, bigoted or prejudiced language based on race/ethnicity, sex/gender, sexuality, religion, disability, or nationality.
* Personal or political attacks.
* Public or private harassment.


## Warnings and Punishments
Accumulating three warnings will result in a repository ban.
Warnings expire in six months from the date of warning.
**Severe violations of this code of conduct may result in community or game server bans.**

* The first issued ban against your account will result in a **one week ban**, which cannot be appealed.
* The second issued ban against your account will result in a **one month ban**, which may be appealed after two weeks.
* The third issued ban against your account will result in a **permanent ban** and removal of chat privlages in #coding, both of which may be appealed after one month.
* Every subsequent ban will result in a permanent ban until appeal as described above.
* Fully serving or successfully appealing a ban will remove the oldest warning, resulting in two.


## Developer Responsibilities
The Head Developer is responsible for clarifying the standards of acceptable behaviour and is expected to take appropriate and fair corrective action in response to any instances of unacceptable behaviour. The Head Developer has the right to to ban temporarily or permanently any contributor for behaviours that they deem inappropriate, threatening, offensive, or harmful, in accordance with the rules established above.

Developers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.


## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported by contacting the Head Developer on Discord (@sabiram). The Head Developer will review and investigate all complaints, and will respond in a way that they deem appropriate to the circumstances. The Head Developer is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Developers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by the Head Developer.


## Modifications
Modifications to this code of conduct may be made by any contributor, by way of a pull request, and will be considered by the development staff. Any accepted modifications will be announced in the #news channel on Discord, and on the forums.


## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/

4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@
-->



#### Client version, Server revision & Game ID
<!-- Found with the "Show server revision" verb in the OOC tab in game. -->



#### Issue bingo

Please check whatever applies. More checkboxes checked increase your chances of the issue being looked at sooner.
Expand All @@ -48,4 +50,4 @@ Please check whatever applies. More checkboxes checked increase your chances of
- [ ] Issue could be reproduced by different players
- [ ] Issue could be reproduced in multiple rounds
- [ ] Issue happened in a recent (less than 7 days ago) round
- [ ] [Couldn't find an existing issue about this]( https://github.com/SS13-SCP13/SS13-SCP13/issues )
- [ ] [Couldn't find an existing issue about this](https://github.com/Baystation12/Baystation12/issues)
6 changes: 4 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ Examples were changelog entries are optional/not typically required:
* Optimizations and other changes to underlying systems which do not affect gameplay.
* Minor bug fixes.

You find a README and example file in .\html\changelogs\ for further instructions.
-->
You'll find a README and example file in .\html\changelogs\ for further instructions.

You can also find a template for adding your changelog directly to the PR description here: https://github.com/Baystation12/Baystation12/wiki/Automatic-changelog-generation
-->
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Thumbs.db
*.backup
*.before
data/
cfg/
build_log.txt
use_map
stopserver
Expand All @@ -17,8 +16,8 @@ atupdate
__pycache__

# ignore config, but not subdirs
!config/*/
config/*
!config/*/
sql/test_db

# vscode
Expand All @@ -40,3 +39,4 @@ Session.vim

# auto-generated tag files
tags
baystation12.code-workspace
37 changes: 23 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,42 @@
#pretending we're C because otherwise ruby will initialize, even with "language: dm".
language: generic
sudo: false

git:
depth: 1
dist: trusty

env:
global:
- BYOND_MAJOR="512"
- BYOND_MINOR="1452"
- BYOND_MACRO_COUNT=2
BYOND_MAJOR="512"
BYOND_MINOR="1464"

# ALL MAPS MUST BE PRESENT HERE
# IF THEY ARE NOT, YOUR BUILD WILL FAIL
matrix:
- DM_MAPFILE="_map_include"
- TEST=CODE
- TEST=WEB
- TEST=MAP MAP_PATH=example
- TEST=MAP MAP_PATH=bearcat_inf
- TEST=MAP MAP_PATH=sierra
- TEST=MAP MAP_PATH=torchinf
- TEST=MAP MAP_PATH=away_sites_testing_inf

cache:
directories:
- tgui/node_modules
- $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}

before_script:
- jdk_switcher use openjdk8

before_install:
- unset _JAVA_OPTIONS

addons:
apt:
packages:
- libc6-i386
- libgcc1:i386
- libstdc++6:i386
- python
- python-pip

before_script:
- chmod +x ./install-byond.sh
- ./install-byond.sh
script:
- (num=`grep -E '\\\\(red|blue|green|black|italic|bold|b|i[^mc])' **/*.dm | wc -l`; echo "$num BYOND text macros (expecting ${BYOND_MACRO_COUNT} or fewer)"; [ $num -le ${BYOND_MACRO_COUNT} ])
- source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
- bash dm.sh -M${DM_MAPFILE} baystation12.dme
- test/run-test.sh
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM mloc6/byond:511
FROM xales/byond:512-latest

COPY . /bs12
RUN chown -R nobody:nogroup /bs12
ARG BUILD_ARGS
ENV RUNAS=root

USER nobody
COPY . /bs12

WORKDIR /bs12

RUN DreamMaker baystation12.dme
RUN apt-get update && apt-get install -y gosu
RUN scripts/dm.sh $BUILD_ARGS baystation12.dme

EXPOSE 8000
VOLUME /bs12/data
VOLUME /bs12/config

ENTRYPOINT ["DreamDaemon"]
CMD ["baystation12.dmb", "8000", "-invisible", "-trusted"]
ENTRYPOINT ["./docker-entrypoint.sh"]
Loading