Shadowlight213
d2d9cd80cd
Removed unused defined proc in APC code.
2016-01-11 11:26:04 -08:00
Razharas
8dc7f8947c
Merge pull request #14553 from lzimann/checkantagfix
...
Fix Check Antagonist button not logging when accessed by player panel
2016-01-11 09:00:03 +03:00
Razharas
e9ecce2918
Merge pull request #14514 from KorPhaeron/helmets
...
Fixes hardsuit helmets being destroyed when force unequipped
2016-01-11 08:55:19 +03:00
tkdrg
444bc977fd
Merge pull request #14548 from KorPhaeron/fixes_nuke_timer
...
Fixes challenge ops shuttle delay
2016-01-11 00:13:30 -03:00
tkdrg
bf278539fb
Merge pull request #14574 from ChangelingRain/titaniumrose
...
Holoparasites are now named after silvery metals and flowers and have updated sprites
2016-01-11 00:13:09 -03:00
Nerd Lord
93f412c497
Adds three new holoparasite colors and updates the parasite sprites to have better shading.
...
Holoparasite naming is now like Titanium Rose/Gallium Ivy/Bismuth Daisy
2016-01-10 21:53:36 -05:00
tkdrg
76625e3d2a
Merge pull request #14546 from ChangelingRain/noglow
...
Blobs should cause significantly less lag
2016-01-10 22:29:28 -03:00
tkdrg
030cf322b4
Merge pull request #14545 from KorPhaeron/alienCD
...
Adds cooldown to aliens attacking APCs
2016-01-10 20:45:35 -03:00
tkdrg
9438cb3ccd
Merge pull request #14537 from MrStonedOne/patch-122
...
Fixes spacewind applying multiple times
2016-01-10 18:39:42 -03:00
Lzimann
4ab36b7c29
Fix Check Antagonist button not logging when accessed by player panel
2016-01-10 04:05:24 -02:00
Cheridan
6c9fa9eb72
Merge pull request #14389 from phil235/VisibleMessageRefactor
...
Refactor the visible_message() proc to be faster in some cases.
2016-01-09 22:16:57 -06:00
KorPhaeron
83a5c9f8b6
Fixes nuke delay
2016-01-09 20:47:15 -06:00
Nerd Lord
3023bfccb1
I'm ~pretty sure~ this is the most efficient way to do the previous functionality(maybe even better?)
2016-01-09 21:40:43 -05:00
Nerd Lord
b48527c67d
I did it like this for a reason how'd I forget it like a minute later
2016-01-09 21:26:00 -05:00
Nerd Lord
d6a631d41b
This is ugly, but the only practical way to have the core regen in Life() and not when Be_Pulsed() is called while still being vareditable
2016-01-09 21:19:24 -05:00
Nerd Lord
f093c070e4
Blobs no longer flash brightly, except for activated factory and resource nodes, as it was causing a lot of lag
2016-01-09 21:11:57 -05:00
tkdrg
1d7a2c187e
Merge pull request #14448 from KorPhaeron/hippies
...
Fixes pAIs not being able to use messenger
2016-01-09 21:22:41 -03:00
KorPhaeron
f24ff47eba
Alien cooldown
2016-01-09 18:10:39 -06:00
tkdrg
efb22f6bfd
Merge pull request #14422 from KorPhaeron/runtime
...
Attack log runtime fix
2016-01-09 20:33:54 -03:00
tkdrg
d8f168f3da
Merge pull request #14529 from AnturK/evenmorefixes
...
Misc fixes
2016-01-09 20:32:02 -03:00
tkdrg
7bf3834b5e
Merge pull request #14487 from xxalpha/shingles
...
Floor level objects will now be protected from explosions until they are exposed.
2016-01-09 20:30:02 -03:00
xxalpha
4dd308c278
fix
...
glass windows no strong
Affect all levels if in devastating range.
2016-01-09 23:00:24 +00:00
KorPhaeron
b24427b766
Attack location
2016-01-09 16:11:24 -06:00
tkdrg
24b7eaa23a
Merge pull request #14488 from KorPhaeron/wall_layer
...
Walls are a slightly higher layer than floors
2016-01-09 18:41:59 -03:00
tkdrg
990efcbb7a
Merge pull request #14526 from KorPhaeron/virus
...
Fixes virus grenade kit being empty
2016-01-09 18:40:58 -03:00
KorPhaeron
1d9b334e50
Fixes layers
2016-01-09 15:32:35 -06:00
tkdrg
fd08e1b103
Merge pull request #14521 from KorPhaeron/sleeper
...
Fixes sleepers deleting people when destroyed
2016-01-09 17:00:38 -03:00
KorPhaeron
a3565f2a38
New code standards
2016-01-09 13:42:02 -06:00
AnturK
23efe5f675
Adds a variable to block shuttles from changing destinations midflight for mining shuttle
2016-01-09 17:44:16 +01:00
Kyle Spier-Swenson
882a117421
I forgot a word
2016-01-09 08:03:49 -08:00
Kyle Spier-Swenson
f51037ab5d
Fixes spacewind applying twice when near unsimulated turfs
...
If an atom got spacewind;ed from a simulated turf to another simulated turf that was later on in the processing queue, and was set to space wind to a unsimulated turf, it would space wind those atoms twice in one fire of SSair.
Unsimulated turfs can't check for the air cycle at share time, because they themselves do not fire, so we have to move the check to the atoms.
This also fixes a few other minor edge cases in space wind, or at least i think it does, from tracing the code.
2016-01-09 07:51:49 -08:00
tkdrg
cd70da9045
Merge pull request #14085 from MrStonedOne/patch-107
...
[Ready]Fixes portable connector keeping air
2016-01-09 12:47:15 -03:00
tkdrg
bff752a69a
Merge pull request #14513 from KorPhaeron/why
...
Removes teleport scroll from snowdin
2016-01-09 12:39:23 -03:00
Kyle Spier-Swenson
3a51b0e4e0
Does it right
2016-01-09 07:35:00 -08:00
Tkdrg
b6d0cee2f7
Merge branch 'KorPhaeron-lava_rivers' into HEAD
...
Closes #13511
2016-01-09 12:07:34 -03:00
KorPhaeron
b96bec5157
River Generation Module
...
This is going to be used for lava rivers in lavaland.
2016-01-09 12:06:55 -03:00
Aranclanos
95df33b325
Merge pull request #14313 from tkdrg/goooof
...
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
2016-01-08 20:39:16 -03:00
AnturK
bd24560cfb
Fixes Hulk punches missing message.
2016-01-09 00:21:32 +01:00
KorPhaeron
a35cdae739
Fixes grenade kit as well
2016-01-08 16:03:17 -06:00
KorPhaeron
b6474aa48f
virus
2016-01-08 15:58:35 -06:00
tkdrg
50bb3263bb
Merge pull request #14485 from lordpidey/Mop_bucket
...
Can put mop in janicart when dry
2016-01-08 18:14:47 -03:00
tkdrg
8cb75f1c68
Merge pull request #14501 from KorPhaeron/clips
...
Fixes magazine desc
2016-01-08 18:12:52 -03:00
tkdrg
f32eee9522
Merge pull request #14453 from MrStonedOne/patch-120
...
[s]Fixes cult teleport centcom exploit.
2016-01-08 18:10:23 -03:00
tkdrg
6c41d0e437
Merge pull request #14468 from KorPhaeron/fuck_off_already
...
Stops defibs/cloners notifying suicides when people are trying to revive them
2016-01-08 18:09:29 -03:00
KorPhaeron
5f425326a1
Fixes sleepers
2016-01-08 13:16:50 -06:00
tkdrg
920bbeb2c4
Merge pull request #14480 from AnturK/minor
...
Minor Fixes
2016-01-08 15:13:22 -03:00
phil235
b9c3836f7b
Merge pull request #14493 from KorPhaeron/monkey
...
Fixes monkeys
2016-01-08 16:49:15 +01:00
KorPhaeron
16bf636167
Helmets
2016-01-08 08:15:46 -06:00
KorPhaeron
7bafb9e1fd
Snowdin
2016-01-08 07:37:57 -06:00
phil235
e5a6113157
Merge pull request #14354 from Arquebusier/eggfix
...
Eggfixv2
2016-01-08 14:31:31 +01:00
