Repede ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt

2018-08-17 19:13:15 -04:00

..

crates_lockers

Merge remote-tracking branch 'upstream/master'

2018-06-29 22:32:22 +01:00

flora

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

2018-08-17 19:13:15 -04:00

ghost_pods

Adds a cursed sword (and other haunted things) (#4931)

2018-03-19 11:49:33 -07:00

props

Folders props, and adds the laser prism, receptor, and sealed doors. (#5337)

2018-06-15 21:42:19 -04:00

stool_bed_chair_nest

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

barsign.dm

…

bedsheet_bin.dm

POLARIS: Fix cutting of bedsheets while holding them.

2018-04-19 20:51:25 -04:00

bonfire.dm

…

catwalk.dm

Merge pull request #5341 from Anewbe/catwalks_again

2018-06-10 15:41:54 -04:00

coathanger.dm

…

curtains.dm

Resolve shower curtain/steam layering issue

2018-05-12 15:29:17 -04:00

displaycase.dm

…

dogbed.dm

…

door_assembly.dm

…

electricchair.dm

…

extinguisher.dm

SSAO object excludes

2018-05-14 11:54:10 -04:00

fitness.dm

…

flora_vr.dm

…

flora.dm

tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1

2018-05-16 01:42:01 -04:00

girders.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

gravemarker.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

grille.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

holoplant.dm

…

inflatable.dm

…

janicart.dm

Merge pull request #5397 from Atermonera/boilerplate_list_fix

2018-07-09 22:52:12 -04:00

kitchen_spike.dm

…

lattice.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

loot_piles.dm

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

map_blocker_vr.dm

…

mirror.dm

Species names should now use defines

2018-03-15 20:24:45 -05:00

mop_bucket.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

morgue_vr.dm

…

morgue.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

musician.dm

…

new_signs.dm

…

noticeboard.dm

…

railing.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

safe.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

signs.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

simple_doors.dm

Constructs 2.0 - Living Stone (#5040)

2018-04-04 23:45:00 -07:00

snowman.dm

…

tank_dispenser.dm

…

target_stake.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

transit_tubes.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

trash_pile.dm

Merge pull request #101 from ProbablyCarl/master

2018-04-16 20:48:37 -04:00

under_wardrobe.dm

…

watercloset.dm

Resolve shower curtain/steam layering issue

2018-05-12 15:29:17 -04:00

windoor_assembly.dm

…

window_spawner.dm

…

window.dm

Fix building frames on walls and windows.

2018-04-11 23:13:54 -04:00