Markolie f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3 ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-09-28 03:05:04 +02:00

..

crates_lockers

Fluff item clean-up

2015-09-25 04:31:30 +02:00

stool_bed_chair_nest

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

transit_tubes

Fixes

2015-09-27 22:50:09 +02:00

artstuff.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

barsign.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

bedsheet_bin.dm

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

coathanger.dm

…

curtains.dm

Centcomm Mods

2015-08-27 12:59:37 -07:00

displaycase.dm

Pipenet overhaul

2015-09-21 02:11:54 +02:00

door_assembly.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

dresser.dm

Sock port

2015-08-21 17:43:16 -04:00

electricchair.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

engicart.dm

…

extinguisher.dm

3/3 port done

2015-05-25 20:16:34 -04:00

false_walls.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

flora.dm

Potted Plant Hiding

2015-05-10 14:41:06 -04:00

foodcart.dm

…

fullwindow.dm

…

girders.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

grille.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

inflatable.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

janicart.dm

Oh, that kind of list

2015-09-27 19:39:09 -04:00

kitchen_spike.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

ladders.dm

3/3 port done

2015-05-25 20:16:34 -04:00

lamarr_cage.dm

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

2015-06-22 13:40:07 -07:00

lattice.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

mineral_doors.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

mirror.dm

Replace (TM) in mirror title with actual TM character)

2015-08-03 14:53:28 -07:00

misc.dm

Cleanup /defines/ folder.

2015-05-09 16:06:59 -07:00

mop_bucket.dm

Oh, that kind of list

2015-09-27 19:39:09 -04:00

morgue.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

musician.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql

2015-09-23 07:07:17 +02:00

noticeboard.dm

…

safe.dm

Bay/-tg- Meteor port

2015-06-21 18:39:39 -07:00

signs.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

spirit_board.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

tables_racks.dm

Syndicate Ship Update

2015-09-17 08:22:50 -04:00

tank_dispenser.dm

…

target_stake.dm

Get Turf Optimizations

2015-06-09 21:29:21 -04:00

watercloset.dm

Janicart and Janitor Update

2015-09-26 06:17:29 -04:00

windoor_assembly.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

window.dm

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00