Commit Graph

13438 Commits

Author SHA1 Message Date
Markolie cd088909b0 Minor bluespace artillery interface update 2015-08-30 22:49:05 +02:00
KasparoVy 9a11454d3f Fixes Tabbing @TheDZD
This has been one big learning experience. Anyway, dropped the tabbing and tested just to make absolutely sure. Everything's good. Thanks for pointing that out @TheDZD
2015-08-30 16:46:12 -04:00
KasparoVy 5b5825dedd Adds the ishuman(user) Check 2015-08-30 16:22:34 -04:00
KasparoVy e1c84f7e9d Allows Vox Quills to Show Through Helmet 2015-08-30 16:11:17 -04:00
TheDZD 0904f16ed8 Merge pull request #1871 from Markolie/watchlist
Watchlist/admin updates
2015-08-30 14:43:43 -04:00
Mark van Alphen 3e30444c1c Merge pull request #1892 from KasparoVy/master
Adds Blind and Mute as Disabilities in Character Creation
2015-08-30 20:42:59 +02:00
FalseIncarnate e8fa1599c6 Assorted Fixes
Fixes toothless shark item using the placeholder fish sprite.

Fixes shark teeth being invisible
- Also slightly randomizes their position like with normal glass shards

Fixes Tobiko Sushi incorrectly being named Ikura Sushi and having an
invisible sprite

Fixes runtimes due to protein being misspelled as "protien" in 4 sushi
defines.

Fixes #1884
- This was caused by diona nymphs lacking the CANPUSH status_flag, which
is required to pass grab checks.
- Gave diona nymphs the PASSMOB pass_flag, should avoid them pushing
people everywhere, and also prevent them from being trapped by other
nymphs/people/Ian.
- CANPUSH and PASSMOB are both flags possessed by mice, so this change
effectively makes the nymph mobs closer to mice than monkeys.
2015-08-30 01:37:11 -04:00
Aurorablade 6b98c1884e Conflict Resoultion part 2
UUUUUUUUCCCCCCCCKKKKKKKKKKKKKKKKKKK
2015-08-30 01:01:15 -04:00
KasparoVy be61b0d4e4 Implementation of the new Sprites 2015-08-30 01:00:44 -04:00
Aurorablade b937cee562 Merge remote-tracking branch 'ParadiseSS13/master' into ImportentpAIUpdate 2015-08-30 00:54:27 -04:00
Aurorablade c1b603c4e8 Conflict Resoultion part 1
FUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU
2015-08-30 00:53:36 -04:00
Aurorablade 558e84ab19 Resolving Conflict Maybeee..... 2015-08-30 00:41:07 -04:00
DZD c190dfaf4d Kharshai fluff item 2015-08-29 20:40:49 -04:00
Aurorablade 0f1a44eb2e Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-29 20:12:41 -04:00
Aurorablade dd558c68e2 Remove an opps and sprite name tweak 2015-08-29 20:05:25 -04:00
Markolie 182e546d6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-30 00:38:03 +02:00
Fox-McCloud 1c9da614c4 Merge pull request #1887 from Markolie/performance
sortAtom removal, performance fixes
2015-08-29 18:10:30 -04:00
KasparoVy 89547828e8 Part 3 of new Disabilities in Player Creation
Adds blind and mute to the disabilities list.
2015-08-29 14:06:29 -04:00
KasparoVy 963a7c0c96 Part 2 of new Disabilities in Player Creation
Adds blind and mute to the disabilities list.
2015-08-29 14:05:12 -04:00
Markolie 134d2116c6 Makes mechanical eyes protect you 2015-08-29 18:38:26 +02:00
Markolie 59632e1897 Add new variable instead of using blocked 2015-08-29 03:25:35 +02:00
Markolie 290b9fafa5 Update mecha weapons/emitter logging 2015-08-29 01:55:45 +02:00
Markolie de03689105 Fix DNA injector radiation damage 2015-08-29 01:28:47 +02:00
Fox-McCloud fc5a0e8932 Merge pull request #1882 from Markolie/fixes
Fixes
2015-08-28 18:59:54 -04:00
Fox-McCloud d70b644621 Merge pull request #1876 from Markolie/magpulse
Give engineering borgs a permanent magboots effect
2015-08-28 18:42:23 -04:00
Markolie 7e06a35c3b Get rid of laggy construct Bump code 2015-08-29 00:21:29 +02:00
Markolie 9839376ca0 Properly sortAtom the machines 2015-08-28 23:56:52 +02:00
Markolie 2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Fox-McCloud 8034b35881 Merge pull request #1869 from Markolie/fuckingglass
Ghost interaction update, voice changer fix, man up global confirmation
2015-08-28 14:36:16 -04:00
Markolie e05a8e34db Fix pAI teleporting 2015-08-28 19:42:46 +02:00
Markolie f8e462b1ee Give engineering borgs magboots 2015-08-27 23:59:47 +02:00
Markolie 529205ccb2 Watchlist/admin updates 2015-08-27 16:22:40 +02:00
Markolie 3d970aba1f Fixes invisible alien leap 2015-08-27 15:54:04 +02:00
Markolie 0e0cc0af50 Ghost interaction update, voice changer fix, man up global confirmation 2015-08-27 15:33:33 +02:00
TheDZD a00b878779 Merge pull request #1856 from Fox-McCloud/rnd-lockboxes
R&D Lockbox Origintech
2015-08-26 22:05:56 -04:00
TheDZD 7884a7c788 Merge pull request #1858 from Fox-McCloud/salty
So Salty
2015-08-26 22:05:50 -04:00
Aurorablade 7ef6ae96c6 Finishes voxxy soxs 2015-08-26 21:30:42 -04:00
Mark van Alphen 055b79aa12 Merge pull request #1859 from Fox-McCloud/tech-fix
Fixes Max Research Levels
2015-08-26 16:01:41 +02:00
Fox-McCloud 52df4c6a33 Fixes Max Research Levels 2015-08-25 21:59:51 -04:00
Fox-McCloud c1f7808d9e So Salty 2015-08-25 21:52:44 -04:00
KasparoVy 5d8df1e002 Fixes Vox Grey Jumpsuit
Previously the only way you'd ever see the correct Vox grey jumpsuit sprite was if you were holding it in-game or looking at the sprite in vox/uniform.dmi.

