Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
bruhlookatthisdood committed May 5, 2022
2 parents f9dd0f7 + 9799aed commit b574cc7
Show file tree
Hide file tree
Showing 819 changed files with 210,399 additions and 74,893 deletions.
16 changes: 10 additions & 6 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,24 @@
#/code/world.dm @GithubNameHere
#/maps/ @GithubNameHere

#Teams
#HeadDev

/.github/ @yogstation13/head-coders
/SQL/ @yogstation13/head-coders
/_maps/ @yogstation13/map
/config/ @yogstation13/head-coders
/goon/ @yogstation13/art
/icons/ @yogstation13/art
/yogstation/SQL/ @yogstation13/head-coders
/yogstation/icons/ @yogstation13/art

/code/modules/client/preferences.dm @yogstation13/head-coders
/code/modules/client/preferences_savefile.dm @yogstation13/head-coders
/html/templates/ @yogstation13/head-coders
/sound/ @yogstation13/head-coders
/yogstation/sound/ @yogstation13/head-coders

#Teams

/_maps/ @yogstation13/map
/goon/ @yogstation13/art
/icons/ @yogstation13/art
/yogstation/icons/ @yogstation13/art

#monster860

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tgstation/byond:514.1566 as base
FROM tgstation/byond:514.1583 as base

FROM base as build_base

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ code tab of https://github.com/yogstation13/Yogstation
(note: this will use a lot of bandwidth if you wish to update and is a lot of
hassle if you want to make any changes at all, so it's not recommended.)

## The Yogstation codebase recommends compiling using version [514.1566](https://www.byond.com/download/build/514/514.1566_byond.exe) and may potentially NOT work on newer or older versions.
## The Yogstation codebase recommends compiling using version [514.1583](https://www.byond.com/download/build/514/514.1583_byond.exe) and may potentially NOT work on newer or older versions.

## :exclamation: How to compile :exclamation:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@
/turf/open/floor/wood,
/area/ruin/powered)
"aF" = (
/obj/item/reagent_containers/glass/bottle/potass_iodide{
desc = "War. War never changes. But this can take away your radiation problems!";
name = "rad-away"
/obj/item/reagent_containers/glass/bottle/radscrub{
desc = "War. War never changes. But this can clean your radiation contamination problems!";
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
Expand Down
Loading

0 comments on commit b574cc7

Please sign in to comment.