Commit Graph

91 Commits

Author SHA1 Message Date
Jordan Brown
7be9b6ebf9 Antag reputation rewards are now configurable 2018-06-03 09:03:51 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox
Query debug logging
2018-05-17 21:38:41 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
Bjorn Neergaard
f56e139fda Use a rust DLL for logging (#36858)
By moving our logging to a DLL we see a drop in CPU/real time of 2-3 orders of magnitude. This is due to BYOND opening and closing file handles on every write, causing incredible amounts of unneeded overhead. The logging library also handles timestamps for us, further increasing performance gains.

This library will also allow for further offloading in the future, such as completely replacing file2text() and friends.

A pre-compiled DLL is bundled, but Linux users will have to compile manually. Directions can be found at the rust-g repo.

Log output is enhanced with millisecond time stamps:

[2018-04-01 15:56:23.522] blah blah blah

This includes runtimes as well, which benefit from the same timestamp improvements and no longer have hacky splitting code to add their own timestamps.

Log shutdown is handled in a dedicated proc called as late as possible, as rust-g integration expands this will be factored out into a generic native code shutdown proc.
2018-04-10 17:02:44 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
LetterJay
80e0be6d1e Merge pull request #6326 from Citadel-Station-13/upstream-merge-37072
[MIRROR] Fix an error message grammer
2018-04-09 16:39:28 -05:00
Jordan Brown
f2717989c9 Fix an error message grammer 2018-04-09 12:48:58 -05:00
KorPhaeron
46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
vuonojenmustaturska
ae61521e67 Merge pull request #36829 from MrStonedOne/onclick_rework
[s]Minor Refactor of click code, anti-auto clicker protection
2018-04-01 08:24:12 -05:00
Jordan Brown
4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
CitadelStationBot
a58a8cdefb [MIRROR] Fixes client version config not working (#5935)
* Merge pull request #36350 from MrStonedOne/patch-490

Fixes client version config not working

* Fixes client version config not working
2018-03-13 05:45:34 -05:00
Jordan Brown
ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -06:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
Jordan Brown
c87455f5a3 Prevents history from repeating itself (#36110)
* Prevents history from repeating itself

* It persisteh
2018-03-04 15:00:48 -06:00
CitadelStationBot
d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762)
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
2018-03-04 13:06:42 -06:00
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485
[MIRROR] Antagonist reputation system
2018-03-04 00:31:41 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 23:37:41 -06:00
CitadelStationBot
7d9dbcd0c3 [MIRROR] [s] Where were you, the day cyberboss exposed the database password to all admins with a holder (#5761)
* Merge pull request #36104 from MrStonedOne/blamecyberboss

[s] Where were you, the day cyberboss exposed the database password to all admins with a holder

* [s] Where were you, the day cyberboss exposed the database password to all admins with a holder
2018-03-02 20:03:17 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:39:08 -06:00
Kyle Spier-Swenson
ca9ac1bdc1 Fixes map configuration values for nonexistent maps applying to box
This caused box'es min pop to get set to 50 because all of the servers still had cere defined with that limitation.
2018-02-09 18:13:12 -06:00
CitadelStationBot
60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294)
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
2018-02-04 23:11:32 -06:00
deathride58
142e96a2dd [READY] Adds night shifts (#4281)
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
2018-02-04 21:28:41 -06:00
Jordan Brown
3b0a00d53c Rename /datum/config_entry/var/value to config_entry_value (#34699)
This works around some vv-fu you can use to pass in a config_entry to a proc that reads the value var of some other datum. Byond is stupid enough to actually read it, so it must be uniquely named.
2018-01-24 15:41:19 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314)
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
2018-01-21 21:39:46 -06:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
oranges
2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd
Moves load_motd to config controller
2018-01-16 14:28:07 -06:00
LetterJay
4ac9269cdf Update configuration.dm 2018-01-11 15:15:50 -06:00
Leo
f9309d4716 Fixes configuration not loading 2018-01-11 07:39:59 -06:00
deathride58
1acdd3ce5c controllers sync 2018-01-03 23:23:11 -05:00
LetterJay
06c309fb0c Merge branch 'master' into upstream-merge-33562 2017-12-21 11:30:58 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
deathride58
65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
LetterJay
26543ea97f Update configuration.dm 2017-12-17 17:50:43 -06:00
LetterJay
9cbe879b51 Update comms.dm 2017-12-17 17:47:12 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
Jordie
4727d8f73c Fixes LoadEntries return value 2017-12-15 10:01:46 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Jordan Brown
d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00
oranges
4dbac00348 Merge pull request #33279 from Robustin/Reported
Standardizes false report weighting
2017-12-10 14:15:50 -06:00
deathride58
53ab4feb2f Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 18:47:56 +00:00