5833990acb
whew
2016-06-04 23:16:02 -04:00
f7dd4495dd
adds compact pickaxes to make pickaxes less non-relevant for miners
2016-06-04 23:12:06 -04:00
eb138256d5
Merge pull request #18227 from lzimann/med
...
Fixes medbeam not stopping properly when equipped to a slot
2016-06-04 20:50:31 -04:00
4277d9bca2
Merge pull request #18215 from KorPhaeron/lava_staff_fix
...
[s]Fixes lava staff being used through walls
2016-06-04 20:48:50 -04:00
93f8605753
Merge pull request #18224 from ChangelingRain/shuttlecrush
...
Slightly improves shuttle crushing
2016-06-05 02:46:33 +03:00
4d7a3836a1
Merge pull request #18192 from lzimann/bz
...
Adds a way to filter BZ gas in air alarms and trinary filters
2016-06-04 19:43:25 -04:00
715e97e4b0
Merge pull request #18151 from RemieRichards/SlimeAttack!
...
Slimes may now be ordered to attack
2016-06-04 17:25:34 -04:00
d81db92008
Merge pull request #18214 from coiax/follow-link-define
...
Refactors all (F) links into using a define
2016-06-04 14:36:31 -04:00
d75ded29fa
Adds all-seeing-eye to necropolis chests. ( #18160 )
...
* Swaps xray syringe with new item.
* blankspace
* standards
2016-06-04 02:52:04 -05:00
13dfd8dbf7
Peacekeepers now use Eye overlays, which means they close their eyes when they die :( ( #18209 )
...
Peacekeepers now have Eye overlays for being servants of Ratvar
Redid some of the shading and lineart for colours for Peacekeepers
2016-06-04 01:23:14 -05:00
6fd1424619
Merge pull request #18085 from Xhuis/earsplitting_string
...
Clockwork Patch III
2016-06-03 19:55:04 -04:00
dcc7d6d99e
Fixes medbeam
2016-06-03 20:52:02 -03:00
ee7ef0d4d7
Fixes experimentor doing many reactions with one event ( #18180 )
...
* Fix many reactions happening at once
* Small fix
2016-06-03 18:00:15 -05:00
f653f38418
it's literally just to make protector holos marginally fancier under 'hit by shuttle' conditions
2016-06-03 17:35:54 -04:00
10520995a2
Slightly improves shuttle crushing
2016-06-03 17:19:09 -04:00
b7b4cc01ed
Throwing Runtime Fix ( #18076 )
2016-06-03 22:22:03 +02:00
a3c6571cfd
Fixes #18167 ( #18170 )
2016-06-03 14:48:32 -05:00
7c8603a0a8
important features ( #18195 )
2016-06-03 14:48:12 -05:00
a9a97f5a81
Fixes for Merge Tokens ( #18168 )
...
* fixes #15649
fixes #16575
* oops forgot those lines
2016-06-03 14:46:42 -05:00
64c19bd2d3
Adjusts RCD family export prices to be realistic ( #18186 )
...
Fixes #18101 . Comments indicate my rough logic, which brings them inline
with the actual cost of materials required to create them, rather than
x10 the amount.
Also still enables their sale rather than just crudely removing them
entirely.
2016-06-03 14:45:04 -05:00
143795d230
Fixes imprinter alone not working ( #18216 )
2016-06-03 14:43:52 -05:00
2b18993b04
Conflicts II
2016-06-03 15:42:19 -04:00
fcd42f1464
Fixes lava staff being used through walls
2016-06-03 13:25:56 -05:00
311347b949
One day remie will leave and then none of my code will ever work
2016-06-03 10:02:20 -05:00
7d2a9abd8c
Fixes lavastaff properly
2016-06-03 09:56:10 -05:00
a2a4480e1b
Fixes lava staff being used through walls
2016-06-03 09:49:29 -05:00
afebc5ef97
Fixes ghost image runtime and see_darkness hiding ghosts again. ( #18158 )
...
(also fixes ghost images not garbage collecting.)
2016-06-03 16:49:08 +02:00
e13725b179
Refactors all (F) links into using a define
...
🆑
bugfix: Clicking the (F) link when an AI talks in binary chat will
follow its camera eye, the same as when (F) is clicked for its radio
chat.
/🆑
FOLLOW_LINK is a define that creates the clickable (F) link, so it
doesn't have to be typed painstakingly out every time we want to give
that link to an observer.
2016-06-03 15:29:28 +01:00
08f88fbe3e
Merge pull request #18159 from coiax/countdown
...
Adds ghost visible countdowns for bombs
2016-06-03 08:55:11 -04:00
4c8f8ae53e
Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
...
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
8e88d2d329
removes obsoleted proc
2016-06-02 23:31:28 -07:00
49f812fada
Merge pull request #18149 from KorPhaeron/pAI
...
pAI ash storm immunity
2016-06-03 08:09:00 +03:00
233a5bba82
Hopefully fixes conflicts.
2016-06-02 22:37:18 -03:00
685d938481
Some more work or something, idk
2016-06-02 20:53:51 -04:00
f5dd3b8623
Adds BZ gas to atmos filters.
2016-06-02 19:48:44 -03:00
a7c6223b7d
Adds a way to filter BZ gas with scrubbers and air alarms
2016-06-02 19:23:41 -03:00
803f414a95
Merge pull request #18130 from coiax/more-manipulator-stuff
...
Shuttle manipulator: Added "Fast Travel" button
2016-06-03 09:11:46 +12:00
50c625a238
Merge pull request #18143 from lordpidey/Non_mobs_can_go_to_hell
...
Bolt of resurrection no longer runtimes on hitting non-mobs.
2016-06-03 09:10:27 +12:00
24056f9df3
Merge pull request #18146 from pudl/angela
...
Fixes smg magazines icon
2016-06-03 09:10:04 +12:00
4d091c010e
Adds Asteroid emergency shuttle to station ( #18125 )
...
Wow, this one is a WEIRD one.
2016-06-02 15:48:08 -05:00
6d238a2ff7
Vines fix ( #18134 )
...
Xenos may now eat vines!
2016-06-02 14:07:16 -05:00
71136fc76b
Fix add custom AI laws ( #18138 )
2016-06-02 14:04:06 -05:00
bf3eb118d9
Push
2016-06-02 18:28:46 +01:00
9fdae2fe4e
Merge pull request #17576 from LatD/Research
...
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
c5e4865a7e
Countdowns, now with some of it working
2016-06-02 16:09:53 +01:00
9ee4563133
It works
2016-06-02 12:36:04 +01:00
2df2c6334f
Adds ghost visible countdowns for bombs
...
🆑 coiax
rscadd: For extra observer drama, ghosts can now visibly see the
countdown of various explosives.
/🆑
- Also updates my build script to take account of the move of dm.sh
2016-06-02 11:06:59 +01:00
835c35e79e
Merge pull request #18111 from optimumtact/restinpeacekeeper
...
Removes peacekeeper borgs bolas
2016-06-02 02:25:33 -05:00
cf71a5833f
repaths plant analyzers
...
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00
ca50d2283b
Slimes may now be ordered to attack, they will not attack their Friends, other slimes, the person who ordered them to attack or themselves.
...
#define'd Slime friendship levels.
2016-06-02 05:16:26 +01:00
MMMiracles
Joan Lung
Razharas
TechnoAlchemist
Remie Richards
Lzimann
LatD
KorPhaeron
Iamgoofball
Thunder12345
coiax
Xhuis
KorPhaeron
Kyle Spier-Swenson
Jordie
PKPenguin321
oranges
GunHog
Cheridan