Commit Graph

10968 Commits

Author SHA1 Message Date
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
Aurorablade
726843ffc9 Changes pathing back
probaly only need the species allowed for non-vox once though will fix
later.
2015-08-25 08:28:06 -04:00
Aurorablade
2ddfd75757 Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-25 06:59:26 -04:00
Aurorablade
1104ca5d2b Ever try to put a vox in fishnets? 2015-08-25 06:33:56 -04:00
KasparoVy
47aa5764a9 Fixes #1776, Vox Welding Helmet now Visible
Title explains the whole PR, for whatever reason it was looking for the sprite in the eyes section instead of the head section.

However, this turned up another issue. The mask's UP state is the exact same sprite as humans'-- which is just odd on Vox. I'll look further into that
2015-08-25 04:06:31 -04:00
Fox-McCloud
7c59d1ce69 Merge pull request #1836 from Markolie/power
Power monitor update
2015-08-24 21:25:06 -04:00
Markolie
be92097e3f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cargonia
Conflicts:
	code/game/supplyshuttle.dm
2015-08-25 00:46:32 +02:00
Fox-McCloud
fd01044d16 Merge pull request #1833 from Markolie/T34-IPC
IPC organs are now printable, shuttle console ghost access
2015-08-24 16:55:05 -04:00
Fox-McCloud
16d14bb7ba Merge pull request #1830 from Markolie/spookyscareobservers
Update ghost following
2015-08-24 16:54:50 -04:00
Spacemanspark
51ea729d99 Allows xenos to use *flip.
Why wasn't this a thing before.
2015-08-24 12:57:33 -05:00
Markolie
1cd47ee4a3 Life reaction log update 2015-08-24 19:53:42 +02:00
Mark van Alphen
b6a504c756 Merge pull request #1826 from FalseIncarnate/Sushi
Sushi Update
2015-08-24 19:28:50 +02:00
Markolie
6a6f09ed36 Cargo interface overhaul 2015-08-24 19:20:20 +02:00
Mark van Alphen
b003de3e66 Merge pull request #1841 from Fox-McCloud/pants-fix
Pants Fix
2015-08-24 15:12:05 +02:00
Aurorablade
3560722717 SQL files, Structure rearrange, Vox Sox
I still need to get species restrict to work properly for vox sox. Not
the BEST sprite edit for it but it works.
2015-08-24 07:42:37 -04:00
Fox-McCloud
ffdca82944 Pants Fix 2015-08-24 03:20:10 -04:00
Fox-McCloud
146ded3521 Gutter Language Update 2015-08-24 02:45:38 -04:00
Fox-McCloud
d2396dc725 Emitter Fix 2015-08-24 02:26:50 -04:00
Markolie
93c52de1f9 Power monitor update 2015-08-23 23:58:38 +02:00
Fox-McCloud
0bd980b6d1 Producible Emitter Boards 2015-08-23 15:54:51 -04:00
Markolie
1a16f807e0 Let robotics print IPC organs 2015-08-23 21:05:38 +02:00