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
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
KathrinBailey
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
TrilbySpaceClone
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
TrilbySpaceClone
6e328ea1b1
art of the deal
2019-11-11 07:26:12 -05:00
TrilbySpaceClone
0662245d80
corrections
2019-11-06 22:52:44 -05:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
Trilbyspaceclone
9af899c9c3
cleaning up
2019-11-03 12:59:41 -05:00
TrilbySpaceClone
63cb466360
MK II
2019-10-26 18:59:34 -04:00
Dap
293034d815
Imagine Updating How Tables Work, But Forgetting MY TABLES
...
## About The Pull Request
Let me just add in a single line so plasmaglass tables actually work.
## Changelog
🆑
fix: You can now make plasmaglass tables again.
/🆑
2019-10-10 09:04:06 -06:00
Poojawa
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
Chayse Ramsay
0cf1415969
[SPEEDMERGE] Glass Machine :b:roke
2019-09-05 16:28:18 +01:00
Dap
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
