CitadelStationBot
|
ec253c4e28
|
[MIRROR] cryotube pod improvements (#1681)
* Bay-like cryotube pods
* Update cryo.dm
* Delete cryo.dm.rej
* Delete cryo.dm
* cryogenics.dmi
|
2017-06-28 04:01:35 -05:00 |
|
CitadelStationBot
|
237691f6fd
|
[MIRROR] Fixes problems that were in the original PR (#1419)
* Fixes problems that were in the original PR
* rej cleanup
* Wow CSS is even worse than byond
|
2017-06-28 03:02:50 -05:00 |
|
CitadelStationBot
|
32f904356d
|
[MIRROR] Removes check_tick from ORM ui_data (#1415)
* Removes check_tick from ORM ui_data
* Update machine_redemption.dm
* Delete machine_redemption.dm.rej
|
2017-06-28 02:28:00 -05:00 |
|
CitadelStationBot
|
65736b7e23
|
[MIRROR] Ports the Ore Redemption Machine to TGUI (#1414)
* Ports the Ore Redemption Machine to TGUI
* Update tgui.css
* Update tgui.js
* Delete tgui.css.rej
* Delete tgui.js.rej
|
2017-06-28 02:24:55 -05:00 |
|
Poojawa
|
789064a3a5
|
Clean up .rej files
|
2017-06-28 02:24:03 -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 |
|
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
|
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
|
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
|
45b6931d9b
|
Update computer.dm
|
2017-06-27 00:28:52 -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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
LetterJay
|
9803f24547
|
Merge pull request #1785 from Citadel-Station-13/upstream-merge-28760
[MIRROR] Adds some neat tiles and walls for use on lavaland
|
2017-06-26 10:10:00 -05:00 |
|
LetterJay
|
89fc77521e
|
Merge pull request #1784 from Citadel-Station-13/upstream-merge-28770
[MIRROR] Fixes piggybacking giving person on top projectile density instead of the person on the bottom.
|
2017-06-26 10:09:34 -05:00 |
|
LetterJay
|
28cd2d6164
|
Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644
[MIRROR] Ninja Dash
|
2017-06-26 10:09:16 -05:00 |
|
CitadelStationBot
|
10f3b3db50
|
Fixes the AI core being flammable
|
2017-06-26 09:38:44 -05:00 |
|
CitadelStationBot
|
ac33b9defb
|
Adds some neat tiles and walls for use on lavaland
|
2017-06-26 09:19:17 -05:00 |
|
CitadelStationBot
|
06e536de4f
|
Fixes piggybacking giving person on top projectile density instead of the person on the bottom.
|
2017-06-26 09:01:53 -05:00 |
|
LetterJay
|
028752c3de
|
Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564
[MIRROR] Shuttle engines affecting travel time
|
2017-06-26 09:00:54 -05:00 |
|
CitadelStationBot
|
5cf2065432
|
Ninja Dash
|
2017-06-26 08:57:46 -05:00 |
|
LetterJay
|
46c3108267
|
Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749
[MIRROR] Exporting mechs!
|
2017-06-26 06:28:22 -05:00 |
|
LetterJay
|
ec966f6814
|
Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750
[MIRROR] Makes goonchat robust.
|
2017-06-26 06:26:11 -05:00 |
|
LetterJay
|
260ee23be8
|
Merge pull request #1649 from Citadel-Station-13/upstream-merge-28490
[MIRROR] The Hierophant is a little less chaotic and murdery on average
|
2017-06-26 06:23:25 -05:00 |
|
LetterJay
|
77295c30d4
|
Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599
[MIRROR] Disablers now have an in-hand sprite (Fixes #28582)
|
2017-06-26 06:21:50 -05:00 |
|
LetterJay
|
75339a25c4
|
Merge pull request #1781 from Citadel-Station-13/upstream-merge-28782
[MIRROR] Improves Ahelp feedback
|
2017-06-26 06:19:03 -05:00 |
|
LetterJay
|
49e1c3f2b6
|
Merge pull request #1689 from Citadel-Station-13/upstream-merge-28591
[MIRROR] Changes tooltip verbs to be on preferences tab
|
2017-06-26 06:15:45 -05:00 |
|
LetterJay
|
f1937eb1fc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-06-26 06:14:55 -05:00 |
|
LetterJay
|
5571cca37c
|
.rej cleanup
|
2017-06-26 06:14:42 -05:00 |
|
LetterJay
|
43d4a06266
|
Merge pull request #1662 from Citadel-Station-13/upstream-merge-28543
[MIRROR] Fixes crusher trophies not properly being added
|
2017-06-26 06:13:46 -05:00 |
|
LetterJay
|
89bc574cb9
|
Merge pull request #1761 from Citadel-Station-13/upstream-merge-28708
[MIRROR] Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit
|
2017-06-26 06:13:26 -05:00 |
|
CitadelStationBot
|
5f4e1ed721
|
Improves Ahelp feedback
|
2017-06-26 06:01:38 -05:00 |
|
LetterJay
|
b4473bedb2
|
Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
|
2017-06-26 05:57:59 -05:00 |
|
LetterJay
|
ed6c0b042e
|
Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
[MIRROR] Clown Toy Box + Wooden Crates
|
2017-06-26 04:29:08 -05:00 |
|
LetterJay
|
4fff59df02
|
Update large_objects.dm
|
2017-06-26 02:35:58 -05:00 |
|
CitadelStationBot
|
0178323fe1
|
Makes goonchat robust.
|
2017-06-26 00:03:57 -05:00 |
|
CitadelStationBot
|
1a38b6fd6f
|
Shuttle engines affecting travel time
|
2017-06-25 20:53:00 -05:00 |
|
CitadelStationBot
|
e57a753701
|
Exporting mechs!
|
2017-06-25 11:35:00 -05:00 |
|
CitadelStationBot
|
d4c54bb0b5
|
Ancient Space Station [Space Spawn Ruin]
|
2017-06-25 11:03:27 -05:00 |
|
CitadelStationBot
|
0c2bf7e5ea
|
Station Engineers Spawn With Industrial Welder
|
2017-06-25 09:17:52 -05:00 |
|
CitadelStationBot
|
919f9f0cfc
|
Turns the maid costume's apron into a detachable accessory.
|
2017-06-24 15:40:03 -05:00 |
|