 Poojawa
|
789064a3a5
|
Clean up .rej files
|
2017-06-28 02:24:03 -05:00 |
|
|
CitadelStationBot
|
a7c18e65bc
|
[MIRROR] fix .html files being invalid types (#1413)
* fix .html files being invalid types
* Delete files.dm.rej
|
2017-06-28 01:43:48 -05:00 |
|
|
CitadelStationBot
|
92da94ca2a
|
[MIRROR] Fixes mapmerge (#1296)
* Fixes mapmerge
* Update mapmerger.py
* Delete mapmerger.py.rej
|
2017-06-28 01:43:26 -05:00 |
|
|
CitadelStationBot
|
f3ec10704c
|
Automatic changelog generation for PR #1714 [ci skip]
|
2017-06-27 22:59:33 -05:00 |
|
|
LetterJay
|
196db74cbe
|
Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588
[MIRROR] Changes to the Atmos Watertank Backpack
|
2017-06-27 22:59:32 -05:00 |
|
|
CitadelStationBot
|
da68472e07
|
Automatic changelog generation for PR #1798 [ci skip]
|
2017-06-27 22:53:41 -05:00 |
|
|
LetterJay
|
7f250e742a
|
Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856
[MIRROR] Straight jackets can now properly be put onto others
|
2017-06-27 22:53:40 -05:00 |
|
|
CitadelStationBot
|
79da431a44
|
Automatic changelog generation for PR #1770 [ci skip]
|
2017-06-27 21:25:51 -05:00 |
|
|
LetterJay
|
e680da7de6
|
Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
[MIRROR] Ancient Space Station [Space Spawn Ruin]
|
2017-06-27 21:25:50 -05:00 |
|
|
CitadelStationBot
|
ed4aa5a01a
|
Straight jackets can now properly be put onto others
|
2017-06-27 15:34:06 -05:00 |
|
|
LetterJay
|
10909c9dee
|
Update oldstation.dmm
|
2017-06-27 12:21:49 -05:00 |
|
|
LetterJay
|
00925de5f3
|
Update energy_gun.dm
|
2017-06-27 12:20:39 -05:00 |
|
|
LetterJay
|
3f3f86e81a
|
Merge pull request #1794 from Citadel-Station-13/upstream-merge-28853
[MIRROR] Adds container types INJECTABLE and DRAWABLE
|
2017-06-27 09:33:15 -05:00 |
|
|
CitadelStationBot
|
d375e24818
|
Automatic changelog generation for PR #1793 [ci skip]
|
2017-06-27 09:32:43 -05:00 |
|
|
LetterJay
|
5db1b0c06d
|
Merge pull request #1793 from Citadel-Station-13/upstream-merge-28841
[MIRROR] Some fixes for the anomalous crystal
|
2017-06-27 09:32:41 -05:00 |
|
|
CitadelStationBot
|
6a38955803
|
Adds container types INJECTABLE and DRAWABLE
|
2017-06-27 08:19:49 -05:00 |
|
|
CitadelStationBot
|
360209314d
|
Some fixes for the anomalous crystal
|
2017-06-27 08:13:38 -05:00 |
|
|
LetterJay
|
56f9c0f82a
|
Merge pull request #1756 from Citadel-Station-13/upstream-merge-28681
[MIRROR] PDA Refactor Part 1: Phantom Blood Menace
|
2017-06-27 08:05:25 -05:00 |
|
|
LetterJay
|
bb916b6040
|
Merge branch 'master' into upstream-merge-28681
|
2017-06-27 06:16:34 -05:00 |
|
|
LetterJay
|
83fead2492
|
Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567
[MIRROR] Refactors PDA cartridge permissions
|
2017-06-27 06:14:42 -05:00 |
|
|
LetterJay
|
f85de2ddd5
|
Update PDA_types.dm
|
2017-06-27 05:58:34 -05:00 |
|
|
LetterJay
|
2158ea1e67
|
Merge branch 'master' into upstream-merge-28681
|
2017-06-27 05:14:45 -05:00 |
|
|
LetterJay
|
8875fbefc5
|
Delete cart.dm.rej
|
2017-06-27 05:12:25 -05:00 |
|
|
LetterJay
|
9d6dec8975
|
Update cart.dm
|
2017-06-27 05:12:05 -05:00 |
|
|
LetterJay
|
163bcf0189
|
Delete PDA.dm.rej
|
2017-06-27 05:11:20 -05:00 |
|
|
LetterJay
|
926589fd58
|
Update PDA.dm
|
2017-06-27 05:11:06 -05:00 |
|
|
LetterJay
|
45b6931d9b
|
Update computer.dm
|
2017-06-27 00:28:52 -05:00 |
|
|
CitadelStationBot
|
07599125ef
|
Automatic changelog generation for PR #1790 [ci skip]
|
2017-06-27 00:27:48 -05:00 |
|
|
LetterJay
|
95a77e9dc1
|
Merge pull request #1790 from Citadel-Station-13/upstream-merge-28831
[MIRROR] Fix modular consoles
|
2017-06-27 00:27:47 -05:00 |
|
|
CitadelStationBot
|
3d1b8be7ce
|
Automatic changelog generation for PR #1728 [ci skip]
|
2017-06-26 23:37:03 -05:00 |
|
|
LetterJay
|
fdf216bf48
|
Merge pull request #1728 from Citadel-Station-13/upstream-merge-28645
[MIRROR] Adds custom lighting support to modular computers, and a flashlight to tablets
|
2017-06-26 23:37:01 -05:00 |
|
|
LetterJay
|
b79fdf0839
|
Delete tgstation.dme.rej
|
2017-06-26 23:21:33 -05:00 |
|
|
LetterJay
|
ccf4306224
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-06-26 23:19:54 -05:00 |
|
|
LetterJay
|
e2ccf1f52f
|
rej cleanup
|
2017-06-26 23:19:17 -05:00 |
|
|
LetterJay
|
039dcb464f
|
Delete tgui.js.rej
|
2017-06-26 23:18:08 -05:00 |
|
|
LetterJay
|
b44d1d721b
|
Update tgui.js
|
2017-06-26 23:15:48 -05:00 |
|
|
LetterJay
|
8022bc9046
|
Merge pull request #1792 from Citadel-Station-13/upstream-merge-28752
[MIRROR] Replaces old midi2piano with a new version
|
2017-06-26 23:04:18 -05:00 |
|
|
CitadelStationBot
|
d99ccf36a2
|
Replaces old midi2piano with a new version
|
2017-06-26 22:06:15 -05:00 |
|
|
CitadelStationBot
|
d97bb2d85d
|
Fix modular consoles
|
2017-06-26 22:02:01 -05:00 |
|
|
LetterJay
|
bd0f0c794b
|
Merge pull request #1789 from Citadel-Station-13/upstream-merge-28822
[MIRROR] Fixes the Hierophant's walls runtiming
|
2017-06-26 21:17:16 -05:00 |
|
|
LetterJay
|
89b2b47a83
|
Merge pull request #1788 from Citadel-Station-13/upstream-merge-28821
[MIRROR] Fixes PAIs deleting their card on death
|
2017-06-26 21:17:05 -05:00 |
|
|
CitadelStationBot
|
0f23003c2f
|
Fixes the Hierophant's walls runtiming
|
2017-06-26 15:59:25 -05:00 |
|
|
CitadelStationBot
|
abeac9d2ae
|
Fixes PAIs deleting their card on death
|
2017-06-26 15:55:15 -05:00 |
|
|
LetterJay
|
ba2e896d8c
|
Merge pull request #1719 from Citadel-Station-13/upstream-merge-28636
[MIRROR] Fixes random runtime
|
2017-06-26 10:53:07 -05:00 |
|
|
CitadelStationBot
|
2434b27582
|
Automatic changelog generation for PR #1744 [ci skip]
|
2017-06-26 10:52:23 -05:00 |
|
|
LetterJay
|
914434891a
|
Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685
[MIRROR] Fixes the sprite for the nullrod clown dagger skin
|
2017-06-26 10:52:21 -05:00 |
|
|
CitadelStationBot
|
718aa79f50
|
Automatic changelog generation for PR #1768 [ci skip]
|
2017-06-26 10:51:53 -05:00 |
|
|
LetterJay
|
090b8b5055
|
Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740
[MIRROR] Station Engineers Spawn With Industrial Welder
|
2017-06-26 10:51:51 -05:00 |
|
|
LetterJay
|
edcadfe83e
|
Merge pull request #1787 from Citadel-Station-13/upstream-merge-28765
[MIRROR] Small jungle trees
|
2017-06-26 10:10:34 -05:00 |
|
|
LetterJay
|
a076b8c54d
|
Merge pull request #1786 from Citadel-Station-13/upstream-merge-28814
[MIRROR] Fixes the AI core being flammable
|
2017-06-26 10:10:17 -05:00 |
|