Repede 2b0aff0b6d Merge branch 'master' into self ...

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types_vr.dm
#	icons/obj/tank_vr.dmi

2018-06-23 17:56:05 -04:00

..

circuitboards

Make gas turbine constructable and operational

2018-02-22 15:43:38 -05:00

grenades

~Promethean Tweaks: The one with the chemicals, and the other thing. (#5201)

2018-05-01 12:23:47 -07:00

id cards

Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff list)

2018-06-15 23:39:13 -04:00

implants

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

material

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

2018-06-02 18:33:44 -04:00

melee

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

storage

Merge pull request #5323 from Anewbe/loadsamoney

2018-06-06 19:08:31 -04:00

tanks

Fixed missing backsprites

2018-06-15 22:49:38 +01:00

AI_modules.dm

Constructs 2.0 - Living Stone (#5040)

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

autopsy.dm

…

bones.dm

…

candle.dm

Stop candles from messaging the universe when they light.

2018-02-22 15:25:39 -05:00

cards_ids_vr.dm

…

cigs_lighters.dm

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

2018-03-15 22:41:14 -04:00

clown_items.dm

…

cosmetics.dm

…

dna_injector.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

explosives.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

handcuffs_vr.dm

Added fuzzy legcuffs

2018-04-13 04:56:16 +10:00

handcuffs.dm

Fixed legcuffs checking for being handcuffed instead of legcuffed when put on

2018-04-13 05:00:18 +10:00

hydroponics.dm

…

improvised_components.dm

…

manuals_vr.dm

…

manuals.dm

…

mop_deploy.dm

…

mop.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

paint.dm

…

paiwire.dm

…

policetape.dm

Arranges lots of things into planes (#5072)

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

power_cells.dm

…

RCD.dm

Constructs 2.0 - Living Stone (#5040)

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

RSF.dm

…

scrolls.dm

…

shields_vr.dm

…

shields_yw.dm

blueshield, more clothes/vests, more weapons, phorochem fixes,

2018-06-11 21:27:11 -04:00

shields.dm

…

stunbaton.dm

Recharger refactor

2018-06-16 17:15:59 -04:00

surgery_tools.dm

…

swords_axes_etc.dm

…

syndie.dm

Ater poi3 (#4968)

2018-03-05 19:55:27 -06:00

tape.dm

Ports the medical item sounds from Bay

2018-04-25 14:39:49 -04:00

teleportation.dm

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

2018-06-02 18:33:44 -04:00

tools.dm

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

2018-06-23 17:53:13 -04:00

towels.dm

…

traps_vr.dm

hurrgh

2018-04-28 00:28:15 +03:00

traps.dm

…

trays.dm

Arranges lots of things into planes (#5072)

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

weaponry.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

weldbackpack.dm

…