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

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm

2015-06-23 12:54:26 -07:00

..

crates_lockers

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

2015-06-23 12:54:26 -07:00

stool_bed_chair_nest

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

2015-06-23 12:54:26 -07:00

transit_tubes

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

2015-06-23 12:54:26 -07:00

ai_core.dm

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

2015-06-23 12:54:26 -07:00

artstuff.dm

Removes a variable from an unused/unneeded fix to seeing paintings in hand.

2015-04-21 09:37:04 +01:00

barsigns.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

bedsheet_bin.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

displaycase.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

door_assembly.dm

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

2015-06-23 12:54:26 -07:00

dresser.dm

Fixes some grammar for the dresser.

2014-12-22 20:00:31 -06:00

electricchair.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

extinguisher.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

false_walls.dm

Merge pull request #9980 from LaharlMontogmmery/ContentTransfer

2015-06-21 00:09:19 +01:00

fireaxe.dm

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

2015-06-20 18:37:39 +10:00

flora.dm

Procedural Map Generator System

2015-02-15 12:08:02 +00:00

girders.dm

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

2015-06-23 12:54:26 -07:00

grille.dm

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

2015-06-23 12:54:26 -07:00

guncase.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

hivebot.dm

eol fixes (probably) and examine fix in closets

2015-05-28 20:48:47 +10:00

janicart.dm

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

2015-06-23 12:54:26 -07:00

kitchen_spike.dm

more spans

2015-04-24 20:52:00 +03:00

ladders.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

lamarr_cage.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

lattice.dm

E

2015-05-06 15:31:09 +12:00

mineral_doors.dm

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

2015-06-23 12:54:26 -07:00

mirror.dm

Merge pull request #9974 from phil235/MirrorRaceChangeFix

2015-06-17 12:54:19 -05:00

mop_bucket.dm

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

morgue.dm

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

musician.dm

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

2015-06-23 12:54:26 -07:00

noticeboard.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

OpTable.dm

Allows you to buckle people to an operating table.

2015-04-29 16:04:22 +02:00

safe.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

showcase.dm

eol conversion

2015-06-13 20:15:49 +10:00

signs.dm

adds directional signs from bay

2015-02-01 06:13:21 -08:00

spirit_board.dm

Adds logging, fixes typo

2014-09-04 00:42:06 -05:00

statues.dm

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

2015-06-23 12:54:26 -07:00

table_frames.dm

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

2015-06-13 14:20:17 -07:00

tables_racks.dm

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

2015-06-23 12:54:26 -07:00

tank_dispenser.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

target_stake.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

watercloset.dm

BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH

2015-06-13 13:58:08 -07:00

windoor_assembly.dm

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

2015-06-23 12:54:26 -07:00

window.dm

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

2015-06-23 12:54:26 -07:00