cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG: Fixes a derp I made with the PA in a recent commit.

Browse Source 
Rules verb moved to the interface to make it more visible (so new players may
actually -read- it occasionally).

Minor changes to investigate singulo based on feedback. Entries are now
timestamped and the "time \ref[src] (location)" bit is in a smaller font.
Collectors note how much fuel they are loaded with.
Revision: r3687
Author: 	 elly1...@rocketmail.com
This commit is contained in:
Erthilo
2012-06-02 01:12:34 +01:00
parent 77610e1265
commit 11529c1c4a
9 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
baystation12.dme
View File

@@ -205,6 +205,7 @@
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "interface"
#define FILE_DIR "maps"
#define FILE_DIR "maps/backup"
#define FILE_DIR "maps/RandomZLevels"
#define FILE_DIR "sound"
#define FILE_DIR "sound/AI"

1
code/defines/global.dm
View File

@@ -152,7 +152,6 @@ var/wavesecret = 0
var/shuttlecoming = 0
var/join_motd = null
var/rules = null
var/forceblob = 0
var/custom_event_msg = null

5
code/game/cellautomata.dm
View File

@@ -20,10 +20,6 @@
/world/proc/load_motd()
join_motd = file2text("config/motd.txt")
/world/proc/load_rules()
rules = file2text("config/rules.html")
if (!rules)
rules = "<html><head><title>Rules</title><body>There are no rules! Go nuts!</body></html>"
/world/proc/load_admins()
var/text = file2text("config/admins.txt")
@@ -83,7 +79,6 @@
src.load_mode()
src.load_motd()
src.load_rules()
src.load_admins()
investigate_reset()
if (config.usealienwhitelist)

5
code/modules/mob/mob.dm
View File

@@ -452,11 +452,6 @@
M.Login()
return
/mob/verb/cmd_rules()
set name = "Rules"
set category = "OOC"
src << browse(rules, "window=rules;size=480x320")
/mob/verb/changes()
set name = "Changelog"
set category = "OOC"

2
code/modules/power/singularity/collector.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
/obj/machinery/power/rad_collector

2
code/modules/power/singularity/singularity.dm
View File

@@ -95,7 +95,7 @@ var/global/list/uneatable = list(
process()
spawn(0)
spawn(0) //Keep this in - Erthilo
eat()
dissipate()
check_energy()

2
config/rules.html
View File

@@ -1,5 +1,5 @@
<html>
<head></head>
<head><title>Server Rules</title></head>
<body>
<iframe width='100%' height='100%' src="http://baystation12.net/wiki/index.php?title=Rules&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>

9
interface/interface.dm
View File

@@ -20,4 +20,11 @@
src << link(config.forumurl)
else
src << "\red The forum URL is not set in the server configuration."
return
return
#define RULES_FILE "config/rules.html"
/client/verb/rules()
set name = "Rules"
set desc = "Show Server Rules."
set hidden = 1
src << browse(file(RULES_FILE), "window=rules;size=480x480")

28
interface/skin.dmf
View File

@@ -1478,6 +1478,34 @@ window "rpane"
splitter = 50
show-splitter = true
lock = none
elem "rulesb"
type = BUTTON
pos = 369,0
size = 60x16
anchor1 = none
anchor2 = none
font-family = ""
font-size = 0
font-style = ""
text-color = #000000
background-color = none
is-visible = true
is-disabled = false
is-transparent = false
is-default = false
border = none
drop-zone = false
right-click = false
saved-params = "is-checked"
on-size = ""
text = "Rules"
image = ""
command = "rules"
is-flat = false
stretch = false
is-checked = false
group = "rpanemode"
button-type = pushbutton
elem "forumb"
type = BUTTON
pos = 304,0