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

Conflicts:
	code/game/machinery/computer/shuttle.dm

2015-10-24 23:32:55 -04:00

..

beds_chairs

Fixes winter coat hood sprite appearing as a bucket.

2015-10-17 16:29:11 +02:00

crates_lockers

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

2015-10-24 23:32:55 -04:00

transit_tubes

…

ai_core.dm

…

artstuff.dm

…

barsigns.dm

…

bedsheet_bin.dm

…

displaycase.dm

Removed unused code in hologram.dm

2015-10-11 20:18:13 +02:00

door_assembly.dm

…

dresser.dm

…

electricchair.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

extinguisher.dm

…

false_walls.dm

Rough Metal Wall

2015-10-12 18:47:22 +02:00

fireaxe.dm

…

flora.dm

…

girders.dm

Rough Metal Wall

2015-10-12 18:47:22 +02:00

grille.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

guncase.dm

…

hivebot.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

janicart.dm

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

2015-10-12 22:01:57 +02:00

kitchen_spike.dm

Fixes var names

2015-09-25 12:25:51 -05:00

ladders.dm

…

lattice.dm

…

mineral_doors.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

mirror.dm

Removes one indent from the return.

2015-10-22 19:11:23 +02:00

mop_bucket.dm

…

morgue.dm

…

musician.dm

…

noticeboard.dm

…

OpTable.dm

…

plasticflaps.dm

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

2015-10-24 23:32:55 -04:00

safe.dm

…

showcase.dm

…

signs.dm

Annoying desc for medbay sign

2015-10-21 09:31:39 -05:00

spirit_board.dm

…

statues.dm

Radiation changes

2015-09-26 13:33:27 -04:00

table_frames.dm

…

tables_racks.dm

…

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

toilet related tweaks and fixes

2015-10-14 11:48:47 -04:00

windoor_assembly.dm

…

window.dm

…