Commit Graph

504 Commits

Author SHA1 Message Date
Ghommie 1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Trilbyspaceclone 5ea9d998fd k_elasticity = 0 2019-07-10 18:32:55 -04:00
Trilbyspaceclone f37e1bf01b Merge branch 'master' into Unmodular 2019-07-09 03:14:49 -04:00
Ghommie b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
TrilbySpaceClone 9d6c930b2c owo
Wat dis?
2019-06-30 15:47:45 -04:00
kevinz000 6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
2019-06-28 05:28:35 -07:00
deathride58 fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
2019-06-28 00:47:09 -04:00
Trilbyspaceclone 063fe4fdef Merge branch 'master' into Unmodular 2019-06-23 21:06:21 -04:00
Ghommie e0b9706453 Alphabetic order. 2019-06-24 00:38:34 +02:00
Ghommie 138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +02:00
Ghommie b85d4d6fb3 Sort of porting MRE rations from Yogstation. 2019-06-22 16:05:03 +02:00
Sishen ec43b34995 access denied 2019-06-20 20:56:25 -04:00
Sishen 59cf148211 Update large_objects.dm 2019-06-20 20:09:44 -04:00
Sishen a5f1028cd8 Update packs.dm 2019-06-20 19:47:45 -04:00
Sishen df7f8b8313 Update large_objects.dm 2019-06-20 19:23:47 -04:00
Sishen 0d3efa0abd sell gases to get that fuckin bike 2019-06-20 19:21:12 -04:00
Ghommie d5279c8373 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-17 09:51:22 +02:00
TrilbySpaseClone b45c870ae4 Immodular 2019-06-16 19:58:49 -04:00
TrilbySpaseClone 3cebb1e807 Worked?
Yay?
2019-06-10 22:59:36 -04:00
kevinz000 4050ba98eb Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
2019-06-08 01:23:31 -07:00
kevinz000 88990f5ae0 Merge pull request #8544 from Trilbyspaceclone/patch-166
Makes ice cream vats and food carts buy-able via cargo
2019-06-08 01:21:41 -07:00
kevinz000 c8435a5658 Merge pull request #8414 from Trilbyspaceclone/MASON
New M.A.S.O.N rig
2019-06-08 01:08:00 -07:00
kevinz000 c7f346a03c Merge pull request #8442 from Trilbyspaceclone/patch-139
Makes soviet clothing no longer need to be hacked AND emaged
2019-06-08 01:02:21 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Trilbyspaceclone a7fe2ca0ff paper work icons 2019-06-06 16:03:24 -04:00
Trilbyspaceclone 7f35a15020 Update packs.dm 2019-06-06 15:58:13 -04:00
Trilbyspaceclone e2a3b855b8 Update order.dm 2019-06-06 15:56:27 -04:00
Trilbyspaceclone 4ef2b15c69 Update manifest.dm 2019-06-06 15:51:37 -04:00
Trilbyspaceclone 3e98ed9553 Update packs.dm 2019-06-05 20:41:59 -04:00
Ghommie af2598035a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-06-05 19:32:17 +02:00
Ghommie 0513f3464a one 2019-06-05 19:20:25 +02:00
Sishen 9aaeed6f81 Update packs.dm 2019-06-01 19:46:09 -04:00
Sishen 5dde4555cc lmao2crate 2019-05-31 21:11:39 -04:00
Trilbyspaceclone 057fd54d92 Update packs.dm 2019-05-26 15:25:04 -04:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
Trilbyspaceclone 82ea741f57 Update packs.dm 2019-05-22 14:34:50 -04:00
Trilbyspaceclone 9f2b91b2e9 Apply suggestions from code review
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-18 12:24:40 -04:00
Trilbyspaceclone 050906bfe8 I know how to code I sware 2019-05-12 22:22:09 -04:00
Trilbyspaceclone e9a18f156f Update engineering.dm 2019-05-12 22:03:21 -04:00
Poojawa 9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00
Trilbyspaceclone 1aa312822a Sure 2019-04-23 02:34:14 -04:00
Trilbyspaceclone e61b4f83d8 Update large_objects.dm 2019-04-20 00:37:45 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
kevinz000 b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Trilbyspaceclone 3e023df8be Update packs.dm 2019-04-04 16:09:45 -04:00
Trilbyspaceclone 899985f22e Update packs.dm 2019-04-04 15:35:49 -04:00
Trilbyspaceclone 0504f2e02a Update packs.dm 2019-03-24 10:34:35 -04:00
Trilbyspaceclone bf1c8a5e7d LOCAL CAT CANT DO ANYTHING CORRECT 2019-03-20 21:09:40 -04:00
Trilbyspaceclone 978b5261ce Update packs.dm 2019-03-20 20:54:34 -04:00