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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -05:00

..

circuitboards

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

grenades

Planes Framework (#4545)

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

id cards

Cleans up references to assistant

2018-01-31 00:55:13 -05:00

implants

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

material

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

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

melee

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

storage

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

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

tanks

Merge polaris sync 01 17 2018

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

AI_modules.dm

One Crew Member

2017-11-26 12:28:59 -05:00

autopsy.dm

…

candle.dm

…

cards_ids_vr.dm

…

cigs_lighters.dm

Adds Bonfires

2018-01-05 02:35:19 -05:00

clown_items.dm

grammar never ends (#4421)

2017-12-08 15:30:34 -06:00

cosmetics.dm

Planes Framework (#4545)

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

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Adds Variable Click Delay

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

hydroponics.dm

…

improvised_components.dm

…

manuals_vr.dm

Revert "Ace didn't write this version"

2017-11-18 10:57:36 -05:00

manuals.dm

Added operating manual book for Tesla

2018-01-19 17:26:45 -05:00

mop_deploy.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

Polaris sync

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

policetape.dm

…

power_cells.dm

9mm pistol updates (#4480)

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

RCD.dm

Adds Missing Ceiling Overlay + Fixes Space on Roof

2018-01-22 14:27:19 -05:00

RSF.dm

…

scrolls.dm

…

shields_vr.dm

…

shields.dm

…

stunbaton.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

…

syndie.dm

…

tape.dm

…

teleportation.dm

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

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

tools.dm

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

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

towels.dm

…

traps.dm

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

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

trays.dm

Adds Variable Click Delay

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

weaponry.dm

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

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

weldbackpack.dm

Adds a mounted welder to the welderpacks in engineering.

2017-10-31 20:07:14 -07:00