b4b3d5bc27
Fixes #15621
2016-02-20 21:50:59 -05:00
27704409a4
Merge pull request #15595 from KorPhaeron/techno_alchemist
...
Arrhythmic Knife
2016-02-20 17:49:35 -05:00
55d22a5d37
Merge pull request #15629 from PKPenguin321/patch-18
...
Fixes morph transforming message
2016-02-20 17:48:33 -05:00
ab658b9e24
Merge pull request #15628 from PKPenguin321/patch-13
...
[s] Fixes nasty cleanbot bug
2016-02-20 17:47:46 -05:00
001b575898
Merge pull request #15151 from CPTANT/laserfire
...
Laser beams may now set you on fire
2016-02-20 19:19:22 -03:00
1485297a64
Fixes dme, can't store knife
2016-02-20 14:57:06 -06:00
83ec0ed002
Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2016-02-20 14:49:30 -06:00
4390482fac
Merge branch 'Shadowlight213-Soundflip' into HEAD
...
Closes #15502
2016-02-20 16:00:11 -03:00
07565ffaa5
Reverses Announcement sound pref to hopefully fix it starting off.
2016-02-20 15:59:15 -03:00
9eb1ff8274
Merge pull request #15625 from phil235/WearmaskInternalIconFix
...
Fixes internals not being turned off immediately when adjusting your mask off
2016-02-20 15:03:16 -03:00
0c0d30a0f0
Merge pull request #15640 from tkdrg/kinder_egg_coding
...
Fixes the nar-sie event the right way.
2016-02-20 11:32:05 -06:00
5f92894e70
removes firestacking
2016-02-20 16:47:39 +01:00
f81e52c164
Merge pull request #15605 from phil235/StreamSpray
...
Spray bottles now have a "stream" mode toggled by clicking the bottle.
2016-02-20 11:56:33 -03:00
0c55904f2a
Merge pull request #15623 from Core0verload/runtime
...
Fixes a spacewalking runtime
2016-02-20 10:00:05 -03:00
a51c987ae2
Merge pull request #15589 from KorPhaeron/weather2
...
Fixes up weather performance
2016-02-20 09:31:12 -03:00
29ffc7ef16
Merge pull request #15213 from xxalpha/future
...
Kinetic accelerators automatically reload.
2016-02-20 09:06:51 -03:00
734e57828f
Fixes the nar-sie event the right way.
...
Weight 0 events still run for some stupid reason, they're just rare.
2016-02-20 08:46:02 -03:00
e36c114ddf
Fixes endless Nar-sies.
...
Hopefully this fixes the endless nar-sie storm.
2016-02-20 02:12:39 -07:00
c576c42e06
Merge pull request #15619 from KazeEspada/chairfixes
...
Chair Fixes.
2016-02-19 22:57:52 -05:00
2de3fac2f4
Chairs can no longer be stacked with dense items(rare) or dense structures. As well as chairs.
2016-02-19 20:47:43 -07:00
78ad41b8ec
Merge pull request #15052 from xxalpha/uhhhhh
...
Added new event: portal storm.
2016-02-19 21:08:16 -03:00
b0c10f910c
Merge pull request #15611 from optimumtact/patch-1
...
Improve admin bomb verb
2016-02-19 19:47:39 -03:00
cdd2673b15
Lower weight, later start.
2016-02-19 22:41:12 +00:00
db419d8008
makes the acid value even lower
...
by request
2016-02-19 13:57:09 -08:00
6458b524a0
Merge pull request #15615 from ChangelingRain/nottheblob
...
Blobbernauts and blob spores are now immune to blob chemicals
2016-02-19 15:51:41 -06:00
66609bff90
fixes morph transforming message
...
by moving it to before the appearance changes
2016-02-19 12:52:01 -08:00
0fe58646c6
fixes massive math error in cleanbot.dm
...
turns out that as it would happen, testing your code doesn't always account for things like this
that being said, this is tested and still strong, but not 1200 damage strong
2016-02-19 12:43:43 -08:00
37eee7c302
keep the heal effect within the tile okay
2016-02-19 14:02:53 -05:00
1a4206c77b
Merge remote-tracking branch 'upstream/master' into uhhhhh
2016-02-19 18:32:07 +00:00
24d17307a3
Merge pull request #15587 from phil235/EffectMorphineFix
...
Fixes certain reagent making you sleep/be stunned/blind for just a split second every tick
2016-02-19 11:18:50 -06:00
23ae1968de
Merge pull request #15593 from MrStonedOne/patch-159
...
Scale down dynamic wait on atmos now that the lag bug is fixed
2016-02-19 14:12:18 -03:00
9ece63edfe
Fixes internals not being turned off immediately when adjusting your mask off.
2016-02-19 17:49:38 +01:00
0bb0c58e6d
Fixes a spacewalking runtime
2016-02-19 13:20:09 +03:00
db5c47b6b2
Merge pull request #15598 from Incoming5643/ape_escape_2
...
Adds the new pun pun to the maps
2016-02-19 04:09:18 -06:00
4305097ace
Properly typecasts user var on place.
2016-02-18 21:56:24 -07:00
fd3557761c
Fixes the wrong proc being used.
2016-02-18 20:32:00 -07:00
fff4639bca
Fixes an issue where you would plant a chair while moving hands.
...
Sets the block chance on declaration rather then on instantiation.
2016-02-18 20:29:37 -07:00
1ec9f757cc
Merge pull request #15591 from Lobachevskiy/telebaton-fix
...
Fix police and telebatons ignoring shields
2016-02-18 19:49:54 -06:00
377838f9e5
Merge pull request #15592 from MrStonedOne/patch-158
...
Fucks around with fire and bomb defines.
2016-02-18 19:35:57 -06:00
ad11039232
Merge pull request #15568 from PKPenguin321/patch-13
...
Pisses off the cleanbots
2016-02-18 18:00:21 -06:00
cc2ec12488
Merge pull request #15590 from KorPhaeron/icepacks
...
glorf jumpsuit
2016-02-18 20:37:20 -03:00
611248a4f8
Fixes Travis
2016-02-18 18:27:35 -05:00
b6c0aa64b6
Set bomb epicenter after chosing splosion size
...
:weed:
2016-02-19 11:32:42 +13:00
59d342af3a
Blobbernauts and blob spores now have healing effects when being healed by the blob.
...
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
2016-02-18 17:11:59 -05:00
180bd6de79
Merge pull request #15588 from AnturK/isbuffingthisactuallygoodidea
...
Fixes tesla southern tendency.
2016-02-18 18:35:26 -03:00
eaef2e842a
Spray bottles now use a "stream" mode toggled by clicking the bottle.
...
The stream mode launches a chem puff that does not react with objects or turfs on its trajectory, it only reacts with standing mobs in its way, the puff doesn't go through the mob and is immediately deleted after reacting, or with the things on the last tile it can reach.
This mode is the initial mode for the nukeops chemsprayer (but the mode can still be toggled if you want to spray things on many tiles). Also the chemsprayer always spray 10 units per use now, and its range in spray mode is reduced to 4 tiles (so player aren't confused by the puff doing nothing when they aim very far and the amount transfered to each tile encountered is very low(amount is divided by range))
Fixes the chem puff appearing behind mobs it passes through.
2016-02-18 20:55:40 +01:00
00528835a5
Merge pull request #15561 from AnturK/tactical_chairs
...
Chairs/Beds Repathing/Refactor
2016-02-18 14:21:10 -03:00
dd8b4f5568
Adds a bunch of ape names from the forum/previous pull.
...
Adds a rare pet list for some of the most supreme of meme names.
2016-02-18 12:08:45 -05:00
11df2fa97a
Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding
...
Fixes jobban cache not updating on jobbans and unbans
2016-02-18 14:03:58 -03:00
884b6c3415
Chair hitsound
2016-02-18 17:55:39 +01:00
Mike Long
Joan Lung
tkdrg
KorPhaeron
Shadowlight213
Cheridan
CPTANT
KazeEspada
xxalpha
PKPenguin321
duncathan salt
phil235
c0
KorPhaeron
Incoming5643
oranges
Incoming
AnturK