 Ghom
|
f24c7fb142
|
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
Ashwalkers now can make a well, got their livestock back and more!
|
2020-03-06 13:48:03 +01:00 |
|
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
|
Ghom
|
5c67c71e90
|
Update towercap.dm
|
2020-03-06 05:41:49 +01:00 |
|
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
Ghom
|
9375113426
|
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
|
2020-03-02 16:36:22 +01:00 |
|
|
Kraseo
|
170e092a24
|
this is going to end well
|
2020-02-25 13:14:18 +01:00 |
|
|
TrilbySpaceClone
|
525cedf16a
|
this just works
|
2020-02-24 11:45:47 -05:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Artur
|
d635af0caa
|
Conflict Fix
|
2020-02-19 13:11:33 +02:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
kevinz000
|
379c914099
|
Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
|
2020-02-16 05:10:19 -07:00 |
|
|
kevinz000
|
b9e8be5784
|
Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
|
2020-02-15 12:15:50 -07:00 |
|
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
Trilbyspaceclone
|
0bd1357e5f
|
flour
|
2020-02-12 15:03:15 -05:00 |
|
|
Trilbyspaceclone
|
1ce9232958
|
Update cereals.dm
|
2020-02-12 15:00:08 -05:00 |
|
|
Artur
|
788d8c5873
|
Just in case.
|
2020-02-12 14:13:26 +02:00 |
|
|
Artur
|
7d1cf6a5a0
|
Hopefully makes blood useless
|
2020-02-12 11:27:57 +02:00 |
|
|
Seris02
|
4ec99a38e2
|
merge fixes
|
2020-02-07 15:28:05 +08:00 |
|
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01:00 |
|
|
kevinz000
|
7898dd089e
|
Merge pull request #10888 from Ghommie/Ghommie-cit554
Ports "Cleans up plante gene mutability."
|
2020-02-06 00:49:09 -07:00 |
|
|
Seris02
|
d0100345fd
|
done hopefully
|
2020-02-05 17:00:38 +08:00 |
|
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
kevinz000
|
d5a44097a3
|
Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine
seed extractor examine tweak/fix
|
2020-02-04 03:32:57 -07:00 |
|
|
Ghom
|
dd4e1d8f57
|
Update flowers.dm
|
2020-02-04 06:57:07 +01:00 |
|
|
Ghom
|
4e4b0d718a
|
Update mushrooms.dm
|
2020-02-04 06:52:54 +01:00 |
|
|
Ghom
|
dcb3447c12
|
Update misc.dm
|
2020-02-04 06:51:50 +01:00 |
|
|
Ghommie
|
b6509d25e6
|
Ports "Cleans up plante gene mutability."
|
2020-02-04 06:34:42 +01:00 |
|
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
|
Hatterhat
|
ca8e40caea
|
i mean its a stupid multiplier regardless
thanks ghom
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 14:33:45 -06:00 |
|
|
Hatterhat
|
9190b69ba3
|
double whoops
|
2020-02-02 13:40:23 -06:00 |
|
|
Hatterhat
|
5dc971f8e8
|
whoops
|
2020-02-02 13:20:43 -06:00 |
|
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
|
kevinz000
|
40b479eb17
|
Update seeds.dm
|
2020-01-25 08:56:06 -07:00 |
|
|
Ghommie
|
5cf7c259fa
|
Runtimenator 2: Compile-net
|
2020-01-25 02:39:58 +01:00 |
|
|
Ghommie
|
f2b04be561
|
More Runtimenator fixes.
|
2020-01-25 02:16:45 +01:00 |
|
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08:00 |
|
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
kevinz000
|
088e586b47
|
Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2020-01-19 16:10:56 -07:00 |
|
|
Ghom
|
536900a7ac
|
Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
|
2020-01-19 16:37:40 +01:00 |
|
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|
|
Seris02
|
fdf3871cb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-18 18:30:51 +08:00 |
|
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|