shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,998 Commits 5 Branches 0 Tags
05efdd9ad3fa81f71c3d8400f8f25f901dfddb7a
Commit Graph
4998 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 05efdd9ad3 Update sm_monitor.dm 2017-09-11 15:45:34 -05:00
LetterJayandGitHub 804a59ad49 Update aux_base.dm 2017-09-11 15:45:11 -05:00
Jordan BrownandCitadelStationBot 799ae80b8a Missed some parentheses in multi Z 2017-09-11 15:43:50 -05:00
LetterJayandGitHub 2d29b49985 Merge pull request #2664 from Citadel-Station-13/upstream-merge-29897 
[MIRROR] Adds Features per Fix tracking
 2017-09-11 15:23:09 -05:00
LetterJayandGitHub 01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
CitadelStationBot b6e2f9bfa1 Automatic changelog generation for PR #2650 [ci skip] 2017-09-11 15:22:51 -05:00
LetterJayandGitHub 1c757deb5b Merge pull request #2650 from Citadel-Station-13/upstream-merge-30420 
[MIRROR] TGUI interfaces to various smartfridges
 2017-09-11 15:22:49 -05:00
LetterJayandGitHub 6b25a0e42b Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465 
[MIRROR] Fixes shuttle name on ramming.
 2017-09-11 15:22:36 -05:00
CitadelStationBot a4236145f4 Automatic changelog generation for PR #2641 [ci skip] 2017-09-11 15:22:28 -05:00
LetterJayandGitHub 77090bf3c1 Merge pull request #2641 from Citadel-Station-13/upstream-merge-30463 
[MIRROR] Gives admins the ability to show a read only vv window to a player
 2017-09-11 15:22:26 -05:00
LetterJayandGitHub ecdb35bb1a Merge pull request #2636 from Citadel-Station-13/upstream-merge-30396 
[MIRROR] Fixes brains counting towards highlander killstreaks
 2017-09-11 15:22:02 -05:00
LetterJayandGitHub c46c442896 Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454 
[MIRROR] Gets rid of manual overlay manipulation
 2017-09-11 15:21:43 -05:00
LetterJayandGitHub 726b86f3a4 Update on_move.dm 2017-09-11 14:18:28 -05:00
LetterJay d731e6342c fix it. FIX IT. 2017-09-11 14:15:57 -05:00
LetterJayandGitHub 337e765d09 Update github_webhook_processor.php 2017-09-11 14:13:23 -05:00
LetterJayandGitHub 24dd22aff5 Update components.dm 2017-09-11 14:10:27 -05:00
LetterJay 14aefe2e64 commit 2017-09-11 14:01:42 -05:00
CitadelStationBot ddd0d9a1fc Automatic changelog generation for PR #2706 [ci skip] 2017-09-11 13:56:54 -05:00
LetterJayandGitHub 0b142672c0 Merge pull request #2706 from Citadel-Station-13/upstream-merge-30484 
[MIRROR] Adds departmental banners
 2017-09-11 13:56:53 -05:00
LetterJayandGitHub 2f10e78ba7 Update on_move.dm 2017-09-11 13:56:28 -05:00
LetterJayandGitHub 9e0cb0fa7c Update datumvars.dm 2017-09-11 13:53:18 -05:00
LetterJay 447937477e more oopsies 2017-09-11 13:50:49 -05:00
LetterJay b008cdada0 oopsie woopsie 2017-09-11 13:47:33 -05:00
Ashe HiggsandCitadelStationBot af5ffcc83a Adds departmental banners 2017-09-11 13:37:58 -05:00
CitadelStationBot a6e280cbad Automatic changelog generation for PR #2600 [ci skip] 2017-09-11 13:16:16 -05:00
LetterJayandGitHub 01a5e4bddf Merge pull request #2600 from Citadel-Station-13/Lisp 
disables the lisp that lizard tongues have
 2017-09-11 13:16:15 -05:00
LetterJayandGitHub 532d8bd0a6 Merge pull request #2558 from Citadel-Station-13/upstream-merge-30268 
[MIRROR] Adds db connectivity check to jobban cache building
 2017-09-11 13:12:38 -05:00
