bgobandit 0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-07-24 11:58:52 -04:00

..

crates_lockers

Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.

2015-07-23 10:49:06 -04:00

stool_bed_chair_nest

Fixes dog bed dropping metal on deconstruction.

2015-07-16 13:04:44 +02:00

transit_tubes

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ai_core.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

artstuff.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

barsigns.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

bedsheet_bin.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

displaycase.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

door_assembly.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

dresser.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

electricchair.dm

Fixes proc arguments

2015-07-15 23:52:35 +02: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

#whoa #wow

2015-07-22 14:58:58 -04:00

fireaxe.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

flora.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

girders.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

grille.dm

Fixes proc arguments

2015-07-15 23:52:35 +02: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

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

janicart.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

kitchen_spike.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ladders.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

lamarr_cage.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

lattice.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mineral_doors.dm

Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)

2015-07-14 00:51:19 +02:00

mirror.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mop_bucket.dm

Pressure_resistance Tweaks

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

morgue.dm

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

2015-07-19 21:53:39 +02:00

musician.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

noticeboard.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

OpTable.dm

Allows you to buckle people to an operating table.

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

safe.dm

Fixes proc arguments

2015-07-15 23:52:35 +02: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

Fixes proc arguments

2015-07-15 23:52:35 +02:00

statues.dm

Changed on phil's comments

2015-07-21 12:20:15 -05:00

table_frames.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

tables_racks.dm

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

2015-07-19 21:53:39 +02:00

tank_dispenser.dm

Fixes proc arguments

2015-07-15 23:52:35 +02: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

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

2015-07-20 22:37:06 +02:00

windoor_assembly.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

window.dm

Merge pull request #10613 from Ikarrus/rwindow-heat

2015-07-16 18:42:45 +02:00