134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
aedb522c7d
wake me up
2015-12-16 06:09:01 -05:00
a2aee48ece
Merge pull request #13609 from AnturK/runtimes
...
Fixes for few runtime errors
2015-12-16 04:15:21 -03:00
88414e5502
woops
2015-12-15 20:25:02 -05:00
55ebaf3bdb
snow stuff i guess
2015-12-15 17:33:34 -05:00
392ca2a505
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
2015-12-15 16:54:22 -05:00
d07f300063
i did things
2015-12-15 16:46:24 -05:00
2c9adb12f3
Fixes spell logging runtime
...
Fixes lava runtime
Fixes mecha ore scanner runtime
Fixes crayon writing runtime
Fixes latejoin headrev runtime
2015-12-13 15:04:12 +01:00
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
b3d992a832
conflict fix
2015-12-11 16:21:18 -05:00
c384aae4c3
more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM
2015-12-08 00:43:53 -05:00
6f32eb473d
Makes noslip floors speed movement up.
...
Because you can run faster in high traction... right....
2015-12-06 09:51:08 -08:00
8ab579cb21
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
...
Conflicts:
icons/mob/animal.dmi
2015-12-04 18:55:10 -05:00
de4c8b8674
snow walls+material
2015-12-04 15:07:05 -05:00
b4ddc0abb3
Merge branch 'madewithrealcaverock' of https://github.com/MMMiracles/-tg-station into MMMiracles-madewithrealcaverock
2015-12-04 11:17:49 +03:00
93ebd07488
Merge pull request #13426 from KorPhaeron/new_mining_turfs
...
Mine turf fixes
2015-12-03 21:49:40 +00:00
7eab9a3f76
so smooth it burns
2015-12-03 16:12:56 -05:00
0e4078fb90
Mine turf fixes
2015-12-03 14:25:38 -06:00
6b0976afcb
updates caves.dm to use the actual basalt asteroid flooring, removes plating variant.
2015-12-03 01:00:43 -05:00
11c26fb328
updates to use real basalt tiles, removes the shitty plating ones
2015-12-03 00:57:21 -05:00
08a8115790
Merge pull request #13271 from KorPhaeron/new_mining_turfs
...
New mining turf sprites
2015-12-02 18:11:46 -06:00
77b36e2415
iced windows, more ice variants of shit in general.
...
more stuff, ice everything.
wew
conflict fix
2015-12-01 16:45:09 -05:00
4fb081826f
shh
2015-11-29 15:55:26 -05:00
e6cfba70a2
iced variant of regular walls added
2015-11-29 15:45:22 -05:00
9e9ccf9474
Merge pull request #13268 from Anonus/teachingsofnarsie
...
Cult theme update
2015-11-29 12:23:07 -06:00
f67dde21d5
foundation set, demands given.
2015-11-29 12:34:49 -05:00
d4d63b7d3f
start of something
2015-11-29 11:02:38 -05:00
38eddb1421
Merge pull request #13179 from AnturK/academy
...
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
da0c466f82
Merge pull request #13149 from Firecage/toolspeed
...
Adds toolspeed
2015-11-29 21:06:15 +11:00
2600371fe0
Updates mine turfs to be slightly more modular
2015-11-28 18:49:40 -06:00
439fa02da9
Smooth lava
2015-11-28 14:21:47 -06:00
b662b470a9
Enables ghost to go through ladders
...
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
1414070115
Cult theme update;
...
Cult stuff uses cult span classes for the most part.
There are beams when using blood drain on a target and when reviving a target with the raise dead rune.
There's a nar-sie maw when you sac something, holy shit.
Sac invocation is now the old invocation, and it worked in testing I promise.
Updates construct descriptions to match what they tend to do.
There's like one or two bugfixes, you can examine talismans as a cultist without the paper menu popping up.
The supply talisman popup is like 50% smaller.
2015-11-27 21:53:56 -05:00
cce47616c0
Merge pull request #13217 from AnturK/shuttlelight
...
Makes shuttle turf copy use proper helper.
2015-11-27 20:56:55 +00:00
5f5d8bca95
did you know this is the final change? no.
2015-11-27 01:01:43 -05:00
2d94b0ff9b
feedback changes:
...
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -05:00
ef7dc5c6b2
rip hole, map is ready.
...
added spawners for all mining mobs.
2015-11-25 18:32:05 -05:00
d71e310390
Makes shuttle turf copy use proper helper.
2015-11-25 21:19:36 +01:00
671fa02edf
almost there folks
2015-11-23 21:53:27 -05:00
3e5de6d749
Merge pull request #12913 from KorPhaeron/lava
...
Lava turf
2015-11-23 20:02:26 -06:00
db84542278
Merge branch 'master' of https://github.com/tgstation/-tg-station into spookycaves
2015-11-21 14:33:45 -05:00
13e4f16ce5
more edits
2015-11-21 14:23:18 -05:00
336e5f6657
Merge pull request #13134 from KorPhaeron/vomit
...
Bar no longer starts covered in vomit
2015-11-21 11:55:29 -06:00
c933363062
Adds the toolspeed var and adds it to most usages of tools which has a timer
2015-11-21 19:24:14 +02:00
3510f10791
Phone editing is hard
2015-11-21 09:42:07 -06:00
cf1f206676
Glowing lava
2015-11-21 09:38:58 -06:00
3aa39e0c52
Lava
2015-11-21 06:29:28 -06:00
3e9700ce65
Clean bar
2015-11-20 12:10:58 -06:00
a183e0474d
Pooling is good for the soul.
2015-11-17 11:27:26 -05:00
oranges
MMMiracles
tkdrg
AnturK
KorPhaeron
Kyle Spier-Swenson
Razharas
Remie Richards
Cheridan
duncathan salt
Jordie
Nerd Lord
Firecage
KorPhaeron