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
bf5094cf19
Update nuclearbomb.dm
2017-09-11 18:40:30 -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
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
6d88e3642b
Update suit_storage_unit.dm
2017-09-11 14:27:28 -05:00
a05bbfc90a
Update weaponry.dm
2017-09-11 14:07:11 -05:00
02d7a04fb1
Update suit_storage_unit.dm
2017-09-11 14:06:01 -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
b008cdada0
oopsie woopsie
2017-09-11 13:47:33 -05:00
af5ffcc83a
Adds departmental banners
2017-09-11 13:37:58 -05:00
489b2c6deb
Update objective_items.dm
2017-09-11 13:08:35 -05:00
26c6f5cc14
Update pinpointer.dm
2017-09-11 13:07:35 -05:00
052fdb70ea
Update nuclearbomb.dm
2017-09-11 13:06:27 -05:00
6a47a7011a
Update nuclear.dm
2017-09-11 13:05:22 -05:00
48e71cfbd5
Update Malf_Modules.dm
2017-09-11 13:04:28 -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
c3fed32afb
Update prolonging_prism.dm
2017-09-10 15:17:25 -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
72bd5e18f4
Merge pull request #2682 from Citadel-Station-13/upstream-merge-30518
...
[MIRROR] Ladders cant be moved by the singularity
2017-09-10 09:47:20 -05:00
685c534d88
Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524
...
[MIRROR] Removes a src.
2017-09-10 09:47:01 -05:00
b363dc352f
[MIRROR] remove GLOB. ( #2683 )
...
* Merge pull request #30540 from p440/blobglob
remove GLOB.
* remove GLOB.
2017-09-10 09:07:18 -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
ee4052eb61
Merge pull request #30524 from ChangelingRain/srcremoval
...
Removes a src.
2017-09-10 06:02:06 -05:00
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
LetterJay