Commit Graph

14916 Commits

Author SHA1 Message Date
Cheridan 457888ce0b Merge pull request #16628 from erwgd/AutolatheMakeHydroTools
Adds hydroponics tools and shovels to autolathe_designs.dm
2016-04-05 19:35:47 -05:00
KorPhaeron 55ca4d89ca Merge pull request #16641 from ChangelingRain/coolitoff
Simple Animal ranged cooldowns now use world.time
2016-04-05 18:45:48 -05:00
Cheridan b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone
Gives the clown a megaphone.
2016-04-05 15:35:36 -05:00
AnturK 3d9c0e3d66 Merge pull request #16584 from MrStonedOne/patch-183
Better sleep()s for procs that abuse it
2016-04-05 21:03:30 +02:00
Joan Lung 43471f70f7 Merge pull request #16627 from erwgd/AutoLatheMakeToolbox
Add toolbox to autolathe_designs.dm
2016-04-05 14:13:46 -04:00
MrStonedOne 5098a3c884 Made more sleeps use stoplag
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
2016-04-05 11:08:28 -07:00
KorPhaeron 511f65200d Shorter ash storms
* Shorter ash storms
2016-04-05 20:05:12 +02:00
duncathan salt f405096258 Merge pull request #16659 from MrStonedOne/airfixes
Final stage of fixes for space getting gas.
2016-04-05 11:52:02 -06:00
Cheridan 90cb067020 Merge pull request #16621 from duncathan/atmosspawnair
Makes atmos_spawn_air() use the new gas string parser
2016-04-05 11:38:12 -05:00
Cheridan 15e66ce517 Merge pull request #16630 from AnturK/gorilla_warfare
Monkeys can now use all guns without restrictions.
2016-04-05 11:24:58 -05:00
KorPhaeron 91255b25e2 Merge pull request #16623 from TechnoAlchemisto/explore_this_fam_unzips_pickaxe
Lets pickaxes be held in explorer suits.
2016-04-05 11:11:51 -05:00
KorPhaeron f0bb212355 Merge pull request #16658 from ChangelingRain/hahawhoops
Fixes support holo beacon teleportation not working under most conditions
2016-04-05 11:09:11 -05:00
Cheridan 663cabf337 Merge pull request #16625 from KorPhaeron/building
Fixes blueprints not working on lavaland
2016-04-05 10:38:24 -05:00
MrStonedOne fd70645f43 Final stage of fixes for space getting gas.
There might be some other edge cases, but this should get most of them now.
2016-04-05 08:27:04 -07:00
Nerd Lord e57492a77e Fixes support holo beacon teleportation not working under most conditions 2016-04-05 09:15:02 -04:00
duncathan salt 45ad72f466 Better idea 2016-04-05 00:46:36 -06:00
duncathan salt dc21b88d22 Update space_mixture.dm 2016-04-05 00:35:51 -06:00
Cheridan fa6655d18c Merge pull request #16604 from ChangelingRain/zombotron
Zombies can no longer remove more than one airlock at once
2016-04-04 23:29:09 -05:00
duncathan salt 1cf07c2445 Merge pull request #16561 from MrStonedOne/ssairtweaks
Tweaks atmos: excited groups and ssair
2016-04-04 20:54:37 -06:00
KorPhaeron a6cd496c95 Merge pull request #16521 from erwgd/StorageEnhance
Exosuit and utility belt enhancements, holster description change
2016-04-04 20:57:03 -05:00
KorPhaeron 268d29af45 Merge pull request #16605 from TechnoAlchemisto/Pocket_Scanner
Makes detective scanners fit inside pockets.
2016-04-04 20:55:38 -05:00
Nerd Lord 45628c7598 A VAR A VAR I NEED TO MAKE THIS A VAR 2016-04-04 20:01:05 -04:00
Nerd Lord 8038c4dd33 Simple Animal ranged cooldowns now use world.time
this might fuck stuff up but ~oh well~
2016-04-04 19:59:59 -04:00
Cheridan 2a4b304df8 Merge pull request #16601 from ChangelingRain/guardedbalance
Holoparasite balance
2016-04-04 18:38:31 -05:00
Cheridan 64c6143e22 Merge pull request #16551 from ChangelingRain/alwaysuseprotectors
Adds protector holoparasites to traitor
2016-04-04 18:22:30 -05:00
Cheridan 591aacfcc5 Merge pull request #16527 from ChangelingRain/thisiskorsfault
Fixes minerals not spreading
2016-04-04 18:20:21 -05:00
Cheridan 4f4a52e206 Merge pull request #16583 from KorPhaeron/rd_fix
Fixes RD machine speed
2016-04-04 18:07:22 -05:00
MrStonedOne e514eb0f36 fixes some bugs with excited groups and ssair under duncmos 2016-04-04 14:22:41 -07:00
MrStonedOne 363f848bc8 Tweaks atmos: excited groups and ssair
Excited groups will be much more aggressive about averaging out their turfs when air movement within has slowed down.
Excited groups will be less aggressive about sleeping simi-idle turfs to prevent deadlocking
Sleeping thresholds lowered.
SSair will now tick_check all loops, not just active turf processing.
2016-04-04 14:22:40 -07:00
erwgd 529309e6ab Added hatchet datum to autolathe_designs.dm, formatting in autolathe_designs.dm and hydroitemdefines.dm 2016-04-04 21:20:03 +01:00
duncathan salt 26df895cda Update space_mixture.dm 2016-04-04 11:32:58 -06:00
AnturK b1f9fa649f Monkeys can now use all guns without restrictions. 2016-04-04 18:15:33 +02:00
Nerd Lord d5a9fc1319 IT IS DONE 2016-04-04 10:31:13 -04:00
erwgd 1ab2e4a7bd Added hydroponics tools to autolathe_designs.dm 2016-04-04 15:23:49 +01:00
erwgd 406b7307cc added toolbox to autolathe_designs.dm 2016-04-04 14:19:02 +01:00
KorPhaeron 0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05:00
TechnoAlchemist 1d96a76eba Lets picks be held in explorer suits. 2016-04-04 01:41:14 -07:00
duncathan 497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
Cheridan cf4ffc2781 Merge pull request #16026 from duncathan/turfs
[REVIEW-READY] removes simulated turfs (and asteroid station)
2016-04-04 01:49:45 -05:00
duncathan 2b01727034 dumb; this is dumb; i am dumb; 2016-04-04 00:40:30 -06:00
bgobandit dc9c725e41 Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt. 2016-04-04 02:13:33 -04:00
duncathan 7751f41d25 fixes compilation warnings; speeds up roundstart init a bit 2016-04-03 22:59:28 -06:00
KorPhaeron 135ceb2b64 Buffs OOC ban
* Buffs OOC ban

* Buffs OOC ban
2016-04-03 22:39:52 -05:00
TechnoAlchemist 40daf9ec34 fixes the tricord recipe because I cannot into spelling. 2016-04-03 19:32:38 -07:00
KorPhaeron 2d41f26541 Merge pull request #16515 from TechnoAlchemisto/spoof_chem
Re-adds the recipes for Kelotane, Bicardine, Antitoxin, and Tricordazine.
2016-04-03 20:31:18 -05:00
TechnoAlchemist 32d3c82371 Makes detective scanners fit inside pockets. 2016-04-03 17:37:48 -07:00
Nerd Lord 0cabcdd673 Zombies can no longer remove more than one airlock at once 2016-04-03 20:34:18 -04:00
duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
Cheridan e1b7477857 Merge pull request #16579 from KorPhaeron/buffs_ignore
Ignore Buffs
2016-04-03 18:39:29 -05:00
Nerd Lord aa4a46e9de I'm awful at this sort of math! 2016-04-03 19:34:55 -04:00