cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
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
6c5774724d
Update sound.dm
2017-09-12 23:15:48 -05:00
f55ad5ec95
Update safe.dm
2017-09-12 23:12:19 -05:00
0429a75e52
Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592
...
[MIRROR] Fixed changeling augmented eyesight ability
2017-09-12 19:10:52 -05:00
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
ee5c44191d
adds logging to graivpult precision throwing ( #30608 )
...
* Update other_tools.dm
* Update other_tools.dm
* Update other_tools.dm
2017-09-12 17:14:22 -05:00
eeadba6f18
Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494
...
[MIRROR] Adds missing span-endings
2017-09-12 06:32:45 -05:00
82db333ee3
Update tools.dm
2017-09-12 03:36:41 -05:00
3ff2263a33
Update taperecorder.dm
2017-09-12 03:22:47 -05:00
6413dd5264
Merge pull request #2699 from Citadel-Station-13/upstream-merge-30551
...
[MIRROR] Mechs now can be connected to atmos ports
2017-09-12 03:19:23 -05:00
5c228f63a5
Update dna_injector.dm
2017-09-12 03:09:19 -05:00
86a1901b5d
Update AI_modules.dm
2017-09-12 03:08:53 -05:00
460820b245
Update safe.dm
2017-09-12 03:05:46 -05:00
59319b6bea
Update taperecorder.dm
2017-09-12 03:04:56 -05:00
a549f3128a
Update atmos_control.dm
2017-09-12 03:02:15 -05:00
deca859284
Update atmos_alert.dm
2017-09-12 03:00:11 -05:00
505925d767
Update atmos_alert.dm
2017-09-12 02:59:58 -05:00
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
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
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
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
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
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
0431fa3cb6
Merge branch 'master' into upstream-merge-30544
2017-09-11 23:21:00 -05:00
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
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
ce518ee45e
Update closets.dm
2017-09-11 18:56:10 -05:00
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
bf5094cf19
Update nuclearbomb.dm
2017-09-11 18:40:30 -05:00
d9abc21a9a
Fixed changeling augmented eyesight ability ( #30592 )
...
* Fix changeling augmented eyesight
Fix not being able to toggle changeling augmented eyesight off again.
* Fix augmented eyesight
Fix changeling's augmented eyesight ability.
* Fix changeling augmented vision
Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
2017-09-11 18:38:16 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
e6cc0673aa
Merge branch 'master' into upstream-merge-30399
2017-09-11 18:07:15 -05:00
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
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
914cc38a2d
Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515
...
[MIRROR] Added warnings for ultrasafe and safe security modes
2017-09-11 17:54:18 -05:00
b5c007ffdf
Update vending.dm
2017-09-11 17:50:56 -05:00
74588305ce
Update vending_items.dm
2017-09-11 17:50:49 -05:00
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
ea82bf9bfa
Update suit_storage_unit.dm
2017-09-11 17:47:48 -05:00
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
240c5bdaad
Update game_mode.dm
2017-09-11 15:55:27 -05:00
59772e2afd
Update events.dm
2017-09-11 15:54:55 -05:00
16912124e5
Update ritual.dm
2017-09-11 15:54:38 -05:00
e767e20574
Update game_mode.dm
2017-09-11 15:49:54 -05:00
9bb9aaa17d
Update events.dm
2017-09-11 15:48:59 -05:00
6b671ffd06
Update ritual.dm
2017-09-11 15:48:24 -05:00
01920e5fea
Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
...
[MIRROR] Adds Archaeology Component
2017-09-11 15:22:59 -05:00
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