Commit Graph

23125 Commits

Author SHA1 Message Date
Aranclanos ef12dc0ea5 Merge pull request #14635 from Razharas/SHutterFix
Fixes c4 not working on shutters
2016-01-16 11:54:25 -03:00
tkdrg dd74b5869d Merge pull request #14630 from securitycopper/bugFix9906
BugFix9906: atospherics heater / cooler power usage based on temp diff
2016-01-16 00:11:45 -03:00
Razharas 2df84aa0b8 Merge pull request #14624 from ChangelingRain/3ammaniaproject
Adds a number of new speechbubble icons.
2016-01-15 20:36:51 +03:00
Remie Richards abefc9578e Merge pull request #14637 from AnturK/whoops
[s]Fixes nograv mecha pushing
2016-01-15 12:37:59 +00:00
AnturK 83f65168c3 Fixes nograv mecha pushing 2016-01-15 13:17:41 +01:00
Razharas 4aea0db29b Merge pull request #14120 from duncathan/listmos
[READY] Listmos & "Datum Gases"
2016-01-15 11:58:05 +03:00
Razharas 20cbeeef74 Fixes c4 not working on shutters 2016-01-15 11:28:57 +03:00
duncathan 0a0f5b9f45 fixes #14633 2016-01-15 01:03:22 -06:00
securitycopper 4ec39f5408 BugFix9906: Changed heater cooler logic to have power usage be based on change in current tempature and not change off of T20C 2016-01-14 21:44:48 -05:00
tkdrg fbeb5cf5c4 Merge pull request #14559 from Buggy123/patch-2
Non-cultist artificers now poop out non-cultist soulstones
2016-01-14 20:04:11 -03:00
duncathan salt bcdb01caba Merge pull request #14557 from Buggy123/patch-1
Graffiti no longer explicitly stated to be drawn with crayons.
2016-01-14 17:04:02 -06:00
Buggy123 8bb52d1feb Fixed indentation 2016-01-14 17:55:25 -05:00
tkdrg 58f6c9ad31 Merge pull request #14615 from Incoming5643/stopgoingsouthwestibegofyou
Shuffles bot scanning
2016-01-14 19:45:34 -03:00
Tkdrg e597110e38 Merge branch 'Buggy123-patch-5' into HEAD
Closes #14605
2016-01-14 19:36:19 -03:00
Buggy123 219a2b3e08 Update soulstone.dm 2016-01-14 17:32:59 -05:00
Buggy123 033aa5d7b0 Update construct_spells.dm
Update soulstone.dm

Update constructs.dm

Update construct_spells.dm

Plz compile

Plz

Compile

Update construct_spells.dm

Update soulstone.dm

Update soulstone.dm

Sarawak

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update constructs.dm

Update constructs.dm

YES! YES! YES!

