duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

beds_chairs

Nar-Sie will now corrupt doors, tables, windows, and windoors

2016-03-17 16:28:26 -04:00

crates_lockers

Adds sandbags

2016-04-02 23:52:12 -04:00

transit_tubes

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

ai_core.dm

Adds AI card tgui

2016-01-24 12:52:31 +01:00

artstuff.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

barsigns.dm

…

bedsheet_bin.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

displaycase.dm

Merge pull request #13317 from neersighted/airlock_electronics

2015-11-30 20:43:33 +03:00

door_assembly.dm

Nar-Sie will now corrupt doors, tables, windows, and windoors

2016-03-17 16:28:26 -04:00

dresser.dm

…

electricchair.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

extinguisher.dm

…

false_walls.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

fireaxe.dm

…

flora.dm

fixed an edgecase where you could spam cut a tree and receive multiple logs.

2016-02-26 23:46:09 -07:00

girders.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-04-03 18:22:20 -06:00

grille.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-04-03 18:22:20 -06:00

guncase.dm

…

hivebot.dm

…

janicart.dm

Can put mop in janicart when dry

2016-01-07 11:02:06 -05:00

kitchen_spike.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

ladders.dm

…

lattice.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

mineral_doors.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

mirror.dm

Merge pull request #15855 from kilkun/master

2016-03-08 21:39:46 -06:00

mop_bucket.dm

…

morgue.dm

Fixes revive() not properly removing the blind overlay. (fixes staff of healing)

2016-02-14 15:26:46 +01:00

musician.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

noticeboard.dm

…

plasticflaps.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

reflector.dm

Corrected syntax error

2016-01-16 18:19:06 -05:00

safe.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

showcase.dm

…

signs.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

spirit_board.dm

…

statues.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

table_frames.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

tables_racks.dm

Adds sandbags

2016-04-02 23:52:12 -04:00

tank_dispenser.dm

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

target_stake.dm

…

watercloset.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

windoor_assembly.dm

Merge pull request #13317 from neersighted/airlock_electronics

2015-11-30 20:43:33 +03:00

window.dm

Merge pull request #16165 from ChangelingRain/cultlock

2016-03-19 21:58:12 -05:00