qweq12yt
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
qweq12yt
04f90b749f
fixes material crates not shipping
2021-03-30 12:33:23 -03:00
kappa-sama
524bb79f0e
tgui machine broke
2021-03-19 15:32:53 -03:00
Letter N
cd5d558fad
safety? what's that?
...
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
Detective Google
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
lolman360
94e24a9738
anvillan
2020-08-24 17:52:42 +10:00
silicons
8ef539b417
Merge pull request #13053 from kappa-sama/patch-39
...
makes cargo's Dirty Magazines 3x cheaper
2020-08-09 05:43:37 -07:00
Putnam
467f66b2a6
Removed crocin/hexacrocin.
2020-08-08 00:46:30 -07:00
kappa-sama
865970fcc3
lol
2020-08-06 21:34:25 -04:00
Ghommie
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
Ghommie
29a8d2ed78
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
2020-06-20 00:07:47 +02:00
Timothy Teakettle
d7bce8aec0
ports some events
2020-06-15 20:22:40 +01:00
Ghommie
495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
Ghommie
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
Ghommie
65899bf906
Removing cargo "paperwork" and a few other bloat packs.
2020-05-03 19:56:00 +02:00
Ghommie
39aef14924
More ToS Compliance.
2020-04-19 02:40:58 +02:00
kevinz000
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
Trilbyspaceclone
487c18cb7e
Update misc.dm
2020-03-13 14:20:28 -04:00
YakumoChen
6c3069e944
less empty line
2020-01-31 14:15:13 +00:00
YakumoChen
32f3b31127
adds two crates
2020-01-31 08:54:07 -05:00
kevinz000
9dfcef68ed
Merge branch 'master' into duke_moxley
2020-01-28 17:53:08 -07:00
Winter Flare
5883124e0d
Removals.
...
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
2020-01-27 20:47:28 -05:00
kevinz000
c665d971c0
Update misc.dm
2020-01-27 17:45:35 -07:00
kevinz000
91e8bec81a
woops
2020-01-27 17:45:13 -07: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
kevinz000
68227dcdb1
Update misc.dm
2020-01-27 03:53:50 -07:00
kevinz000
fa2cc0cfdf
adds
2020-01-27 03:39:27 -07:00
Trilbyspaceclone
f7aa4f3050
Merge branch 'master' into glassware
2020-01-06 23:55:44 -05:00
Trilbyspaceclone
67afcc13db
Update misc.dm
2020-01-04 20:01:44 -05: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
Trilbyspaceclone
2931cb6757
Merge branch 'master' into glassware
2020-01-02 20:30:20 -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
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
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
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
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
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
7adba39e82
Update misc.dm
2019-10-21 19:00:02 -04:00
TrilbySpaceClone
71aeddd6f6
Packbrakeout
2019-09-02 11:17:55 -04:00
