Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
uraniummeltdown
1a0d8a601a
only living mobs can squeak bananium tiles
2017-02-16 22:35:34 +04: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
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
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
af937077cd
cooldown 25->60 upgraded 10->20
2017-02-15 16:09:51 +04: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
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
e89bbcd9c1
Merge pull request #6330 from FlimFlamm/box_sprite_addition
...
Large Cardboard Box Decals/Sprites
2017-02-14 23:12:41 -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
d26835747b
Merge pull request #6103 from uraniummeltdown/borerimprove
...
Better Borers
2017-02-14 21:43:56 -08:00
Crazy Lemon
35653d0cee
Merge pull request #6380 from uraniummeltdown/tanksprites
...
New Tank Sprites
2017-02-14 21:32:53 -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
Crazy Lemon
10d38bb4b2
Merge pull request #6445 from Twinmold93/blobfix
...
Fixes Blob Conscious Split Decreasing Scaling
2017-02-14 20:33:01 -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
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
uraniummeltdown
60e61db55f
ports rod form wizard spell from tgstation
2017-02-14 21:05:08 +04: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
uraniummeltdown
c4dd6f533f
Merge remote-tracking branch 'remotes/upstream/master' into tanksprites
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2017-02-13 21:01:58 +04: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
