Commit Graph

31980 Commits

Author SHA1 Message Date
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
f43c030924 Update drinks.dm 2021-08-23 16:22:57 +01:00
Cerebulon
22d073b193 Don't forget to wipe. 2021-08-23 14:41:07 +01:00
Cerebulon
781ca69f31 Standardise species hair pathing 2021-08-23 14:01:23 +01:00
Cerebulon
8a7d0cb108 Lower case R 2021-08-23 13:45: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
7a81420729 Merge pull request #8228 from MistakeNot4892/tabloids
Added tabloid magazines.
2021-08-22 19:23:22 -05: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
Cerebulon
26c65596ec Removes dependency on stale PR 2021-08-22 20:09:06 +01:00
Cerebulon
f5fb5d4a3c New Labcoat Sprites 2021-08-22 19:52:20 +01:00
Cerebulon
d4fd5f0208 Separates Swimsuit and Athletic Lockers, Adds Wetsuits 2021-08-22 17:33:41 +01:00
MistakeNot4892
b3e77fe8df Added tabloid magazines. 2021-08-21 16:39:01 +10: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
17cbd9e7fb Merge pull request #8182 from GhostActual/shotgun-code-fix
New Shotguns/Rifles
2021-08-19 15:22:39 +10:00
MistakeNot4892
93ce4a49e6 Merge pull request #8205 from Cerebulon/lockeranims
Locker Opening Animations Port
2021-08-19 15:10:23 +10:00
MistakeNot4892
39e96b062f Merge pull request #8216 from Cerebulon/randomvend
Randomized Vendor Spawners for Mapping
2021-08-19 14:57:15 +10: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
84c7e598b0 Merge pull request #8198 from Cerebulon/prophunt
Ports a ton of decorative mapping objects
2021-08-13 17:34:49 -05:00
Schnayy
4e38ad179f Merge pull request #8194 from Cerebulon/toiletfix
Toilet + donut box sprite fixes
2021-08-13 17:28:00 -05:00
Cerebulon
bc2cbedf4b Randomized Vendor Spawners for Mapping 2021-08-13 23:26:59 +01: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
61217e039a Locker Opening Animations Port 2021-08-10 04:14:46 +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