Commit Graph

15280 Commits

Author SHA1 Message Date
Fox McCloud 2103683cdd Merge pull request #6490 from Crazylemon64/bsa_is_winnable
The BSA goal will no longer choke on the z2 BSA
2017-02-18 07:46:03 -05:00
Crazylemon64 27e7d538c4 The BSA goal will no longer choke on the z2 BSA 2017-02-17 23:29:33 -08:00
Crazylemon64 11c9f59abd Lighting now states which atom is missing a light_sources list on
runtime
2017-02-17 23:07:43 -08:00
Fox McCloud e0b23a1e10 Merge pull request #6421 from tigercat2000/library
Improve View Flagged Books admin verb
2017-02-17 14:01:28 -05:00
Fox McCloud adf9ab2e32 Merge pull request #6455 from Crazylemon64/smart_kudzu
Kudzu is now more intelligent about where it tries to grow
2017-02-17 12:31:05 -05:00
Mark van Alphen dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Tigercat2000 52b0f94bb7 I test all of my code 👍 2017-02-16 16:14:35 -08:00
Tigercat2000 e433e0283d Add sanitizeSQL 2017-02-16 16:06:00 -08:00
Markolie c26e6d1559 Replace z check with atoms_share_level(a,b) 2017-02-16 19:16:16 +01:00
Fox McCloud a4dc75792a Merge pull request #6452 from Crazylemon64/lungless_cough
Slime people and Diona now make sounds when coughing
2017-02-16 11:52:42 -05:00
Fox McCloud adbd138595 Merge pull request #6448 from uraniummeltdown/rodform
Wizard Rod Form
2017-02-16 11:49:07 -05:00
KasparoVy fcfd24219c Welding Gasmasks/Goggles now work again.
Just a missing proc call.
2017-02-16 04:33:27 -05:00
Fox McCloud 129d1c63f5 Merge pull request #6461 from davipatury/paradise
Urnaium
2017-02-16 00:37:13 -05:00
davipatury cffe34e3f9 Description fix. 2017-02-15 20:04:26 -02:00
davipatury 63a690ca79 Urnaium. 2017-02-15 20:00:12 -02:00
Fox McCloud 9301cdc74d Merge pull request #6456 from Markolie/fixxxxx
Fix OP minebots, move them into a separate file
2017-02-15 14:13:58 -05:00
Markolie 56dd8b189e Proper fix for minebot damage issue 2017-02-15 17:23:57 +01:00
Markolie 519749cf8d Fix OP minebots, move them into a separate file 2017-02-15 16:21:04 +01:00
Crazylemon64 5c0e2a43b3 Smart Kudzu is now a mutation, instead of standard behavior 2017-02-15 07:17:21 -08:00
Fox McCloud 078fb75ff5 Merge pull request #6402 from Crazylemon64/phlog_ignite_fix
Phlog now consistently ignites upon application.
2017-02-15 08:35:45 -05:00
uraniummeltdown c661609076 Merge remote-tracking branch 'remotes/upstream/master' into rodform
# Conflicts:
#	icons/mob/actions.dmi
2017-02-15 15:56:36 +04:00
Crazylemon64 9f342be1a5 Kudzu is now more intelligent about where it tries to grow
This makes it spread monstrously fast; none shall be spared.
This might be better as a specific mutation, instead of standard,
extremely deadly behavior
2017-02-15 02:30:19 -08:00
Crazylemon64 9eb59bd590 Squishy cough 2017-02-15 02:00:51 -08:00
Aurorablade 9eb652d7d0 Its one letter 2017-02-15 04:39:36 -05:00
Crazylemon64 36762c70f5 Ruins immersion 2017-02-14 23:51:54 -08:00
Crazy Lemon 4366ba550e Merge pull request #6300 from Alexshreds/disease_effects
Adds Cough and Sneeze Sounds
2017-02-14 23:38:23 -08:00
Crazy Lemon 77a98d9a21 Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug
Fixes Vox-tail Bug
2017-02-14 23:24:49 -08:00
Crazy Lemon dd4a64ea6a Uses evil memetainer powers
Pre-emptively prevents empty list runtimes
2017-02-14 22:49:41 -08:00
Crazy Lemon 96afaca62c Merge pull request #6293 from KasparoVy/deadchat-anon-pref
Makes Deadchat Anonymity Persistent as a Preference
2017-02-14 20:54:27 -08:00
KasparoVy 87aa937d8d Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
2017-02-14 21:39:40 -05:00
Aurorablade 92c3311b78 Lighting Bugs 2017-02-14 17:02:16 -05:00
Crazy Lemon de73349f16 Merge pull request #6359 from Fox-McCloud/advanced-camera-fixup
Advanced Camera Speedup, features, and sound.
2017-02-14 13:38:34 -08:00
Crazy Lemon c665d91448 Merge pull request #6409 from Kyep/smite
Adds Bless & Smite options for prayers
2017-02-14 13:29:29 -08:00
Crazy Lemon ebe28b3372 Merge pull request #6425 from Markolie/stackprogressbars
Progress bars now stack vertically
2017-02-14 13:27:47 -08:00
Crazy Lemon eaa0316eed Merge pull request #6434 from Kyep/check_antags_ert
Adds ERT to Check Antagonists
2017-02-14 13:24:12 -08:00
Crazy Lemon 1f4b684aa0 Merge pull request #6435 from Aurorablade/MagicMushrooms
Stunts Growth Serum
2017-02-14 13:21:00 -08:00
Crazy Lemon 1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools
Goonchat Admin Filters
2017-02-14 13:09:24 -08:00
uraniummeltdown 60e61db55f ports rod form wizard spell from tgstation 2017-02-14 21:05:08 +04:00
Kyep cdf35ce9da fixes merge conflict 2017-02-13 22:27:06 -08:00
Aurorablade a39a0f92d9 1.5 growht cap 2017-02-13 08:32:36 -05:00
KasparoVy 46158e7854 conflict resolution 2017-02-13 06:35:17 -05:00
Fox McCloud 90f034b470 Merge pull request #6097 from Kyep/terrorspiders-PR2
Terror Spiders - Part 2
2017-02-13 06:27:32 -05:00
Fox McCloud 300751373d Merge pull request #6280 from fludd12/Grey-Wingdings
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Fox McCloud 5953b527c0 Merge pull request #6398 from tigercat2000/game_pref_fix
Fix window flashing not saving to SQL & Add error logging to log_client_to_db
2017-02-13 06:18:20 -05:00
Fox McCloud 69eae328d3 Merge pull request #6386 from uraniummeltdown/nukedeclaration
Custom War Declaration
2017-02-13 06:12:31 -05:00
Fox McCloud 5ac10184a4 Merge pull request #6432 from Crazylemon64/kudzu_botany
Kudzu growth now scales the correct way for quicker growth speed
2017-02-13 05:44:02 -05:00
Crazy Lemon 00ed6cd1bd Merge pull request #6367 from Markolie/fixxxxx
Fixes
2017-02-13 00:09:46 -08:00
Kyep 3aeb37eedb Adds ERT to Check Antagonists 2017-02-12 23:55:48 -08:00
Aurorablade 6aa7905651 Growth Cap 2017-02-13 02:54:46 -05:00