Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnOxford committed May 28, 2019
1 parent 66bd1b9 commit cb8b509
Show file tree
Hide file tree
Showing 15 changed files with 147 additions and 115 deletions.
171 changes: 94 additions & 77 deletions _maps/map_files/BoxStation/BoxStation.dmm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,4 @@
#define AI_VOX // Comment out if you don't want VOX to be enabled and have players download the voice sounds.

//Respawn timer
#define RESPAWN_TIMER 3000 // in deciseconds, the time to wait before allowing respawn. 10 minutes = 10 * 60 (seconds in minute) * 10 (seconds to deciseconds)
#define RESPAWN_TIMER 1 // in deciseconds, the time to wait before allowing respawn. 10 minutes = 10 * 60 (seconds in minute) * 10 (seconds to deciseconds)
5 changes: 4 additions & 1 deletion code/modules/client/client_colour.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Define subtypes of this datum
*/
/datum/client_colour
var/colour = "" //Any client.color-valid value
var/colour = "fallout" //Any client.color-valid value
var/priority = 1 //Since only one client.color can be rendered on screen, we take the one with the highest priority value:
//eg: "Bloody screen" > "goggles colour" as the former is much more important

Expand Down Expand Up @@ -107,6 +107,9 @@
/datum/client_colour/glass_colour/gray
colour = "#cccccc"

/datum/client_colour/glass_colour/fallout
colour = "#411D1E"


/datum/client_colour/monochrome
colour = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
preferred_map = maplist[pickedmap]

