Anewbe 53b1b6dbc1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling ...

# Conflicts:
#	icons/obj/weapons.dmi

2017-03-28 22:57:00 -05:00

..

__defines

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

_compatibility/509

…

_helpers

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

_onclick

Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.

2017-03-10 22:06:05 -05:00

ATMOSPHERICS

…

controllers

Antag Radio changes

2017-03-25 14:19:57 -05:00

datums

Merge pull request #2955 from Anewbe/heart_damage

2017-03-28 20:02:24 -05:00

defines

Fix mob.loc = X on spawn

2017-03-22 23:05:44 -04:00

game

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling

2017-03-28 22:57:00 -05:00

js

…

modules

Merge pull request #3169 from Anewbe/italics_switch

2017-03-28 21:54:23 -05:00

unit_tests

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

ZAS

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak

2017-03-24 16:35:31 -05:00

_macros.dm

…

_unit_tests.dm

…

global.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00