Update soulstone.dm
2016-01-14 17:32:49 -05:00
Buggy123 abd7b8ead5 Moderate blood loss now does tapering damage. 2016-01-14 19:29:30 -03:00
tkdrg 642c665297 Merge pull request #14613 from MrStonedOne/patch-125
Minor (2line) partial revert of Refactor MC/Failsafe/add Subsystems #13437 - Readds check that #13437 removed
2016-01-14 18:23:35 -03:00
tkdrg 79ece99a92 Merge pull request #14592 from Shadowlight213/Perfectpointer
[s]Makes the pinpointer actually track the nuking AI.
2016-01-14 18:22:47 -03:00
tkdrg 214c7a942b Merge pull request #14590 from Shadowlight213/Cameralightfix
Fixes camera lights for multiple Ais.
2016-01-14 18:22:19 -03:00
Nerd Lord 9bfcb1d678 Adds swarmer and slime bubbles.
Also removes a duplicate line~
2016-01-14 15:50:12 -05:00
duncathan e20eee52ad fixes reconcile_air(); makes gas flow properly through pipes 2016-01-14 14:02:01 -06:00
Nerd Lord 901325d8ae The speechbubble a mob uses is now a var instead of an argument on say() 2016-01-14 12:28:49 -05:00
tkdrg e8dd5db665 Merge pull request #14610 from ChangelingRain/gausscannon
Changes accelerator sniper rounds to have unique projectile sprites
2016-01-14 00:57:16 -03:00
tkdrg 99cc12b4e4 Merge pull request #14607 from ChangelingRain/ayyyspaces
Adds a space between the follow link and abductor chat.
2016-01-14 00:56:23 -03:00
tkdrg 5c3f5ac9c8 Merge pull request #14609 from ChangelingRain/teslaarmornotrevenantarmor
Reactive tesla armor uses the proper lightning bolt sprites
2016-01-14 00:55:34 -03:00
Jordie 41454f9391 Merge pull request #14604 from ChangelingRain/aluminiumlilac
Updates guardian HUD button icons and adds guardian teleport effects
2016-01-14 14:55:19 +11:00
duncathan 31d9757e98 the game compiles I swear 2016-01-13 20:41:57 -06:00
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
duncathan d5086b27b4 fixes space superheating and air canisters not updating icons 2016-01-13 19:22:18 -06:00
Shadowlight213 ed1f425349 Changes to use ai_list. 2016-01-13 15:18:03 -08:00
Shadowlight213 f056cb5ae6 Made malf pinpointer tracking use curated list instead of world. Also used ai_list instead of player list 2016-01-13 15:07:32 -08:00
Nerd Lord 81efcbbac0 Generalize! 2016-01-13 16:56:02 -05:00
Nerd Lord 33ece2fd29 Less obvious, obvious things after freeze. 2016-01-13 16:44:13 -05:00
tkdrg 2a5f1a3280 Merge pull request #14594 from KorPhaeron/washing_machine
Marginal washing machine improvements
2016-01-13 18:13:11 -03:00
Nerd Lord a99b39f18b More glows.
Some typo fixes, adds feedback to light toggling.
2016-01-13 15:42:08 -05:00
KorPhaeron 576dc891b1 Removes excess check 2016-01-13 14:40:15 -06:00
KorPhaeron 4ae95bc6ce My shitcode mystifies even me sometimes 2016-01-13 14:39:51 -06:00
Incoming 4eaaf49dc2 Shuffles bot scanning
Because tile scanning uses view() the results were always presented with the southwest corner placed first the list, and since the for loop returns on finding a valid tile this means that a bot will always head southwest if that is a valid option. By shuffling up the turfs in priority we can be fairly sure that different bots working in the same area won't constantly try to fix a problem another bot is already fixing, and that when a bunch of bots are released into an environment with lots of valid tiles they'll usually fan outwards in all directions instead of all heading to the southwest corner to sulk.
2016-01-13 11:13:05 -05:00
Kyle Spier-Swenson 32d9dd7b93 Minor revert of Refactor MC/Failsafe/add Subsystems #13437
Readds check that #13437 removed
2016-01-13 03:35:51 -08:00
Jordie 84b943f349 Merge pull request #14606 from MrStonedOne/patch-124
makes pulling stop if the thing clicked can't be pulled
2016-01-13 19:41:58 +11:00
Bjorn Neergaard f7d829c811 Support IE8 2016-01-13 00:20:06 -06:00
Nerd Lord 4f6f6e9973 Changes accelerator sniper rounds to use their own, unique projectile sprites. 2016-01-12 23:16:01 -05:00
Bjorn Neergaard bb80fd647c Fix state checks 2016-01-12 21:55:37 -06:00
Bjorn Neergaard 07747e4410 Put tgui interactions behind admin toggle 2016-01-12 21:55:36 -06:00
Bjorn Neergaard c32ce28733 Improve IE8/old IE messages 2016-01-12 21:55:35 -06:00
Bjorn Neergaard 345e4a5d71 Continue to remove Coffeescript for es6 2016-01-12 21:55:34 -06:00
Bjorn Neergaard 743cb09a8f Continue to ES6 everything, drop IE8 support 2016-01-12 21:55:33 -06:00
Nerd Lord eae13b9e06 Reactive tesla armor uses the tesla lightning bolts instead of revenant lightning 2016-01-12 22:54:50 -05:00
Jordie 261295dbb2 Merge pull request #14596 from ChangelingRain/swarmwalk
Swarmer communication now has a follow link for ghosts
2016-01-13 14:34:34 +11:00