Commit Graph

15313 Commits

Author SHA1 Message Date
monster860
7d0f5cb400 Fixes
- Makes it so that log_client_to_db is called before mob/Login()
- Makes it so can_vote() doesn't runtime if the player_age isn't a number
2017-04-04 18:50:24 -04:00
monster860
f23cf99031 Remove the commented out code 2017-02-25 18:56:58 -05:00
monster860
c044f0aa44 Player Polls Revamp 2017-02-25 18:54:06 -05:00
Fox McCloud
66b4e64250 Merge pull request #6369 from Markolie/admin_interact
Admin interaction update
2017-02-18 11:11:02 -05:00
Fox McCloud
cff15468ba Merge pull request #6478 from FlattestGuitar/lasers
New laser carbine icons
2017-02-18 11:07:56 -05:00
Markolie
9a69922a86 Fix slicing disposal pipes not showing a progress bar 2017-02-18 15:58:38 +01:00
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Fox McCloud
8503211af8 Merge pull request #6410 from Kyep/ahelp_take
Adds 'take ahelp' option on ahelp/mhelp
2017-02-18 08:30:14 -05:00
Fox McCloud
ce50279b73 Merge pull request #6436 from Kyep/playtime_for_mentors
Lets mentors see playtime
2017-02-18 08:29:25 -05:00
Fox McCloud
38e6c45407 Merge pull request #6465 from Allfd/CoughSneezeFix
Fixes cough and sneeze oversight
2017-02-18 07:58:31 -05:00
Fox McCloud
4617206927 Merge pull request #6487 from Crazylemon64/fix_mindswap
Mind transfer works again
2017-02-18 07:52:05 -05:00
Fox McCloud
baed9bad25 Merge pull request #6488 from Crazylemon64/speechspan_runtime
Fixes a speech_span runtime
2017-02-18 07:49:13 -05:00
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
Crazylemon64
f5f7383ab8 Fixes a speech_span runtime 2017-02-17 22:44:19 -08:00
Crazylemon64
e9ef99d68d Mind transfer works again 2017-02-17 21:54:13 -08:00
allfd
e435701531 Adds unique Vox coughs and sneezes 2017-02-17 18:39:24 -05: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
Mieszko Jędrzejczak
e8a04e5524 Laser carbine icons! 2017-02-17 14:21:48 +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
allfd
8a7b1ad2fc Fix list issue 2017-02-15 22:46:10 -05:00
allfd
d3444658c9 Fixes cough and sneeze oversight 2017-02-15 22:11:32 -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