Mark van Alphen and GitHub
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
uraniummeltdown
c661609076
Merge remote-tracking branch 'remotes/upstream/master' into rodform
...
# Conflicts:
# icons/mob/actions.dmi
2017-02-15 15:56:36 +04:00
Crazy Lemon and GitHub
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 and GitHub
d26835747b
Merge pull request #6103 from uraniummeltdown/borerimprove
...
Better Borers
2017-02-14 21:43:56 -08:00
Crazy Lemon and GitHub
35653d0cee
Merge pull request #6380 from uraniummeltdown/tanksprites
...
New Tank Sprites
2017-02-14 21:32:53 -08:00
Crazy Lemon and GitHub
10d38bb4b2
Merge pull request #6445 from Twinmold93/blobfix
...
Fixes Blob Conscious Split Decreasing Scaling
2017-02-14 20:33:01 -08:00
Crazy Lemon and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
Fox McCloud and GitHub
b3c9912ea0
Merge pull request #6438 from Kyep/iaa_bugfix
...
Fixes an IAA bug
2017-02-13 06:25:05 -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 and GitHub
69eae328d3
Merge pull request #6386 from uraniummeltdown/nukedeclaration
...
Custom War Declaration
2017-02-13 06:12:31 -05:00
Fox McCloud and GitHub
d293666275
Merge pull request #6415 from Kyep/ert_playerpanelnew_fix
...
ERT PPN Fix
2017-02-13 06:04:16 -05:00
Fox McCloud and GitHub
39f5b5a5ef
Merge pull request #6395 from uraniummeltdown/movetools
...
Move tools into tools.dmi, RSF sprite
2017-02-13 06:02:13 -05:00
Crazy Lemon and GitHub
ae26ca3de2
Merge pull request #6412 from Kyep/playtime_req_update
...
Tweaks some playtime requirements
2017-02-13 00:12:33 -08:00
Crazy Lemon and GitHub
00ed6cd1bd
Merge pull request #6367 from Markolie/fixxxxx
...
Fixes
2017-02-13 00:09:46 -08:00
Crazy Lemon and GitHub
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
uraniummeltdown
0e96552cf8
added back and belt sprites, double tanks use old belt sprites
2017-02-13 06:24:51 +04: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
Kyep
60e1afbc89
Dark Gygax & Seraph mechs get precision teleporters instead
2017-02-12 05:38:45 -08:00
Kyep
a9c59e8b8d
Adds area to admin canister open notices
...
Modifies the "X opened a canister that contains <gas>" notice for
admins. Add the area the canister was opened in.
Reason: someone opening a toxins canister in toxins is not a big deal.
Someone opening one in central primary is. With this PR, admins can tell
the difference without having to go look at the canister.
2017-02-12 03:56:18 -08:00
Kyep
86cb8d14d1
Nerfs mech mounted teleporters
...
Changes:
- Mech mounted teleporters now use 8000 power on use (previously, did
not appear to use any)
- With a 40,000 capacity bluespace cell, this gives them 4-5 uses of the
bluespace cell before their battery drains.
- This also affects the CC seraph and Syndi Dark Gygax mechs. They've
been retrofitted with bluespace cells also to handle the extra power
drain.
- With these changes, mech-mounted teleporters are still buildable (with
LOTS of R&D) and still useful, but you can no longer spam them to
teleport across the station uncatchably fast.
2017-02-11 23:59:06 -08:00
Kyep
53f00eabc8
ERT PPN Fix
...
Makes ERT members show up correctly in Player Panel New.
IE: "Major Tom (ERT Security)" instead of "Major Tom ()".
No CL as it is admin-only.
2017-02-11 23:20:21 -08:00
Kyep
7172545e62
Tweaks some playtime requirements
...
Changes:
- IAA now requires 5 hours
- Captain and AI now require 20 hours
2017-02-11 22:08:31 -08:00
Markolie
0aabf436db
Fix ion trail effect
2017-02-11 20:33:26 +01:00
Markolie
900653ea0e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx
2017-02-11 20:31:23 +01:00
Fox McCloud and GitHub
d875475097
Merge pull request #6393 from VampyrBytes/spell-drop-fixes
...
Fixes #6292
2017-02-11 14:27:28 -05:00
Markolie
4d857de148
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
uraniummeltdown
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
uraniummeltdown
e03981aa02
formatting tools.dm
2017-02-11 15:47:25 +04:00
uraniummeltdown
1edc9a63e8
add rsf icon+inhand from /vg/, move crowbar,cutters,screwdriver,welders,wrench,rcd,rsf to tools.dmi
2017-02-11 15:46:38 +04:00
uraniummeltdown
1bdc663053
add inhand sprites for tanks
2017-02-11 13:06:54 +04:00
