Commit Graph

624 Commits

Author SHA1 Message Date
KazeEspada
f1d903dadb Add fireplace and a map generator. Finishes more the cabin map. 2016-02-28 14:18:08 -07:00
KazeEspada
03c168c2b3 Begins work on Cabin away mission. Its a quiet away mission that resembles beach. 2016-02-27 17:36:09 -07:00
Steelpoint
b73e8ed9a5 FinalChange 2016-02-22 17:48:18 +08:00
MrStonedOne
a2ae265064 Brings the rest of atmos into the new turf list system (and some more speed ups for process_cell()) 2016-02-14 00:07:43 -08:00
KorPhaeron
9df93ced27 Attack animation for simple animal attacks 2016-02-08 13:58:53 -06:00
tkdrg
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
GunHog
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
Lzimann
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
tkdrg
8c5f3ea143 Merge pull request #15012 from KorPhaeron/title_screen
Allows mappers to set their own title screen for each map
2016-01-31 15:14:17 -03:00
tkdrg
7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
xxalpha
062cb76e29 Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj 2016-01-30 19:45:45 +00:00
xxalpha
83a4491756 Space icon state function is a define. 2016-01-30 19:44:20 +00:00
AnturK
1cbb8137d9 Moves initialize from /atom/movable to /atom
Bit cleaner powernet/pipes initialization in templates
2016-01-30 14:34:34 +01:00
KorPhaeron
2549733a83 Adds eff station 2016-01-30 01:49:43 -06:00
KorPhaeron
10a154fad8 Merge remote-tracking branch 'refs/remotes/tgstation/master' into title_screen 2016-01-30 01:48:00 -06:00
xxalpha
e75d6ca09b Fix smooth shuttle sprites
No maps
2016-01-28 21:05:20 +00:00
KorPhaeron
5badf64caf Titlescreen 2016-01-28 13:49:33 -06:00
Firecage
d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
xxalpha
379eb05015 Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj 2016-01-27 14:50:06 +00:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
xxalpha
6133cccd79 Maps 2016-01-27 03:29:05 +00:00
xxalpha
3d27a75c21 Instructions etc. 2016-01-27 02:33:57 +00:00
xxalpha
d59e0c7866 Diagonal smoothing first commit 2016-01-27 02:04:17 +00:00
Razharas
6f8ce47951 New proximity code
New proximity code
2016-01-26 07:47:33 +03:00
duncathan salt
d5e97230d0 removes gas miners 2016-01-23 11:06:08 -06:00
Bjorn Neergaard
59b7419593 Remove roomfiller canister, repath n20 to n2o 2016-01-22 19:25:38 -06:00
tkdrg
717ebcf6bb Merge pull request #14707 from xxalpha/beachicons
Divide beach coast icon into two.
2016-01-20 20:34:41 -03:00
Firecage
d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
duncathan salt
536beac2f9 Merge pull request #14732 from tgstation/atmosfixes
Atmos fixes
2016-01-18 22:13:37 -06:00
duncathan
ed974ff559 atmos fixes 2016-01-18 21:24:26 -06:00
xxalpha
af7059e1f3 Divide beach coast icon into two. 2016-01-17 23:26:43 +00:00
tkdrg
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
xxalpha
6d56fafa1c fasdasdjaidfhasiufh
conflix

fuck that

mistake

Clearer if
2016-01-17 20:14:02 +00:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Buggy123
87c82007f2 Uses infinity instead of a really large number. 2016-01-16 17:19:11 -05:00
Buggy123
3b4c7003a2 Reinforced floors no longer burn away under extremely high temperatures. 2016-01-16 16:25:11 -05:00
xxalpha
e4150ac88e Merge remote-tracking branch 'upstream/master' into shingles 2016-01-16 18:37:40 +00:00
xxalpha
2cc55c3ba0 Changed floor ex_act to not break grilles & src if under r-windows. 2016-01-16 17:43:33 +00:00
duncathan
0a0f5b9f45 fixes #14633 2016-01-15 01:03:22 -06:00
duncathan
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
tkdrg
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
xxalpha
4dd308c278 fix
glass windows no strong

Affect all levels if in devastating range.
2016-01-09 23:00:24 +00:00
tkdrg
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
KorPhaeron
1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06:00
Tkdrg
b6d0cee2f7 Merge branch 'KorPhaeron-lava_rivers' into HEAD
Closes #13511
2016-01-09 12:07:34 -03:00
KorPhaeron
b96bec5157 River Generation Module
This is going to be used for lava rivers in lavaland.
2016-01-09 12:06:55 -03:00
KorPhaeron
224c5d1029 Use defines 2016-01-07 13:10:12 -06:00
KorPhaeron
c93fcdb5dc Wall layer 2016-01-07 13:02:36 -06:00
Kyle Spier-Swenson
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