shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,335 Commits 5 Branches 0 Tags
0b97f3f99d9d5faab36fffa7af9c4810eb3584c5
Commit Graph
680 Commits
Author SHA1 Message Date
CitadelStationBotandkevinz000 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
LetterJayandGitHub 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
ShizCalevandletterjay 786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
Jordan Brownandletterjay f9cb1e34c6 Merge pull request #38044 from Mickyan/bronzegirder_spelfix 
Fixes bronze spelling in girder construction
 2018-05-25 11:01:18 -05:00
Jordan Brownandletterjay 2bcfe00283 Fix some inconsistencies relating to resting 2018-05-25 10:56:47 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
Wilchenxandletterjay 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
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJayandGitHub 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
81Dentonandletterjay 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
ShizCalevandletterjay 0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
Jordan Brownandletterjay 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJayandGitHub 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
LetterJayandGitHub c92a18f733 Update syndicate.dm 2018-05-13 22:07:01 -05:00
vuonojenmustaturskaandletterjay 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
LetterJayandGitHub 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
Alexch2andletterjay 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 Hardestyandletterjay 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
deathride58andletterjay bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
deathride58andGitHub 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
deathride58andGitHub 757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 
[MIRROR] Improves skittish code
 2018-05-07 12:43:47 +00:00
vuonojenmustaturskaandCitadelStationBot 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
vuonojenmustaturskaandCitadelStationBot 8e791af911 Merge pull request #37680 from kevinz000/patch-498 
Improves skittish code
 2018-05-06 16:37:57 -05:00
vuonojenmustaturskaandCitadelStationBot 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
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
AnturKandCitadelStationBot 1c390cbbc5 Fixes falsewall letting through air. (#37306) 
* Fixes falsewall letting through air.

* define
 2018-04-22 19:15:51 -05:00
LetterJayandGitHub 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
ShizCalevandCitadelStationBot 5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
kevinz000andCitadelStationBot 9da197469b Fixes interaction AI stuff 2018-04-11 14:10:50 -05:00
Bjorn NeergaardandCitadelStationBot 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
Poojawaanddeathride58 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
deathride58andGitHub 1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
Jordan BrownandCitadelStationBot 4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin 
Fixes trash bin wrenching message
 2018-04-06 09:07:20 -05:00
kevinz000andCitadelStationBot 38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
deathride58andGitHub 5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733 
[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
 2018-04-04 21:15:55 +00:00
John GinnaneandCitadelStationBot 80fee95dab Fixed sometimes using items on full storage items (#36711) 
* Fixed sometimes using items on full storage items

* Removed redundant code and fixed spray being used on container
 2018-04-03 22:02:39 -05:00
ArmhulenandCitadelStationBot fff22d5409 podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) (#36733) 
* yeeeeeeeeeeap

* i turned myself into a commit morty!

* I'M COMMIT RICKKKKKKKK

* tinydwarfy was an inside job

* *reels in pain* you KNOW I DON'T LIKE PISTACHIOS

* WOO
 2018-04-03 22:02:17 -05:00
Jordan BrownandCitadelStationBot 5142076ea7 Merge pull request #36901 from KorPhaeron/beeper 
Fixes morgue beeper message
 2018-04-02 08:32:33 -05:00
LetterJayandGitHub dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
CruixandCitadelStationBot 0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
RandomMarineandCitadelStationBot d7cd4726a2 Fixes plasma window fire armor 2018-03-28 13:37:53 -05:00
deathride58andGitHub ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398 
[MIRROR] [READY]pathfinding circuitry upgrade
 2018-03-27 17:47:11 +00:00
deathride58andGitHub 15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective 
Removes the old hypospray from CMO closet, updates tator objective
 2018-03-27 17:41:44 +00:00
arsserpentariumandCitadelStationBot 303272319a [READY]pathfinding circuitry upgrade (#36398) 
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
 2018-03-26 11:01:22 -05:00
CitadelStationBotandPoojawa de697be536 [MIRROR] Fix unwrenching and placing directional signs (#6106) 
* Fix unwrenching and placing directional signs

* Merge pull request #36677 from AutomaticFrenzy/patch/sign-backings

Fix unwrenching and placing directional signs
 2018-03-26 04:30:33 -05:00