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
d8f168f3da
Merge pull request #14529 from AnturK/evenmorefixes
...
Misc fixes
2016-01-09 20:32:02 -03:00
24b7eaa23a
Merge pull request #14488 from KorPhaeron/wall_layer
...
Walls are a slightly higher layer than floors
2016-01-09 18:41:59 -03:00
1d9b334e50
Fixes layers
2016-01-09 15:32:35 -06:00
23efe5f675
Adds a variable to block shuttles from changing destinations midflight for mining shuttle
2016-01-09 17:44:16 +01:00
b6d0cee2f7
Merge branch 'KorPhaeron-lava_rivers' into HEAD
...
Closes #13511
2016-01-09 12:07:34 -03:00
b96bec5157
River Generation Module
...
This is going to be used for lava rivers in lavaland.
2016-01-09 12:06:55 -03:00
227b3149b2
Merge pull request #14441 from SouDescolado/master
...
Fixes abandoned crates minigame / Also fixes tuberculosis kit
2016-01-08 07:16:22 -06:00
224c5d1029
Use defines
2016-01-07 13:10:12 -06:00
c93fcdb5dc
Wall layer
2016-01-07 13:02:36 -06:00
d16fe1c490
Merge pull request #14419 from KorPhaeron/chasm_fix
...
Chasm Fix
2016-01-06 13:30:17 -06:00
4a7cb6a066
Fixes abandoned crates minigame
...
Replaces the user input 0 with "z"(Code side only. Player can still use
0). Wont return 0 as "cows" anymore.
Remove useless variable
2016-01-06 10:43:54 -02:00
936973a68d
Chasm Fix
2016-01-05 13:54:12 -06:00
4815a0f37c
Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.
...
No, no, do it properly not half-ass it
2016-01-04 15:29:23 -05:00
c510fb69c2
Merge pull request #14337 from AnturK/miningbot
...
Fixes mining bot being hard to repair.
2016-01-04 20:23:23 +01:00
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
41f7d95aa4
Fixes mining bot being hard to repair.
...
Stops bruisepacks working on mining bot
2016-01-03 13:18:02 +01:00
29977a2d16
Merge pull request #14243 from KorPhaeron/darkness
...
Fixes floor is lava and advanced darkness
2016-01-03 02:54:21 -03:00
28a0c48403
Moves spawn to weather
2016-01-02 23:21:46 -06:00
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
dde4690cb4
Fixes floor is lava and advanced darkness
2016-01-01 05:43:17 -06:00
e5941a59a2
Merge pull request #14124 from KorPhaeron/darkness
...
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -03:00
b9bf6ef547
Advanced Darkness
2015-12-31 19:32:02 -06:00
ff5767d785
Nevermind
2015-12-30 20:12:40 -06:00
9499d35c6b
Diety name
2015-12-30 19:39:35 -06:00
79e5f3d37e
Check that actually works
2015-12-30 19:10:49 -06:00
e0157185fc
Blacklist
2015-12-30 10:10:54 -06:00
9148b9ccd2
Bluespace shelter
2015-12-29 13:08:29 -06:00
9cf6a315b7
Advanced Darkness
2015-12-28 15:25:42 -06:00
b943109a02
Merge pull request #13905 from KorPhaeron/weather
...
Weather datums [WIP]
2015-12-28 22:06:31 +01:00
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
15d4ad156c
Final (I hope) weather tweaks
2015-12-24 23:03:32 -06:00
4d7d3654bc
False alarm fix
2015-12-24 05:05:13 -06:00
6716fc9282
Entirely area based
2015-12-24 03:50:27 -06:00
1b7892a37e
Lavaland Turfs
2015-12-23 06:33:22 -06:00
07bdfef551
Opacity Fix
2015-12-23 05:02:48 -06:00
404666546b
More weather updates
2015-12-23 04:45:09 -06:00
ef30f9e64d
Less copypaste
2015-12-22 10:29:27 -06:00
772451816d
Code clean up
2015-12-22 10:18:06 -06:00
70060cb6c1
Weather datums
2015-12-22 05:31:46 -06:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
55ebaf3bdb
snow stuff i guess
2015-12-15 17:33:34 -05:00
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
0979b72d29
Merge pull request #13554 from bgobandit/banditfixyourshit
...
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
01dd491390
Fixes various mining bugs. Adjusts gear costs.
2015-12-10 14:43:33 -05:00
755455c9de
New sprite
2015-12-10 01:36:27 -06:00
8f01581fc0
Updates to use variables
2015-12-07 18:28:36 -06:00
c9330c5ef0
Chasm
2015-12-05 02:35:33 -06:00
b8909aa814
Fixes the pre-mapped cave pieces to spawn the right tiles
2015-12-03 16:07:00 -06:00
duncathan