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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether_defines.dm

2017-07-20 15:50:53 -04:00

..

crates_lockers

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

2017-07-20 15:50:53 -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

Fix catwalks initialization and destroy to not suck.

2017-06-10 22:44:03 -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

Update flora.dm

2017-07-08 11:05:39 -04: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

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

2017-06-11 23:48:17 -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

…

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

…

noticeboard.dm

…

railing.dm

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -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 in body snatcher device (#1822)

2017-07-19 15:26:34 -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

More and more Destroy() cleanups all across the board - Return qdel hints.

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