Artur
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
kevinz000
|
9208c42747
|
Merge pull request #11722 from timothyteakettle/bye-separated-chems
goodbye separated chemicals
|
2020-04-09 02:02:55 -07:00 |
|
timothyteakettle
|
c28aa08c71
|
woops i didnt add it to the seed
|
2020-04-07 00:16:28 +01:00 |
|
timothyteakettle
|
1b940a5464
|
space tobacco now has gaseous
|
2020-04-07 00:01:27 +01:00 |
|
timothyteakettle
|
378e188b3b
|
goodbye slip prickles
|
2020-04-06 23:57:00 +01:00 |
|
Timothy Teakettle
|
0919737c21
|
fixes shadow emission (#11713)
|
2020-04-03 14:23:24 +02:00 |
|
Timothy Teakettle
|
6b3de998c0
|
remove noreact from being used in plants
|
2020-04-02 21:18:27 +01:00 |
|
Timothy Teakettle
|
0dcc630c4a
|
ports some trait changes
|
2020-04-02 21:15:04 +01:00 |
|
Artur
|
a903752ff9
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-31 19:42:35 +03:00 |
|
kevinz000
|
dd90d21f93
|
Merge pull request #11645 from Trilbyspaceclone/vaild
Et tu?
|
2020-03-28 15:58:56 -07:00 |
|
TrilbySpaceClone
|
879b626cd1
|
Et tu
|
2020-03-27 03:12:04 -04:00 |
|
Artur
|
e8f3e0a3a1
|
Forgot to add the mutation, what a dummy i am
|
2020-03-26 09:49:20 +02:00 |
|
Artur
|
fdc6a02eea
|
Hm
|
2020-03-25 12:46:42 +02:00 |
|
Artur
|
9bb7529a49
|
Progress
|
2020-03-24 16:55:46 +02:00 |
|
Artur
|
c6a8515297
|
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
|
2020-03-24 12:36:21 +02:00 |
|
Winter Flare
|
0effeb6ed5
|
Ports Hyper Drinks
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
|
2020-03-22 19:33:50 -04:00 |
|
Winter Flare
|
5c3037b5d0
|
Fixed Several Foods, Strawberry Juice
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783
Made lizards like:
Egg Wrap
Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
|
2020-03-22 00:19:28 -04:00 |
|
Trilbyspaceclone
|
7ad1831b44
|
Update fermenting_barrel.dm (#11534)
|
2020-03-20 15:52:09 +01:00 |
|
Putnam3145
|
480eb32c68
|
Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
|
2020-03-11 17:01:13 -07:00 |
|
Ghom
|
e41e3a5fbb
|
Update banana.dm
|
2020-03-12 00:22:53 +01:00 |
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
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 |
|
Artur
|
5d3f3fc06a
|
WIP
|
2020-02-28 14:11:38 +02: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 |
|