shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,218 Commits 5 Branches 0 Tags
4da91bc330c976fe0353cf949b860e87d90302b9
Commit Graph

364 Commits

Author SHA1 Message Date
CitadelStationBot
4da91bc330 [MIRROR] Fixes Archaeology not working (#2744) 
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
 2017-09-13 16:53:30 -05:00
LetterJay
1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
aa09cd4785 Update teleport.dm 2017-09-13 00:50:41 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
81fdf521fb Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502 
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
 2017-09-12 19:10:21 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 
[MIRROR] Adds Gondoland and the rare Gondolas
 2017-09-12 01:21:09 -05:00
LetterJay
f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
Joan Lung
2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502) 
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
 2017-09-11 20:54:55 -05:00
LetterJay
e2f9ec4f18 Merge pull request #2686 from Citadel-Station-13/upstream-merge-30538 
[MIRROR] Uplink lock codes now pick from the phonetic alphabet global list
 2017-09-11 18:54:53 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJay
1f7db947e4 Update teleport.dm 2017-09-11 15:54:01 -05:00
LetterJay
f6f456068f Update teleport.dm 2017-09-11 15:47:48 -05:00
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
LetterJay
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
LetterJay
7b157a9a6a Update datumvars.dm 2017-09-11 14:23:15 -05:00
LetterJay
d731e6342c fix it. FIX IT. 2017-09-11 14:15:57 -05:00
LetterJay
9e0cb0fa7c Update datumvars.dm 2017-09-11 13:53:18 -05:00
LetterJay
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
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
Leo
44e62d8016 Uplink lock codes now pick from the phonetic alphabet global list (#30538) 
* Uplink lock codes now pick from the phonetic alphabet global list

* Update virus_cart.dm
 2017-09-10 14:17:16 -05:00
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
Kyle Spier-Swenson
3f025582f2 Gives admins the ability to show a read only vv window to a player 2017-09-07 10:01:47 -05:00
LetterJay
17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
Poojawa
5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597) 
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
 2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5 [MIRROR] Port material containers to datum components (#2562) 
* Port material containers to datum components

* Fixes Rej
 2017-09-04 04:08:42 -05:00
LetterJay
3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay
a6aa71e0b9 commit 2017-09-01 09:52:29 -05:00
Jordan Brown
528b7a86b8 Merge pull request #30292 from Xhuis/revert-30289-RevertAntag 
Rearranges the antagonist panel: now with 150 more hours of testing
 2017-08-31 14:39:42 -05:00
kevinz000
039aea1724 Merge pull request #2541 2017-08-29 22:39:48 -07:00
kevinz000
f33f543d8a Merge branch 'master' into upstream-merge-30254 2017-08-29 22:12:34 -07:00
kevinz000
1dc4e09682 Merge branch 'master' into upstream-merge-30250 2017-08-29 20:04:01 -07:00
LetterJay
b2114a7b81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-08-29 21:19:22 -05:00
CitadelStationBot
3e1031d6b9 Adds a ghost verb to see all available ghost spawners 2017-08-29 17:45:50 -05:00
CitadelStationBot
1caba77431 Server tools versioning and fix to displayed testmerges 2017-08-29 17:16:17 -05:00
kevinz000
5f5065eb46 kek 2017-08-29 09:59:57 -07:00
CitadelStationBot
b753909958 Cult ghosts can no longer be potentially deconverted or debrained 2017-08-29 10:25:31 -05:00
CitadelStationBot
d55bac862e Updates out of date documentation 2017-08-28 14:52:27 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay
02ba44a8eb Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169 
[MIRROR] Allows disabling shuttle purchases per map.
 2017-08-28 08:56:33 -05:00
LetterJay
1457e388c2 Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183 
[MIRROR] Small devil fixes.
 2017-08-28 08:45:16 -05:00
CitadelStationBot
4c4bd22578 [MIRROR] Some more tweaks to Geis (#2487) 
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
 2017-08-27 01:36:17 -07:00
CitadelStationBot
14ceaa39b4 Fixes component dupe checks not actually checking if there IS a dupe component (#2501) 2017-08-26 19:11:03 -07:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00