Skip to content
This repository
Browse code

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

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
  • Loading branch information...
commit 11529c1c4ace1c09c065c1cae8c50b66a7271f0a 1 parent 77610e1
Erthilo authored
1  baystation12.dme
@@ -205,6 +205,7 @@
205 205 #define FILE_DIR "icons/vending_icons"
206 206 #define FILE_DIR "interface"
207 207 #define FILE_DIR "maps"
  208 +#define FILE_DIR "maps/backup"
208 209 #define FILE_DIR "maps/RandomZLevels"
209 210 #define FILE_DIR "sound"
210 211 #define FILE_DIR "sound/AI"
1  code/defines/global.dm
@@ -152,7 +152,6 @@ var/wavesecret = 0
152 152 var/shuttlecoming = 0
153 153
154 154 var/join_motd = null
155   -var/rules = null
156 155 var/forceblob = 0
157 156
158 157 var/custom_event_msg = null
5 code/game/cellautomata.dm
@@ -20,10 +20,6 @@
20 20 /world/proc/load_motd()
21 21 join_motd = file2text("config/motd.txt")
22 22
23   -/world/proc/load_rules()
24   - rules = file2text("config/rules.html")
25   - if (!rules)
26   - rules = "<html><head><title>Rules</title><body>There are no rules! Go nuts!</body></html>"
27 23
28 24 /world/proc/load_admins()
29 25 var/text = file2text("config/admins.txt")
@@ -83,7 +79,6 @@
83 79
84 80 src.load_mode()
85 81 src.load_motd()
86   - src.load_rules()
87 82 src.load_admins()
88 83 investigate_reset()
89 84 if (config.usealienwhitelist)
5 code/modules/mob/mob.dm
@@ -452,11 +452,6 @@
452 452 M.Login()
453 453 return
454 454
455   -/mob/verb/cmd_rules()
456   - set name = "Rules"
457   - set category = "OOC"
458   - src << browse(rules, "window=rules;size=480x320")
459   -
460 455 /mob/verb/changes()
461 456 set name = "Changelog"
462 457 set category = "OOC"
2  code/modules/power/singularity/collector.dm
... ... @@ -1,4 +1,4 @@
1   -//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
  1 +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
2 2
3 3
4 4 /obj/machinery/power/rad_collector
2  code/modules/power/singularity/singularity.dm
@@ -95,7 +95,7 @@ var/global/list/uneatable = list(
95 95
96 96
97 97 process()
98   - spawn(0)
  98 + spawn(0) //Keep this in - Erthilo
99 99 eat()
100 100 dissipate()
101 101 check_energy()
2  config/rules.html
... ... @@ -1,5 +1,5 @@
1 1 <html>
2   -<head></head>
  2 +<head><title>Server Rules</title></head>
3 3 <body>
4 4
5 5 <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
@@ -20,4 +20,11 @@
20 20 src << link(config.forumurl)
21 21 else
22 22 src << "\red The forum URL is not set in the server configuration."
23   - return
  23 + return
  24 +
  25 +#define RULES_FILE "config/rules.html"
  26 +/client/verb/rules()
  27 + set name = "Rules"
  28 + set desc = "Show Server Rules."
  29 + set hidden = 1
  30 + src << browse(file(RULES_FILE), "window=rules;size=480x480")
28 interface/skin.dmf
@@ -1478,6 +1478,34 @@ window "rpane"
1478 1478 splitter = 50
1479 1479 show-splitter = true
1480 1480 lock = none
  1481 + elem "rulesb"
  1482 + type = BUTTON
  1483 + pos = 369,0
  1484 + size = 60x16
  1485 + anchor1 = none
  1486 + anchor2 = none
  1487 + font-family = ""
  1488 + font-size = 0
  1489 + font-style = ""
  1490 + text-color = #000000
  1491 + background-color = none
  1492 + is-visible = true
  1493 + is-disabled = false
  1494 + is-transparent = false
  1495 + is-default = false
  1496 + border = none
  1497 + drop-zone = false
  1498 + right-click = false
  1499 + saved-params = "is-checked"
  1500 + on-size = ""
  1501 + text = "Rules"
  1502 + image = ""
  1503 + command = "rules"
  1504 + is-flat = false
  1505 + stretch = false
  1506 + is-checked = false
  1507 + group = "rpanemode"
  1508 + button-type = pushbutton
1481 1509 elem "forumb"
1482 1510 type = BUTTON
1483 1511 pos = 304,0

0 comments on commit 11529c1

Please sign in to comment.
Something went wrong with that request. Please try again.