Tad Hardesty and letterjay
a7b900425b
[s] Prevent unbreakable ladders from being moved by shuttles ( #38477 )
...
* Prevent unbreakable ladders from being moved by shuttles
* Disconnect ladders before and reconnect them after shuttle move
2018-06-16 06:18:08 -05:00
oranges and letterjay
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
CitadelStationBot and kevinz000
e68fbe9fa4
[MIRROR] Readds actual fun to admins throwing around drop pods ( #7052 )
...
* Readds actual fun to admins throwing around drop pods (#38374 )
* Readds fun
* Fun
* Readds actual fun to admins throwing around drop pods
2018-06-10 12:28:38 -07:00
deathride58 and GitHub
e279392386
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
...
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
deathride58 and GitHub
bdef4e4e77
Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116
...
[MIRROR] Refactor machinery to default to being anchored
2018-06-05 23:37:20 +00:00
deathride58 and GitHub
cf170aee33
Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193
...
[MIRROR] Turns /datum.isprocessing into a datum flag
2018-06-05 23:36:37 +00:00
MrDoomBringer and letterjay
71f684e5d8
Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) ( #38290 )
...
* Arianya
* whups caps
2018-06-05 18:02:36 -05:00
vuonojenmustaturska and letterjay
83ac5852dd
Turn /datum.isprocessing into a datum flag ( #38193 )
2018-06-05 18:00:21 -05:00
deathride58 and GitHub
b49458e0ba
Merge branch 'master' into upstream-merge-38116
2018-06-05 21:30:21 +00:00
81Denton and letterjay
1778c97eeb
Adds missing minerals to /everything closet ( #38267 )
...
* adds bs/ayy minerals to everything closet
* plastic+wood
2018-06-05 04:13:56 -05:00
MrDoomBringer and letterjay
678e429dbf
Adds a Supplypod-delivery admin smite ( #38069 )
...
* wa la
* oop forgot an icon
* buildmode compatibility
* ok
* makes centcompod default
* CentCom pods fall faster and are capatilized right
* yike
* yike2
* FASTER
* white space and default icon state
* spacemaniac thanks
2018-06-04 00:37:24 -05:00
Jordan Brown and letterjay
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
ShizCalev and letterjay
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
ShizCalev and letterjay
4452dc4629
Corrects bronze floor & table's name ( #38164 )
2018-05-31 22:41:01 -05:00
deathride58 and kevinz000
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 and kevinz000
7bb6bc8dd3
[MIRROR] HoP/QM have access to vault ( #6818 )
...
* Vault Access for QM (#37880 )
* HoP/QM have access to vault
* Update captain.dm
2018-05-27 17:25:18 -07:00
LetterJay and GitHub
761035b391
Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960
...
[MIRROR] Fix some inconsistencies relating to resting
2018-05-27 14:39:18 -05:00
ShizCalev and letterjay
786b062f61
Capitalizes CentCom ( #38086 )
...
* Capitalized CentCom
* neediful
2018-05-27 11:40:12 -05:00
Jordan Brown and letterjay
f9cb1e34c6
Merge pull request #38044 from Mickyan/bronzegirder_spelfix
...
Fixes bronze spelling in girder construction
2018-05-25 11:01:18 -05:00
Jordan Brown and letterjay
2bcfe00283
Fix some inconsistencies relating to resting
2018-05-25 10:56:47 -05:00
LetterJay and GitHub
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
Wilchenx and letterjay
85ef262082
Removes firing-pins box in RD's locker ( #37906 )
...
Makes no sense since science can't print any guns and probably won't ever be able to again.
2018-05-21 16:36:04 -05:00
LetterJay and GitHub
e57cf81636
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
LetterJay and GitHub
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
81Denton and letterjay
5ed28b5cd2
Adds "proper" solar/gold/silver crates ( #37890 )
...
* adds solar/gold/silver crates
* replaces pubbystation crates
* hhhh
* forgot adding spaces
* travis pls
2018-05-19 02:14:00 -05:00
ShizCalev and letterjay
0e819cb1fc
Fixes container_resist runtimes ( #37888 )
2018-05-17 10:57:48 -05:00
Jordan Brown and letterjay
7dc1c116d5
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
...
Fix some missing icons
2018-05-14 15:13:33 -05:00
LetterJay and GitHub
f9f42658e1
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
...
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
LetterJay and GitHub
c92a18f733
Update syndicate.dm
2018-05-13 22:07:01 -05:00
vuonojenmustaturska and letterjay
998e49da06
Merge pull request #37809 from Qbopper/secskirts
...
Adds security jumpskirts this time with less broken github
2018-05-13 12:11:02 -05:00
LetterJay and GitHub
ca86c93e70
Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
...
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
Alexch2 and letterjay
b0b9240466
Fixes large crates acting like lockers ( #37707 )
...
* Fixes large crates acting like lockers
* removes forgotten comment
* Adds Cobby's suggestions, and makes the description more useful. Also improves feedback when using the wrong tool.
2018-05-12 16:41:54 -05:00
Tad Hardesty and letterjay
021f30f0c0
Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-11 17:30:32 -05:00
deathride58 and letterjay
bc6fbeb9fe
Adds (fake) ambient occlusion as a client preference
2018-05-07 22:08:08 -05:00
deathride58 and GitHub
8bc97a10d6
Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676
...
[MIRROR] Prevents electric grills from mass producing lightning through exploits
2018-05-07 12:44:12 +00:00
deathride58 and GitHub
757cd6aa73
Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680
...
[MIRROR] Improves skittish code
2018-05-07 12:43:47 +00:00
vuonojenmustaturska and CitadelStationBot
4b36831fbe
Merge pull request #37681 from kevinz000/patch-499
...
Fixes supply pod duping
2018-05-06 16:38:08 -05:00
vuonojenmustaturska and CitadelStationBot
8e791af911
Merge pull request #37680 from kevinz000/patch-498
...
Improves skittish code
2018-05-06 16:37:57 -05:00
vuonojenmustaturska and CitadelStationBot
ed41503127
Merge pull request #37676 from AverageJoe82/electric-grill-engine
...
Prevents electric grills from mass producing lightning through exploits
2018-05-06 16:37:49 -05:00
deathride58 and GitHub
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
ShizCalev and CitadelStationBot
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
kevinz000 and Poojawa
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
oranges and CitadelStationBot
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
Poojawa
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
AnturK and CitadelStationBot
1c390cbbc5
Fixes falsewall letting through air. ( #37306 )
...
* Fixes falsewall letting through air.
* define
2018-04-22 19:15:51 -05:00
LetterJay and GitHub
86ca6b424d
Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122
...
[MIRROR] Fixes interaction AI stuff
2018-04-14 07:44:50 -05:00
ShizCalev and CitadelStationBot
5dfd1f7d42
grunge airlock
2018-04-13 09:04:55 -05:00
kevinz000 and CitadelStationBot
9da197469b
Fixes interaction AI stuff
2018-04-11 14:10:50 -05:00
Bjorn Neergaard and CitadelStationBot
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