Commit Graph

20238 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ghost Actual
d383606a6f 2021 Drink Revamp (#8185)
* Base Commit

* Code Fix

* Code Fix
2021-07-28 17:24:47 -09:00
klaasjared
4d66a12492 Base Commit 2021-07-26 22:12:40 -04:00
Atermonera
e0fd6dd832 Merge pull request #8180 from GhostActual/Chemsprayer
Chemsprayer Update
2021-07-24 16:41:28 -07:00
Atermonera
6f32ef51df Merge pull request #8179 from Neerti/double_chat_fix
Fixes double chat bug
2021-07-24 16:20:06 -07:00
Atermonera
daa36c205e Merge pull request #8173 from Cerebulon/tgportports
Misc Vore-TG Port Ports
2021-07-24 16:19:36 -07:00
klaasjared
b93ac41a9d Base Commit 2021-07-17 03:12:33 -04:00
Neerti
9fcb71dde4 Fixes double chat bug. 2021-07-16 16:15:48 -04:00
Cerebulon
47029f2657 chairs, colour application fixes for bed subtypes, more barsigns 2021-07-14 04:12:32 +01:00
Cerebulon
18b6eeae21 Misc Vore-TG Port Ports 2021-07-13 03:30:04 +01:00
Neerti
6b4ee972dd Fixes Indoor Rain 2021-07-12 14:19:59 -04:00
Ketrai
9932e13f6d Cold cavern tileset. (#8166)
* Adds cold walls & floors

woop

* adds dark ice

weee

* updates snow edges tooo

weee

* adds a temporary ice sand sprite

ver scary

* Fixed a weird one

* But why

* Cleans up footprints

* Adds a brown version of the rock I've made because
2021-07-11 21:00:44 -09:00
MarinaGryphon
ae1ec55bf3 Fixes utensils, adds variable scoop size (#8165)
* Fixes utensils, adds variable scoop size

* Update code/game/objects/items/weapons/material/kitchen.dm
2021-07-11 20:58:28 -09:00
Atermonera
351c82238e Merge pull request #8161 from MarinaGryphon/patch-6
Fixes inverted logic in staffwho
2021-07-11 22:52:51 -07:00
Atermonera
959511918c Replaces DEFAULT_WALL_MATERIAL with MAT_STEEL, where applicable (#8156)
* Replaces DEFAULT_WALL_MATERIAL with MAT_STEEL, where applicable

* floorbot compiles
2021-06-29 20:28:16 -07:00