shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

47 Commits

Author SHA1 Message Date
BlackMajor
95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13:00
r4d6
5f95e0d5a6 Remove an extra antimatter engine shielding 2019-12-13 08:17:06 -05:00
Useroth
28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Useroth
1158c03ed7 Added bamboo. 2019-12-06 19:00:10 +01:00
Winter Flare
6377f1b3a9 Organisation 2019-12-06 03:42:57 -05:00
Winter Flare
8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare
83b77650a8 Additional Cleanup 
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
 2019-12-06 01:13:54 -05:00
kevinz000
b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404 
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
 2019-12-05 21:47:29 -07:00
Winter Flare
c31ca96e87 Rebalanced Meat Crate 2019-12-02 16:21:48 -05:00
Winter Flare
89aa08837f Updated Access, Bluespace Trash (again). Fixes 
Updated Engineering and Medical hardsuits to require access for their applicable departments.

Moved Virus Containment into it's proper file.

Put Bluespace Trashbag back in the advanced sanitation crate.

Spellcheck.
 2019-12-01 05:12:14 -05:00
Winter Flare
66114f9c37 Removed Power Tools, Tweaked EF Crate 
Removed Power Tool Crate

Made exotic footwear non-contraband, and increased price.
 2019-11-30 00:49:14 -05:00
Winter Flare
a524ca6f18 Spellchecking and Crate balance. 
Integrated #9939 spellchecking.

Rebalanced Emergency Medical Supplies, EMS Lite, and advanced janitorial crate. (Also added to Advanced Janitorial and Power Tools crate that they require access.)
 2019-11-29 16:54:04 -05:00
Ghommie
e6484a22a8 Ports tgstation loom changes, and durathred golems. 2019-11-29 05:34:17 +01:00
Winter Flare
ee55170b3f Fixed Meat Crates 2019-11-28 18:30:43 -05:00
Ghommie
e884f606c4 wait, what the fuck! 2019-11-28 05:41:49 +01:00
Ghommie
6194dddf42 I'll hold on this until I port the conveyor_construct conversion to stacks. 2019-11-28 05:40:26 +01:00
Ghommie
0ad89bd9de Merging, tweaking or otherwise removing a few of the stupidest cargo packs. 2019-11-28 05:34:56 +01:00
Winter Flare
6a4c959b0a Added more crates. 2019-11-24 19:05:03 -05:00
Winter Flare
386dd6aa8a Made Medical Emergency Crate Drop-Pod only. 
Trill made me do it.
 2019-11-22 06:44:59 -05:00
Winter Flare
05b22caaa3 Added 12 new crates, fixed issues raised in #9901 
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
 2019-11-22 02:37:57 -05:00
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