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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme

2017-10-17 08:49:37 -04:00

..

crates_lockers

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

2017-10-17 08:49:37 -04:00

ghost_pods

Corrects the autospawn pod timer

2017-09-30 21:38:23 -05:00

stool_bed_chair_nest

Polaris sync

2017-09-15 21:17:34 -04:00

barsign.dm

…

bedsheet_bin.dm

…

catwalk.dm

Improves catwalks and railings

2017-09-23 20:43:51 -05: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

Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's.

2017-09-29 22:10:48 -07:00

gravemarker.dm

Finishing touches on gravemarkers

2017-09-27 18:59:26 -05:00

grille.dm

Pol Sync

2017-10-08 17:44:25 -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

…

kitchen_spike.dm

…

lattice.dm

Catwalks and Railings

2017-09-16 00:54:33 -07:00

loot_piles.dm

Ports Trashpiles

2017-09-18 06:34:10 -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

…

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

Improves catwalks and railings

2017-09-23 20:43:51 -05:00

safe.dm

…

signs.dm

Polaris sync

2017-09-15 21:17:34 -04:00

simple_doors.dm

Adds Farm PoI

2017-09-26 01:44:06 -04:00

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

trash_pile.dm

LOTS OF FIXES

2017-10-08 18:05:27 -04:00

under_wardrobe.dm

…

watercloset.dm

Adds a few instances of to_chat()

2017-09-24 01:32:52 -05:00

windoor_assembly.dm

Updates Tools

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

window_spawner.dm

…

window.dm

Polaris sync

2017-09-15 21:17:34 -04:00