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

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. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3687 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-05-28 17:10:54 +00:00
parent 503f615363
commit 7f52605277
10 changed files with 85 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/global.dm
View File

@@ -133,7 +133,6 @@ var/wavesecret = 0
var/shuttlecoming = 0 var/shuttlecoming = 0
var/join_motd = null var/join_motd = null
var/rules = null
var/forceblob = 0 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. //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.

5
code/game/cellautomata.dm
View File

@@ -14,10 +14,6 @@
/world/proc/load_motd() /world/proc/load_motd()
join_motd = file2text("config/motd.txt") 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() /world/proc/load_admins()
var/text = file2text("config/admins.txt") var/text = file2text("config/admins.txt")
@@ -77,7 +73,6 @@
src.load_mode() src.load_mode()
src.load_motd() src.load_motd()
src.load_rules()
src.load_admins() src.load_admins()
investigate_reset() investigate_reset()
if (config.usewhitelist) if (config.usewhitelist)

4
code/modules/admin/admin_investigate.dm
View File

@@ -25,7 +25,7 @@
if(!message) return if(!message) return
var/F = investigate_subject2file(subject) var/F = investigate_subject2file(subject)
if(!F) return 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) if(!F)
src << "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>" src << "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>"
return return
src << browse(F,"window=investigate;title='investigate [subject]'") src << browse(F,"window=investigate;size=800x300")

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

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

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

@@ -20,6 +20,7 @@
process() process()
if(P) if(P)
if(P.air_contents.toxins <= 0) if(P.air_contents.toxins <= 0)
investigate_log("<font color='red'>out of fuel</font>.","singulo")
P.air_contents.toxins = 0 P.air_contents.toxins = 0
eject() eject()
else else
@@ -33,7 +34,7 @@
toggle_power() toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \ user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
"You turn 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 return
else else
user << "\red The controls are locked!" user << "\red The controls are locked!"
@@ -98,47 +99,47 @@
return ..() return ..()
proc proc/eject()
eject() locked = 0
var/obj/item/weapon/tank/plasma/Z = src.P var/obj/item/weapon/tank/plasma/Z = src.P
if (!Z) if (!Z)
return
Z.loc = get_turf(src)
Z.layer = initial(Z.layer)
src.P = null
if(active)
toggle_power()
else
updateicon()
receive_pulse(var/pulse_strength)
if(P && active)
var/power_produced = 0
power_produced = P.air_contents.toxins*pulse_strength*20
add_avail(power_produced)
last_power = power_produced
return
return return
Z.loc = get_turf(src)
Z.layer = initial(Z.layer)
updateicon() src.P = null
overlays = null if(active)
if(P) toggle_power()
overlays += image('singularity.dmi', "ptank") else
if(stat & (NOPOWER|BROKEN))
return
if(active)
overlays += image('singularity.dmi', "on")
toggle_power()
active = !active
if(active)
icon_state = "ca_on"
flick("ca_active", src)
else
icon_state = "ca"
flick("ca_deactive", src)
updateicon() updateicon()
return
proc/receive_pulse(var/pulse_strength)
if(P && active)
var/power_produced = 0
power_produced = P.air_contents.toxins*pulse_strength*20
add_avail(power_produced)
last_power = power_produced
return
return
proc/updateicon()
overlays = null
if(P)
overlays += image('singularity.dmi', "ptank")
if(stat & (NOPOWER|BROKEN))
return
if(active)
overlays += image('singularity.dmi', "on")
proc/toggle_power()
active = !active
if(active)
icon_state = "ca_on"
flick("ca_active", src)
else
icon_state = "ca"
flick("ca_deactive", src)
updateicon()
return

1
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -87,7 +87,6 @@
strength = 2 strength = 2
else else
investigate_log("increased to <font color='red'>[strength]</font> by [usr.key]","singulo") 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) for(var/obj/structure/particle_accelerator/part in connected_parts)
part.strength = strength part.strength = strength
part.update_icon() part.update_icon()

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

@@ -182,6 +182,7 @@ var/global/list/uneatable = list(
consume_range = 4 consume_range = 4
dissipate = 0 //It cant go smaller due to e loss dissipate = 0 //It cant go smaller due to e loss
if(current_size == allowed_size) if(current_size == allowed_size)
investigate_log("<font color='red'>grew to size [current_size]</font>","singulo")
return 1 return 1
else if(current_size < (--temp_allowed_size)) else if(current_size < (--temp_allowed_size))
expand(temp_allowed_size) expand(temp_allowed_size)

6
config/rules.html
View File

@@ -1,7 +1,5 @@
<html> <html>
<head> <head><title>Server Rules</title></head>
</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 /> <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 /> <br />
@@ -26,6 +24,6 @@
The way we play the game isn't everyone's cup of tea. We understand that and we don't fault you if you enjoy more a competitive style of play, but we do expect you to go elsewhere for that.<br /> The way we play the game isn't everyone's cup of tea. We understand that and we don't fault you if you enjoy more a competitive style of play, but we do expect you to go elsewhere for that.<br />
<br /> <br />
This is not a comprehensive list. You're using my server and my bandwidth, and as Draconian as it sounds I have the final say on who stays and who goes. <br /> This is not a comprehensive list. You're using my server and my bandwidth, and as Draconian as it sounds I have the final say on who stays and who goes. <br />
</body> </body>
</html> </html>

9
interface/interface.dm
View File

@@ -20,4 +20,11 @@
src << link(config.forumurl) src << link(config.forumurl)
else else
src << "\red The forum URL is not set in the server configuration." 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=480x320")

29
interface/skin.dmf
View File

@@ -1045,6 +1045,7 @@ window "mapwindow"
text-mode = false text-mode = false
on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\"" on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\""
on-hide = ".winset\"mainwindow.mainvsplit.left=\"" on-hide = ".winset\"mainwindow.mainvsplit.left=\""
style = ""
window "outputwindow" window "outputwindow"
elem "outputwindow" elem "outputwindow"
@@ -1179,6 +1180,34 @@ window "rpane"
splitter = 50 splitter = 50
show-splitter = true show-splitter = true
lock = none 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" elem "forumb"
type = BUTTON type = BUTTON
pos = 304,0 pos = 304,0