Commit Graph

14861 Commits

Author SHA1 Message Date
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
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
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
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 69f9549a11 Ignore Buffs 2016-04-02 10:59:59 -05: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
KorPhaeron bb3d04d351 Merge pull request #16526 from LatD/NutriMax
More plant analyzers to NutriMax
2016-04-01 19:53:36 -05:00
Isratosh 75b350561a Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation 2016-04-01 01:32:59 -06:00
KorPhaeron 826844ecc6 Merge pull request #16504 from Eaglendia/fashion2
Improves selections for head of staff fashion
2016-03-31 22:06:29 -05:00
Joan Lung 82350431b2 Merge pull request #16439 from KorPhaeron/mecha2
Mining Gear Balance
2016-03-31 22:10:07 -04:00
KorPhaeron 2be10e302f Uses temp overlays for material scanners 2016-03-31 17:15:06 -05:00
TechnoAlchemist 059666660f Fixes chem_reactions to proper names, 2016-03-31 15:05:10 -07:00
KorPhaeron f2d5345093 Mesons 2016-03-31 17:02:50 -05:00
LatD 62f93b7a32 Adds hydrogen to grass 2016-04-01 00:09:33 +03:00
duncathan salt 1d32467096 Merge pull request #16496 from ChangelingRain/edgecases
Fixes edge case where it was possible to get multiple parasites without admin intervention
2016-03-31 12:20:41 -06:00
duncathan salt 8825858d9c Merge pull request #16492 from coiax/name-my-golems
Lavaland Golems have a larger naming pool
2016-03-31 12:20:10 -06:00
duncathan salt b2cd470024 Merge pull request #16480 from erwgd/BiogenAscend
Biogenerator and botany bottle improvements
2016-03-31 12:16:43 -06:00
duncathan salt bcc92cf76f Merge pull request #16471 from Core0verload/events
Adds minimal players requirements for random events
2016-03-31 12:14:44 -06:00
duncathan salt f568ae3f31 Merge pull request #16425 from Thunder12345/varspotting
Adds new atom and new datum options to viewvars
2016-03-31 12:07:14 -06:00
duncathan salt 1183681424 Merge pull request #16393 from KorPhaeron/triggerwarninggoofball
Math with goofball: Part 2
2016-03-31 12:03:39 -06:00
duncathan salt 3315717ef9 Merge pull request #16348 from Shadowlight213/adminsoundvolume
Adds client volume control for admin sounds.
2016-03-31 11:59:52 -06:00
KorPhaeron 55434a673d Heavy Weapon Fix 2016-03-31 12:23:46 -05:00
KorPhaeron 40023cf843 Merge pull request #16495 from ChangelingRain/dazedzinnia
Daisy and Zinnia holoparasites no longer try to kill your eyes
2016-03-31 11:40:15 -05:00
erwgd 5fc02ccee8 moved all returns in generation ifs to new lines 2016-03-31 15:14:28 +01:00
erwgd 0109c274fb moved returns to new lines, put 10u black pepper 2016-03-31 15:09:45 +01:00
TechnoAlchemist 38e971feb8 Fixes spelling 2016-03-31 02:08:16 -07:00
KorPhaeron 03216dce2e Merge pull request #16465 from TehZombehz/foodbox
Adds random ingredient food packages to chefs
2016-03-31 04:03:09 -05:00
KorPhaeron a74b7c209c Mining Drone Upgrades 2016-03-31 03:41:03 -05:00
TehZombehz 229a90ba10 Reorganized for standards 2016-03-31 02:53:52 -05:00
duncathan salt 1ff5882696 Merge pull request #16473 from KorPhaeron/goliath_meat
Goliath changes
2016-03-31 00:35:13 -06:00
Eaglendia d38e3e7cc1 Adds more options for CE and RD cloaks 2016-03-31 00:34:59 -05:00
duncathan salt 3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery
Slot icons micro-refactor
2016-03-30 23:30:06 -06:00
TechnoAlchemist 7678e68c4e :^) 2016-03-30 22:16:42 -07:00
TechnoAlchemist 0862131ac5 :^) 2016-03-30 22:15:12 -07:00
TechnoAlchemist c1bae85f6b :^) 2016-03-30 22:10:15 -07:00
duncathan eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
KorPhaeron 507b48f8a3 Merge pull request #16476 from ChangelingRain/charrrrrrge
Adds charger holoparasites to traitor
2016-03-30 21:39:29 -05:00
KorPhaeron 41dc2df094 Merge pull request #16491 from bgobandit/speeling
Fixes spelling in cargo crates
2016-03-30 19:50:03 -05:00