Commit Graph

1372 Commits

Author SHA1 Message Date
deathride58
aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165
[MIRROR] Adds config for monkey cap
2018-06-05 23:38:54 +00:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
LetterJay
eac5206e51 Merge pull request #6990 from Citadel-Station-13/upstream-merge-38077
[MIRROR] Antag reputation rewards are now configurable
2018-06-05 12:10:07 -05:00
deathride58
a57bda822b Update game_options.dm 2018-06-03 22:19:13 -04:00
Tad Hardesty
9f4f470607 Delay smoothing atoms that have not initialized yet (#38173) 2018-06-03 14:25:35 -05:00
Jordan Brown
7be9b6ebf9 Antag reputation rewards are now configurable 2018-06-03 09:03:51 -05:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156)
* Only load clock cult during clock cult

* Return FALSE
2018-06-03 09:02:55 -05:00
LetterJay
4c876d9612 Update blackbox.dm 2018-06-02 07:27:13 -05:00
LetterJay
f51552c68a Update game_options.dm 2018-06-02 07:21:53 -05:00
Jordie
2d650450df Fix First Death not being remembered if DB is not in use 2018-06-01 05:27:59 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Jordan Brown
db20e34d76 Adds config for monkey cap 2018-05-31 22:41:12 -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
CitadelStationBot
8502508c21 [MIRROR] Anomalies can now be deconstructed for techwebs for 10k points (#6850)
* Anomalies can now be deconstructed for techwebs for 10k points

* Update research.dm
2018-05-27 17:26:36 -07:00
LetterJay
54510e95b1 Merge pull request #6904 from Citadel-Station-13/upstream-merge-38055
[MIRROR] Enable Goonchat ping during the lobby
2018-05-26 18:40:25 -05:00
LetterJay
c512fe52c8 Merge pull request #6898 from Citadel-Station-13/upstream-merge-38008
[MIRROR] Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
2018-05-26 18:38:07 -05:00
Jordan Brown
cf4ef9a59f Merge pull request #38055 from AutomaticFrenzy/patch/ssping-lobby
Enable Goonchat ping during the lobby
2018-05-25 11:06:36 -05:00
Jordan Brown
6e9cad688c Merge pull request #38008 from MrStonedOne/ISawSSTimerFloatingInMyDreams
Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
2018-05-25 10:51:56 -05:00
Jordan Brown
d0cd2f4f95 Merge pull request #38009 from MrStonedOne/deletedcrackdown
Timers on qdeleted objects is no longer supported.
2018-05-25 10:50:44 -05:00
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
LetterJay
de44ac926e Merge branch 'master' into upstream-merge-37665 2018-05-23 10:14:10 -05:00
oranges
c27d97a6e5 Merge pull request #37934 from AutomaticFrenzy/patch/ssping
Migrate goonchat pings to a subsystem
2018-05-21 16:40:29 -05:00
cyclowns
7cc9d9103d Refactors hydrocarbon combustion + other general atmos code changes (#37600)
* splits hydrocarbon combustion + other stuff

* nob max() thing

* whoops

* remove proc + new define
2018-05-21 03:21:08 -05:00
kevinz000
d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -05:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox
Query debug logging
2018-05-17 21:38:41 -05:00
deathride58
649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429
[MIRROR] Update DMAPI to version 3.2.1.0
2018-05-17 18:14:54 +00:00
Jordie
68fcab96a5 Splits up round table initialize, start, end and shutdown 2018-05-15 02:12:50 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Jordan Brown
1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
oranges
e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Jordan Brown
da2ea729ee Merge pull request #37561 from AnturK/customloadingfix
Fixes loading custom aways.
2018-04-30 21:19:05 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
LetterJay
44f966d0eb Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461
[MIRROR] Removes the signals on process procs
2018-04-29 02:24:04 -05:00
LetterJay
811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
2018-04-28 01:36:04 -05:00
Emmett Gaines
ce5ccc8498 Removes the signals on process procs (#37461) 2018-04-27 13:04:24 -05:00
deathride58
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276)
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
2018-04-27 07:40:45 -07:00
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
2018-04-27 07:37:15 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
AnturK
54ef24b75a Adds a note if the loaded away is custom or not in the logs. (#37305) 2018-04-22 19:17:05 -05:00
LetterJay
68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223
[MIRROR] Fixes some defines and value
2018-04-22 02:43:26 -05:00
AnturK
68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
AnturK
31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
AnturK
15ac393773 Filters out duplicate trophies. 2018-04-15 12:42:41 -05:00
kevinz000
44a273f6b8 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167)
* Emergency NTNet patch

* ok

* @naksu

* explicit null
2018-04-14 04:43:25 -05:00
LetterJay
3cd0591d90 Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858
[MIRROR] Use a rust DLL for logging
2018-04-12 07:06:08 -05:00
Jordan Brown
68e0b31cf6 Fixes signals being raised too soon 2018-04-11 15:02:30 -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