Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 ...

# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm

2018-01-15 13:27:39 -05:00

..

crates_lockers

Merge pull request #2725 from VOREStation/aro-bacon

2018-01-14 00:07:54 -05:00

flora

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

ghost_pods

Makes lost drone pod charger-able.

2017-11-03 14:26:59 -04:00

stool_bed_chair_nest

Polaris sync

2017-12-21 04:01:07 -05:00

alien_props.dm

work

2017-11-26 12:08:05 -05:00

barsign.dm

…

bedsheet_bin.dm

…

bonfire.dm

Adds Bonfires

2018-01-05 02:35:19 -05:00

catwalk.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

coathanger.dm

…

curtains.dm

…

displaycase.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

door_assembly.dm

work

2017-11-26 12:08:05 -05:00

electricchair.dm

…

extinguisher.dm

…

fitness.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

flora.dm

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

girders.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

gravemarker.dm

Finishing touches on gravemarkers

2017-09-27 18:59:26 -05:00

grille.dm

Polaris sync

2017-12-21 04:01:07 -05:00

inflatable.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

janicart.dm

…

kitchen_spike.dm

Meatspike fixes. (#4299)

2017-11-19 14:42:37 -06:00

lattice.dm

These are not Vorestation edits. (#4088)

2017-10-16 23:01:30 -05:00

loot_piles.dm

Fixes 'varient'

2018-01-08 16:42:20 -05:00

map_blocker_vr.dm

…

mirror.dm

…

mop_bucket.dm

…

morgue_vr.dm

Polaris sync

2017-12-21 04:01:07 -05:00

morgue.dm

POLARIS: Planes shenanigans. Begins 'plane' work.

2018-01-14 00:39:59 -05:00

musician.dm

Adds rotate verb for pianos (#4324)

2017-11-23 12:58:43 -06:00

noticeboard.dm

…

railing.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

safe.dm

The game actually clicks when it claims to. (#4403)

2017-12-07 18:18:01 -06:00

signs.dm

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

2017-12-26 23:07:58 -05:00

simple_doors.dm

Adds Farm PoI

2017-09-26 01:44:06 -04:00

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

trash_pile.dm

LOTS OF FIXES

2017-10-08 18:05:27 -04:00

under_wardrobe.dm

…

watercloset.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

windoor_assembly.dm

…

window_spawner.dm

…

window.dm

Polaris sync

2017-12-21 04:01:07 -05:00