Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

crates_lockers

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

stool_bed_chair_nest

Fixed the escape tram to actually work

2017-04-30 19:56:58 -04:00

barsign.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

bedsheet_bin.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

catwalk.dm

Ported Catwalks from Eris

2017-04-18 23:19:18 -04:00

coathanger.dm

…

curtains.dm

Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.

2017-04-11 22:36:48 -04:00

displaycase.dm

…

door_assembly.dm

Continues work on the surface map

2017-03-21 16:11:13 -04:00

electricchair.dm

…

extinguisher.dm

…

flora.dm

Merge pull request #3064 from Woodratt/WR_SC_Changes

2017-03-08 19:58:46 -06:00

girders.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

grille.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

inflatable.dm

Added in-hand sprites to most item lacking them from the Medical department.

2017-03-26 07:04:01 +01:00

janicart.dm

I missed a B.

2017-04-02 12:07:54 -04:00

kitchen_spike.dm

…

lattice.dm

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

map_blocker_vr.dm

…

mirror.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

mop_bucket.dm

Makes mopbucket climbable.

2017-04-02 11:42:13 -04:00

morgue_vr.dm

Small fix, Weird line that shouldnt be there is gone now.

2017-01-26 14:06:31 -03:00

morgue.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

musician.dm

…

noticeboard.dm

…

railing.dm

Ported Eris's "railings"

2017-04-18 23:19:26 -04:00

safe.dm

…

signs.dm

Work on tether-1 and tether-3

2017-04-27 23:08:41 -04:00

simple_doors.dm

Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.

2017-04-11 22:36:48 -04:00

tank_dispenser.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

target_stake.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

transit_tubes.dm

…

under_wardrobe.dm

…

watercloset.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

windoor_assembly.dm

Updates for Yosh's work

2016-11-20 16:56:12 -06:00

window_spawner.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

window.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00