 CitadelStationBot
|
a6cb12b84a
|
[MIRROR] Plastic golems (#806)
* Plastic golems
* Update lavaland_ruin_code.dm
* Delete lavaland_ruin_code.dm.rej
|
2017-05-08 00:25:20 -07:00 |
|
|
kevinz000
|
41341e50a5
|
Merge pull request #696 from Citadel-Station-13/upstream-merge-25458
[MIRROR] Belligerent now prevents you from running even between chants
|
2017-05-07 23:19:35 -07:00 |
|
|
kevinz000
|
49881624e2
|
Merge pull request #772 from Citadel-Station-13/upstream-merge-26874
[MIRROR] Fixes the most annoying thing about admin helping.
|
2017-05-07 23:16:33 -07:00 |
|
|
kevinz000
|
e94993f437
|
Revert "Delete mind.dm.rej"
This reverts commit 9430f89756.
|
2017-05-07 23:07:10 -07:00 |
|
|
kevinz000
|
9430f89756
|
Delete mind.dm.rej
|
2017-05-07 23:06:10 -07:00 |
|
|
kevinz000
|
010baa6a34
|
Merge pull request #661 from Citadel-Station-13/upstream-merge-26705
[MIRROR] Fixes spelling for Lavaland Syndicate
|
2017-05-07 22:53:29 -07:00 |
|
|
kevinz000
|
a87424e105
|
Merge pull request #735 from Citadel-Station-13/upstream-merge-26813
[MIRROR] Curator Update
|
2017-05-07 22:53:24 -07:00 |
|
|
kevinz000
|
9ca8b570b2
|
Merge branch 'master' into upstream-merge-26705
|
2017-05-07 22:53:14 -07:00 |
|
|
kevinz000
|
52a8aacd00
|
Delete lavaland_ruin_code.dm.rej
|
2017-05-07 22:52:47 -07:00 |
|
|
kevinz000
|
204a3a3938
|
Update lavaland_ruin_code.dm
|
2017-05-07 22:52:39 -07:00 |
|
|
kevinz000
|
106a9d3ad9
|
Delete clockwork_slab.dm.rej
|
2017-05-07 22:48:04 -07:00 |
|
|
kevinz000
|
e12fc21d60
|
Update clockwork_slab.dm
|
2017-05-07 22:47:58 -07:00 |
|
|
kevinz000
|
bebb9ec571
|
Delete status_effect.dm.rej
|
2017-05-07 22:44:14 -07:00 |
|
|
kevinz000
|
14a9bda61e
|
Update status_effect.dm
|
2017-05-07 22:44:06 -07:00 |
|
|
kevinz000
|
bd8bfe1327
|
Merge pull request #684 from Citadel-Station-13/upstream-merge-26728
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
|
2017-05-07 22:41:24 -07:00 |
|
|
kevinz000
|
8c80fee6aa
|
Merge pull request #835 from Citadel-Station-13/upstream-merge-26993
[MIRROR] Allows Mediborg organ storage to hold inorganic bodyparts
|
2017-05-07 22:36:52 -07:00 |
|
|
kevinz000
|
54b8375f9c
|
Merge pull request #803 from Citadel-Station-13/upstream-merge-26881
[MIRROR] Updated: Reduces dominator timer ceiling, changes territory scaling
|
2017-05-07 22:36:03 -07:00 |
|
|
kevinz000
|
4a59682803
|
Update gang.dm
|
2017-05-07 22:35:54 -07:00 |
|
|
kevinz000
|
6bf46e1a6d
|
Delete gang.dm.rej
|
2017-05-07 22:35:48 -07:00 |
|
|
kevinz000
|
9012783adb
|
Merge pull request #838 from Citadel-Station-13/upstream-merge-26888
[MIRROR] Adds several weapons and cost adjustments to Gangtool
|
2017-05-07 22:35:11 -07:00 |
|
|
kevinz000
|
335b6cde56
|
Merge branch 'master' into upstream-merge-26813
|
2017-05-07 22:31:16 -07:00 |
|
|
kevinz000
|
a87cee8a05
|
copy-paste-this-from-tg
|
2017-05-07 22:30:43 -07:00 |
|
|
kevinz000
|
68f7ea7fd0
|
handled rejects
|
2017-05-07 22:30:28 -07:00 |
|
|
kevinz000
|
2e0dd27978
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
|
2017-05-07 22:28:00 -07:00 |
|
|
kevinz000
|
066c8e8de8
|
Merge pull request #720 from Citadel-Station-13/upstream-merge-26822
[MIRROR] Trophy case hotfixes
|
2017-05-07 22:27:05 -07:00 |
|
|
kevinz000
|
48d9e2e349
|
fixes rejects
|
2017-05-07 22:24:26 -07:00 |
|
|
kevinz000
|
5d2f131d07
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822
|
2017-05-07 22:22:24 -07:00 |
|
|
kevinz000
|
13b0ae2b45
|
Merge pull request #676 from Citadel-Station-13/upstream-merge-26725
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
|
2017-05-07 19:37:35 -07:00 |
|
|
kevinz000
|
03a52b2bc9
|
Merge pull request #836 from Citadel-Station-13/upstream-merge-26984
[MIRROR] Fixes clockwork obelisk logic
|
2017-05-07 19:21:56 -07:00 |
|
|
kevinz000
|
e3f123d5bb
|
Merge pull request #821 from Citadel-Station-13/upstream-merge-26970
[MIRROR] Fixes an inconsistency with the Banana Honk drink
|
2017-05-07 19:19:44 -07:00 |
|
|
kevinz000
|
68e1087825
|
Merge pull request #823 from Citadel-Station-13/upstream-merge-26959
[MIRROR] Mega arachnid
|
2017-05-07 19:17:10 -07:00 |
|
|
kevinz000
|
6c293e3e3d
|
Merge pull request #716 from Citadel-Station-13/upstream-merge-26768
[MIRROR] Species-locked inventory slots are now indicated.
|
2017-05-07 19:15:02 -07:00 |
|
|
kevinz000
|
eb9caea261
|
Merge pull request #658 from Citadel-Station-13/upstream-merge-26670
[MIRROR] The least surprising nerf: Null Crates & Emagged Plasma Export Bonus
|
2017-05-07 19:14:06 -07:00 |
|
|
kevinz000
|
2f55a67b7a
|
Delete packs.dm.rej
|
2017-05-07 19:13:39 -07:00 |
|
|
kevinz000
|
18abfb70c9
|
Update packs.dm
|
2017-05-07 19:13:29 -07:00 |
|
|
kevinz000
|
2a8acb13d2
|
Merge pull request #840 from Citadel-Station-13/upstream-merge-26966
[MIRROR] Fixes being able to stand on chasms
|
2017-05-07 19:07:59 -07:00 |
|
|
kevinz000
|
09dbd467bb
|
Merge pull request #820 from Citadel-Station-13/upstream-merge-26976
[MIRROR] Fixes away gateway
|
2017-05-07 19:07:41 -07:00 |
|
|
kevinz000
|
cab4c53f06
|
Merge pull request #841 from Citadel-Station-13/upstream-merge-26940
[MIRROR] Plastic sheet production - Chemistry recipe
|
2017-05-07 19:06:30 -07:00 |
|
|
CitadelStationBot
|
47c0304a4b
|
Corrects get id query to ckey
|
2017-05-07 19:40:58 -05:00 |
|
|
LetterJay
|
2efe90055f
|
Revert "[MIRROR] Fixes say verbs not working"
|
2017-05-07 19:41:33 -04:00 |
|
|
CitadelStationBot
|
61a7897962
|
Plastic sheet production - Chemistry recipe
|
2017-05-07 18:23:05 -05:00 |
|
|
CitadelStationBot
|
884338d048
|
Fixes being able to stand on chasms
|
2017-05-07 18:06:44 -05:00 |
|
|
CitadelStationBot
|
db468a1dd6
|
Adds several weapons and cost adjustments to Gangtool
|
2017-05-07 18:00:26 -05:00 |
|
|
CitadelStationBot
|
e3b3921bf2
|
Fixes clockwork obelisk logic
|
2017-05-07 17:15:22 -05:00 |
|
|
CitadelStationBot
|
6d2b02dabd
|
Allows Mediborg organ storage to hold inorganic bodyparts
|
2017-05-07 17:14:17 -05:00 |
|
|
CitadelStationBot
|
181eee013e
|
[READY]DATUM VERBS AND TOP MENUS!
|
2017-05-07 17:07:59 -05:00 |
|
|
CitadelStationBot
|
53d43227ab
|
Fixes this annoying ass thing in the bandb I should have fixed before.
|
2017-05-07 17:05:44 -05:00 |
|
|
LetterJay
|
75ca44a767
|
Merge pull request #827 from LetterJay/snap
Snap Emote
|
2017-05-07 15:41:32 -05:00 |
|
|
kevinz000
|
482ac95873
|
Merge pull request #822 from Citadel-Station-13/upstream-merge-26987
[MIRROR] Sigils of Transgression are brighter
|
2017-05-07 13:07:14 -07:00 |
|
|
kevinz000
|
78d64cbeed
|
Merge pull request #825 from Citadel-Station-13/upstream-merge-26941
[MIRROR] C4 planting takes 3 seconds, down from 5
|
2017-05-07 12:59:10 -07:00 |
|