Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

crates_lockers

Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync

2016-05-19 23:52:00 -04:00

stool_bed_chair_nest

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

2016-05-28 20:22:09 +01:00

barsign.dm

Barsigns now rotate correctly with client.dir, improved the code a bit

2015-08-18 07:18:13 +01:00

bedsheet_bin.dm

Bedsheets can be worn as capes

2016-03-28 22:01:37 -04:00

coathanger.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

curtains.dm

Merge pull request #1239 from Mark9013100/3/23/2016layering

2016-03-26 17:06:54 -04:00

displaycase.dm

Adds click cooldown to display case

2016-05-13 01:34:19 +01:00

door_assembly.dm

Multi-tile airlock building FIX

2016-05-16 18:31:32 +01:00

electricchair.dm

…

extinguisher.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

flora.dm

…

girders.dm

Reinforced Walls

2016-04-15 16:41:33 +02:00

grille.dm

Updates blob

2015-10-05 18:10:16 +03:00

inflatable.dm

Polaris tweaks.

2016-04-06 07:48:09 -04:00

janicart.dm

Construction Update

2016-03-25 16:02:36 -04:00

kitchen_spike.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

lattice.dm

Generalized pulling restrictions to mob level.

2016-01-08 23:20:30 +10:30

map_blocker_vr.dm

Beach.dmm fixes

2016-05-21 16:32:37 -04:00

mirror.dm

Construction Update

2016-03-25 16:02:36 -04:00

mop_bucket.dm

Generalized pulling restrictions to mob level.

2016-01-08 23:20:30 +10:30

morgue.dm

Morgue Trays interface with occupant minds

2016-04-25 20:10:43 +02:00

musician.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

noticeboard.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

safe.dm

Construction Update

2016-03-25 16:02:36 -04:00

signs.dm

Generalized pulling restrictions to mob level.

2016-01-08 23:20:30 +10:30

simple_doors.dm

Adds common proc to obtain the material of an object

2015-08-01 23:03:21 -04:00

tank_dispenser.dm

Generalized pulling restrictions to mob level.

2016-01-08 23:20:30 +10:30

target_stake.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

transit_tubes.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

under_wardrobe.dm

Underwear Datums (#1794)

2016-05-29 17:29:36 +01:00

watercloset.dm

Construction Update

2016-03-25 16:02:36 -04:00

windoor_assembly.dm

Generalized pulling restrictions to mob level.

2016-01-08 23:20:30 +10:30

window_spawner.dm

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

window.dm

Allow building lights on windows.

2016-05-25 21:43:59 -04:00