Ghom
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01: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
6e7d079928
Changed Dirty Mags and Candle
2020-01-27 19:34:33 -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
necromanceranne
52b1f63941
Literally just kills spinfusors
2020-01-27 12:32:40 +11:00
Trilbyspaceclone
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
r4d6
96c0a86b5f
Make the Radiation Hardsuit a Voidsuit instead
2020-01-22 13:17:29 -05:00
Trilbyspaceclone
181984f478
Update materials.dm
2020-01-21 09:31:38 -05:00
Seris02
afd848e45a
weh
2020-01-20 10:29:09 +08:00
Trilbyspaceclone
2b2e694341
Update code/modules/cargo/packs/science.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-01-17 15:56:09 -05:00
r4d6
ee33e36e6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-12 12:46:30 -05:00
Trilbyspaceclone
f7aa4f3050
Merge branch 'master' into glassware
2020-01-06 23:55:44 -05:00
Trilbyspaceclone
9d21a0e000
oil blood b gone
2020-01-05 09:57:11 -05:00
Trilbyspaceclone
bd42f20047
Update organic.dm
2020-01-04 20:11:10 -05:00
Trilbyspaceclone
2d573c3f7a
carpets are misc
2020-01-04 20:06:54 -05:00
Trilbyspaceclone
67afcc13db
Update misc.dm
2020-01-04 20:01:44 -05:00
Hatterhat
c0e010c612
e
2020-01-04 16:44:11 -06:00
Hatterhat
97242050ec
bad idea
2020-01-04 02:16:55 -06:00
Hatterhat
7c98656939
upstream merge
2020-01-04 01:48:50 -06:00
Hatterhat
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
r4d6
8b760f5f3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-03 21:01:31 -05:00
Trilbyspaceclone
2931cb6757
Merge branch 'master' into glassware
2020-01-02 20:30:20 -05:00
r4d6
be62bbc96d
Lowering price and change description
2019-12-31 18:17:07 -05:00
r4d6
81a39aa324
Add the space radsuit and the crate
2019-12-31 13:25:09 -05:00
kappa-sama
c0bc53ea81
more
2019-12-31 01:43:42 -05:00
kappa-sama
970814adbc
it begins
2019-12-31 01:42:07 -05:00
TrilbySpaceClone
8aee20cdf3
Ready
2019-12-28 17:55: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
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
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
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
