kevinz000
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
TrilbySpaceClone
|
73661cfe52
|
more fixing+ chem selling tweaks
|
2019-11-13 09:39:42 -05:00 |
|
TrilbySpaceClone
|
de1ce4afc8
|
more crates and explote fixing
|
2019-11-13 09:15:44 -05:00 |
|
TrilbySpaceClone
|
ec57e28c17
|
Merge branch 'master' into Cargo_MKII
|
2019-11-13 08:00:24 -05:00 |
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
kevinz000
|
487e1806e7
|
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
|
2019-11-10 11:30:33 -07:00 |
|
TrilbySpaceClone
|
0662245d80
|
corrections
|
2019-11-06 22:52:44 -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 |
|
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
|
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
|
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 |
|
Trilbyspaceclone
|
c0034e93a1
|
readds chose goose
|
2019-10-16 22:31:34 -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
|
71aeddd6f6
|
Packbrakeout
|
2019-09-02 11:17:55 -04:00 |
|