Commit Graph

29362 Commits

Author SHA1 Message Date
Atermonera
63ff55b209 Merge pull request #6293 from Cerebulon/xenoarchtweaks
Xenoarcheaology Tweaks
2019-07-11 22:50:30 -08:00
Atermonera
4d043c3cba Merge pull request #6287 from Wickedtemp/master
Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
2019-07-11 22:49:56 -08:00
Atermonera
23742ce284 Merge pull request #6286 from Mechoid/Glitterpatch
Patches Glitterflies
2019-07-11 22:48:36 -08:00
Atermonera
bf6d5f8542 Merge pull request #6282 from Mechoid/TryToFixSlimes
Try to fix slimes and Prometheans.
2019-07-11 19:56:53 -08:00
Atermonera
b394451201 Merge pull request #6280 from Nalarac/patch-8
Fixes Nurse Spider Feeding
2019-07-11 19:55:23 -08:00
Cerebulon
8b4b52acc6 Xenoarcheaology Tweaks 2019-07-11 05:22:34 +01:00
Heroman3003
3eb4c7a531 Fixes endcaps on the specialized pipes (#6283) 2019-07-10 01:52:43 -07:00
Wickedtemp
3306fdf8a5 Update cartridge.dm 2019-07-09 20:56:25 -05:00
Heroman3003
3d46075733 MC camera and access fixes and adjustments (#6269)
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
2019-07-09 13:00:47 -05:00
Anewbe
49812cad36 Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds
Actually adds the new seeds to the vendors.
2019-07-09 12:59:48 -05:00
Mechoid
6c4f0cc32b Patches Glitterflies 2019-07-09 00:23:07 -07:00
Mechoid
009152a3f0 Try to fix slimes. 2019-07-08 19:58:21 -07:00
Andrew
86a1b63307 Actually make handle_corpse do something
Whoops
2019-07-08 18:45:08 -05:00
Andrew
deb97d8d8c Merge pull request #1 from Nalarac/patch-9
Fixes Nurse Spider Feeding
2019-07-08 18:39:39 -05:00
Andrew
53f0181382 Fixes Nurse Spider Feeding
Gives nurse spider mauling so they can attack in crit to wrap the mob in webs and handle_corpse so they can wrap dead mobs
2019-07-08 18:38:22 -05:00
Andrew
c6b040db7b Allows AI to Acknowledge Corpses
Creates the var "handle_corpse"
2019-07-08 18:35:47 -05:00
Heroman3003
128549881f Returns logs from plants (#6274)
* Returns logs from plants

* Returns production of planks from fruit with wood pulp
2019-07-08 14:32:21 -07:00
Mechoid
92a3d9d20e Actually adds the new seeds to the vendors. 2019-07-07 18:55:41 -07:00
Heroman3003
6d9a5bc168 Fixes ghost riders (#6252)
* Fixes ghost riders

* Wider usage permissions for bikes
2019-07-07 16:40:16 -07:00
Anewbe
3e5cea6a71 Merge pull request #6271 from Nalarac/patch-7
Un-Nerfs Odysseus Tools
2019-07-07 16:44:21 -05:00
Atermonera
2b0603faaa Merge pull request #6262 from Mechoid/CivilianExpansion1
Civilian Expansion 1: The Plantening
2019-07-07 13:29:08 -08:00
Anewbe
ce97daed2e Merge pull request #6242 from Nalarac/patch-4
Adds Arcane Tech to Cult Items
2019-07-07 16:17:15 -05:00
Mechoid
16107124ac Update flowercrowns.dm 2019-07-07 13:59:28 -07:00
Anewbe
964740cb3b Merge pull request #6270 from Heroman3003/inviscrawl
Fixes invisible ventcrawlers
2019-07-06 20:34:25 -05:00
Anewbe
8862c180ba Merge pull request #6267 from Heroman3003/carpetfix
Fixes carpeted tables refunding wrong carpet type if nonstandard one was used
2019-07-06 20:33:56 -05:00
Anewbe
7132e2540e Merge pull request #6268 from Heroman3003/targetfix
Fixes aiming at z-shadows breaking aiming
2019-07-06 20:33:44 -05:00
Andrew
6e1612da7a Un-Nerfs Odysseus Tools
This requires staff input

Reverts part of #6170 that makes the mech syringe gun unable to pierce clothing. My opinion is that industrial syringe cannon can pierce clothing.
Partially reverts #2196 that makes it so the sleeper can load someone in 3 seconds instead of 5 (original change was 2 seconds to 5)
2019-07-05 18:00:21 -05:00
Heroman
2e5d8c6e78 Fixes invisible ventcrawlers 2019-07-06 07:51:09 +10:00
Mechoid
e5b7e11206 Update Chemistry-Recipes.dm 2019-07-04 13:42:42 -07:00
Atermonera
438e113621 Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2
Flashes actually work as said on the tin.
2019-07-03 19:10:07 -08:00
Atermonera
43a96486d3 Merge pull request #6265 from Heroman3003/camerafix
Fixes technical cameras being affected by random event
2019-07-03 19:09:15 -08:00
Atermonera
2a7f324393 Merge pull request #6264 from Heroman3003/awood
Fixes alien wood issues
2019-07-03 19:08:46 -08:00
Atermonera
1f4b96fab6 Merge pull request #6263 from Nalarac/patch-6
Nerfs Simple Doors
2019-07-03 19:07:38 -08:00
Heroman
947f89299e Fixes targeting z-shadows breaking targeting 2019-07-04 05:37:53 +10:00
Anewbe
55caa09122 Merge pull request #6260 from Heroman3003/alarmchange
Properly splits security and engineering alarms
2019-07-03 12:10:14 -05:00
Anewbe
5eb4b3e2e0 Merge pull request #6256 from Heroman3003/fixtheone
Fixes '1' message from MCs
2019-07-03 12:09:57 -05:00
Anewbe
c5bd6e7526 Merge pull request #6254 from Heroman3003/farmbotfix
Fixes farmbot infinite looping
2019-07-03 12:09:49 -05:00
Anewbe
4e711c4399 Merge pull request #6259 from Heroman3003/flowerfix
Fixes ppflowers having no icon sometiems
2019-07-03 12:09:11 -05:00
Anewbe
b5694b7bfb Merge pull request #6261 from Heroman3003/botanfix
Fixes atmosphere targeted mutation editing wrong plant traits
2019-07-03 12:09:03 -05:00
Heroman
717fede5cd Makes carpeted tables refund the carpet type that was used 2019-07-03 16:49:44 +10:00
Mechoid
a01fb92313 Flashes actually work as said on the tin. 2019-07-02 23:42:08 -07:00
Heroman
492dc81de1 Fixes technical cameras being affected by random event 2019-07-03 15:32:04 +10:00
Heroman
4736a54b2c Fixes alien wood issues 2019-07-03 15:00:53 +10:00
Andrew
4f8173e3b7 Fixes bullet_act to Proj.force 2019-07-02 21:28:37 -05:00
Andrew
e6b3c67465 Nerfs Simple Doors
Simple doors would take the integrity of the material (150 for steel AND resin), divide it by 10, and use that hardness as health. Damage taken by the door would have its force divided by 100. This meant that in order to do 15 damage to a steel door with a baton, you'd need to hit the door 100 times. Now you only need to hit the door 10 times.

Also makes it so bullets/lasers work against the doors

Summation: Resin doors take 10 baton hits to break. (Resin walls take 14.)
2019-07-02 21:24:52 -05:00
Mechoid
71541c9806 Mo drinks n stuff 2019-07-02 16:59:18 -07:00
Anewbe
be5413ad10 Merge pull request #6253 from Heroman3003/invisible-wall-fix
Fixes deconstructed wall frames blocking passage
2019-07-02 07:27:47 -05:00
Anewbe
8f7008838d Merge pull request #6251 from Heroman3003/reactionfix
Fixes retaliate mobs ignoring melee attacks
2019-07-02 07:27:19 -05:00
Heroman
2da1f5b0e0 Fixes Atmosphere targeted mutation editing wrong traits 2019-07-02 16:05:32 +10:00
Heroman
ede313118f Properly splits security and engineering alarms 2019-07-02 13:20:56 +10:00