LetterJayandGitHub 74a163db23 Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252 
[MIRROR] Server tools versioning and fix to displayed testmerges
 2017-09-11 13:12:10 -05:00
CitadelStationBotandkevinz000 8ee6fdb76a [MIRROR] Fixes stop-sounds not force-stopping internet midis (#2692) 
* Fixes stop-sounds not force-stopping internet midis (#30571)

* Update playsound.dm

* Update preferences_toggles.dm (#17)

* Fixes stop-sounds not force-stopping internet midis
 2017-09-10 20:29:12 -07:00
CitadelStationBot be3881bbf4 Automatic changelog generation for PR #2688 [ci skip] 2017-09-10 15:53:05 -05:00
LetterJayandGitHub 48a20c94b9 Merge pull request #2688 from Citadel-Station-13/upstream-merge-30382 
[MIRROR] Adds cybernetic lungs(and an upgraded and actually useful variety) to the game.
 2017-09-10 15:53:04 -05:00
LetterJayandGitHub 0a30d7e962 Merge pull request #2646 from Citadel-Station-13/upstream-merge-30466 
[MIRROR] Fixes drone light toggle while dead
 2017-09-10 15:23:45 -05:00
LetterJayandGitHub e5aed03bcb all of my HATE 2017-09-10 15:20:58 -05:00
LetterJayandGitHub 50587ea679 Update tools.dm 2017-09-10 15:18:30 -05:00
LetterJayandGitHub c3fed32afb Update prolonging_prism.dm 2017-09-10 15:17:25 -05:00
CitadelStationBot 619cc18345 Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. 2017-09-10 14:31:47 -05:00
FirecageandCitadelStationBot 1e0297f9ef Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. (#30382) 
* Adds cybernetic lungs

* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.

* Adds an EMP effect to cybernetic lungs.
 2017-09-10 14:31:47 -05:00
LetterJayandGitHub 3dbfac920a Update weaponry.dm 2017-09-10 11:48:28 -05:00
LetterJayandGitHub 33f35fe4d2 Update tools.dm 2017-09-10 11:46:34 -05:00
CitadelStationBot 863db1b7c3 Automatic changelog generation for PR #2633 [ci skip] 2017-09-10 11:44:48 -05:00
LetterJayandGitHub 037faa1305 Merge pull request #2633 from Citadel-Station-13/upstream-merge-30456 
[MIRROR] Adds CE power tool sprites for the toolbelt
 2017-09-10 11:44:46 -05:00
LetterJayandGitHub 72bd5e18f4 Merge pull request #2682 from Citadel-Station-13/upstream-merge-30518 
[MIRROR] Ladders cant be moved by the singularity
 2017-09-10 09:47:20 -05:00
LetterJayandGitHub 685c534d88 Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524 
[MIRROR] Removes a src.
 2017-09-10 09:47:01 -05:00
CitadelStationBotandPoojawa b363dc352f [MIRROR] remove GLOB. (#2683) 
* Merge pull request #30540 from p440/blobglob

remove GLOB.

* remove GLOB.
 2017-09-10 09:07:18 -05:00
CitadelStationBot bf2d7aabf8 Ladders cant be moved by the singularity 2017-09-10 06:06:17 -05:00
KorPhaeronandCitadelStationBot 55f9874a08 Ladders cant be moved by the singularity (#30518) 
It'd be weird to have the top part of a ladder moved five tiles and then still lead to the ladder underneath its old location. Just destroys it instead.
 2017-09-10 06:06:17 -05:00
CitadelStationBot c27a569bc0 Removes a src. 2017-09-10 06:02:06 -05:00
orangesandCitadelStationBot ee4052eb61 Merge pull request #30524 from ChangelingRain/srcremoval 
Removes a src.
 2017-09-10 06:02:06 -05:00
CitadelStationBot 9704893614 Automatic changelog generation for PR #2674 [ci skip] 2017-09-09 23:50:23 -05:00
LetterJayandGitHub 3a30daa2ec Merge pull request #2674 from Citadel-Station-13/upstream-merge-30520 
[MIRROR] Fix Hearty Punch healing to include softcrit
 2017-09-09 23:50:20 -05:00