f1d903dadb
Add fireplace and a map generator. Finishes more the cabin map.
2016-02-28 14:18:08 -07:00
03c168c2b3
Begins work on Cabin away mission. Its a quiet away mission that resembles beach.
2016-02-27 17:36:09 -07:00
95f86ffea8
Nuke Tiles
...
AI's Doomsday Device and Stations' self-destruct now turn all blue
circuit tiles to red when activated.
Fixed a bug where cancelling the self-destruct via the "Safety" button
did not change the tiles back to normal.
2016-02-04 09:16:56 -06:00
59b7419593
Remove roomfiller canister, repath n20 to n2o
2016-01-22 19:25:38 -06:00
717ebcf6bb
Merge pull request #14707 from xxalpha/beachicons
...
Divide beach coast icon into two.
2016-01-20 20:34:41 -03:00
af7059e1f3
Divide beach coast icon into two.
2016-01-17 23:26:43 +00:00
87c82007f2
Uses infinity instead of a really large number.
2016-01-16 17:19:11 -05:00
3b4c7003a2
Reinforced floors no longer burn away under extremely high temperatures.
2016-01-16 16:25:11 -05:00
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
869354f105
Revert commit f6d13b93 (blame rr)
...
This crashes the client
(burn code sets burn_state to ON_FIRE) setting it back to FIRE_PROOF kept it from detecting it was already on fire, so it kept re-adding the overlay
2016-01-04 23:30:15 -08:00
f6d13b93a4
blame RR
...
[23:27:53] \<%Remie\> you know how it makes inflammable things burn
[23:28:02] \<%Remie\> (and that's buggy as fug but w/e)
[23:28:10] \<%Remie\> what about resetting it after the fire_act() call?
[23:28:21] \<%Remie\> that way inflammable things become inflammable again if they escape the lava
2016-01-03 23:31:33 -08:00
1451db4cc4
does the remie
2016-01-03 23:22:33 -08:00
c0de47d3d7
Fixes lava turfs processing forever as well as some burn logic
2016-01-01 15:29:58 -08:00
17f167bcb7
associative list
2015-12-29 13:33:12 -06:00
b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
8758ca1a72
various map edits
2015-12-19 22:27:40 -05:00
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
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
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
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
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
KazeEspada
GunHog
Bjorn Neergaard
tkdrg
xxalpha
Buggy123
duncathan
Kyle Spier-Swenson
MMMiracles
oranges
AnturK
KorPhaeron
Razharas
Remie Richards
Cheridan
Jordie
Nerd Lord