Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 ...

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm

2018-04-06 15:40:06 -04:00

..

circuitboards

Make gas turbine constructable and operational

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

grenades

POLARIS: Revamp logging to be consistent

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

id cards

Initial cleanup/changes

2018-04-02 16:36:04 -04:00

implants

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

2018-03-31 09:20:59 -04:00

material

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

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

melee

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

2018-03-31 09:20:59 -04:00

storage

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

2018-04-06 15:40:06 -04:00

tanks

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

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

AI_modules.dm

One Crew Member

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

autopsy.dm

…

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

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

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.dm

Merge pull request #5065 from VOREStation/vs-port-3204

2018-03-20 21:13:47 -04: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

Arranges lots of things into planes (#5072)

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

power_cells.dm

9mm pistol updates (#4480)

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

RCD.dm

Fix runtime when clicking RCD on almost anything.

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

RSF.dm

…

scrolls.dm

…

shields_vr.dm

AwooCosplayCrate

2018-02-08 12:57:18 -06:00

shields.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

stunbaton.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06: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

Ater poi3 (#4968)

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

tape.dm

Arranges lots of things into planes (#5072)

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

teleportation.dm

Removes Hardcoded Z-check on Handteles

2018-01-01 06:41:17 -05:00

tools.dm

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

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

towels.dm

…

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

Adds a mounted welder to the welderpacks in engineering.

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