Commit Graph

14935 Commits

Author SHA1 Message Date
TechnoAlchemist
c8bb360fe3 Goliath meat has its own sprite, goliath steaks don't magically generate plates. 2016-04-06 21:15:48 -07:00
Remie Richards
da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances
Conflicts:
	code/game/atoms.dm
2016-04-06 21:26:46 +01:00
Kyle Spier-Swenson
91d90c602f fixes trees fucking up atmos. 2016-04-06 12:37:54 -07:00
Cheridan
fe73fc2b58 Merge pull request #16664 from erwgd/PortaseederDesign
Adds portable seed extractor to protolathe designs
2016-04-06 13:23:40 -05:00
AnturK
2ecaea5525 Merge pull request #16595 from Core0verload/on_species_gain
Adds on_species_gain proc to human species
2016-04-06 20:18:15 +02:00
AnturK
a09b6819c1 Merge pull request #16662 from MrStonedOne/patch-187
Fixes directional atmos spread blockers (like small windows/windoors)
2016-04-06 20:13:26 +02:00
KorPhaeron
5e416d2188 Merge pull request #16661 from ChangelingRain/fixkorsshit2k16
Fixes minerals showing up weird with mining scanners
2016-04-06 10:57:31 -05:00
Core0verload
4e9db5beac Slimes can now be put in stasis by CO2 2016-04-06 02:25:49 -06:00
Core0verload
04ce5e42cd World "?status" expansion, Topic() rework
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
2016-04-06 02:15:25 -06:00
Cheridan
3b3bdcdb75 Merge pull request #16640 from KorPhaeron/snow_biome
Fixes snow biome alarm bolting doors in every ruin
2016-04-06 00:21:21 -05:00
Cheridan
3ad85b8171 Merge pull request #16642 from LatD/freegolems
Makes lavaland golem shell name and description better
2016-04-06 00:18:45 -05:00
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
Kyle Spier-Swenson
c3ae0ea393 Fixes directional atmos spread blockers (like small windows/windoors)
byond and `in` are lame, and it processes wrong with tinaries this is better anyways as it avoids a list loop.
2016-04-05 10:28:12 -07:00
erwgd
66a12a9233 added portable seed extractor to designs.dm 2016-04-05 18:14:47 +01: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
Nerd Lord
0741e4876b Fixes minerals showing up weird with mining scanners 2016-04-05 12:03:13 -04: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
LatD
e91a99c882 Lavaland golem shell name and description 2016-04-05 03:32:10 +03: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
KorPhaeron
64a73a7759 Alarm Fix 2016-04-04 18:26:06 -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