Commit Graph

31896 Commits

Author SHA1 Message Date
Cerebulon
781ca69f31 Standardise species hair pathing 2021-08-23 14:01:23 +01:00
Cerebulon
0cca42d671 Aurora Taj Hair 2021-08-22 20:47:43 +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
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
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
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
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
Ghost Actual
aaddb5fa71 Binoculars and Spyglass (#8176)
* Base Commit

* Update device.dmi

* Update binoculars.dm
2021-07-26 22:14:42 -09:00
klaasjared
6492ce144d Base Commit 2021-07-26 23:02:51 -04:00
klaasjared
4d66a12492 Base Commit 2021-07-26 22:12:40 -04:00
Atermonera
424b1c1ce0 Merge pull request #8183 from Cerebulon/hopid
Fixes blank ID sprite for HoP/Secretary
2021-07-25 01:59:49 -07: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
Cerebulon
923b4908db Sign Oh Sure (#8172)
* Sign Oh Sure

* clean bads

* more bads

* other doublesigns

* did a dumb with online editor
2021-07-24 08:22:11 -09:00
Cerebulon
cc9d9d498a Fixes blank ID sprite for HoP/Secretary 2021-07-22 01:47:48 +01: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
Leshana
e3cb292c7b Fix compiler warning from unused var. 2021-07-01 18:35:30 -04: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