shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,130 Commits 5 Branches 0 Tags
e04d89e57c42dcd7861de0cb44aff99634e6785c
Commit Graph
17130 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot e04d89e57c Automatic changelog generation for PR #6915 [ci skip] 2018-05-27 14:41:21 -05:00
LetterJayandGitHub 0cf88041e0 Merge pull request #6915 from Citadel-Station-13/upstream-merge-37864 
[MIRROR] Ports gloves of the north star from Hippie
 2018-05-27 14:41:19 -05:00
CitadelStationBot cea9ddbf86 Automatic changelog generation for PR #6901 [ci skip] 2018-05-27 14:39:20 -05: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
LetterJayandGitHub 42fa4e36d5 Merge pull request #6914 from Citadel-Station-13/upstream-merge-38054 
[MIRROR] Eatting fried items actually consumes the item
 2018-05-27 14:38:53 -05:00
LetterJayandGitHub f636b4be4d Merge pull request #6913 from Citadel-Station-13/upstream-merge-38080 
[MIRROR] Fix typo in Python dependencies file
 2018-05-27 14:38:29 -05:00
LetterJayandGitHub dbc8033f16 Merge pull request #6911 from Citadel-Station-13/upstream-merge-38086 
[MIRROR] Capitalizes CentCom
 2018-05-27 14:38:01 -05:00
