shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,534 Commits 5 Branches 0 Tags
237cc0dabdba074a5bbb2446dfd38483bfcf6d80
Commit Graph

17534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
237cc0dabd Automatic changelog generation for PR #7104 [ci skip] 2018-06-13 21:31:31 -05:00
CitadelStationBot
d875c362fa [MIRROR] Turf grammar omnibus (#7104) 
* Turf grammar omnibus (#38375)

* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors

* Turf grammar omnibus
 2018-06-13 19:31:29 -07:00
CitadelStationBot
226780e0ed [MIRROR] Fixes vote ss trying to remove actions of people who already voted. (#7099) 
* Fixes votes trying to remove actions of people who already voted. (#38431)

* Fixes vote ss trying to remove actions of people who already voted.
 2018-06-13 19:30:14 -07:00
CitadelStationBot
8ec3ac03cd [MIRROR] Fixes drunken scientist R&D point gain. (#7098) 
* Fixes drunken scientist R&D point gain. (#38432)

* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.

* Fixes drunken scientist R&D point gain.
 2018-06-13 19:28:35 -07:00
ShizCalev
901dd94253 Corrects climax cooldown timer message, makes relieve message pronounsensitive (#7086) 2018-06-13 19:27:19 -07:00
CitadelStationBot
496a1d1165 [MIRROR] [s] Fixes sleeper logging. (#7085) 
* Merge pull request #38429 from AnturK/runtimeA

[s] Fixes sleeper logging.

* [s] Fixes sleeper logging.
 2018-06-12 17:23:37 -07:00
CitadelStationBot
602f52f423 Automatic changelog generation for PR #7073 [ci skip] 2018-06-12 08:09:23 -05:00
LetterJay
64d5c8cbdc Merge pull request #7073 from Citadel-Station-13/upstream-merge-38381 
[MIRROR] Fix legion cores not healing confusion
 2018-06-12 08:09:20 -05:00
LetterJay
8b65c88f64 Merge pull request #7077 from Citadel-Station-13/upstream-merge-38404 
[MIRROR] Fixes unintentional vehicle buff
 2018-06-12 08:08:51 -05:00
LetterJay
d4684b5204 Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424 
[MIRROR] Removes doubled iaa definition.
 2018-06-12 08:08:39 -05:00
CitadelStationBot
e01c027366 Automatic changelog generation for PR #7072 [ci skip] 2018-06-12 08:08:17 -05:00
LetterJay
14f7ca0449 Merge pull request #7072 from Citadel-Station-13/upstream-merge-38376 
[MIRROR] [s] Fix lockboxes not actually being locked
 2018-06-12 08:08:15 -05:00
CitadelStationBot
3a29c8bbfd Automatic changelog generation for PR #7070 [ci skip] 2018-06-12 08:03:42 -05:00
LetterJay
2c0a82ec50 Merge pull request #7070 from Citadel-Station-13/upstream-merge-38378 
[MIRROR] Fix deaf people hearing borg modules going offline
 2018-06-12 08:03:40 -05:00
CitadelStationBot
20d0b78ef7 Automatic changelog generation for PR #7069 [ci skip] 2018-06-12 07:59:23 -05:00
LetterJay
49cdba9f90 Merge pull request #7069 from Citadel-Station-13/upstream-merge-38380 
[MIRROR] Give plasmamen their plasma suits in VR
 2018-06-12 07:59:20 -05:00
LetterJay
ac078c4789 Merge pull request #7068 from Citadel-Station-13/upstream-merge-38382 
[MIRROR] Make chat squashing HTML-agnostic II
 2018-06-12 07:58:55 -05:00
LetterJay
87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
CitadelStationBot
b70ed7cd11 Automatic changelog generation for PR #7066 [ci skip] 2018-06-12 07:38:15 -05:00
LetterJay
e20db49269 Merge pull request #7066 from Citadel-Station-13/upstream-merge-38366 
[MIRROR] Replace area-wide fire overlay with reddening the lights
 2018-06-12 07:38:13 -05:00
CitadelStationBot
158bf09a8d Automatic changelog generation for PR #7065 [ci skip] 2018-06-12 07:37:02 -05:00
LetterJay
69bfb75970 Merge pull request #7065 from Citadel-Station-13/upstream-merge-38367 
[MIRROR] Fix pulling diagonally looking goofy
 2018-06-12 07:37:00 -05:00
CitadelStationBot
3f79c7e31f Automatic changelog generation for PR #7056 [ci skip] 2018-06-12 07:35:52 -05:00
LetterJay
b9365f45e1 Merge pull request #7056 from Citadel-Station-13/upstream-merge-38394 
[MIRROR] Fixes and Upgrades Stabilized Gold Extracts
 2018-06-12 07:35:47 -05:00
letterjay
301150e2ce Fixes unintentional vehicle buff 2018-06-12 00:57:53 -05:00
kevinz000
4d9645766a Fixes unintentional vehicle buff (#38404) 2018-06-12 00:57:53 -05:00
letterjay
2637926fb5 Removes doubled iaa definition. 2018-06-11 22:30:27 -05:00
Jordan Brown
adf4cad9ea Merge pull request #38424 from AnturK/iaafixup 
Removes doubled iaa definition.
 2018-06-11 22:30:26 -05:00
letterjay
842e354d2a Fix legion cores not healing confusion 2018-06-11 22:30:19 -05:00
Jordan Brown
9835bed8d4 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion 
Fix legion cores not healing confusion
 2018-06-11 22:30:18 -05:00
letterjay
d71d93538e [s] Fix lockboxes not actually being locked 2018-06-11 22:30:09 -05:00
oranges
4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-11 22:30:08 -05:00
letterjay
48f40425a5 Fix deaf people hearing borg modules going offline 2018-06-11 22:29:52 -05:00
oranges
69730f0a60 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-11 22:29:51 -05:00
letterjay
32382c5466 Give plasmamen their plasma suits in VR 2018-06-11 22:29:44 -05:00
oranges
997d85329c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes 
Give plasmamen their plasma suits in VR
 2018-06-11 22:29:43 -05:00
letterjay
4f2f4d4909 Make chat squashing HTML-agnostic II 2018-06-11 22:29:36 -05:00
oranges
bc35ff9b10 Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup 
Make chat squashing HTML-agnostic II
 2018-06-11 22:29:36 -05:00
letterjay
c684042f05 Cleans up some logging 2018-06-11 22:29:27 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
letterjay
0e9fd73bd7 Replace area-wide fire overlay with reddening the lights 2018-06-11 22:29:10 -05:00
oranges
ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-11 22:29:10 -05:00
letterjay
4c98992298 Fix pulling diagonally looking goofy 2018-06-11 22:29:01 -05:00
oranges
3aaad1bc31 Merge pull request #38367 from AutomaticFrenzy/patch/pull-diagonally 
Fix pulling diagonally looking goofy
 2018-06-11 22:29:01 -05:00
deathride58
ecd200a5bc Merge pull request #7043 from Cw3040/master 
Small Cryosleeper Bug Fix and Box Map Fix
 2018-06-12 03:16:40 +00:00
deathride58
e30807616a Merge pull request #7058 from Citadel-Station-13/upstream-merge-38372 
[MIRROR] Makes swimsuits an underwear option
 2018-06-12 03:15:58 +00:00
CitadelStationBot
28321a20f2 Automatic changelog generation for PR #7059 [ci skip] 2018-06-11 22:15:30 -05:00
deathride58
abc19ae405 Merge pull request #7059 from Citadel-Station-13/upstream-merge-38388 
[MIRROR] Anti-magic components start active
 2018-06-12 03:15:28 +00:00
deathride58
7effee3ee8 Merge pull request #7061 from Citadel-Station-13/upstream-merge-38417 
[MIRROR] Fixes nuke exploding instantly.
 2018-06-12 03:14:37 +00:00
deathride58
67a5eee94b Merge pull request #7057 from Citadel-Station-13/upstream-merge-38396 
[MIRROR] Adds logging for sleeper chem injections
 2018-06-12 03:14:14 +00:00