xxalpha 94f045b73f Merge remote-tracking branch 'upstream/master' into airlocking ...

Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41F.dmm
	code/game/objects/structures/door_assembly.dm

2015-08-30 19:53:54 +01:00

..

crates_lockers

Merge pull request #11433 from Core0verload/framed

2015-08-30 13:43:19 -05:00

stool_bed_chair_nest

-First revision of Swarmer mob, hud, icons, etc

2015-08-25 03:24:34 -07: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

Update barsigns.dm

2015-08-20 20:08:23 -04:00

bedsheet_bin.dm

Fixes bedsheet-capes sprites.

2015-08-09 01:42:36 +03:00

displaycase.dm

Fixes proc arguments

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

door_assembly.dm

Merge remote-tracking branch 'upstream/master' into airlocking

2015-08-30 19:53:54 +01: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

-Adds swarmer as a language, makes them only able to speak to each other

2015-08-27 22:10:30 -07:00

grille.dm

-Adds swarmer as a language, makes them only able to speak to each other

2015-08-27 22:10:30 -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

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

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

janicart.dm

Removes dirt from walking on tiles

2015-08-24 11:33:52 +03: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

Buttons and wall frames rework

2015-08-28 02:01:49 +03: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

…

spirit_board.dm

Fixes proc arguments

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

statues.dm

Fixes plasma cutter firing sound, as well as lack of sound when slicing girder/statues.

2015-08-07 23:14:45 +02: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

Changed some circuits paths to reduce copypasta

2015-08-30 16:58:13 +03:00

window.dm

-First revision of Swarmer mob, hud, icons, etc

2015-08-25 03:24:34 -07:00