Commit Graph

22 Commits

Author SHA1 Message Date
qweq12yt
c392d6e888 fix issue 2021-04-08 21:40:51 -03:00
qweq12yt
7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
Lin
05ae354d87 Merge pull request #14565 from DeltaFire15/wood-pack-correction
Corrects the wood plank crate's name and description
2021-04-04 23:18:55 -05:00
Hatterhat
8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
DeltaFire
1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
qweq12yt
04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
MrJWhit
477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Ghom
ed90c59d65 Removal of """silk""" (#12221)
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
Ghommie
65899bf906 Removing cargo "paperwork" and a few other bloat packs. 2020-05-03 19:56:00 +02:00
Trilbyspaceclone
181984f478 Update materials.dm 2020-01-21 09:31:38 -05:00
TrilbySpaceClone
67d3d19cb9 correctiosn
and movement
2019-12-07 13:43:34 -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
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
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
73661cfe52 more fixing+ chem selling tweaks 2019-11-13 09:39:42 -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