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
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
LetterJay
4ee17d5167
Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
...
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
LetterJay
f55ad5ec95
Update safe.dm
2017-09-12 23:12:19 -05:00
LetterJay
82db333ee3
Update tools.dm
2017-09-12 03:36:41 -05:00
LetterJay
3ff2263a33
Update taperecorder.dm
2017-09-12 03:22:47 -05:00
LetterJay
5c228f63a5
Update dna_injector.dm
2017-09-12 03:09:19 -05:00
LetterJay
86a1901b5d
Update AI_modules.dm
2017-09-12 03:08:53 -05:00
LetterJay
460820b245
Update safe.dm
2017-09-12 03:05:46 -05:00
LetterJay
59319b6bea
Update taperecorder.dm
2017-09-12 03:04:56 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
LetterJay
caca1d1794
Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553
...
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-12 01:22:11 -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
7deeac86eb
Merge pull request #2670 from Citadel-Station-13/upstream-merge-29839
...
[MIRROR] [s] Adds a security token to all admin hrefs
2017-09-12 01:17:56 -05:00
LetterJay
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
LetterJay
0431fa3cb6
Merge branch 'master' into upstream-merge-30544
2017-09-11 23:21:00 -05:00
LetterJay
1d19ee6bbf
Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117
...
[MIRROR] Crew monitoring rework part 1: crew pinpointers
2017-09-11 22:41:24 -05:00
LetterJay
ce518ee45e
Update closets.dm
2017-09-11 18:56:10 -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
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
LetterJay
e6cc0673aa
Merge branch 'master' into upstream-merge-30399
2017-09-11 18:07:15 -05:00
LetterJay
6cc0ea6af0
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
...
[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
LetterJay
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
LetterJay
74588305ce
Update vending_items.dm
2017-09-11 17:50:49 -05:00
LetterJay
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
KorPhaeron
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -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
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
LetterJay
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
LetterJay
80dbaae65a
fuck
2017-09-11 14:37:55 -05:00
LetterJay
a05bbfc90a
Update weaponry.dm
2017-09-11 14:07:11 -05:00
LetterJay
c03e216016
Update implantchair.dm
2017-09-11 14:05:58 -05:00
LetterJay
447937477e
more oopsies
2017-09-11 13:50:49 -05:00
Ashe Higgs
af5ffcc83a
Adds departmental banners
2017-09-11 13:37:58 -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
vuonojenmustaturska
053b283745
Fixes initialize hints for a fair number of mobs and items
2017-09-11 12:20:19 -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
ExcessiveUseOfCobblestone
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
AnturK
5e3e525036
Fixes lockers alt-click
2017-09-10 16:07:31 -05:00
LetterJay
e5aed03bcb
all of my HATE
2017-09-10 15:20:58 -05:00
LetterJay
50587ea679
Update tools.dm
2017-09-10 15:18:30 -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
LetterJay
3dbfac920a
Update weaponry.dm
2017-09-10 11:48:28 -05:00
LetterJay
33f35fe4d2
Update tools.dm
2017-09-10 11:46:34 -05:00
KorPhaeron
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
