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

..

devices

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

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

robot

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

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

stacks

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

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

weapons

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

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

apc_frame.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

blueprints.dm

Fixes construction permits dissapearing even when usage fails and fixes a small grammar error with blueprints.

2015-06-20 22:04:39 -06:00

body_egg.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

bodybag.dm

pre-map compile

2015-04-08 15:40:41 +10:00

candle.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

crayons.dm

- Ghosts can hear gang messages

2015-06-12 08:22:42 -06:00

dehy_carp.dm

Dehydrated carps inherit factions (minus neutral) from their owner.

2015-04-24 15:18:37 -05:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

holotape.dm

Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages

2015-06-20 00:19:03 -05:00

latexballoon.dm

Removed unnecessary spaces in these situations:

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

shooting_range.dm

Fixes range targets changing icons

2015-05-14 03:30:32 -03:00

toys.dm

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

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

trash.dm

Fixes trash disappearing when washed in a sink.

2015-03-03 00:07:08 +01:00