Arokha Sieyes 3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml

2018-02-27 21:27:35 -05:00

..

devices

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

2018-02-23 21:55:42 -05:00

robot

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

2018-02-27 21:27:35 -05:00

stacks

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

2018-02-27 21:27:35 -05:00

weapons

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

2018-02-27 21:27:35 -05:00

antag_spawners.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

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

…

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

…

toys.dm

The largest PR I've probably actually done. Adds the following:

2018-02-15 03:33:23 -06:00

trash_vr.dm

Squashed commit of the following:

2018-02-04 22:43:02 +02:00

trash.dm

…