cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 04:56:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9860 from PsiOmegaDelta/dev-freeze

Browse Source 
Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-06-19 10:05:55 +02:00
parent 078cfb2533 839b26f927
commit 042d10ef99
6 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+8
View File
@@ -91,6 +91,7 @@ var/list/gamemode_cache = list()
var/guests_allowed = 1
var/debugparanoid = 0
var/serverurl
var/server
var/banappeals
var/wikiurl
@@ -163,6 +164,7 @@ var/list/gamemode_cache = list()
var/use_irc_bot = 0
var/irc_bot_host = ""
var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge
var/main_irc = ""
var/admin_irc = ""
var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix
@@ -384,6 +386,9 @@ var/list/gamemode_cache = list()
if ("hostedby")
config.hostedby = value
if ("serverurl")
config.serverurl = value
if ("server")
config.server = value
@@ -499,6 +504,9 @@ var/list/gamemode_cache = list()
if("use_irc_bot")
use_irc_bot = 1
if("irc_bot_export")
irc_bot_export = 1
if("ticklag")
Ticklag = text2num(value)
code/modules/ext_scripts/irc.dm
+15 -12
View File
@@ -1,17 +1,20 @@
/proc/send2irc(var/channel, var/msg)
if(config.use_irc_bot && config.irc_bot_host)
if(config.use_lib_nudge)
var/nudge_lib
if(world.system_type == MS_WINDOWS)
nudge_lib = "lib\\nudge.dll"
else
nudge_lib = "lib/nudge.so"
spawn(0)
call(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]")
if(config.irc_bot_export)
world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]")
else
spawn(0)
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
if(config.use_lib_nudge)
var/nudge_lib
if(world.system_type == MS_WINDOWS)
nudge_lib = "lib\\nudge.dll"
else
nudge_lib = "lib/nudge.so"
spawn(0)
call(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]")
else
spawn(0)
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
return
/proc/send2mainirc(var/msg)
@@ -26,6 +29,6 @@
/hook/startup/proc/ircNotify()
send2mainirc("Server starting up on [config.server? "byond://[config.server]" : "byond://[world.address]:[world.port]"]")
send2mainirc("Server starting up on byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
return 1
config/example/config.txt
+7
View File
@@ -174,6 +174,10 @@ GUEST_BAN
## set a server location for world reboot. Don't include the byond://, just give the address and port.
#SERVER server.net:port
## set a server URL for the IRC bot to use; like SERVER, don't include the byond://
## Unlike SERVER, this one shouldn't break auto-reconnect
#SERVERURL server.net:port
## forum address
# FORUMURL http://example.com
@@ -241,6 +245,9 @@ USEALIENWHITELIST
## Uncomment to enable sending data to the IRC bot.
#USE_IRC_BOT
## Uncomment if the IRC bot requires using world.Export() instead of nudge.py/libnudge
#IRC_BOT_EXPORT
## Host where the IRC bot is hosted. Port 45678 needs to be open.
#IRC_BOT_HOST localhost
html/changelog.html
+12
View File
@@ -56,6 +56,18 @@
-->
<div class="commit sansserif">
<h2 class="date">19 June 2015</h2>
<h3 class="author">HarpyEagle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Prevents being on fire from merely warming mobs up slightly in some cases. Mob fires also burn hotter.</li>
<li class="rscadd">Matches can now be used to light things adjacent to you when thrown.</li>
<li class="tweak">Made the effects of having a damaged robotic leg more prominent.</li>
<li class="bugfix">Robot limbs no longer cause pain messages. A reminder that you can still check their status with 'Help Intent' -> 'Click Self'.</li>
<li class="tweak">Knifing damage scales with weapon force and throat protection. Helmets only provide throat protection if they are air tight. Trying to cut someone's throat with wirecutters and/or while wearing an armoured sealed helmet will require several attempts before the victim passes out.</li>
<li class="tweak">Knifing switches on harm intent, in case you just wanted to beat on the victim for some reason.</li>
<li class="bugfix">Prevents knifing bots or silicons.</li>
</ul>
<h2 class="date">05 June 2015</h2>
<h3 class="author">PsiOmegaDelta updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+15
View File
@@ -1883,3 +1883,18 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
PsiOmegaDelta:
- bugfix: Split stacks no longer lose their coloring.
- tweak: Can no longer merge cables of different colors.
2015-06-19:
HarpyEagle:
- bugfix: Prevents being on fire from merely warming mobs up slightly in some cases.
Mob fires also burn hotter.
- rscadd: Matches can now be used to light things adjacent to you when thrown.
- tweak: Made the effects of having a damaged robotic leg more prominent.
- bugfix: Robot limbs no longer cause pain messages. A reminder that you can still
check their status with 'Help Intent' -> 'Click Self'.
- tweak: Knifing damage scales with weapon force and throat protection. Helmets
only provide throat protection if they are air tight. Trying to cut someone's
throat with wirecutters and/or while wearing an armoured sealed helmet will
require several attempts before the victim passes out.
- tweak: Knifing switches on harm intent, in case you just wanted to beat on the
victim for some reason.
- bugfix: Prevents knifing bots or silicons.
html/changelogs/HarpyEagle-dev-freeze.yml
+2 -11
View File
@@ -1,12 +1,3 @@
author: HarpyEagle
delete-after: False
changes:
- bugfix: "Prevents being on fire from merely warming mobs up slightly in some cases. Mob fires also burn hotter."
- rscadd: "Matches can now be used to light things adjacent to you when thrown."
- tweak: "Made the effects of having a damaged robotic leg more prominent."
- bugfix: "Robot limbs no longer cause pain messages. A reminder that you can still check their status with 'Help Intent' -> 'Click Self'."
- tweak: "Knifing damage scales with weapon force and throat protection. Helmets only provide throat protection if they are air tight. Trying to cut someone's throat with wirecutters and/or while wearing an armoured sealed helmet will require several attempts before the victim passes out."
- tweak: "Knifing switches on harm intent, in case you just wanted to beat on the victim for some reason."
- bugfix: "Prevents knifing bots or silicons."
changes: []
delete-after: false