Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0a6bdda
Add files via upload
nmajask May 11, 2021
f2617bd
Merge branch 'yogstation13:master' into master
nmajask May 12, 2021
ecae62c
Merge branch 'yogstation13:master' into master
nmajask May 14, 2021
be6c0e1
changed sigtech, tourist, and clerk icons
nmajask May 14, 2021
8894bf5
Merge branch 'yogstation13:master' into master
nmajask May 17, 2021
2d5f354
Some more icon changes
nmajask May 17, 2021
04c2539
Merge branch 'yogstation13:master' into master
nmajask May 17, 2021
2530bdf
applied grimm-hollowknight requested changes
nmajask May 19, 2021
7239268
ah, so thats why you reverted that change
nmajask May 28, 2021
50139ca
why cant i merge upstream
nmajask May 28, 2021
ccd6514
Merge branch 'yogstation13:master' into master
nmajask May 28, 2021
c741bab
Adds brig physicians
nmajask Jul 14, 2021
0613fed
Fixed some stuff
nmajask Jul 14, 2021
53cc9cb
Removed Brig Physician's ability to be an antag
nmajask Jul 15, 2021
73aa83f
Many requested changes
nmajask Jul 16, 2021
308897c
Another bunch of changes
nmajask Jul 19, 2021
f3110a8
Merge branch 'master' into brigphys
nmajask Jul 21, 2021
919c2d5
Might fix one of the merge conflicts
nmajask Jul 21, 2021
7a36f46
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
nmajask Jul 22, 2021
cdc31b3
Should finally bring this back to a functional state
nmajask Jul 22, 2021
c4f1717
Thought I fixed this
nmajask Jul 25, 2021
f63974c
Should fix wejengin2's issues with the maps
nmajask Jul 30, 2021
f9ab97f
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
nmajask Jul 30, 2021
0ea447c
Renames yogstation
nmajask Dec 22, 2021
8023f3b
Merge branch 'yogstation13-master' into rename-box2
nmajask Dec 27, 2021
6c8a36f
Revert "Merge branch 'yogstation13-master' into rename-box2"
nmajask Dec 27, 2021
d9843df
aaa
nmajask Dec 27, 2021
cc57173
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Dec 27, 2021
a79cd06
Revert "aaa"
nmajask Dec 27, 2021
796f849
does this work?
nmajask Dec 27, 2021
0321ec3
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Dec 30, 2021
29e2381
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Jan 4, 2022
c2b721b
Merge branch 'master' of git://github.com/yogstation13/Yogstation int…
nmajask Jan 27, 2022
5b4d3dd
this might be important
nmajask Jan 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "map_files\mining\Icemoon.dmm"
#include "map_files\mining\IcemoonUnderground.dmm"
#include "map_files\debug\runtimestation.dmm"
#include "map_files\YogStation\Yogstation.dmm"
#include "map_files\YogsBox\Yogsbox.dmm"
#include "map_files\YogsMeta\YogsMeta.dmm"
#include "map_files\YogsDelta\YogsDelta.dmm"
#include "map_files\EclipseStation\EclipseStation.dmm"
Expand Down
1 change: 1 addition & 0 deletions _maps/yogsbox.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/yogsbox.json"
6 changes: 3 additions & 3 deletions _maps/yogstation.json → _maps/yogsbox.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"map_name": "YogStation",
"map_path": "map_files/YogStation",
"map_file": "YogStation.dmm",
"map_name": "YogsBox",
"map_path": "map_files/YogsBox",
"map_file": "YogsBox.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
Expand Down
1 change: 0 additions & 1 deletion _maps/yogstation.dm

This file was deleted.

8 changes: 4 additions & 4 deletions code/datums/map_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

/datum/map_config
// Metadata
var/config_filename = "_maps/yogstation.json"
var/config_filename = "_maps/yogsbox.json"
var/defaulted = TRUE // set to FALSE by LoadConfig() succeeding
// Config from maps.txt
var/config_max_users = 0
Expand All @@ -14,9 +14,9 @@
var/votable = FALSE

// Config actually from the JSON - should default to Box
var/map_name = "YogStation"
var/map_path = "map_files/YogStation"
var/map_file = "YogStation.dmm"
var/map_name = "YogsBox"
var/map_path = "map_files/YogsBox"
var/map_file = "YogsBox.dmm"

var/traits = null
var/space_ruin_levels = 7
Expand Down
2 changes: 1 addition & 1 deletion config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Format:
disabled (disables the map)
votable (is this map votable)

map yogstation
map yogsbox
voteweight 0.7
votable
endmap
Expand Down