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

# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi

2018-02-24 22:51:59 -05:00

..

crates_lockers

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

2018-02-24 22:51:59 -05:00

flora

Adds various cabin-related things. (#4888)

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

ghost_pods

Makes a dark ritual even darker (#4923)

2018-02-23 13:16:26 -06:00

stool_bed_chair_nest

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05: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

…

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

Adds Material Girders (#4622)

2018-01-28 18:13:54 -08:00

gravemarker.dm

…

grille.dm

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

2018-02-17 00:35:29 -05: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

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

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

loot_piles.dm

Port Bay's survival boxes

2018-02-16 19:21:15 -06:00

map_blocker_vr.dm

Initialize procs for virgo

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

mirror.dm

…

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

Polaris sync

2017-12-21 04:01:07 -05:00

morgue.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06: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

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

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

safe.dm

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

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

signs.dm

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

2018-02-01 23:55:47 -05:00

simple_doors.dm

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

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

snowman.dm

Build igloos and snowmen (#4811)

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

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

trash_pile.dm

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

2018-02-18 00:25:36 -06: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

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

2018-02-23 21:55:42 -05:00