shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,842 Commits 5 Branches 0 Tags
a8d5c7d8003814804ef029aee3fea00b53c77860
Commit Graph
16842 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot a8d5c7d800 Automatic changelog generation for PR #6839 [ci skip] 2018-05-21 21:25:15 -05:00
deathride58andGitHub f0a9344c8e Merge pull request #6839 from Citadel-Station-13/upstream-merge-37900 
[MIRROR] Adds OOC verb to show the last round end report you've viewed
 2018-05-22 02:25:13 +00:00
CitadelStationBot c654859eb0 Automatic changelog generation for PR #6840 [ci skip] 2018-05-21 21:24:59 -05:00
deathride58andGitHub 5b15984c0e Merge pull request #6840 from Citadel-Station-13/upstream-merge-37945 
[MIRROR] Fix construction behavior of hydroponics trays
 2018-05-22 02:24:57 +00:00
CitadelStationBot a6f7a31b10 Automatic changelog generation for PR #6841 [ci skip] 2018-05-21 21:24:33 -05:00
deathride58andGitHub d676e1ecf9 Merge pull request #6841 from Citadel-Station-13/upstream-merge-37973 
[MIRROR] Fix wormhole jaunter grammar
 2018-05-22 02:24:31 +00:00
letterjay 7fbe369b55 Fix wormhole jaunter grammar 2018-05-21 17:03:47 -05:00
Jordan Brownandletterjay 46f90d8fae Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter 
Fix wormhole jaunter grammar
 2018-05-21 17:03:46 -05:00
letterjay 9d537c24f2 Fix construction behavior of hydroponics trays 2018-05-21 16:58:31 -05:00
orangesandletterjay 3fd74027c1 Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays 
Fix construction behavior of hydroponics trays
 2018-05-21 16:58:31 -05:00
letterjay 7e087663c2 Adds OOC verb to show the last round end report you've viewed 2018-05-21 16:48:08 -05:00
Jordan Brownandletterjay 96106ff2e8 Adds OOC verb to show the last round end report you've viewed (#37900) 
You can now view your last round end report window with the "Your last round" verb in the OOC tab

stores the HTML in a data dir
 2018-05-21 16:48:08 -05:00
LetterJayandGitHub 6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJayandGitHub 6060df5b92 Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267 
[MIRROR] Adds log and management tabs to permissions panel
 2018-05-21 08:42:21 -05:00
LetterJay d9cc361b81 Merge branch 'upstream-merge-37476' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-37476 2018-05-21 08:38:33 -05:00
LetterJay e415aac87a missed one 2018-05-21 08:38:09 -05:00
CitadelStationBot 02887eb721 Automatic changelog generation for PR #6812 [ci skip] 2018-05-21 08:30:21 -05:00
LetterJayandGitHub 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928 
[MIRROR] Comms consoles don't update while viewing messages
 2018-05-21 08:30:19 -05:00
CitadelStationBot 50a8bc3de8 Automatic changelog generation for PR #6815 [ci skip] 2018-05-21 08:30:07 -05:00
LetterJayandGitHub 35ccd1aafe Merge pull request #6815 from Citadel-Station-13/upstream-merge-37905 
[MIRROR] Fix RPD icons not showing in IE8
 2018-05-21 08:30:05 -05:00
CitadelStationBot 0529a3e525 Automatic changelog generation for PR #6825 [ci skip] 2018-05-21 08:29:49 -05:00
LetterJayandGitHub 207c022f87 Merge pull request #6825 from Citadel-Station-13/upstream-merge-37954 
[MIRROR] Refresh mob views when atoms enter/exit storage
 2018-05-21 08:29:46 -05:00
CitadelStationBot add7e32628 Automatic changelog generation for PR #6823 [ci skip] 2018-05-21 08:29:33 -05:00
LetterJayandGitHub 0b26ea7b5e Merge pull request #6823 from Citadel-Station-13/upstream-merge-37925 
[MIRROR] Removes skewium from saferChems
 2018-05-21 08:29:31 -05:00
LetterJayandGitHub cb5ea0aab7 Merge pull request #6822 from Citadel-Station-13/upstream-merge-37600 
[MIRROR] Refactors hydrocarbon combustion + other general atmos code changes
 2018-05-21 08:29:16 -05:00
CitadelStationBot 601fcf1384 Automatic changelog generation for PR #6821 [ci skip] 2018-05-21 08:29:03 -05:00
LetterJayandGitHub 52bd7904be Merge pull request #6821 from Citadel-Station-13/upstream-merge-37927 
[MIRROR] Replaces nauseous with nauseated
 2018-05-21 08:29:00 -05:00
CitadelStationBot 0e09e1d683 Automatic changelog generation for PR #6820 [ci skip] 2018-05-21 08:28:49 -05:00
LetterJayandGitHub 388c17664f Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938 
[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch
 2018-05-21 08:28:47 -05:00
LetterJayandGitHub 1afdd03d78 Merge pull request #6819 from Citadel-Station-13/upstream-merge-37937 
[MIRROR] Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing
 2018-05-21 08:28:30 -05:00
CitadelStationBot b3eab0058a Automatic changelog generation for PR #6817 [ci skip] 2018-05-21 08:28:15 -05:00
LetterJayandGitHub 1896bc86e8 Merge pull request #6817 from Citadel-Station-13/upstream-merge-37633 
[MIRROR] Circuit Labels (sorta understanding git edition)
 2018-05-21 08:28:13 -05:00
LetterJayandGitHub 9121d4968e Merge pull request #6789 from Citadel-Station-13/upstream-merge-37891 
[MIRROR] Cleans up clap bodypart check
 2018-05-21 08:27:57 -05:00
letterjay 8c7fbe2523 Refresh mob views when atoms enter/exit storage 2018-05-21 04:46:21 -05:00
Tad Hardestyandletterjay 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
letterjay 3241c9575d Removes skewium from saferChems 2018-05-21 03:57:06 -05:00
81Dentonandletterjay 1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -05:00
letterjay 07ee80f303 Refactors hydrocarbon combustion + other general atmos code changes 2018-05-21 03:21:08 -05:00
cyclownsandletterjay 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
letterjay 51f4840851 Replaces nauseous with nauseated 2018-05-21 03:06:39 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
letterjay 09c0def840 Fixes some issues with pacifism by disabling intent auto-switch 2018-05-21 02:54:14 -05:00
Mickyanandletterjay 2b9d18597b Remove intent auto switch from pacifism (#37938) 2018-05-21 02:54:14 -05:00
letterjay 90d1fda2b1 Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing 2018-05-21 02:38:44 -05:00
kevinz000andletterjay 73b0ac7859 Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing (#37937) 
* rdconsole emagging

* Fix grammar
 2018-05-21 02:38:44 -05:00
letterjay ddec53bd6f Circuit Labels (sorta understanding git edition) 2018-05-21 02:11:50 -05:00
r-esistorandletterjay 63e472050c Circuit Labels (sorta understanding git edition) (#37633) 
* Customizable circuit names/descriptions

* Circuit descriptions are now copied

* Prevents code injection through the desc
 2018-05-21 02:11:50 -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
LetterJay 1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00