Commit Graph

33 Commits

Author SHA1 Message Date
Ghom
28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dip
9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
kevinz000
45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000
2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip
c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
KathrinBailey
fdafeb94d8 tile floofing 2020-10-10 06:36:58 +01:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Dip
f659c2e67a caps 2020-09-28 01:14:08 -03:00
Dip
72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip
7e090472a8 fix 2020-09-18 20:55:08 -03:00
Dip
11b6d44aa5 craftable solar bois 2020-09-18 20:54:48 -03:00
Dip
918a0c04bf Bugfixes, convert to machinery type. 2020-09-16 20:50:15 -03:00
Dip
36218b61b9 Powered Microfan Craft Rework 2020-09-16 19:09:36 -03:00
Dip
d0765fbbc1 Micro powered fans! 2020-09-14 23:13:55 -03:00
Dip
d3048c85a8 Craft Tiny Fans with metal sheets 2020-09-14 14:50:41 -03:00
jjpark-kb
6ce26a163f okay, here are some changes 2020-07-16 22:27:26 -04:00
QuoteFox
cb561ff456 fix for plushie reward 2020-03-03 13:16:25 +00:00
ForrestWick
41870bbf24 Fireman Carry 2020-02-13 18:26:40 -06:00
Azarak
05f4a3163f adds in coconuts, coconut milk, coconut bongs 2019-12-10 07:21:41 +01:00
Azarak
db540ac496 Botany stuffs 2019-12-06 17:54:19 +01:00
Azarak
12f230d77f Ports 3 new botany plants and more bioluminescence types 2019-12-05 15:45:47 +01:00
Azarak
dd4e7df65e New cargo crates, typo fixes, and some minor fixes 2019-11-29 19:26:38 +01:00
quotefox
20d85b8d35 bones breaking system 2019-11-25 07:11:44 +00:00
quotefox
002b595775 removed band 2019-11-19 04:38:44 +00:00
Nam
e8f20dae0a Durathread fix
This ones for reals

Found out some fixes I did azy already did cause I didnt update my shit :(

Couldnt make bandoliers work in crafting menu so they got moved to stack crafting and added alt jumpsuit and jumpskirt for durathread
2019-11-18 05:19:53 -08:00
Kabra_men
a3c09948fa Cross 2019-11-07 18:06:34 -02:00
quotefox
af29c87583 Merge pull request #45 from shellspeed1/botany-belt-redo
Adds a botany toolbelt craftable with 4 leather.
2019-10-25 17:07:43 +01:00
shellspeed1
32283dd1f8 recreates belt. 2019-10-24 15:24:49 -07:00
shellspeed1
8c8b95efb4 sprites and similar fixes 2019-10-19 13:04:54 -07:00
shellspeed1
5d1ed71dc2 Code work to port carpets from citadel 2019-10-19 12:02:31 -07:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00