Commit Graph

13853 Commits

Author SHA1 Message Date
bear1ake 3f53c745aa Some fixes
filter.dm - fixes unrepoted bug with filters
asteriod.dm - fixes #13811
2016-01-16 04:34:28 +09: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
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
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
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
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 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
tkdrg 2a5f1a3280 Merge pull request #14594 from KorPhaeron/washing_machine
Marginal washing machine improvements
2016-01-13 18:13:11 -03: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
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
Nerd Lord fed4212716 Updates guardian HUD button icons.
Adds two new holoparasite colors, light purple and crimson.
Replaces silver in the possible holoparasite prefix list with platinum.
Updates descriptions for the guardian types traitors have access to.

Adds glow effects when guardians teleport or recall, including fire guardian teleporting and support guardian teleporting.
2016-01-12 16:39:08 -05:00
tkdrg 8f3785a894 Merge pull request #14542 from KorPhaeron/soulstones
Soulstone fixes
2016-01-12 16:15:18 -03:00
KorPhaeron cd0d588b0a Soulstone 2016-01-12 13:04:09 -06:00
Nerd Lord d7fd95bb2e Swarmer communication now has a follow link for ghosts. 2016-01-11 22:46:47 -05:00
KorPhaeron d7b27e329d Washing machine 2016-01-11 20:11:23 -06:00
Shadowlight213 f922fc94f6 Makes the pinpointer actually track the nuking AI 2016-01-11 17:55:16 -08:00
Shadowlight213 7a8dd02edc Change to use player_list 2016-01-11 17:28:31 -08:00
Shadowlight213 a5a2a105ad Fixes camera light for multiple Ais. 2016-01-11 17:14:45 -08:00
Cheridan 360086c74f Merge pull request #14555 from Buggy123/Buggy123-mirrorfix
Adds attack cooldown when attacking a mirror.
2016-01-11 16:11:34 -06: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 76625e3d2a Merge pull request #14546 from ChangelingRain/noglow
Blobs should cause significantly less lag
2016-01-10 22:29:28 -03:00
Buggy123 692d3a6100 Fuck it just genericize the description. 2016-01-10 18:46:38 -05:00
Buggy123 18bab22f25 New spraypaint decal 2016-01-10 18:23:43 -05:00
Buggy123 ebb7e62edc Update crayon.dm 2016-01-10 02:54:22 -05:00
Buggy123 30ceab8c19 Spraypainted stuff no longer appears to be drawn with crayons. 2016-01-10 02:33:07 -05:00
Buggy123 03da055f5c Maybe now it'll compile? 2016-01-10 01:58:44 -05:00
Buggy123 2d6ba27ce8 Update mirror.dm 2016-01-10 01:38:44 -05: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 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