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

Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm

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

..

crates_lockers

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

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

stool_bed_chair_nest

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

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

transit_tubes

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

2015-06-13 13:58:08 -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

Barsign

2015-05-03 15:01:16 +01:00

bedsheet_bin.dm

- Fixed nettle soup recipe says abstract nettle.

2015-05-02 01:34:38 +02:00

displaycase.dm

…

door_assembly.dm

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

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

dresser.dm

…

electricchair.dm

"You hear something" set to italics.

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

extinguisher.dm

pre-map compile

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

false_walls.dm

Ports /vg/s Smoothwall code, Angry all caps comments from N3X15 included.

2015-05-16 21:05:18 +01:00

flora.dm

…

girders.dm

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

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

grille.dm

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

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

guncase.dm

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

2015-04-08 22:51:45 +10:00

hivebot.dm

eol fixes (probably) and examine fix in closets

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

janicart.dm

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

2015-06-13 13:58:08 -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

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

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

mirror.dm

Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).

2015-06-10 03:40:14 -04: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

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

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

noticeboard.dm

…

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

reorganizing stray objs in /defines

2015-05-05 21:18:21 +10:00

signs.dm

…

spirit_board.dm

…

statues.dm

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

2015-06-13 13:58:08 -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

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

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

tank_dispenser.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

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

target_stake.dm

Fixes range targets changing icons

2015-05-14 03:30:32 -03: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-13 14:20:17 -07:00

window.dm

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

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