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

..

devices

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

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

robot

Module change and reset animations for borgs (#3210)

2018-03-16 20:35:08 -04:00

stacks

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

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

weapons

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

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

antag_spawners.dm

…

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Cryobag oxygen supply increased (#4866)

2018-02-18 11:48:30 -08:00

contraband_vr.dm

…

contraband.dm

…

crayons.dm

Reverted use of 'usr' back to 'user' from commit 05fd53ebcc

2018-04-01 22:03:10 -04:00

glassjar.dm

…

gunbox_vr.dm

More guns for the gun box

2018-01-18 18:53:43 -05:00

gunbox.dm

…

latexballoon.dm

…

paintkit.dm

Prod suit modkits

2018-02-12 13:10:26 -08:00

poi_items.dm

Added Decoupled starship engine PoI (#4649)

2018-01-28 01:08:40 -08:00

shooting_range.dm

Arranges lots of things into planes (#5072)

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

toys.dm

Changes to objects random

2018-03-23 23:03:15 -07:00

trash_vr.dm

VS: Rewrites basically all of how bellies work

2018-02-27 13:29:45 -05:00

trash.dm

…