Commit Graph

16395 Commits

Author SHA1 Message Date
FlattestGuitar c6a40b7291 Merge branch 'master' into fluffles 2017-08-07 11:43:58 +02:00
Crazy Lemon 21bd7e7f24 Merge pull request #7919 from Fox-McCloud/hydro-updates
Updates Hydroponics, Nerfs it, Adds Onions
2017-08-06 06:45:36 -07:00
Fox McCloud 83c6c168b7 Merge pull request #7941 from Kyep/smite_bless_fix
Fixes #7925 for smite/bless and SIT
2017-08-06 09:35:47 -04:00
Fox-McCloud b1495e7cf5 comment tweak 2017-08-06 09:06:57 -04:00
Fox McCloud 2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Fox McCloud 1c64b71a5c Merge pull request #7885 from shazbot194/Drone_gibber
Changes the icon for the matter decompiler
2017-08-06 08:39:39 -04:00
Crazy Lemon d18c20cb9f Merge pull request #7939 from Fox-McCloud/wormsss
Makes has_brain_worms cheaper
2017-08-05 07:16:58 -07:00
Crazy Lemon 8575e3a6d5 Merge pull request #7931 from Fox-McCloud/tesla-performance
Reduces Tesla Cost
2017-08-05 07:04:39 -07:00
Kyep 568874ed6a Fixes #7925 for smite/bless and SIT 2017-08-05 01:58:53 -07:00
Fox-McCloud b366f5e598 Makes has_brain_worms cheaper 2017-08-04 23:37:17 -04:00
Fox-McCloud c3ed8de770 faster 2017-08-04 17:15:47 -04:00
Sam 9eb092555d karma karma karma karma chameleon.... 2017-08-04 15:29:18 +01:00
Fox-McCloud 2f87d0f55a Reduces Tesla Cost 2017-08-03 19:37:10 -04:00
Fox-McCloud 5443a3f6d3 Fixes Fox Being A Moron 2017-08-03 00:30:56 -04:00
Crazy Lemon 59a9df3762 Merge pull request #7906 from Fox-McCloud/remove-cael
Removes Unused Xenoarch Code
2017-08-01 22:15:22 -07:00
Crazy Lemon c85acf0a81 Merge pull request #7875 from Fox-McCloud/sound-update
Sound Update/Refactor
2017-08-01 22:09:46 -07:00
Crazy Lemon 5d85b6697c Merge pull request #7870 from Fox-McCloud/tweaks/fixes/organ/stuff
Various little fixes/refactors
2017-08-01 21:41:13 -07:00
Fox-McCloud 223d608aa8 styling 2017-08-01 18:31:52 -04:00
Fox-McCloud ca49a28f02 Updates Hydroponics, Nerfs it, Adds Onions 2017-08-01 17:58:23 -04:00
Fox McCloud 4264f24e52 Merge pull request #7913 from Birdtalon/stockrebalance
R&D Stock Parts Print Time Fix
2017-07-31 18:07:10 -04:00
Birdtalon bdd7cc4c27 Fixes lathe_time_factor to correct values 2017-07-31 22:46:37 +01:00
Birdtalon 5dcb44c3d5 fixed silly mistake 2017-07-31 22:10:26 +01:00
Birdtalon e5e3293289 rebalances stock part printing times for RND 2017-07-31 21:57:11 +01:00
Fox-McCloud 6bd0d17527 performance 2017-07-31 14:01:15 -04:00
Kyep acc26bdcf2 TRUE and FALSE 2017-07-29 21:59:52 -07:00
Kyep 8aca3fad06 Also prevents mother wandering through, dying, and summoning horde 2017-07-29 21:44:15 -07:00
Kyep bb089e2056 Prevents TS spiderlings traversing gateawy 2017-07-29 21:39:07 -07:00
Fox-McCloud 968050c5ce Removes Unused Xenoarch Files 2017-07-29 20:13:45 -04:00
Fox-McCloud 99ad3db8ba Fixes Dead Hearts Allowing you to live. 2017-07-29 19:28:38 -04:00
Birdtalon 5d1545f996 Fox McCloud changes request 2017-07-27 22:15:07 +01:00
Birdtalon ad9bbd36f9 Modifies rdconsole.dm protolathe speed coefficient 2017-07-27 15:03:58 +01:00
shazbot194 757706db6b Changes the icon for the matter decompiler
^^
2017-07-26 21:22:36 -08:00
Citinited 9553aa8279 Makes autopsy reports its own object 2017-07-27 00:14:27 +01:00
Aurorablade d6edfe8ccf Corsets are now an acessory 2017-07-26 19:05:32 -04:00
Fox-McCloud e3d425aae3 eh 2017-07-26 16:29:05 -04:00
Aurorablade a962d3abde I HATE WHEN I FORGET TO COMMIT THINGS 2017-07-26 01:46:30 -04:00
Aurorablade d423ba9b7d redoes corset utterly 2017-07-26 01:34:52 -04:00
Aurorablade 04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -04:00
Fox-McCloud b12baedada ok there TG, let's let BYOND do something better... 2017-07-25 20:50:16 -04:00
Fox-McCloud f78c507122 Sound Update/Refactor 2017-07-25 20:35:38 -04:00
Fox-McCloud 0f168fab4e multiplication memes 2017-07-25 15:40:56 -04:00
Fox-McCloud 81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Crazy Lemon 1b8af7dc94 Merge pull request #7708 from Fox-McCloud/you-cant-outmeme-memers
Darts no longer proc reaction
2017-07-25 10:42:42 -07:00
Crazy Lemon e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
Fox McCloud 14da673a8b Merge pull request #7782 from Kyep/emag_syndi_drone
Makes emagged drones more identifiable
2017-07-25 12:26:29 -04:00
Fox McCloud d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
Fox McCloud afa34c51e0 Merge pull request #7740 from owenowen212/honksquad_fix
Fix: Adds the clownish language to honksquad members
2017-07-25 12:02:58 -04:00
Fox McCloud d29d285aef Merge pull request #7764 from Kyep/shotgun_noreact
Shotgun darts are no longer noreact like cryobeakers
2017-07-25 11:48:14 -04:00
Fox McCloud ae1128b33d Merge pull request #7787 from imsxz/honk-rifle-self-charge
Makes HONK Rifle selfcharge
2017-07-25 11:46:36 -04:00
Fox-McCloud 8c91244ea8 better 2017-07-25 08:34:35 -04:00