Commit Graph

32 Commits

Author SHA1 Message Date
Trilbyspaceclone
0f7618b348 Update organic.dm 2020-02-16 14:07:00 -05:00
Trilbyspaceclone
1e2562ed02 Update organic.dm 2020-02-08 18:59:00 -05:00
TrilbySpaceClone
e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
Ghom
362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
Winter Flare
5883124e0d Removals.
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
2020-01-27 20:47:28 -05:00
Winter Flare
24388f4fc1 Reverts Path changes. 2020-01-27 20:30:06 -05:00
Winter Flare
21fe8be5dc Mmmmm, more crates.
Fixed: Engineering Hardsuit Crate

Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)

Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate

Moved:
Grill to Service
All Vending Supplies to a new tab.

Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate

Known Issues:
I don't know how to get randomised crates to show up in the proper order.
2020-01-27 07:00:40 -05:00
Trilbyspaceclone
f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
Trilbyspaceclone
bd42f20047 Update organic.dm 2020-01-04 20:11:10 -05:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Trilbyspaceclone
2931cb6757 Merge branch 'master' into glassware 2020-01-02 20:30:20 -05:00
Trilbyspaceclone
ddd3676903 Merge branch 'master' into glassware 2019-12-17 15:18:30 -05:00
Trilbyspaceclone
0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05:00
Trilbyspaceclone
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
TrilbySpaceClone
67d3d19cb9 correctiosn
and movement
2019-12-07 13:43:34 -05:00
TrilbySpaceClone
e5c8f7bf06 Merge branch 'master' into glassware 2019-12-07 12:50:32 -05:00
Useroth
28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
TrilbySpaceClone
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
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
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
Winter Flare
c31ca96e87 Rebalanced Meat Crate 2019-12-02 16:21:48 -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
Winter Flare
ee55170b3f Fixed Meat Crates 2019-11-28 18:30:43 -05:00
Winter Flare
6a4c959b0a Added more crates. 2019-11-24 19:05:03 -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
TrilbySpaceClone
a3aa70be75 Tweaks, and such
Tweaks many cargo packs, and fixes a few issues
Sneak peak into the kilm as well
2019-11-20 06:02:06 -05:00
TrilbySpaceClone
de1ce4afc8 more crates and explote fixing 2019-11-13 09:15:44 -05:00
TrilbySpaceClone
0662245d80 corrections 2019-11-06 22:52:44 -05: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
TrilbySpaceClone
71aeddd6f6 Packbrakeout 2019-09-02 11:17:55 -04:00