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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme

2017-02-03 21:35:22 -05:00

..

crates_lockers

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

2017-02-03 21:35:22 -05:00

stool_bed_chair_nest

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

barsign.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

bedsheet_bin.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

coathanger.dm

…

curtains.dm

…

displaycase.dm

Adds click cooldown to display case

2016-05-13 01:34:19 +01:00

door_assembly.dm

Updates for Yosh's work

2016-11-20 16:56:12 -06:00

electricchair.dm

…

extinguisher.dm

…

flora.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

girders.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

grille.dm

…

inflatable.dm

Inflatable QoL tweaks

2016-11-22 01:13:29 -06:00

janicart.dm

Ports Bay's custodial bag tweaks

2017-01-14 23:44:16 -06:00

kitchen_spike.dm

Fixes #2012

2016-08-15 10:46:26 -04:00

lattice.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

map_blocker_vr.dm

Beach.dmm fixes

2016-05-21 16:32:37 -04:00

mirror.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

mop_bucket.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

morgue_vr.dm

Small fix, Weird line that shouldnt be there is gone now.

2017-01-26 14:06:31 -03:00

morgue.dm

Forgot about this

2017-01-26 22:20:45 -03:00

musician.dm

changed player minimum age for some jobs, fixed amara fluff stuff, adding fluff boxes. Sergal speed +++, Blade borg now got mining stuff, all borgs got pounce module.

2017-01-01 17:03:25 -05:00

noticeboard.dm

…

safe.dm

…

signs.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

simple_doors.dm

…

tank_dispenser.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

target_stake.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

transit_tubes.dm

…

under_wardrobe.dm

Adds a verb for toggling specific pieces of underwear

2016-08-12 20:58:40 +02:00

watercloset.dm

item_state cleanup

2016-07-11 22:31:32 -04:00

windoor_assembly.dm

Updates for Yosh's work

2016-11-20 16:56:12 -06:00

window_spawner.dm

…

window.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00