Spades 1338225afa Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

..

circuitboards

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

grenades

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

id cards

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

implants

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

material

Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix

2018-10-13 17:17:27 -04:00

melee

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

storage

Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak

2018-10-30 18:40:18 -04:00

tanks

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

tools

Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

AI_modules.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

autopsy.dm

Merge pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry

2018-07-14 15:57:52 -04:00

bones.dm

Adds decorative bones and bone loot pile (#4800)

2018-02-12 22:13:47 -06:00

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

Hopefully fixes some tool-conversion things

2018-08-03 15:13:29 -05:00

extinguisher.dm

…

flamethrower.dm

Partially ports the GLOB system

2018-08-14 18:14:09 -05:00

game_kit.dm

…

gift_wrappaper.dm

Ports /vg/ instrument frame work, adds client based sound pref

2018-09-05 03:35:34 -05:00

handcuffs_vr.dm

Added fuzzy legcuffs

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

handcuffs.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

hydroponics.dm

…

improvised_components.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

manuals_vr.dm

…

manuals.dm

…

mop_deploy.dm

…

mop.dm

Merge pull request #5397 from Atermonera/boilerplate_list_fix

2018-07-09 22:52:12 -04:00

paint.dm

…

paiwire.dm

…

policetape.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

power_cells.dm

…

RCD.dm

Makes RCDs Clean Again

2018-10-16 14:17:44 -04:00

RSF.dm

…

scrolls.dm

…

shields_vr.dm

Refactors Awoos into Wolfgirls

2018-10-20 12:35:32 +10:00

shields.dm

…

stunbaton.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

surgery_tools.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

swords_axes_etc.dm

…

syndie.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

tape.dm

Merge pull request #5678 from Neerti/anchored_fix

2018-10-16 14:05:10 -04:00

teleportation.dm

for(var/bad_code in world)

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

towels.dm

…

traps_vr.dm

hurrgh

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

traps.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

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

…