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

# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-04-20 09:03:58 -04:00

..

crates_lockers

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

2018-04-20 09:03:58 -04:00

flora

Merge branch 'master' of https://github.com/Repede/YawnWiderStation

2018-02-24 22:53:24 -05:00

ghost_pods

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

2018-03-19 11:49:33 -07: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

alien_props.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

barsign.dm

…

bedsheet_bin.dm

POLARIS: Fix cutting of bedsheets while holding them.

2018-04-17 20:24:06 -04:00

bonfire.dm

Adds various cabin-related things. (#4888)

2018-02-21 15:45:01 -06:00

catwalk.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

coathanger.dm

…

curtains.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

displaycase.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

dogbed.dm

Further Map Fixes and Adjustments

2018-01-31 05:11:23 -08:00

door_assembly.dm

Makes Projectiles Sometimes Pass Through Door Assemblies

2018-02-08 04:37:21 -05:00

electricchair.dm

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

extinguisher.dm

…

fitness.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

flora_vr.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

flora.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05: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/PolarisSS13/Polaris into polaris-sync-2018-03-30

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

holoplant.dm

Adds holoplants, and to cargo

2018-02-20 22:17:50 -05:00

inflatable.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

janicart.dm

Makes janicarts hold more water (#4558)

2018-01-17 17:29:49 -06:00

kitchen_spike.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

lattice.dm

Arranges lots of things into planes (#5072)

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

loot_piles.dm

Alien pod typo

2018-03-03 00:11:30 +00:00

map_blocker_vr.dm

Initialize procs for virgo

2018-02-03 01:00:57 -05:00

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/PolarisSS13/Polaris into polaris-sync-2018-01-19

2018-01-19 17:52:25 -05:00

morgue_vr.dm

VS: Consistent logging changes to match polaris commit

2018-03-10 17:18:09 -05:00

morgue.dm

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

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

musician.dm

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

2018-01-24 19:52:12 -05:00

new_signs.dm

All my changes so far.

2018-02-02 04:57:01 -05:00

noticeboard.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

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/PolarisSS13/Polaris into polaris-sync-2018-03-30

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

simple_doors.dm

Constructs 2.0 - Living Stone (#5040)

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

snowman.dm

Build igloos and snowmen (#4811)

2018-02-15 14:25:51 -06:00

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

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

windoor_assembly.dm

…

window_spawner.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

window.dm

Fix building frames on walls and windows.

2018-04-11 19:45:04 -04:00