afd848e45a
weh
2020-01-20 10:29:09 +08:00
ee33e36e6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-12 12:46:30 -05:00
c0e010c612
e
2020-01-04 16:44:11 -06:00
97242050ec
bad idea
2020-01-04 02:16:55 -06:00
7c98656939
upstream merge
2020-01-04 01:48:50 -06:00
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
8b760f5f3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-03 21:01:31 -05:00
be62bbc96d
Lowering price and change description
2019-12-31 18:17:07 -05:00
81a39aa324
Add the space radsuit and the crate
2019-12-31 13:25:09 -05:00
c0bc53ea81
more
2019-12-31 01:43:42 -05:00
970814adbc
it begins
2019-12-31 01:42:07 -05:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
5f95e0d5a6
Remove an extra antimatter engine shielding
2019-12-13 08:17:06 -05:00
e6282e95c2
Apply suggestions from code review
...
Ghommie fixes
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-12 21:46:31 -05:00
28ddfd29b6
Merge branch 'master' into new-tg-plants
2019-12-07 14:25:38 +01:00
c4450579ac
Why does breakfast have a timer?
...
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
2019-12-07 01:53:55 -05:00
1158c03ed7
Added bamboo.
2019-12-06 19:00:10 +01:00
6377f1b3a9
Organisation
2019-12-06 03:42:57 -05:00
8bd6c58bcd
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:27:44 -05:00
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
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
c31ca96e87
Rebalanced Meat Crate
2019-12-02 16:21:48 -05:00
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
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
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
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
ee55170b3f
Fixed Meat Crates
2019-11-28 18:30:43 -05:00
e884f606c4
wait, what the fuck!
2019-11-28 05:41:49 +01:00
6194dddf42
I'll hold on this until I port the conveyor_construct conversion to stacks.
2019-11-28 05:40:26 +01:00
0ad89bd9de
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-11-28 05:34:56 +01:00
6a4c959b0a
Added more crates.
2019-11-24 19:05:03 -05:00
386dd6aa8a
Made Medical Emergency Crate Drop-Pod only.
...
Trill made me do it.
2019-11-22 06:44:59 -05:00
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
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
73661cfe52
more fixing+ chem selling tweaks
2019-11-13 09:39:42 -05:00
de1ce4afc8
more crates and explote fixing
2019-11-13 09:15:44 -05:00
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
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
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
0662245d80
corrections
2019-11-06 22:52:44 -05:00
09cd439f85
so dumb that github suggestions brake "
2019-11-04 17:24:37 -05:00
061579decb
no fun allowed
2019-11-04 17:08:55 -05:00
28b96494e6
huh
2019-11-04 17:03:00 -05:00
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
526d9b203c
aliens
...
man
2019-11-04 00:34:03 -05:00
a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01:00
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
63cb466360
MK II
2019-10-26 18:59:34 -04:00
8f1c983b25
Update armory.dm
2019-10-25 09:36:54 -07:00
Seris02