Commit Graph

12942 Commits

Author SHA1 Message Date
duncathan salt
748e2e3485 Merge pull request #14345 from AnturK/mapjectors
Fixes injectors spawned before mutation table is ready
2016-01-04 20:21:48 +01:00
duncathan salt
777302afa5 Merge pull request #14346 from AnturK/chambutts
Restores default chameleon projector disguise
2016-01-04 20:20:59 +01:00
Remie Richards
dc1e7c11fa Merge pull request #14273 from MrStonedOne/patch-110
Fixes lava turfs processing forever as well as some burn logic
2016-01-04 07:41:30 +00:00
Kyle Spier-Swenson
f6d13b93a4 blame RR
[23:27:53] \<%Remie\> you know how it makes inflammable things burn
[23:28:02] \<%Remie\> (and that's buggy as fug but w/e)
[23:28:10] \<%Remie\> what about resetting it after the fire_act() call?
[23:28:21] \<%Remie\> that way inflammable things become inflammable again if they escape the lava
2016-01-03 23:31:33 -08:00
Kyle Spier-Swenson
1451db4cc4 does the remie 2016-01-03 23:22:33 -08:00
MrStonedOne
6632a4c547 fixes explosions 2016-01-03 17:42:04 -08:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
tkdrg
8612333265 Merge pull request #14133 from KorPhaeron/follow
Adds follow links to all forms of chat
2016-01-03 16:31:11 -03:00
AnturK
bbaca08f74 Restores default chameleon projector disguise 2016-01-03 19:19:17 +01:00
AnturK
ff6d88f4e6 Fixes injectors spawned before mutation table is ready 2016-01-03 18:49:10 +01:00
duncathan salt
9ee0f50cd9 Merge pull request #14285 from neersighted/tgui_followup
tgui followup
2016-01-03 18:00:43 +01:00
Razharas
10b74eb793 Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00
KorPhaeron
b3b579c60c Adds Follow Links to everything 2016-01-03 01:33:16 -06:00
Aranclanos
0c6ae04a99 Merge pull request #14284 from KorPhaeron/remove_extra_message
Removes "error" message from roundstart logout report
2016-01-03 03:05:50 -03:00
Aranclanos
e6d9711892 Merge pull request #14272 from KorPhaeron/AI_fix
Fixes borgs not getting 0 law, ion laws, etc
2016-01-03 02:19:22 -03:00
Kyle Spier-Swenson
db0f88c99b Fixes sleep formatting 2016-01-02 20:46:18 -08:00
Aranclanos
ca5f29b56c Merge pull request #14223 from KorPhaeron/tank
Fixes tank default release
2016-01-03 01:22:19 -03:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
Razharas
fd390009c7 Merge pull request #14252 from tkdrg/cablefix
Fixes cable_coil children not merging each other
2016-01-03 04:38:52 +03:00
Cheridan
cfbe48fc61 Merge pull request #14264 from AnturK/chamfix
Fixes chameleon projector ignoring closets
2016-01-02 16:37:40 -06:00
Cheridan
32f1dc2c9d Merge pull request #14258 from arty23/patch-5
M90gl dufflebag grammar fixed
2016-01-02 16:23:50 -06:00
tkdrg
2e25b27041 Merge pull request #14250 from AnturK/burningtables
Fixes extinguishing burning structures
2016-01-02 13:53:30 -03:00
tkdrg
7717aa27d1 Merge pull request #14244 from AnturK/tubefix
Fixes diagonal transit tube flipping
2016-01-02 13:50:32 -03:00
KorPhaeron
4338e551e7 Remove extra message 2016-01-01 23:25:09 -06:00
tkdrg
0949e89a5a Merge pull request #14031 from KorPhaeron/AI
New malf power (lipreading) + points rebalancing
2016-01-01 23:19:26 -03:00
KorPhaeron
6adc22a350 Removes copypaste 2016-01-01 19:34:04 -06:00
Bjorn Neergaard
0c03a39f5d Fix air alarm sizing 2016-01-01 18:50:49 -06:00
Bjorn Neergaard
777ba0486d Rename the tgui pref and adjust all UI sizes for the rewrite 2016-01-01 17:47:45 -06:00
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
Bjorn Neergaard
8d344ec883 Finish even more UIs...
* Add atmos UIs and solar interface
* Add air alarm interface
2016-01-01 17:47:13 -06:00
Bjorn Neergaard
bb152b5c47 Add more complete UIs
* Add airlock electronics UI
* Add space heater UI
* Add SMES interface
2016-01-01 17:46:57 -06:00
Bjorn Neergaard
dc9db90064 Add interfaces
* Add tanks interface
* Add canister interface
* Add chem heater interface; wrap long template lines
* Add chem dispenser interface
* Add section header buttons
2016-01-01 17:45:58 -06:00
Kyle Spier-Swenson
c0de47d3d7 Fixes lava turfs processing forever as well as some burn logic 2016-01-01 15:29:58 -08:00
KorPhaeron
d25c62fd53 Fixes AI lawsync 2016-01-01 17:28:52 -06:00
tkdrg
6adbd8972f Merge pull request #14211 from Jalleo/Camera_fix
Fixes a edgecase bug in computer camera consoles
2016-01-01 18:49:14 -03:00
AnturK
45912423df Makes champrojector use appearance 2016-01-01 21:35:14 +01:00
AnturK
99f56abe38 Fixes chameleon projector ignoring closets 2016-01-01 21:23:04 +01:00
tkdrg
e28576b1ce Merge pull request #14207 from KorPhaeron/spike
Meat spiking someone removes the grab from your hand
2016-01-01 16:32:56 -03:00
arty23
0e23fdee89 M90gl dufflebag grammar fixed
Issue reported by LanCartwright.
2016-01-01 12:46:23 -06:00
Tkdrg
94752caf4a Fixes cable_coil children not merging each other
Fixes #14240
2016-01-01 12:44:04 -03:00
AnturK
1ee0c1cbba Buffs Dihydrogen monoxide 2016-01-01 15:17:29 +01:00
AnturK
907083e071 Fixes extinguishing burning structures 2016-01-01 14:55:34 +01:00
AnturK
1cdafe8a1d Fixes transit tube flipping 2016-01-01 13:39:43 +01:00
tkdrg
8c21c8561c Merge pull request #14185 from KorPhaeron/revert-14123-multiverse
Revert "Multiverse clones are now identical to the summoner"
2016-01-01 00:47:53 -03:00
Cheridan
cb27e966eb Merge pull request #14144 from TheRealGLH/electric_chair
Containment fields and electric chairs now use electrocute_act
2015-12-31 19:01:52 -06:00
tkdrg
3d1e20f9b1 Merge pull request #14180 from KorPhaeron/challenge
Using challenge ops delays shuttle refuel
2015-12-31 21:54:23 -03:00
KorPhaeron
2c7d5ef326 Proper delay 2015-12-31 18:48:41 -06:00
Tkdrg
0b40fe620f Merge remote-tracking branch 'LanCartwright/FIXESBOX' into HEAD
Closes #14225
2015-12-31 21:37:12 -03:00
Akke
6f47f9b5ee fixes items spawning in nullspace 2016-01-01 00:34:57 +00:00
KorPhaeron
18ef72b3c5 Fixes tank default release 2015-12-31 17:55:51 -06:00