Commit Graph

13999 Commits

Author SHA1 Message Date
Joan Lung ab658b9e24 Merge pull request #15628 from PKPenguin321/patch-13
[s] Fixes nasty cleanbot bug
2016-02-20 17:47:46 -05:00
tkdrg 001b575898 Merge pull request #15151 from CPTANT/laserfire
Laser beams may now set you on fire
2016-02-20 19:19:22 -03:00
Tkdrg 4390482fac Merge branch 'Shadowlight213-Soundflip' into HEAD
Closes #15502
2016-02-20 16:00:11 -03:00
Shadowlight213 07565ffaa5 Reverses Announcement sound pref to hopefully fix it starting off. 2016-02-20 15:59:15 -03:00
tkdrg 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
Cheridan 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
CPTANT 5f92894e70 removes firestacking 2016-02-20 16:47:39 +01:00
tkdrg 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
tkdrg 0c55904f2a Merge pull request #15623 from Core0verload/runtime
Fixes a spacewalking runtime
2016-02-20 10:00:05 -03:00
tkdrg a51c987ae2 Merge pull request #15589 from KorPhaeron/weather2
Fixes up weather performance
2016-02-20 09:31:12 -03:00
tkdrg 29ffc7ef16 Merge pull request #15213 from xxalpha/future
Kinetic accelerators automatically reload.
2016-02-20 09:06:51 -03:00
Tkdrg 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
KazeEspada e36c114ddf Fixes endless Nar-sies.
Hopefully this fixes the endless nar-sie storm.
2016-02-20 02:12:39 -07:00
tkdrg 78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh
Added new event: portal storm.
2016-02-19 21:08:16 -03:00
tkdrg b0c10f910c Merge pull request #15611 from optimumtact/patch-1
Improve admin bomb verb
2016-02-19 19:47:39 -03:00
xxalpha cdd2673b15 Lower weight, later start. 2016-02-19 22:41:12 +00:00
PKPenguin321 db419d8008 makes the acid value even lower
by request
2016-02-19 13:57:09 -08:00
duncathan salt 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
PKPenguin321 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
xxalpha 1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
Cheridan 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
phil235 9ece63edfe Fixes internals not being turned off immediately when adjusting your mask off. 2016-02-19 17:49:38 +01:00
c0 0bb0c58e6d Fixes a spacewalking runtime 2016-02-19 13:20:09 +03:00
duncathan salt 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
duncathan salt ad11039232 Merge pull request #15568 from PKPenguin321/patch-13
Pisses off the cleanbots
2016-02-18 18:00:21 -06:00
tkdrg cc2ec12488 Merge pull request #15590 from KorPhaeron/icepacks
glorf jumpsuit
2016-02-18 20:37:20 -03:00
Incoming5643 611248a4f8 Fixes Travis 2016-02-18 18:27:35 -05:00
oranges b6c0aa64b6 Set bomb epicenter after chosing splosion size
:weed:
2016-02-19 11:32:42 +13:00
Nerd Lord 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
tkdrg 180bd6de79 Merge pull request #15588 from AnturK/isbuffingthisactuallygoodidea
Fixes tesla southern tendency.
2016-02-18 18:35:26 -03:00
phil235 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
tkdrg 00528835a5 Merge pull request #15561 from AnturK/tactical_chairs
Chairs/Beds Repathing/Refactor
2016-02-18 14:21:10 -03:00
Incoming 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
tkdrg 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
AnturK 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
Cheridan 309bfa0e91 Merge pull request #15418 from MMMiracles/spaceman
Adds several templates for space ruins
2016-02-18 01:30:13 -06:00
Cheridan cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
Cheridan a2ef1ad26f Merge pull request #15545 from Shadowlight213/defenderpref
Makes wizard academy defender respect prefs
2016-02-17 19:57:02 -06:00
Cheridan 6290022001 Merge pull request #15547 from KorPhaeron/seed_vault
Five lavaland ruins
2016-02-17 19:54:08 -06:00
tkdrg 2934e6c8b7 Merge pull request #15165 from xxalpha/urange
ultra range again
2016-02-17 21:32:38 -03:00
tkdrg 2b96cbbdce Merge pull request #15574 from KazeEspada/Bagfixes
Bag tweaks.
2016-02-17 21:29:05 -03:00
PKPenguin321 fc9bf6479c changes proc to acid_act(), adds more messages
cleanbots will rise
2016-02-17 15:50:13 -08:00
duncathan salt b8946d608e Merge pull request #15480 from bgobandit/kitty
Cats now display a variety of catlike behaviors!
2016-02-17 17:07:05 -06:00
KorPhaeron 28b179908f glorf 2016-02-17 16:59:56 -06:00
KorPhaeron 67aec79ecf Weather 2016-02-17 16:28:59 -06:00
AnturK 422b55d2f9 Fixes tesla southern tendency. 2016-02-17 22:52:10 +01:00
AnturK 3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes
Fixes mask and head gear issues
2016-02-17 21:47:17 +01:00
phil235 54b87e0239 Fixes typo in suit.dmi
Removes action button from the paranormal response unit helmet
2016-02-17 21:32:46 +01:00
phil235 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
Cheridan 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