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
9df93ced27
Attack animation for simple animal attacks
2016-02-08 13:58:53 -06:00
c4cb425b5f
Merge pull request #15195 from GunHog/Hack_ALL_The_Tiles!
...
Doomsday and Self-Destruct now change ALL the blue circuit tiles!
2016-02-06 01:37:40 -03: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
6c7e12b030
Makes mech don't suck while destroying walls
...
Also makes them destroy table in one hit.
2016-02-03 11:55:54 -02:00
7891ac2805
Merge pull request #15034 from AnturK/shuttle_templates
...
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
062cb76e29
Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj
2016-01-30 19:45:45 +00:00
1cbb8137d9
Moves initialize from /atom/movable to /atom
...
Bit cleaner powernet/pipes initialization in templates
2016-01-30 14:34:34 +01:00
e75d6ca09b
Fix smooth shuttle sprites
...
No maps
2016-01-28 21:05:20 +00:00
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
6133cccd79
Maps
2016-01-27 03:29:05 +00:00
3d27a75c21
Instructions etc.
2016-01-27 02:33:57 +00:00
d59e0c7866
Diagonal smoothing first commit
2016-01-27 02:04:17 +00: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
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
af7059e1f3
Divide beach coast icon into two.
2016-01-17 23:26:43 +00:00
4de5320c5a
Merge pull request #14674 from Buggy123/patch-7
...
Reinforced floors no longer burn away under extremely high temperatures.
2016-01-17 18:47:03 -03:00
6d56fafa1c
fasdasdjaidfhasiufh
...
conflix
fuck that
mistake
Clearer if
2016-01-17 20:14:02 +00:00
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
332bde0f4f
Does the rest of the if()'s/ else's
2016-01-17 19:03:12 +02: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
e4150ac88e
Merge remote-tracking branch 'upstream/master' into shingles
2016-01-16 18:37:40 +00:00
2cc55c3ba0
Changed floor ex_act to not break grilles & src if under r-windows.
2016-01-16 17:43:33 +00: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
7bf3834b5e
Merge pull request #14487 from xxalpha/shingles
...
Floor level objects will now be protected from explosions until they are exposed.
2016-01-09 20:30:02 -03:00
4dd308c278
fix
...
glass windows no strong
Affect all levels if in devastating range.
2016-01-09 23:00:24 +00: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
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
224c5d1029
Use defines
2016-01-07 13:10:12 -06:00
c93fcdb5dc
Wall layer
2016-01-07 13:02:36 -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
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
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
6716fc9282
Entirely area based
2015-12-24 03:50:27 -06:00
70060cb6c1
Weather datums
2015-12-22 05:31:46 -06:00
8758ca1a72
various map edits
2015-12-19 22:27:40 -05:00
58b9ea0174
Merge remote-tracking branch 'refs/remotes/tgstation/master' into lava_rivers
2015-12-18 15:33:48 -06: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
KazeEspada
KorPhaeron
tkdrg
GunHog
Lzimann
xxalpha
AnturK
Firecage
Bjorn Neergaard
Buggy123
duncathan
Kyle Spier-Swenson
MMMiracles
oranges