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

# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi

2017-08-18 08:14:12 -04:00

..

crates_lockers

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

2017-08-18 08:14:12 -04:00

stool_bed_chair_nest

Polaris sync

2017-08-06 19:07:17 -04:00

barsign.dm

…

bedsheet_bin.dm

…

catwalk.dm

Disables phasing downward through catwalks

2017-08-02 22:29:42 -04:00

coathanger.dm

…

curtains.dm

Updates Tools

2017-08-03 04:49:23 -04:00

displaycase.dm

…

door_assembly.dm

Updates Tools

2017-08-03 04:49:23 -04:00

electricchair.dm

Updates Tools

2017-08-03 04:49:23 -04:00

extinguisher.dm

Updates Tools

2017-08-03 04:49:23 -04:00

flora.dm

Polaris sync

2017-08-06 19:07:17 -04:00

girders.dm

Updates Tools

2017-08-03 04:49:23 -04:00

grille.dm

Polaris sync

2017-08-06 19:07:17 -04:00

inflatable.dm

A plethora of Destroy() fixes - return qdel hints and clean stuff up.

2017-06-14 01:07:35 -04:00

janicart.dm

I missed a B.

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

kitchen_spike.dm

…

lattice.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

map_blocker_vr.dm

…

mirror.dm

Updates Tools

2017-08-03 04:49:23 -04:00

mop_bucket.dm

Update mop_bucket.dm

2017-06-04 18:24:13 -04:00

morgue_vr.dm

…

morgue.dm

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

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

musician.dm

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

2017-08-18 08:14:12 -04:00

noticeboard.dm

Updates Tools

2017-08-03 04:49:23 -04:00

railing.dm

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

safe.dm

…

signs.dm

Polaris sync

2017-08-06 19:07:17 -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

Trash piles can spawn mice

2017-08-13 19:15:04 -04:00

under_wardrobe.dm

…

watercloset.dm

Updates Tools

2017-08-03 04:49:23 -04:00

windoor_assembly.dm

Updates Tools

2017-08-03 04:49:23 -04:00

window_spawner.dm

Removes the datum pool, as it is not performant.

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

window.dm

Polaris sync

2017-08-06 19:07:17 -04:00