Kelshark a17b2437e8 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	config/custom_items.txt
#	vorestation.dme

2017-06-12 12:39:07 -04:00

..

crates_lockers

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-12 12:39:07 -04:00

stool_bed_chair_nest

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01

2017-06-01 17:27:00 -04:00

barsign.dm

…

bedsheet_bin.dm

…

catwalk.dm

Converts our own uses of PoolOrNew to use just new()

2017-05-16 00:26:56 -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

…

grille.dm

Revert changes to structures.dmi and re-do them using structures_vr.dmi

2017-05-17 20:47:38 -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

Fixes Runtime in lattice.dm,41: undefined proc or verb /turf/simulated/floor/airless/update().

2017-05-25 15:38:01 -04:00

map_blocker_vr.dm

…

mirror.dm

…

mop_bucket.dm

Update mop_bucket.dm

2017-06-04 18:24: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

Fix missing closing HTML tags in messages.

2017-05-20 16:05:54 -04:00

safe.dm

…

signs.dm

Added VOREStation comments to our custom lines that were missing them and removed debugging code.

2017-05-20 16:57:33 -04:00

simple_doors.dm

Door stuff

2017-05-22 17:17:28 +01:00

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

trash_pile.dm

Adds the terrible quality NIF to trash piles

2017-06-06 19:35:48 -04:00

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

…

window_spawner.dm

Removes the datum pool, as it is not performant.

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

window.dm

Revert changes to structures.dmi and re-do them using structures_vr.dmi

2017-05-17 20:47:38 -04:00