Commit Graph

32015 Commits

Author SHA1 Message Date
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
ee4cccf08e html 2021-08-10 00:30:06 +01:00
Cerebulon
bc35a4d034 Fixes Rat Description Typo 2021-08-10 00:23:46 +01:00
Cerebulon
7101189db3 final tweaks 2021-08-10 00:17:51 +01:00
Cerebulon
2368c341c0 and the rest 2021-08-09 23:24:00 +01:00
Cerebulon
3a9a58b12a code 2021-08-09 21:54:28 +01:00
Cerebulon
04686a032c Dethrone The ERP King 2021-08-09 02:13:04 +01:00
Cerebulon
092108e894 Revert "Skyrat Singularity"
This reverts commit 7878bcf43a.
2021-08-08 23:29:33 +01:00
Cerebulon
1ea47b1e62 Ports a ton of decorative items 2021-08-08 23:22:31 +01:00
Cerebulon
7878bcf43a Skyrat Singularity 2021-08-08 21:07:07 +01:00
Cerebulon
319382738e Telecomms Feather Duster 2021-08-08 20:41:15 +01:00
Cerebulon
813049a8f2 Misc. Skyrat Sprites Port 2021-08-08 20:29:11 +01:00
Cerebulon
0b7ebc9e46 Toilet + donut sprite fixes 2021-08-08 19:50:41 +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
Atermonera
beaa3051ff Merge pull request #8190 from GhostActual/Jukeboxes
New Jukebox
2021-08-01 02:07:02 -07:00
Atermonera
15b0a4478e Merge pull request #8188 from GhostActual/new_stuff1
New Rack and Wardrobe
2021-08-01 02:05:45 -07:00
Atermonera
ccfa9ce3f3 Merge pull request #8186 from GhostActual/Cell-rack
Cell Rack Update
2021-08-01 02:04:29 -07:00
Greenjoe12345
0fe701ef28 adds teshari legwraps 2021-07-31 01:16:47 +01:00
Atermonera
83ddd8c35e Custom poster fix (#8174)
* Replaces DEFAULT_WALL_MATERIAL with MAT_STEEL, where applicable

* floorbot compiles

* fixes custom posters

* adds lint
2021-07-28 17:25:24 -09:00
Ghost Actual
d383606a6f 2021 Drink Revamp (#8185)
* Base Commit

* Code Fix

* Code Fix
2021-07-28 17:24:47 -09:00
klaasjared
d755886d9c Base Commit 2021-07-28 05:02:38 -04:00