Commit Graph

174 Commits

Author SHA1 Message Date
Persi
0c9244f669 Clarifies comments and locks defusal kits behind an emag 2020-02-15 14:17:22 -05:00
Trilbyspaceclone
cb215be40d Apply suggestions from code review
dap the hero

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
2019-11-04 07:21:30 -05:00
TrilbySpaceClone
526d9b203c aliens
man
2019-11-04 00:34:03 -05:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
Sishen
c51bfc153b b 2019-10-11 13:24:00 -04:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Sishen
f3d373a6b8 loose goose
honk honk
2019-10-02 02:27:30 -04:00
TrilbySpaceClone
71aeddd6f6 Packbrakeout 2019-09-02 11:17:55 -04:00
TrilbySpaceClone
d37cb76f42 part 3 2019-08-28 21:18:51 -04:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Winter Flare
141a93236c Service QoL
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
2019-08-14 04:01:18 -04:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
kevinz000
cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular
Ummodular a few files - Fixes Freelance Crate costs
2019-08-05 00:47:28 -07:00
Trilbyspaceclone
3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
Poojawa
ec90505881 neyh 2019-08-01 11:06:03 -05:00
Ghommie
1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. 2019-07-31 21:02:12 +02:00
kevinz000
e0c92e023c Merge pull request #8931 from Trilbyspaceclone/cargo_memes_2
3 New cargocrates - Security EVA jetpacks, woodstock shotguns, and russian clothing + guns (that totally is balanced)
2019-07-25 17:42:45 -07:00
kevinz000
f114094138 Merge pull request #8926 from Thalpy/Secbats
Secbats
2019-07-22 20:15:36 -07:00
Fermi
4f2406ee3a Made it a critterbox instead. 2019-07-20 20:55:46 +01:00
Fermi
c2b3df34c1 Cargobox. 2019-07-20 20:46:50 +01:00
TrilbySpaceClone
0a8954c2d6 Update packs.dm 2019-07-19 23:53:12 -04:00
TrilbySpaceClone
d981b756e3 Update packs.dm 2019-07-19 23:49:53 -04:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Trilbyspaceclone
f37e1bf01b Merge branch 'master' into Unmodular 2019-07-09 03:14:49 -04: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
a5f1028cd8 Update packs.dm 2019-06-20 19:47:45 -04:00
Sishen
0d3efa0abd sell gases to get that fuckin bike 2019-06-20 19:21:12 -04: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
Trilbyspaceclone
7f35a15020 Update packs.dm 2019-06-06 15:58:13 -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
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