Leshana f93141d7d3 Merge remote-tracking branch 'polaris/master' ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme

2017-03-22 20:08:29 -04:00

..

crates_lockers

Merge remote-tracking branch 'polaris/master'

2017-03-22 20:08:29 -04:00

stool_bed_chair_nest

Fix two extra robust bugs

2017-03-03 16:25:53 -05: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

coathanger.dm

…

curtains.dm

…

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

…

inflatable.dm

Inflatable QoL tweaks

2016-11-22 01:13:29 -06:00

janicart.dm

Ports Bay's custodial bag tweaks

2017-01-14 23:44:16 -06:00

kitchen_spike.dm

Fixes #2012

2016-08-15 10:46:26 -04:00

lattice.dm

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

map_blocker_vr.dm

Beach.dmm fixes

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

mirror.dm

Returns the Vox, who now breath Phoron

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

mop_bucket.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -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

Forgot about this

2017-01-26 22:20:45 -03:00

musician.dm

…

noticeboard.dm

…

safe.dm

…

signs.dm

WR_SC_Map_Changes

2017-03-08 17:44:48 -08:00

simple_doors.dm

…

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

Adds a verb for toggling specific pieces of underwear

2016-08-12 20:58:40 +02:00

watercloset.dm

Toilet fixes

2017-02-28 01:52:57 -05:00

windoor_assembly.dm

Updates for Yosh's work

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

window_spawner.dm

…

window.dm

Polaris Sync October 9th (#633)

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