mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
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. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3687 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
@@ -133,7 +133,6 @@ var/wavesecret = 0
|
||||
var/shuttlecoming = 0
|
||||
|
||||
var/join_motd = null
|
||||
var/rules = null
|
||||
var/forceblob = 0
|
||||
|
||||
//airlockWireColorToIndex takes a number representing the wire color, e.g. the orange wire is always 1, the dark red wire is always 2, etc. It returns the index for whatever that wire does.
|
||||
|
||||
@@ -14,10 +14,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")
|
||||
@@ -77,7 +73,6 @@
|
||||
|
||||
src.load_mode()
|
||||
src.load_motd()
|
||||
src.load_rules()
|
||||
src.load_admins()
|
||||
investigate_reset()
|
||||
if (config.usewhitelist)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
if(!message) return
|
||||
var/F = investigate_subject2file(subject)
|
||||
if(!F) return
|
||||
F << "[src] \ref[src] ([x],[y],[z]) [message]<br>"
|
||||
F << "<small>[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
|
||||
|
||||
|
||||
|
||||
@@ -38,6 +38,6 @@
|
||||
if(!F)
|
||||
src << "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>"
|
||||
return
|
||||
src << browse(F,"window=investigate;title='investigate [subject]'")
|
||||
src << browse(F,"window=investigate;size=800x300")
|
||||
|
||||
|
||||
|
||||
@@ -424,11 +424,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"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
process()
|
||||
if(P)
|
||||
if(P.air_contents.toxins <= 0)
|
||||
investigate_log("<font color='red'>out of fuel</font>.","singulo")
|
||||
P.air_contents.toxins = 0
|
||||
eject()
|
||||
else
|
||||
@@ -33,7 +34,7 @@
|
||||
toggle_power()
|
||||
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
|
||||
"You turn the [src.name] [active? "on":"off"].")
|
||||
investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"It contains [P]":"It is empty"].","singulo")
|
||||
investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
|
||||
return
|
||||
else
|
||||
user << "\red The controls are locked!"
|
||||
@@ -98,8 +99,8 @@
|
||||
return ..()
|
||||
|
||||
|
||||
proc
|
||||
eject()
|
||||
proc/eject()
|
||||
locked = 0
|
||||
var/obj/item/weapon/tank/plasma/Z = src.P
|
||||
if (!Z)
|
||||
return
|
||||
@@ -111,7 +112,7 @@
|
||||
else
|
||||
updateicon()
|
||||
|
||||
receive_pulse(var/pulse_strength)
|
||||
proc/receive_pulse(var/pulse_strength)
|
||||
if(P && active)
|
||||
var/power_produced = 0
|
||||
power_produced = P.air_contents.toxins*pulse_strength*20
|
||||
@@ -121,7 +122,7 @@
|
||||
return
|
||||
|
||||
|
||||
updateicon()
|
||||
proc/updateicon()
|
||||
overlays = null
|
||||
if(P)
|
||||
overlays += image('singularity.dmi', "ptank")
|
||||
@@ -131,7 +132,7 @@
|
||||
overlays += image('singularity.dmi', "on")
|
||||
|
||||
|
||||
toggle_power()
|
||||
proc/toggle_power()
|
||||
active = !active
|
||||
if(active)
|
||||
icon_state = "ca_on"
|
||||
|
||||
@@ -87,7 +87,6 @@
|
||||
strength = 2
|
||||
else
|
||||
investigate_log("increased to <font color='red'>[strength]</font> by [usr.key]","singulo")
|
||||
strength = min(2,strength+1)
|
||||
for(var/obj/structure/particle_accelerator/part in connected_parts)
|
||||
part.strength = strength
|
||||
part.update_icon()
|
||||
|
||||
@@ -182,6 +182,7 @@ var/global/list/uneatable = list(
|
||||
consume_range = 4
|
||||
dissipate = 0 //It cant go smaller due to e loss
|
||||
if(current_size == allowed_size)
|
||||
investigate_log("<font color='red'>grew to size [current_size]</font>","singulo")
|
||||
return 1
|
||||
else if(current_size < (--temp_allowed_size))
|
||||
expand(temp_allowed_size)
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<html>
|
||||
<head>
|
||||
|
||||
</head>
|
||||
<head><title>Server Rules</title></head>
|
||||
<body>There are a few notable rules we have here. If you disagree with them, drop by the forums and contribute to the "Server Rules - You Decide" thread. <br />
|
||||
<br />
|
||||
|
||||
|
||||
@@ -21,3 +21,10 @@
|
||||
else
|
||||
src << "\red The forum URL is not set in the server configuration."
|
||||
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=480x320")
|
||||
@@ -1045,6 +1045,7 @@ window "mapwindow"
|
||||
text-mode = false
|
||||
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
|
||||
on-hide = ".winset\"mainwindow.mainvsplit.left=\""
|
||||
style = ""
|
||||
|
||||
window "outputwindow"
|
||||
elem "outputwindow"
|
||||
@@ -1179,6 +1180,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 = "bold"
|
||||
text-color = #ffffff
|
||||
background-color = #8080ff
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user