if ("clientfps")
var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
var/desiredfps = input(user, "Choose your desired fps. If you're reading this on Exodus, either set this number to zero or set it above 100. Tinker with it until you smooth out your movement. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
if (!isnull(desiredfps))
clientfps = desiredfps
parent.fps = desiredfps
Expand Down
2 changes: 1 addition & 1 deletion code/modules/goonchat/browserassets/css/browserOutput.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ html, body {
color: #000000;
}
body {
background: #fff;
background: #FFE1E2;
font-family: Verdana, sans-serif;
font-size: 9pt;
line-height: 1.2;
Expand Down
2 changes: 1 addition & 1 deletion config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $include antag_rep.txt
SERVERSQLNAME deathclawexodus

## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead.
STATIONNAME Mojave Wasteland
STATIONNAME The Mojave Wasteland

## Put on byond hub: Uncomment this to put your server on the byond hub.
HUB
Expand Down
Binary file modified icons/misc/splashscreen.dmi
Binary file not shown.
78 changes: 45 additions & 33 deletions interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ window "mainwindow"
size = 640x440
anchor1 = none
anchor2 = none
background-color = #3c4438
background-color = #411d1e
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
title = "Deathclaw: Exodus - [ERP+] [100% FREE LAG]"
Expand All @@ -63,11 +63,11 @@ window "mainwindow"
menu = "menu"
elem "split"
type = CHILD
pos = 3,0
pos = -2,0
size = 634x417
anchor1 = 0,0
anchor2 = 100,100
background-color = #3c4438
background-color = #411d1e
saved-params = "splitter"
left = "mapwindow"
right = "infowindow"
Expand All @@ -78,7 +78,7 @@ window "mainwindow"
size = 517x20
anchor1 = 0,100
anchor2 = 100,100
background-color = #c0c0c0
background-color = #6f3132
is-default = true
border = sunken
saved-params = "command"
Expand All @@ -89,7 +89,7 @@ window "mainwindow"
anchor1 = 100,100
anchor2 = none
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Chat"
command = ".winset \"saybutton.is-checked=true ? input.command=\"!say \\\"\" : input.command=\"\"saybutton.is-checked=true ? mebutton.is-checked=false\"\"saybutton.is-checked=true ? oocbutton.is-checked=false\""
Expand All @@ -101,7 +101,7 @@ window "mainwindow"
anchor1 = 100,100
anchor2 = none
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "OOC"
command = ".winset \"oocbutton.is-checked=true ? input.command=\"!ooc \\\"\" : input.command=\"\"oocbutton.is-checked=true ? mebutton.is-checked=false\"\"oocbutton.is-checked=true ? saybutton.is-checked=false\""
Expand All @@ -113,7 +113,7 @@ window "mainwindow"
anchor1 = 100,100
anchor2 = none
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Me"
command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
Expand All @@ -124,7 +124,7 @@ window "mainwindow"
size = 200x200
anchor1 = none
anchor2 = none
background-color = #3c4438
background-color = #411d1e
is-visible = false
saved-params = ""
elem "tooltip"
Expand All @@ -133,7 +133,7 @@ window "mainwindow"
size = 999x999
anchor1 = none
anchor2 = none
background-color = #3c4438
background-color = #411d1e
is-visible = false
saved-params = ""

Expand All @@ -155,6 +155,7 @@ window "mapwindow"
anchor2 = 100,100
font-family = "Arial"
font-size = 7
background-color = #411d1e
is-default = true
saved-params = "icon-size"
zoom-mode = distort
Expand All @@ -163,86 +164,91 @@ window "infowindow"
elem "infowindow"
type = MAIN
pos = 281,0
size = 640x480
size = 643x484
anchor1 = none
anchor2 = none
background-color = #3c4438
background-color = #411d1e
saved-params = "pos;size;is-minimized;is-maximized"
titlebar = false
statusbar = false
can-close = false
can-minimize = false
can-resize = false
is-pane = true
elem "info"
type = CHILD
pos = 0,30
size = 640x445
size = 643x449
anchor1 = 0,0
anchor2 = 100,100
background-color = #454943
background-color = #6f3132
saved-params = "splitter"
left = "statwindow"
right = "outputwindow"
is-vert = false
elem "changelog"
type = BUTTON
pos = 16,4
size = 104x20
size = 105x20
anchor1 = 3,0
anchor2 = 19,0
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Changelog"
command = "changelog"
elem "rules"
type = BUTTON
pos = 120,4
pos = 121,4
size = 100x20
anchor1 = 19,0
anchor2 = 34,0
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Rules"
command = "rules"
elem "wiki"
type = BUTTON
pos = 220,4
pos = 221,4
size = 100x20
anchor1 = 34,0
anchor2 = 50,0
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Patreon"
command = "wiki"
elem "forum"
type = BUTTON
pos = 320,4
size = 100x20
pos = 321,4
size = 101x20
anchor1 = 50,0
anchor2 = 66,0
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Discord"
command = "forum"
elem "github"
type = BUTTON
pos = 420,4
pos = 422,4
size = 100x20
anchor1 = 66,0
anchor2 = 81,0
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Github"
command = "github"
elem "report-issue"
type = BUTTON
pos = 520,4
size = 100x20
pos = 522,4
size = 101x20
anchor1 = 81,0
anchor2 = 97,0
text-color = #ffffff
background-color = #3c4438
background-color = #411d1e
saved-params = "is-checked"
text = "Report Issue"
command = "report-issue"
Expand All @@ -254,7 +260,7 @@ window "outputwindow"
size = 640x480
anchor1 = none
anchor2 = none
background-color = #747a70
background-color = #ffe1e2
saved-params = "pos;size;is-minimized;is-maximized"
titlebar = false
statusbar = false
Expand All @@ -268,7 +274,7 @@ window "outputwindow"
size = 638x480
anchor1 = 0,0
anchor2 = 100,100
background-color = #747a70
background-color = #6f3132
is-visible = false
is-disabled = true
saved-params = ""
Expand All @@ -279,6 +285,7 @@ window "outputwindow"
size = 638x480
anchor1 = 0,0
anchor2 = 100,100
background-color = #ffe1e2
is-default = true
saved-params = ""

Expand All @@ -289,19 +296,24 @@ window "statwindow"
size = 640x480
anchor1 = none
anchor2 = none
background-color = #3c4438
background-color = #411d1e
saved-params = "pos;size;is-minimized;is-maximized"
titlebar = false
statusbar = false
can-close = false
can-minimize = false
can-resize = false
is-pane = true
elem "stat"
type = INFO
pos = 0,0
size = 640x480
size = 638x455
anchor1 = 0,0
anchor2 = 100,100
text-color = #ffffff
background-color = #454943
background-color = #411d1e
is-default = true
saved-params = ""
tab-text-color = #ffffff
tab-background-color = #3c4438
tab-background-color = #411d1e

Binary file modified sound/f13/lobby1.ogg
Binary file not shown.
Binary file modified sound/f13/lobby2.ogg
Binary file not shown.
Binary file modified sound/f13/lobby3.ogg
Binary file not shown.
Binary file modified sound/f13/lobby4.ogg
Binary file not shown.
Binary file modified sound/f13/lobby5.ogg
Binary file not shown.
Binary file modified sound/f13/lobby6.ogg
Binary file not shown.
File renamed without changes.

0 comments on commit cb8b509

Please sign in to comment.