Arokha Sieyes c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 ...

# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi

2018-05-29 21:05:27 -04:00

..

sheets

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

tiles

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

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

fifty_spawner.dm

Various Loot Pile and Dungeon objects Stage Uno (#4975)

2018-02-28 11:18:44 -06:00

marker_beacons.dm

tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1

2018-05-16 01:42:01 -04:00

matter_synth.dm

…

medical.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

nanopaste.dm

…

rods.dm

Ghetto splints now spawn properly when used in hand (#4857)

2018-02-18 01:09:34 -08:00

stack.dm

…

telecrystal.dm

…