letterjay 5f59c6fa03 Ports gloves of the north star from Hippie 2018-05-27 11:40:47 -05:00
GuyonBroadwayandletterjay 0082b0f2c0 Ports gloves of the north star from Hippie (#37864) 
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
 2018-05-27 11:40:47 -05:00
letterjay ef06e39cf0 Eatting fried items actually consumes the item 2018-05-27 11:40:39 -05:00
ShizCalevandletterjay 2e8cdac9a3 Eatting fried items actually consumes the item (#38054) 
* Eatting fried items actually consumes the item

* destroy
 2018-05-27 11:40:39 -05:00
letterjay 9683a0d9e2 Fix typo in Python dependencies file 2018-05-27 11:40:31 -05:00
Tad Hardestyandletterjay c1fcc0a86e Fix typo in Python dependencies file (#38080) 2018-05-27 11:40:31 -05:00
letterjay 3726e16e4c Capitalizes CentCom 2018-05-27 11:40:12 -05:00
ShizCalevandletterjay 786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
CitadelStationBot fb0c6a9158 Automatic changelog generation for PR #6848 [ci skip] 2018-05-27 01:32:05 -05:00
LetterJayandGitHub 69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631 
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
 2018-05-27 01:32:02 -05:00
LetterJayandGitHub 2a56a5d0c1 Merge pull request #6873 from Citadel-Station-13/upstream-merge-38048 
[MIRROR] [s] Fixes fried items losing inhands
 2018-05-27 01:31:42 -05:00
LetterJayandGitHub e544f0fe29 Update dance_machine.dm 2018-05-26 21:40:10 -05:00
LetterJayandGitHub ec9b4ef955 Merge pull request #6902 from Citadel-Station-13/upstream-merge-38045 
[MIRROR] Security console fixes
 2018-05-26 21:39:54 -05:00
CitadelStationBot 724c1a1549 Automatic changelog generation for PR #6909 [ci skip] 2018-05-26 18:41:11 -05:00
LetterJayandGitHub 071165b925 Merge pull request #6909 from Citadel-Station-13/upstream-merge-37963 
[MIRROR] Unredden the input bar when the viewport is clicked
 2018-05-26 18:41:09 -05:00
CitadelStationBot 0af4077b26 Automatic changelog generation for PR #6906 [ci skip] 2018-05-26 18:40:55 -05:00
LetterJayandGitHub e6128d5419 Merge pull request #6906 from Citadel-Station-13/upstream-merge-38042 
[MIRROR] Adjust antag rep values to remove chain-of-command -based bonuses
 2018-05-26 18:40:53 -05:00
LetterJayandGitHub 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
CitadelStationBot 9917e27470 Automatic changelog generation for PR #6903 [ci skip] 2018-05-26 18:40:03 -05:00
LetterJayandGitHub 202e02750d Merge pull request #6903 from Citadel-Station-13/upstream-merge-38044 
[MIRROR] Fixes bronze spelling in girder construction
 2018-05-26 18:40:01 -05:00
LetterJayandGitHub 393676aa3e Update dance_machine.dm 2018-05-26 18:39:20 -05:00
LetterJayandGitHub 47e7dfde51 Merge pull request #6900 from Citadel-Station-13/upstream-merge-37976 
[MIRROR] Add a Python script to fix DMI conflicts
 2018-05-26 18:38:49 -05:00
CitadelStationBot e872fc560a Automatic changelog generation for PR #6899 [ci skip] 2018-05-26 18:38:21 -05:00
LetterJayandGitHub 7caef42502 Merge pull request #6899 from Citadel-Station-13/upstream-merge-37993 
[MIRROR] Adds two saferChems for vent clogs.
 2018-05-26 18:38:19 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 7be2b7cce5 Merge pull request #6897 from Citadel-Station-13/upstream-merge-38009 
[MIRROR] Timers on qdeleted objects is no longer supported.
 2018-05-26 18:37:46 -05:00
LetterJayandGitHub 7c201df696 Merge pull request #6896 from Citadel-Station-13/upstream-merge-38014 
[MIRROR] Fixes luxury shuttle forcefields vanishing
 2018-05-26 18:37:26 -05:00
CitadelStationBot 078200f8fa Automatic changelog generation for PR #6895 [ci skip] 2018-05-25 23:28:03 -05:00
LetterJayandGitHub cfe5c7a962 Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023 
[MIRROR] Fix various bugs with telekinesis
 2018-05-25 23:28:01 -05:00
CitadelStationBot f8a2693de5 Automatic changelog generation for PR #6894 [ci skip] 2018-05-25 23:03:29 -05:00
LetterJayandGitHub 3d57f4e360 Merge pull request #6894 from Citadel-Station-13/upstream-merge-38026 
[MIRROR] Fix frost spiders injecting a nonexistent reagent
 2018-05-25 23:03:27 -05:00
CitadelStationBot 008a65ee04 Automatic changelog generation for PR #6893 [ci skip] 2018-05-25 23:03:04 -05:00
LetterJayandGitHub dd777f8ef2 Merge pull request #6893 from Citadel-Station-13/upstream-merge-38068 
[MIRROR] Fixes navbeacon access reqs
 2018-05-25 23:03:02 -05:00
LetterJayandGitHub 60b1774131 Merge pull request #6892 from Citadel-Station-13/upstream-merge-38027 
[MIRROR] [s] Fix Jacob's Ladder allowing access to VR
 2018-05-25 22:52:46 -05:00
LetterJayandGitHub 45dcee8f29 Merge pull request #6891 from Citadel-Station-13/upstream-merge-38047 
[MIRROR] Sync permanent admin removals to the players table immediately
 2018-05-25 22:52:27 -05:00
CitadelStationBot 2888c8f9eb Automatic changelog generation for PR #6890 [ci skip] 2018-05-25 22:51:53 -05:00
LetterJayandGitHub 1a87aa1b33 Merge pull request #6890 from Citadel-Station-13/upstream-merge-38052 
[MIRROR] Fixes accidental empty ahelp replies
 2018-05-25 22:51:51 -05:00
CitadelStationBot 2e1a50a4ed Automatic changelog generation for PR #6889 [ci skip] 2018-05-25 22:50:42 -05:00
LetterJayandGitHub d4d8c89fea Merge pull request #6889 from Citadel-Station-13/upstream-merge-38019 
[MIRROR] Fixes drones being able to magically sense invisible revenants
 2018-05-25 22:50:40 -05:00
CitadelStationBot 09bc3a047b Automatic changelog generation for PR #6888 [ci skip] 2018-05-25 22:50:27 -05:00
LetterJayandGitHub 25bd4a2d55 Merge pull request #6888 from Citadel-Station-13/upstream-merge-38017 
[MIRROR] Disallow effects from being scanned by the chameleon projector
 2018-05-25 22:50:25 -05:00
CitadelStationBot 0d856ec3ce Automatic changelog generation for PR #6887 [ci skip] 2018-05-25 22:50:13 -05:00
LetterJayandGitHub 79584bd08a Merge pull request #6887 from Citadel-Station-13/upstream-merge-37971 
[MIRROR] Fix template preview being invisible on space turfs
 2018-05-25 22:50:11 -05:00