Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
kevinz000
|
88f625edfc
|
Merge pull request #10636 from Ghommie/Ghommie-cit512
Trilby's solar panels PR but improved.
|
2020-01-23 04:35:13 -07: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 |
|
Ghommie
|
3ee855ab77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 22:14:06 +01:00 |
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|
Putnam
|
a4cc73f219
|
some craft logging
|
2020-01-16 18:40:00 -08: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 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01: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 |
|
Ghom
|
516ec585d2
|
Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
|
2020-01-05 16:22:44 +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 |
|
Ghom
|
39da7cc58e
|
Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
|
2020-01-04 14:03:01 +01:00 |
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
kevinz000
|
d1d9b7a179
|
Merge pull request #10403 from r4d6/patch-1
Add a way to make opaque plastic flaps
|
2020-01-03 08:16:17 -08:00 |
|
kevinz000
|
04649efc62
|
Update stack.dm
|
2020-01-03 02:46:57 -08:00 |
|
Trilbyspaceclone
|
2931cb6757
|
Merge branch 'master' into glassware
|
2020-01-02 20:30:20 -05:00 |
|
Lin
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00: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 |
|
kevinz000
|
1b9b54b33d
|
Merge pull request #10267 from Ghommie/Ghommie-cit486
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
|
2019-12-23 00:44:42 -08:00 |
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
Ghommie
|
8bc277d38d
|
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
|
2019-12-22 11:40:25 +01:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
Trilbyspaceclone
|
0b63e79098
|
Merge branch 'master' into glassware
|
2019-12-21 15:41:45 -05:00 |
|
Ghom
|
ce34bcf2e4
|
Merge pull request #10012 from Commandersand/INEEDAMEDICBAG
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
|
2019-12-21 14:34:43 +01:00 |
|
Ghom
|
7f0ae5dbde
|
I gotta go fast.
|
2019-12-21 13:04:27 +01:00 |
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +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 |
|
Ghommie
|
5bf252a58c
|
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2019-12-17 01:57:56 +01:00 |
|
loginsandylogout
|
491958475b
|
fixed
|
2019-12-15 18:48:50 -06:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
loginsandylogout
|
2c08f7ac95
|
oops
|
2019-12-08 17:25:17 -06:00 |
|