shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,666 Commits 5 Branches 0 Tags
3ba5a2fd69287c170d04e547332c15dcb8bfe430
Commit Graph

267 Commits

Author SHA1 Message Date
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
BlackMajor
dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124 
Removes Nitryl bounty but adds 7 more in!
 2019-08-19 20:07:40 +12: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
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
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
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