kevinz000
6f31e1270e
Merge pull request #11098 from Trilbyspaceclone/bows!
...
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
Ghom
0619521418
Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
...
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
TrilbySpaceClone
a1f1a01a81
grammer and quiver
2020-02-15 00:52:19 -05:00
TrilbySpaceClone
bbe1ddc0cf
silk, bows, and graytide!
2020-02-14 23:04:02 -05:00
Winter Flare
5549cd93f1
Merge branch 'master' into tinytweaks-2-9-20
2020-02-11 07:20:16 -05:00
kevinz000
5d2b2d7fbf
Merge pull request #10971 from Trilbyspaceclone/disco_baby
...
Adds more Alien disco
2020-02-10 04:14:18 -07:00
Winter Flare
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
TrilbySpaceClone
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05:00
TrilbySpaceClone
30c78c5be2
Let their be lists
2020-02-08 02:37:37 -05:00
TrilbySpaceClone
76219e0188
Primortial
2020-02-08 02:21:14 -05:00
Trilbyspaceclone
4625d4f25d
Update sheet_types.dm
2020-02-01 01:56:41 -05:00
Trilbyspaceclone
fa40490915
Update sheet_types.dm
2020-02-01 01:08:14 -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
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
Ghommie
c93f16e4d4
Unused variable.
2020-01-21 00:45:51 +01:00
Ghommie
ddf037da92
Trilby's solar panels PR but improved.
2020-01-21 00:28:41 +01:00
TrilbySpaceClone
92dc5e61c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
2020-01-13 03:42:20 -05:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Trilbyspaceclone
3c877c96f5
Update sheet_types.dm
2020-01-09 20:42:56 -05:00
Trilbyspaceclone
530d710f57
Update mineral.dm
2020-01-09 20:42:07 -05:00
Trilbyspaceclone
7df495f4ba
Merge branch 'master' into plastic__world
2020-01-09 20:41:33 -05:00
Trilbyspaceclone
17afb84f94
I didnt even touch any maps
2020-01-09 05:53:23 -05:00
TrilbySpaceClone
34c6288d22
so fantastic!
2020-01-09 05:46:30 -05:00
Trilbyspaceclone
f7aa4f3050
Merge branch 'master' into glassware
2020-01-06 23:55:44 -05:00
Ghommie
592422ee70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-05 22:53:00 +01:00
Hatterhat
f166586ca0
a comma
2020-01-04 21:05:55 -06:00
Hatterhat
5b0d20cf37
this one fucking tab
2020-01-04 19:52:01 -06:00
Hatterhat
46ced736ba
what the fuck was that damage my guy
2020-01-04 19:51:06 -06:00
Hatterhat
92f6fe129a
tgstation 40394 port
2020-01-04 07:14:39 -06:00
Trilbyspaceclone
2931cb6757
Merge branch 'master' into glassware
2020-01-02 20:30:20 -05:00
r4d6
6e5d04ff1f
Adding a way to make opaque plastic flaps
2020-01-02 02:52:48 -05:00
TrilbySpaceClone
e71d23fc39
more fixes
2019-12-29 02:51:49 -05:00
TrilbySpaceClone
8aee20cdf3
Ready
2019-12-28 17:55:20 -05:00
Ghommie
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
Ghommie
57cecd2499
work
2019-12-25 06:54:44 +01:00
Ghommie
53d142b4c0
more work.
2019-12-25 01:34:33 +01: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
TrilbySpaceClone
67d3d19cb9
correctiosn
...
and movement
2019-12-07 13:43:34 -05:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02: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
5f56d40f58
Incorporated the bamboo grammar fixes.
2019-12-07 06:41:24 +01:00
Artur
19ab4a5f70
Review fixes and tweaks
2019-12-07 00:43:02 +02:00
Useroth
1158c03ed7
Added bamboo.
2019-12-06 19:00:10 +01:00
Winter Flare
8bd6c58bcd
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:27:44 -05:00
Artur
82d1497ddc
Fixes bad buds and toxin healing
2019-12-05 17:29:00 +02:00
Trilbyspaceclone
aa3598f166
less dope
2019-12-03 19:51:19 -05:00
Trilbyspaceclone
0b90def435
Update sheet_types.dm
2019-12-03 19:43:31 -05:00
