 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
|
bfe633540a
|
Update human_movement.dm
|
2017-09-11 17:55:35 -05:00 |
|
|
LetterJay
|
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 |
|
|
LetterJay
|
6816b83a6d
|
Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509
[MIRROR] num2text the Instances number
|
2017-09-11 17:53:54 -05:00 |
|
|
LetterJay
|
578846ba4b
|
Merge branch 'master' into upstream-merge-30519
|
2017-09-11 17:53:13 -05:00 |
|
|
LetterJay
|
c3a1c08206
|
Update smartfridge.dm
|
2017-09-11 17:51:49 -05:00 |
|
|
LetterJay
|
b5c007ffdf
|
Update vending.dm
|
2017-09-11 17:50:56 -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 |
|
|
LetterJay
|
ea82bf9bfa
|
Update suit_storage_unit.dm
|
2017-09-11 17:47:48 -05:00 |
|
|
LetterJay
|
9adcc174b3
|
Update shuttle.dm
|
2017-09-11 17:09:44 -05:00 |
|
|
KorPhaeron
|
4d2fe460ed
|
Nightmare
|
2017-09-11 16:23:47 -05:00 |
|
|
LetterJay
|
9e73d297cc
|
Update security_levels.dm
|
2017-09-11 15:58:47 -05:00 |
|
|
LetterJay
|
97b25bc59a
|
Update vent_clog.dm
|
2017-09-11 15:58:12 -05:00 |
|
|
LetterJay
|
fe3d825596
|
Update spider_infestation.dm
|
2017-09-11 15:57:45 -05:00 |
|
|
LetterJay
|
12f17ecbe7
|
Update radiation_storm.dm
|
2017-09-11 15:57:15 -05:00 |
|
|
LetterJay
|
57343fa712
|
Update immovable_rod.dm
|
2017-09-11 15:56:25 -05:00 |
|
|
LetterJay
|
240c5bdaad
|
Update game_mode.dm
|
2017-09-11 15:55:27 -05:00 |
|
|
LetterJay
|
59772e2afd
|
Update events.dm
|
2017-09-11 15:54:55 -05:00 |
|
|
LetterJay
|
16912124e5
|
Update ritual.dm
|
2017-09-11 15:54:38 -05:00 |
|
|
LetterJay
|
1f7db947e4
|
Update teleport.dm
|
2017-09-11 15:54:01 -05:00 |
|
|
LetterJay
|
c7ae892e8d
|
Update persistence.dm
|
2017-09-11 15:53:35 -05:00 |
|
|
LetterJay
|
496b5d17c2
|
Update mapping.dm
|
2017-09-11 15:52:58 -05:00 |
|
|
LetterJay
|
e767e20574
|
Update game_mode.dm
|
2017-09-11 15:49:54 -05:00 |
|
|
LetterJay
|
9bb9aaa17d
|
Update events.dm
|
2017-09-11 15:48:59 -05:00 |
|
|
LetterJay
|
6b671ffd06
|
Update ritual.dm
|
2017-09-11 15:48:24 -05:00 |
|
|
LetterJay
|
f6f456068f
|
Update teleport.dm
|
2017-09-11 15:47:48 -05:00 |
|
|
LetterJay
|
e0e552829c
|
Update persistence.dm
|
2017-09-11 15:47:18 -05:00 |
|
|
LetterJay
|
c6c34b07be
|
Update mapping.dm
|
2017-09-11 15:46:45 -05:00 |
|
|
LetterJay
|
05efdd9ad3
|
Update sm_monitor.dm
|
2017-09-11 15:45:34 -05:00 |
|
|
LetterJay
|
804a59ad49
|
Update aux_base.dm
|
2017-09-11 15:45:11 -05:00 |
|
|
Jordan Brown
|
799ae80b8a
|
Missed some parentheses in multi Z
|
2017-09-11 15:43:50 -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
|
1c757deb5b
|
Merge pull request #2650 from Citadel-Station-13/upstream-merge-30420
[MIRROR] TGUI interfaces to various smartfridges
|
2017-09-11 15:22:49 -05:00 |
|
|
LetterJay
|
6b25a0e42b
|
Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465
[MIRROR] Fixes shuttle name on ramming.
|
2017-09-11 15:22:36 -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
|
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 |
|
|
AnturK
|
1553e26fe2
|
I missed that in last fix. (#30590)
|
2017-09-11 14:37:22 -05:00 |
|
|
LetterJay
|
6d88e3642b
|
Update suit_storage_unit.dm
|
2017-09-11 14:27:28 -05:00 |
|
|
LetterJay
|
7b157a9a6a
|
Update datumvars.dm
|
2017-09-11 14:23:15 -05:00 |
|
|
LetterJay
|
7cdd5eaa02
|
Update admin.dm
|
2017-09-11 14:22:23 -05:00 |
|
|
LetterJay
|
726b86f3a4
|
Update on_move.dm
|
2017-09-11 14:18:28 -05:00 |
|
|
LetterJay
|
d731e6342c
|
fix it. FIX IT.
|
2017-09-11 14:15:57 -05:00 |
|
|
LetterJay
|
24dd22aff5
|
Update components.dm
|
2017-09-11 14:10:27 -05:00 |
|
|
LetterJay
|
a05bbfc90a
|
Update weaponry.dm
|
2017-09-11 14:07:11 -05:00 |
|
|
LetterJay
|
02d7a04fb1
|
Update suit_storage_unit.dm
|
2017-09-11 14:06:01 -05:00 |
|
|
LetterJay
|
c03e216016
|
Update implantchair.dm
|
2017-09-11 14:05:58 -05:00 |
|