Commit Graph

370 Commits

Author SHA1 Message Date
Winter Flare
4b6d9848ff Update assistant.dm 2019-11-05 01:44:15 -05:00
Winter Flare
74b5961a8d Removed an unneeded line, added gas masks 2019-11-05 01:43:38 -05:00
Winter Flare
87695c0a21 Moved some stuff around, added some more.
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
2019-11-05 00:22:22 -05:00
Trilbyspaceclone
09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00
Trilbyspaceclone
061579decb no fun allowed 2019-11-04 17:08:55 -05:00
Trilbyspaceclone
28b96494e6 huh 2019-11-04 17:03:00 -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
Trilbyspaceclone
3ab70cbc26 Update sheets.dm 2019-11-03 13:04:48 -05:00
TrilbySpaceClone
a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
Trilbyspaceclone
4fa6c4d5c0 Apply suggestions from code review
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
2019-11-03 11:10:30 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Winter Flare
eb5f014382 Travis is mean. 2019-11-01 05:24:20 -04:00
Winter Flare
7a9f48302d Reworked a bit of bounty stuff. 2019-11-01 01:38:27 -04:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Trilbyspaceclone
db19eae0f8 Apply suggestions from code review
Grammar

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
2019-10-27 08:44:46 -04:00
TrilbySpaceClone
63cb466360 MK II 2019-10-26 18:59:34 -04:00
kevinz000
50b9ae3cf3 Update large_objects.dm 2019-10-25 09:39:00 -07:00
kevinz000
8f1c983b25 Update armory.dm 2019-10-25 09:36:54 -07:00
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