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
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
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
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
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
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
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
80dbaae65a
fuck
2017-09-11 14:37:55 -05:00
a05bbfc90a
Update weaponry.dm
2017-09-11 14:07:11 -05:00
c03e216016
Update implantchair.dm
2017-09-11 14:05:58 -05:00
447937477e
more oopsies
2017-09-11 13:50:49 -05:00
af5ffcc83a
Adds departmental banners
2017-09-11 13:37:58 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
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
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
5e3e525036
Fixes lockers alt-click
2017-09-10 16:07:31 -05:00
e5aed03bcb
all of my HATE
2017-09-10 15:20:58 -05:00
50587ea679
Update tools.dm
2017-09-10 15:18:30 -05:00
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
3dbfac920a
Update weaponry.dm
2017-09-10 11:48:28 -05:00
33f35fe4d2
Update tools.dm
2017-09-10 11:46:34 -05:00
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
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
780faec591
Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202
...
[MIRROR] You can now drag things up and down ladders
2017-09-09 00:59:58 -05:00
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
0dfe72d77e
chainsaws rebalance, but working this time :)
2017-09-08 10:00:47 -05:00
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
d5c4f6e62d
Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451
...
[MIRROR] Disablers and ions wont burn plasma statues statues
2017-09-07 15:55:04 -05:00
b9bbd348df
You can now drag things up and down ladders ( #30202 )
...
* Can drag things up and down ladders
* Somehow left out this line
* Icon update, auto_connect
* Uses the proper pulling proc
2017-09-07 12:48:43 -05:00
b172025e96
Disablers and ions wont burn statues
2017-09-07 10:34:44 -05:00
dd27a1850a
Adds a message when trying to move while buckled
2017-09-07 10:12:32 -05:00
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
d8a3b87719
Fixes brains counting towards highlander killstreaks
2017-09-07 05:14:39 -05:00
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -05:00
LetterJay