Leshana 4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 ...

# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm

2018-02-24 13:19:10 -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 polaris-sync-2018-02-23

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

stacks

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

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

weapons

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

2018-02-24 13:19:10 -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

Pol sync part 2

2017-10-27 15:30:51 -04:00

bodybag.dm

Cryobag oxygen supply increased (#4866)

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

contraband_vr.dm

De-equips combat hardsuit from stolen package

2017-11-28 23:52:18 -05:00

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

Allows detectives to take an optional revolver + some other stuff (#4217)

2017-11-05 22:53:11 -06:00

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

…