LetterJay
|
f2c011a37b
|
Update console.dm
|
2017-08-14 18:55:25 -05:00 |
|
CitadelStationBot
|
f840a18a9a
|
Fix compile warning
|
2017-08-14 02:59:42 -05:00 |
|
CitadelStationBot
|
cdbaf5c4e8
|
Standardized CENTCOM spelling
|
2017-08-08 09:05:44 -05:00 |
|
CitadelStationBot
|
dd22c79678
|
Completes major inhand split project (#2178)
|
2017-08-02 06:30:33 -05:00 |
|
CitadelStationBot
|
76f7fcef9a
|
[MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
|
2017-08-02 03:17:32 -05:00 |
|
CitadelStationBot
|
2d74f9f45a
|
Fixes a cliffhanger comment
|
2017-07-31 08:57:56 -05:00 |
|
LetterJay
|
35fba1933e
|
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
|
2017-07-31 03:43:03 -05:00 |
|
LetterJay
|
27b826a6f1
|
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
[MIRROR] Changes all access const to be a define
|
2017-07-19 13:18:58 -05:00 |
|
CitadelStationBot
|
a72962c300
|
Made some object lists less terrible to read
|
2017-07-18 09:44:43 -05:00 |
|
CitadelStationBot
|
260a140f97
|
Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034)
|
2017-07-17 00:52:43 -07:00 |
|
CitadelStationBot
|
609ae007ae
|
Changes all access const to be a define
|
2017-07-16 11:44:47 -05:00 |
|
CitadelStationBot
|
d21766956e
|
[MIRROR] Cleaned up some emag_acts (#2018)
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
|
2017-07-15 13:17:56 -07:00 |
|
CitadelStationBot
|
ff6bbbedf5
|
Changes some 1s and 0s to TRUE and FALSE (#1967)
|
2017-07-10 16:13:16 -07:00 |
|
Poojawa
|
b1b4826c0c
|
July 5th TG sync (#1883)
July 5th TG sync
|
2017-07-05 22:14:19 -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 |
|
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
|
5571cca37c
|
.rej cleanup
|
2017-06-26 06:14:42 -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
|
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
|
35ac6c40e0
|
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652)
|
2017-06-20 07:59:04 -07:00 |
|
LetterJay
|
a4c9dc43dd
|
Dufflebag => Dufflebag
|
2017-06-19 16:42:05 -05:00 |
|
CitadelStationBot
|
00a4b5ce8c
|
Fixes 28154: Accidental cargo exploit edition. (#1471)
|
2017-06-17 13:37:43 -07:00 |
|
CitadelStationBot
|
3f92d14933
|
Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
|
2017-06-16 20:12:20 -05:00 |
|
LetterJay
|
b80a184d97
|
up to upstream-merge-27868
|
2017-06-11 00:04:00 -05:00 |
|
LetterJay
|
7189249f66
|
Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
|
2017-06-10 09:01:25 -05:00 |
|
CitadelStationBot
|
f26cf4e9ef
|
Clown Toy Box + Wooden Crates
|
2017-06-09 11:02:37 -05:00 |
|
CitadelStationBot
|
9725329268
|
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
|
2017-06-07 03:06:15 -05:00 |
|
LetterJay
|
35b56f3075
|
Merge branch 'master' into upstream-merge-27773
|
2017-06-06 09:05:26 -05:00 |
|
LetterJay
|
bc5ecc91b5
|
rej clean
|
2017-05-30 15:55:00 -05:00 |
|
LetterJay
|
33af767101
|
Merge pull request #1169 from Citadel-Station-13/upstream-merge-27596
[MIRROR] Nerfs plasma cost
|
2017-05-30 15:46:34 -05:00 |
|
LetterJay
|
3c89f142ed
|
Update materials.dm
|
2017-05-30 15:17:00 -05:00 |
|
CitadelStationBot
|
afbfb66386
|
Splits mining_mobs.dm into separate files
|
2017-05-29 01:17:13 -05:00 |
|
CitadelStationBot
|
a4b0d04fe4
|
Fixes a runtime with contraband crates
|
2017-05-27 20:56:13 -05:00 |
|
CitadelStationBot
|
20886e15de
|
Nerfs plasma cost
|
2017-05-24 16:54:14 -05:00 |
|
CitadelStationBot
|
01cd2039e5
|
Changes investigate logs to use a define
|
2017-05-22 22:45:54 -05:00 |
|
CitadelStationBot
|
7d04404ae3
|
[MIRROR] Fixed tech disk exports (#971)
* Fixed tech disk exports
* Update research.dm
* Delete research.dm.rej
|
2017-05-18 11:59:06 -05:00 |
|
CitadelStationBot
|
abc74c8b06
|
Fixes engraved messages
|
2017-05-14 14:50:49 -05:00 |
|
CitadelStationBot
|
18607f79a2
|
Wooden planks now sell for 50 instead of 25 cargo points (#897)
|
2017-05-10 16:00:59 -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
|
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 |
|
CitadelStationBot
|
30f7e170a3
|
Makes medbay vending machines buildable
|
2017-05-06 13:52:12 -05:00 |
|
CitadelStationBot
|
33a93a611b
|
Curator Update
|
2017-05-03 22:22:12 -05:00 |
|
CitadelStationBot
|
0bbe5a67fa
|
The least surprising nerf: Null Crates & Emagged Plasma Export Bonus
|
2017-04-29 17:05:17 -05:00 |
|
CitadelStationBot
|
bde5d6253a
|
Unorphans the blackbox
|
2017-04-26 17:05:23 -05:00 |
|
Poojawa
|
9e72b1b8fd
|
/tg/ 4/14 (#367)
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
|
2017-04-14 23:28:04 -05:00 |
|