Commit Graph

14899 Commits

Author SHA1 Message Date
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
Nerd Lord e57492a77e Fixes support holo beacon teleportation not working under most conditions 2016-04-05 09:15:02 -04: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
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
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
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
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
Nerd Lord 89c9e6a3d3 flash 2016-04-03 19:01:38 -04:00
Nerd Lord 1f191b07ec visible memessage 2016-04-03 18:41:57 -04:00
Nerd Lord e6abb95178 Holoparasite balance 2016-04-03 18:33:20 -04:00
bawhoppen af51a66e37 Adds sandbags
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
Supermichael777 bcedee0f42 OOPS 2016-04-02 23:49:27 -04:00
KorPhaeron c93abbb0b9 Adds Techno's absinthe to mining
* Absinthe

* Formatting
2016-04-02 23:48:24 -04:00
Joan Lung a2bd358eb8 Merge pull request #16507 from PKPenguin321/patch-16
fixes being able to grind guns with an autolathe
2016-04-02 20:09:06 -04:00
KorPhaeron e632d78846 RD Fix 2016-04-02 11:21:49 -05:00
KorPhaeron 69f9549a11 Ignore Buffs 2016-04-02 10:59:59 -05:00
Nerd Lord 1467d0d6f1 slowmover 2016-04-02 11:28:43 -04:00
AnturK 7e24fadedd Merge pull request #16542 from Isratosh/transformfix
Fixing rudimentary transformation not working properly on ghosts with minds
2016-04-02 11:36:36 +02:00
erwgd 3095d3bf21 Adds scalpel, syringes, DNA injectors to the list of allowed items in boots
* added scalpel to the list of allowed items in shoes
* Put the scalpel on same line as others
* Added syringe to list of shoe items
* Added DNA injector to list of shoe items
2016-04-02 11:32:17 +02:00
Isratosh fa122fe793 Adding admin logs to bluespace shelter capsules.
* Adding admin logs to bluespace shelter capsules.

* Only logs when not on mining or lavaland z level
2016-04-02 02:42:18 -06:00
Nerd Lord 97508e9f33 now has a flash when hit in protection mode 2016-04-02 01:06:26 -04:00
KorPhaeron bb3d04d351 Merge pull request #16526 from LatD/NutriMax
More plant analyzers to NutriMax
2016-04-01 19:53:36 -05:00
Nerd Lord 7d5dce7e10 this, on the other hand, is byond's fault 2016-04-01 20:10:07 -04:00
Nerd Lord e26aa0636c the explosion glances off the protector's energy shielding 2016-04-01 18:37:16 -04:00