shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,351 Commits 5 Branches 0 Tags
a650e1e411a8b42e522aac6dac0cb142a08098d9
Commit Graph

300 Commits

Author SHA1 Message Date
kevinz000
9a74d91106 Merge pull request #9542 from Trilbyspaceclone/patch-231 
Lowers Cargo most packs down to Pre- MK I Cargo rework*
 2019-10-24 18:51:34 -07:00
Trilbyspaceclone
8ce8246182 lowers paperwork 2019-10-21 19:01:59 -04:00
Trilbyspaceclone
7adba39e82 Update misc.dm 2019-10-21 19:00:02 -04:00
Trilbyspaceclone
0b03b879b3 adds more crates 2019-10-21 18:51:39 -04:00
Trilbyspaceclone
70c7894155 Update emergency.dm 2019-10-21 17:20:44 -04:00
Trilbyspaceclone
6379807370 Update armory.dm 2019-10-21 17:10:48 -04:00
Trilbyspaceclone
656ff4d943 Lowers exotic carpet to 7k from 10k 2019-10-20 00:18:11 -04:00
Poojawa
c7e1449a3c re-adds blood crate 2019-10-18 06:02:23 -05:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Trilbyspaceclone
113f62a705 right 
we removed my tools...
 2019-10-17 01:38:29 -04:00
Trilbyspaceclone
c0034e93a1 readds chose goose 2019-10-16 22:31:34 -04: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
Trilbyspaceclone
1ccf95462a Update costumes_toys.dm 2019-10-08 19:07:02 -04:00
Trilbyspaceclone
0a878c17bc readds carpet 2019-10-08 18:51:58 -04:00
Trilbyspaceclone
e4a2c21b8c Merge branch 'master' into Cargo_rebalance 2019-10-08 18:49:38 -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
bacd0d39de recomplie 2019-10-01 20:56:01 -04:00
Poojawa
f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
TrilbySpaceClone
fd585aa6ea Merge branch 'master' into more_cooking2 2019-09-03 11:22:38 -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
TrilbySpaceClone
0e5ddc88c1 Part 2 
bounty nerfs
 2019-08-28 19:51:07 -04:00
TrilbySpaceClone
f0a1d44503 Part 1 
The food brake
 2019-08-28 16:54:10 -04:00
TrilbySpaceClone
db317b65af Grand! 2019-08-24 19:39:15 -04:00
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
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05: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
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
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