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
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
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
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
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
56d2a34201
Splits beds and chairs
...
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
309bfa0e91
Merge pull request #15418 from MMMiracles/spaceman
...
Adds several templates for space ruins
2016-02-18 01:30:13 -06:00
cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
a2ef1ad26f
Merge pull request #15545 from Shadowlight213/defenderpref
...
Makes wizard academy defender respect prefs
2016-02-17 19:57:02 -06:00
6290022001
Merge pull request #15547 from KorPhaeron/seed_vault
...
Five lavaland ruins
2016-02-17 19:54:08 -06:00
a66e40eb9a
Merge pull request #15558 from Incoming5643/pisssh
...
Restores the old sound of windowed doors
2016-02-17 19:50:29 -06:00
bb00bd311f
Merge pull request #15513 from KorPhaeron/chaplain3
...
Four more holy weapons
2016-02-17 19:48:06 -06:00
2934e6c8b7
Merge pull request #15165 from xxalpha/urange
...
ultra range again
2016-02-17 21:32:38 -03:00
514446d6ee
Scale down dynamic wait on atmos now that the lag bug is fixed
2016-02-17 16:31:17 -08:00
2b96cbbdce
Merge pull request #15574 from KazeEspada/Bagfixes
...
Bag tweaks.
2016-02-17 21:29:05 -03:00
7d255c67db
Fucks around with fire and bomb defines.
2016-02-17 16:26:21 -08:00
0b888afc41
Merge pull request #15572 from KorPhaeron/gland
...
Adds missing punctuation to alien mindshock
2016-02-17 21:22:58 -03:00
569797531c
Fixed map
2016-02-18 00:00:07 +00:00
fc9bf6479c
changes proc to acid_act(), adds more messages
...
cleanbots will rise
2016-02-17 15:50:13 -08:00
5f2b0eae79
Merge pull request #15577 from phil235/NukeCinematicLayerFix
...
Fixes inventory things appearing above the nuke cinematic.
2016-02-17 20:49:12 -03:00
b8946d608e
Merge pull request #15480 from bgobandit/kitty
...
Cats now display a variety of catlike behaviors!
2016-02-17 17:07:05 -06:00
28b179908f
glorf
2016-02-17 16:59:56 -06:00
43207c3070
Fix police and telebatons ignoring shields
2016-02-18 02:57:32 +04:00
422b55d2f9
Fixes tesla southern tendency.
2016-02-17 22:52:10 +01:00
3c8652e346
Merge pull request #15504 from phil235/HatMaskFacialHairFixes
...
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
54b87e0239
Fixes typo in suit.dmi
...
Removes action button from the paranormal response unit helmet
2016-02-17 21:32:46 +01:00
e3ba907c58
Fixes certain reagent making you sleep/be stunned/blind for just a split second every time life() is called.
2016-02-17 21:20:39 +01:00
9c4d90c72c
Merge pull request #15564 from Incoming5643/ape_escape
...
Pun Pun has gained a few persistence save file features
2016-02-17 12:42:37 -06:00
238329dba3
Removed mecha pilots from event; added no loot syndies
2016-02-17 15:05:21 +00:00
Joan Lung
KazeEspada
tkdrg
xxalpha
duncathan salt
Cheridan
KorPhaeron
Incoming5643
oranges
Incoming
AnturK
Kyle Spier-Swenson
PKPenguin321
KorPhaeron
Lo6a4evskiy
AnturK
phil235