Commit Graph

20254 Commits

Author SHA1 Message Date
MistakeNot4892
f3c3c3b51d Merge pull request #8238 from Cerebulon/componentsprites
Updated Robot Component Sprites
2021-08-31 10:04:24 +10:00
MistakeNot4892
50e880ce5e Merge pull request #8237 from Cerebulon/organic
New Organ Sprites
2021-08-26 13:29:32 +10:00
MistakeNot4892
76a9574d09 Merge pull request #8234 from Cerebulon/qipao
Adds Qipaos
2021-08-26 13:27:31 +10:00
MistakeNot4892
0b8d6e343a Merge pull request #8209 from Cerebulon/news_popup
Prevents Pop-up for Already Seen Lore News
2021-08-26 12:34:05 +10:00
MistakeNot4892
0ff54c0de1 Merge pull request #8233 from Cerebulon/slidebar
Ports sliding things along tables
2021-08-26 11:46:52 +10:00
MistakeNot4892
34127628ee Merge pull request #8240 from Cerebulon/vendthrow
Vending machine throwing tweaks
2021-08-26 11:45:05 +10:00
MistakeNot4892
0ba8c6a52a Merge pull request #8243 from Cerebulon/illegaltech
Illegal Tech -> Transgressive Tech
2021-08-26 11:44:00 +10:00
MistakeNot4892
34a0149642 Merge pull request #8242 from Cerebulon/radiosounds
Adds Headset Radio Sounds
2021-08-26 11:43:47 +10:00
MistakeNot4892
9382cd1416 Merge pull request #8232 from Cerebulon/hairballs
Aurora Tajaran Hairstyles
2021-08-26 11:43:34 +10:00
Cerebulon
0fd3725228 Illegal Tech -> Transgressive Tech 2021-08-23 20:36:53 +01:00
Cerebulon
bfdbd5b1fa Adds headset radio sounds 2021-08-23 19:58:43 +01:00
Cerebulon
6b73ba2fe1 Vending machine throwing tweaks 2021-08-23 18:30:39 +01:00
Cerebulon
3a2447eadb Robot Component Sprites 2021-08-23 17:01:06 +01:00
Cerebulon
1327fc1620 New Organ Sprites 2021-08-23 16:44:18 +01:00
Cerebulon
781ca69f31 Standardise species hair pathing 2021-08-23 14:01:23 +01:00
Atermonera
53118573a9 Merge pull request #8222 from MistakeNot4892/survivalism_nomap
General wilderness updates.
2021-08-22 21:04:17 -07:00
MistakeNot4892
2765306410 Merge pull request #8225 from Schnayy/seedupdate
Seed Contraband Changes
2021-08-23 13:26:12 +10:00
MistakeNot4892
0350114bff Merge pull request #8226 from Schnayy/nameloopfix
Fixes infinite naming loop
2021-08-23 13:26:01 +10:00
Schnayy
9f7a83b50c Merge pull request #8223 from MistakeNot4892/fixes
Updates wine reagent id to redwine.
2021-08-22 19:15:25 -05:00
Schnayy
05ec3b0f59 Merge pull request #8213 from Cerebulon/byazura
Adds more pointy-ear body mod options
2021-08-22 19:14:22 -05:00
Schnayy
32aa7cd150 Merge pull request #8212 from Cerebulon/panamahat
Adds a Panama Hat
2021-08-22 19:13:21 -05:00
Schnayy
b5e964de2b Merge pull request #8211 from Cerebulon/nondepjacks
Non-Departmental Light Jackets Port
2021-08-22 19:12:19 -05:00
Schnayy
ce80a3f317 Merge pull request #8196 from Cerebulon/telecomexorcism
Telecomms Feather Duster
2021-08-22 19:09:45 -05:00
Cerebulon
48d6fff875 Adds Qipaos 2021-08-23 01:01:13 +01:00
Cerebulon
de245fb082 remove debugs 2021-08-23 00:48:30 +01:00
Cerebulon
faf4a4121a Ports sliding things along tables 2021-08-23 00:45:08 +01:00
Cerebulon
0cca42d671 Aurora Taj Hair 2021-08-22 20:47:43 +01:00
Schnayy
0f7b693a8c Requested fixes 2021-08-20 23:24:26 -05:00
Schnayy
a7f5804163 Changes contraband for seed vendors 2021-08-20 22:41:34 -05:00
MistakeNot4892
9286036a3d Updates wine reagent id to redwine. 2021-08-20 11:06:05 +10:00
Cerebulon
e013dd567d Generate news index from list 2021-08-19 07:37:22 +01:00
MistakeNot4892
4c53eda3b2 General wilderness updates; fixed frostbelle, adjusted scavenging, added some recipes and mushrooms.
Fixes for wilderness commit.
2021-08-17 18:54:37 +10:00
klaasjared
2d70018ecb Base Commit 2021-08-16 10:22:59 -04:00
Schnayy
6668345966 Merge pull request #8207 from Cerebulon/offswitch2
Farmbot can be turned off, not just on
2021-08-13 17:39:18 -05:00
Schnayy
ccb6385678 Merge pull request #8204 from Cerebulon/ratsratsrats
Fixes Rat Description Typo
2021-08-13 17:37:17 -05:00
Schnayy
a802b440ac Merge pull request #8201 from Cerebulon/erpking
Dethrone The ERP King
2021-08-13 17:36:23 -05:00
Schnayy
8282d24c35 Merge pull request #8191 from Greenjoe12345/teshshoes
Adds Teshari legwraps
2021-08-13 17:26:41 -05:00
Cerebulon
8283981813 Adds more pointy-ear body mod options 2021-08-12 00:09:02 +01:00
Cerebulon
acb9d45bd0 Adds a Panama Hat 2021-08-11 23:07:07 +01:00
Cerebulon
3714eb0867 Non-Departmental Light Jackets Port 2021-08-11 22:52:25 +01:00
Cerebulon
3aa4b45ae2 html more in line with other menu options 2021-08-11 02:13:20 +01:00
Cerebulon
8a1a14a4fa Incorporate Neerti preferences 2021-08-11 02:07:02 +01:00
Cerebulon
3e735591b6 Prevents Lore News Pop-up On Every Connect 2021-08-11 02:00:09 +01:00
Cerebulon
30b192cc2b Farmbot can be turned off, not just on 2021-08-11 00:18:08 +01:00
Cerebulon
1c5eb95ab2 rats 2021-08-10 00:36:57 +01:00
Cerebulon
bc35a4d034 Fixes Rat Description Typo 2021-08-10 00:23:46 +01:00
Cerebulon
04686a032c Dethrone The ERP King 2021-08-09 02:13:04 +01:00
Cerebulon
319382738e Telecomms Feather Duster 2021-08-08 20:41:15 +01:00
klaasjared
f15e1c42cf Commit 2021-08-06 01:47:58 -04:00
klaasjared
a7f6460766 Base Commit 2021-08-06 01:47:24 -04:00