Crazy Lemon
10d38bb4b2
Merge pull request #6445 from Twinmold93/blobfix
...
Fixes Blob Conscious Split Decreasing Scaling
2017-02-14 20:33:01 -08: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
2e6f341f70
Merge pull request #6388 from DrunkDwarf/rcd-airlock-name2
...
Allows the Rapid Construction Device to set the name of a constructed Airlock
2017-02-14 13:34:21 -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
3fdfde6767
Merge pull request #6443 from Markolie/fixxxxx
...
Fix KA reskin mods and welding tool inhand
2017-02-14 13:23:22 -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
Crazy Lemon
faa041220d
Merge pull request #6439 from VampyrBytes/God-Emperor
...
The God Emperor lives on!
2017-02-14 13:09:11 -08:00
Twinmold
a2b01153a2
Fixes Blob Conscious Split Decreasing Scaling
...
Makes it so that when a blob uses the Conscious Split verb, it no longer
sets it to 700 (350*2), but instead increases the current requirement by
350 (the initial amount) before the blobs can win. This gives blobs the
chance to make more cores and in turn theoretically reach that limit
quicker (and also gives them a chance to increase their play-time as
blob), but if they lose cores, they have much more work ahead of them to
make up for that loss.
Fixes #6372
:cl:Twinmold
Fix: Blob Conscious Split now properly scales the requirement of blob
tiles to win.
/🆑
2017-02-14 04:51:19 -06:00
Kyep
cdf35ce9da
fixes merge conflict
2017-02-13 22:27:06 -08:00
Aurorablade
321c1801bd
RRRRRRRRRRRRRREEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2017-02-14 00:51:32 -05:00
Aurorablade
d461b46f91
dunno why its hcnageing lines on this
2017-02-14 00:28:58 -05:00
Aurorablade
55db3a41a0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie4
2017-02-13 22:40:09 -05:00
Aurorablade
5bc07df8cb
Revert "......TIGERCATTTTT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111111111111111111111111111"
...
This reverts commit fdf02fc2a0
2017-02-13 21:44:11 -05:00
Markolie
078ca5dd92
Fix examine
2017-02-13 19:30:22 +01:00
Markolie
5c177320c3
Fix remaining welding tool inhands
2017-02-13 19:26:18 +01:00
Markolie
e3eac9cdc7
Fix KA reskin mods and welding tool inhand
2017-02-13 19:12:26 +01:00
VampyrBytes
738ebac765
The God Emperor lives on!
...
Fixes #6404
There were 2 issues here.
Firstly I'm guessing that UI has grown in length since this disk was
made... the UI on the disk only had a length of 24 instead of 32 which
was leading to a list out of bounds runtime. Fixed with a loop adding
0x000 to the end to prevent this happening again if the UI length
changes again
Secondly, even though it's a UI&UE disk, the dna record on it still
needed SE for it to work - Clean SE now added to it
2017-02-13 15:03:20 +00:00
Aurorablade
a39a0f92d9
1.5 growht cap
2017-02-13 08:32:36 -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
b3c9912ea0
Merge pull request #6438 from Kyep/iaa_bugfix
...
Fixes an IAA bug
2017-02-13 06:25:05 -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
Kyep
d60c060758
Fixes an IAA bug
...
Fixes a missing definition that was meant to be added in
https://github.com/ParadiseSS13/Paradise/pull/6412
2017-02-13 03:18:19 -08:00
Fox McCloud
69eae328d3
Merge pull request #6386 from uraniummeltdown/nukedeclaration
...
Custom War Declaration
2017-02-13 06:12:31 -05:00
Fox McCloud
d293666275
Merge pull request #6415 from Kyep/ert_playerpanelnew_fix
...
ERT PPN Fix
2017-02-13 06:04:16 -05:00
Fox McCloud
39f5b5a5ef
Merge pull request #6395 from uraniummeltdown/movetools
...
Move tools into tools.dmi, RSF sprite
2017-02-13 06:02:13 -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
ac5cb8fdf8
Merge pull request #6418 from Kyep/more_punchy
...
Makes Attack Logs Punchier
2017-02-13 00:54:04 -08:00
Crazy Lemon
ae26ca3de2
Merge pull request #6412 from Kyep/playtime_req_update
...
Tweaks some playtime requirements
2017-02-13 00:12:33 -08:00
Crazy Lemon
00ed6cd1bd
Merge pull request #6367 from Markolie/fixxxxx
...
Fixes
2017-02-13 00:09:46 -08:00
Crazy Lemon
be15d2656e
Merge pull request #6416 from Kyep/rebalance_mech_teleporter
...
Nerfs mech mounted teleporters
2017-02-13 00:08:53 -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
Crazylemon64
24e255a496
Kudzu growth now scales the correct way for quicker growth speed
2017-02-12 20:54:30 -08:00
Kyep
f8647a2108
Crazylemon spacing changes
2017-02-12 19:52:37 -08:00
Crazy Lemon
f547af48ab
Merge pull request #6417 from Kyep/toxins_warning_update
...
Adds area to admin canister open notices
2017-02-12 18:47:42 -08:00
Tigercat2000
577df3de36
Add debug light source/corner/overlay instance count
2017-02-12 17:30:10 -08:00
Markolie
c570ec4db2
Fix if() space
2017-02-13 00:02:33 +01:00
Markolie
40740d18ba
Code cleanup
2017-02-12 23:54:53 +01:00
Markolie
d0247fff2c
Progress bars now stack vertically. Also adds a bunch of lazy list helpers.
2017-02-12 23:51:50 +01:00
Tigercat2000
d0f1bc0a52
Readd lighting DI info
2017-02-12 09:05:14 -08:00
uraniummeltdown
4cb4b6be82
better war dec checks, added custom war declarations from TG
2017-02-12 20:30:17 +04:00
Fox-McCloud
c2c3881755
Merge remote-tracking branch 'upstream/master' into advanced-camera-fixup
2017-02-12 09:44:07 -05:00
Crazy Lemon
f6ccb2bca7
Merge pull request #6414 from Kyep/singulo_warning
...
Improves singularity failure notice
2017-02-12 05:48:05 -08:00
Crazy Lemon
50ab71760f
Merge pull request #6403 from Fox-McCloud/config-change
...
Tweaks Ticklag default config
2017-02-12 05:47:25 -08:00
Kyep
60e1afbc89
Dark Gygax & Seraph mechs get precision teleporters instead
2017-02-12 05:38:45 -08:00
