Commit Graph

204 Commits

Author SHA1 Message Date
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Chinsky
520ae404ed Merge pull request #4931 from Mloc/bs12-rsv
voting: failed gamemode votes will undelay too
2014-05-08 13:20:27 +04:00
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Ccomp5950
fe4f9b0df9 Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.
2014-05-04 23:12:06 -05:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00
Mloc-Hibernia
2040c5a720 controllers: make process_machines more profilable
Splits process_machines() into 3 procs for its actions, trying to
figure out which is causing the lagspikes.

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-04-30 09:56:55 +00:00
Ccomp5950
e3dd035aa7 Fixes runtime that stops ghosts from ghostwriting...yay 4 month old bugs. 2014-04-29 03:30:50 -05:00
Ravensdale
a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07:00
Mloc-Argent
5f8c6dfd9a voting: failed gamemode votes will undelay too
Moved the undelay code in voting.dm out of the success check, as
failures should get undelayed too.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-07 19:42:06 +01:00
Ccomp5950
6af132b834 APC bugfix after someone messed with mah areas!
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.
2014-04-01 03:06:58 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Ccomp5950
936db263ef *NIX Log files part 2.
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
2014-03-26 18:51:37 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master"
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
2014-03-24 13:55:41 +00:00
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems.
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
2014-03-23 02:26:06 -05:00
Chinsky
0e08c90571 Merge branch 'dev-freeze' into dev
Conflicts:
	maps/tgstation2.dmm
2014-03-10 19:05:24 +04:00
Ccomp5950
bb9a66cc3a Effeciency Project: APC / Machinery power usage.
We no longer run auto_use_power() on every machine every tick.
We now have a global list of areas, and areas that have an APC in them (all_areas and active_areas) no more looping through world bullshit.
A bunch of snowflakey as fuck machines won't use_power() in their process, you get two options, active and idle, use them!
This means a lot of machines won't double dip on power as well so power usage for the station has dropped about 20%

Because everything is snowflakey as fuck we're going to have some machines that don't force an update on their power usage.  Fuck them.
We should catch them with the root obj/machine/proc's forcing updates.
2014-03-08 03:42:44 -06:00
Ccomp5950
2877b27399 Debug Options: Gives us an idea of what mobs are taking so long to process
Adds an "Expensive Mobs" list that shows what mobs took more then 1 decisecond to process.

This way if mob controller is going nuts we can debug master controller and see why, or atleast see which mob it is.
2014-03-08 01:44:43 -06:00
Ccomp5950
e0e1bd9cfb APC Area update initial commit. 2014-03-07 23:42:28 -06:00
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Mloc-Argent
49890421f8 Adds a C library alternative to the ircbot nudge script.
This allows for more secure and stable transmission on Linux, but you might see some improvements on Windows too.
Code lies in (confusingly) lib/src.
nudge.c should be compiled to lib/nudge.[dll/so] and be linked against netutil.c.

There's some horribly hacky code in nudge.c to assemble pickled data, but it's probably the fastest way that's still safe.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-03-04 10:08:17 +00:00
Ccomp5950
8f2d5e817f Configuration option: Ability to set ERT to be admin call only.
Admin request.

Default behavior is what we're used to, that two heads can call for the ERT
with the option turned on it removes the ability for players to call for an ERT and requires admin intervention.
2014-03-02 06:20:26 -06:00
Aryn
ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag
Conflicts:
	icons/mob/uniform.dmi
2014-02-04 23:55:27 -08:00
DJSnapshot
9c803dc1f6 Added the rest of the objectiveless antag types 2014-02-04 23:51:34 -08:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Segrain
55605624eb Gamemode autovote. 2014-02-03 04:43:38 +03:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
Mloc
794be2b31e Fix previous commit for BS12.
Signed-off-by: Mloc <colmohici@gmail.com>
2014-01-08 11:49:15 +00:00
Mark Aherne (Faerdan)
909c873b2e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-05 02:48:44 +00:00
Mark Aherne (Faerdan)
6d9368d949 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.
2014-01-05 02:48:15 +00:00
Zuhayr
62893f80b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-04 11:35:07 +10:30
Zuhayr
e642b3e7e7 Merge pull request #4175 from Mloc/runtimelog
Fixes runtime logging and makes it a config option.
2014-01-02 17:46:28 -08:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
Mloc-Argent
bd3a1718c4 Fixes runtime logging and makes it a config option.
Option starts off by default, since that could be seen as the original behavior...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-02 21:38:15 +00:00
Mloc-Argent
df5fd9555c Fix for the roundstart hook "runtime".
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-01 19:10:55 +00:00
Zuhayr
85ad2363c4 Added config toggle for ghost writing (for adminbus). 2013-12-28 23:53:20 +10:30
Zuhayr
df38d75131 Added config values for ghost writing. 2013-12-28 23:30:23 +10:30
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
RavingManiac
6f067f4b4f Removed two variables accidentally copied over from dev 2013-12-19 20:39:10 +08:00
RavingManiac
e92bb6a02b Two config variables added - disable_player_mice and uneducated_mice. The first, if enabled, prevents players from spawning as mice, and the second, if enabled, prevents mice from understanding human speech (which they now do my default)
universal_understand = 1 now allows player-controlled mobs to understand what everybody is saying without necessarily allowing them to talk back intelligibly. Mice have universal_understand = 1 by default.
2013-12-18 16:56:49 +08:00
DJSnapshot
8813123997 added config flags for objectives being enabled or disabled.
added antag options menu.
added ability to choose where a syndicate uplink is installed.
2013-11-29 17:02:23 -08:00
Mloc-Argent
5e34c0e056 Hmm hmm, it could help to actually commit the hooks.dm file, couldn't it?
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-25 21:19:58 +00:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev"
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-11-25 11:59:57 +00:00
jack-fractal
ce18d47778 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	baystation12.int
	code/controllers/verbs.dm
2013-11-23 11:58:50 -05:00
Zuhayr
f359919623 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:11 +10:30
jack-fractal
5df2797b86 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	baystation12.int
2013-11-22 20:30:23 -05:00