No longer! Now if a Vox player wears this jumpsuit it will look in the correct location for the sprite instead of giving them an ill-fitting human one.

Fixes part of #1130.
To fix the rest of that issue report, unfortunately-- as I'd not figured out then-- sprites for all the other colours of uniforms will need to be made and lines 51-54 copypasted to each jumpsuit code block that's added in.

I'll rewrite #1130 accordingly and see if I can work out those sprites some other time.

Before PR: <Picture Here>

AFTER PR: http://i.imgur.com/phSVZpK.png
2015-08-25 21:48:47 -04:00
Fox-McCloud 110abbda59 R&D Lockbox Origintech 2015-08-25 21:24:09 -04:00
Fox-McCloud 16c17d3e8e Reduces Powernet Lag 2015-08-25 17:46:20 -04:00
Fox-McCloud 386ccd9717 Merge pull request #1844 from Markolie/cargonia
Cargo interface overhaul
2015-08-25 16:29:56 -04:00
TheDZD 9bcc8ae3d9 Merge pull request #1852 from Markolie/BRAINZZ
Bug fixes
2015-08-25 13:40:59 -04:00
Markolie 4cc6192783 Fix robotics console admin message 2015-08-25 19:31:38 +02:00
Markolie 77ed7b6d68 Brainloss fix 2015-08-25 19:18:19 +02:00
Markolie 960436945c NanoUI apostrophe fix 2015-08-25 19:18:02 +02:00
Mark van Alphen 3a4652fa6e Merge pull request #1845 from Spacemanspark/master
Allows xenos to use *flip.
2015-08-25 18:49:54 +02:00
Mark van Alphen a762491eb4 Merge pull request #1839 from Fox-McCloud/gutter
Gutter Language Update
2015-08-25 18:49:46 +02:00