Commit Graph

243 Commits

Author SHA1 Message Date
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +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
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
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
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
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
Trilbyspaceclone
9d15665cbb Update packs.dm 2019-03-20 17:12:05 -04:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
2019-03-10 13:44:57 -07:00
Trilbyspaceclone
8b99ca8094 Update packs.dm 2019-03-09 20:31:00 -05:00
Trilbyspaceclone
beb812e291 Update packs.dm 2019-03-09 20:03:40 -05:00
Trilbyspaceclone
1995f2d61d [Ready] More cargo bounties. (#7955)
* Fixing updater

* Update medical.dm

* Update medical.dm

* ?

* Update engineering.dm

* Update science.dm

* Update security.dm

* Update mining.dm

* Forgot this

* Apply suggestions from code review

Killing rag with grammar

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Update science.dm

* Kev requestions

* Fixed?

* even more sec things

* Makes bluespace crystals say the kind they want

* Fixed? And more medical boundys

* Update medical.dm

* Blood fixed?

* Update medical.dm

* Poojawa the saver

* Poojawa the hero

* Update medical.dm
2019-02-22 05:51:01 -08:00
deathride58
225d435efd Merge pull request #8015 from Trilbyspaceclone/patch-62
Adds A Valentine Crate And Candy Crate
2019-02-20 20:18:42 -05:00
BlackMajor
10244cd3b1 Plushtide 2
More plushies, /random plush spawner.
Some more dumb sounds.
2019-02-20 01:36:38 +13:00
Trilbyspaceclone
66f1a572ea Update packs.dm 2019-02-17 22:00:41 -05:00
Trilbyspaceclone
5ca088202d Update packs.dm 2019-02-17 21:25:40 -05:00
Tupinambis
0f271498d1 Makes plushies less common. (#7981) 2019-02-13 20:47:09 -08:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -08:00